Merge remote-tracking branch 'origin/main' into gitee

package.json

@@ -61,7 +61,7 @@
     "@wangeditor/editor-for-vue": "^5.1.12",
     "@zxcvbn-ts/core": "^3.0.4",
     "animate.css": "^4.1.1",
-    "axios": "^1.6.3",
+    "axios": "^1.6.5",
     "china-area-data": "^5.0.1",
     "cropperjs": "^1.6.1",
     "dayjs": "^1.11.10",
@@ -87,8 +87,8 @@
     "v-contextmenu": "3.0.0",
     "v3-infinite-loading": "^1.3.1",
     "version-rocket": "^1.7.1",
-    "vue": "^3.4.3",
-    "vue-i18n": "^9.8.0",
+    "vue": "^3.4.5",
+    "vue-i18n": "^9.9.0",
     "vue-json-pretty": "^2.3.0",
     "vue-pdf-embed": "^1.2.1",
     "vue-router": "^4.2.5",
@@ -98,14 +98,14 @@
     "vue-waterfall-plugin-next": "^2.3.1",
     "vue3-danmaku": "^1.6.0",
     "vuedraggable": "^4.1.0",
-    "wavesurfer.js": "^7.6.0",
+    "wavesurfer.js": "^7.6.1",
     "xgplayer": "^3.0.11",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
-    "@commitlint/cli": "^18.4.3",
-    "@commitlint/config-conventional": "^18.4.3",
-    "@commitlint/types": "^18.4.3",
+    "@commitlint/cli": "^18.4.4",
+    "@commitlint/config-conventional": "^18.4.4",
+    "@commitlint/types": "^18.4.4",
     "@eslint/js": "^8.56.0",
     "@faker-js/faker": "^8.3.1",
     "@iconify-icons/ep": "^1.2.12",
@@ -120,13 +120,13 @@
     "@types/qrcode": "^1.5.5",
     "@types/qs": "^6.9.11",
     "@types/sortablejs": "^1.15.7",
-    "@typescript-eslint/eslint-plugin": "^6.17.0",
-    "@typescript-eslint/parser": "^6.17.0",
+    "@typescript-eslint/eslint-plugin": "^6.18.0",
+    "@typescript-eslint/parser": "^6.18.0",
     "@vitejs/plugin-vue": "^5.0.2",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "autoprefixer": "^10.4.16",
     "cloc": "^2.11.0",
-    "cssnano": "^6.0.2",
+    "cssnano": "^6.0.3",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-define-config": "^2.1.0",
@@ -135,23 +135,23 @@
     "husky": "^8.0.3",
     "lint-staged": "^15.2.0",
     "picocolors": "^1.0.0",
-    "postcss": "^8.4.32",
+    "postcss": "^8.4.33",
     "postcss-html": "^1.5.0",
     "postcss-import": "^15.1.0",
     "postcss-scss": "^4.0.9",
     "prettier": "^3.1.1",
     "rimraf": "^5.0.5",
     "rollup-plugin-visualizer": "^5.12.0",
-    "sass": "^1.69.6",
+    "sass": "^1.69.7",
     "stylelint": "^16.1.0",
     "stylelint-config-recess-order": "^4.4.0",
     "stylelint-config-recommended-vue": "^1.5.0",
     "stylelint-config-standard-scss": "^12.0.0",
     "stylelint-prettier": "^5.0.0",
     "svgo": "^3.2.0",
-    "tailwindcss": "^3.4.0",
+    "tailwindcss": "^3.4.1",
     "typescript": "^5.3.3",
-    "vite": "^5.0.10",
+    "vite": "^5.0.11",
     "vite-plugin-cdn-import": "^0.3.5",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-fake-server": "2.0.0",

src/router/modules/able.ts

@@ -47,7 +47,7 @@ export default {
     {
       path: "/able/print",
       name: "Print",
-      component: () => import("@/views/able/print.vue"),
+      component: () => import("@/views/able/print/index.vue"),
       meta: {
         title: $t("menus.hsPrint")
       }

src/views/able/print/index.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref } from "vue";
 import Print from "@/utils/print";
-import Line from "../welcome/components/Line.vue";
+import pieChart from "./pieChart.vue";
 
 defineOptions({
   name: "Print"
@@ -157,7 +157,7 @@ const tableData: User[] = [
         }"
       >
         <p class="font-medium pt-1">Echart</p>
-        <Line class="echart mt-[10px]" />
+        <pieChart class="echart mt-[10px]" />
       </el-col>
 
       <el-col

src/views/able/print/pieChart.vue

@@ -0,0 +1,43 @@
+<script setup lang="ts">
+import { ref, computed } from "vue";
+import { useDark, useECharts } from "@pureadmin/utils";
+
+const { isDark } = useDark();
+
+const theme = computed(() => (isDark.value ? "dark" : "light"));
+
+const pieChartRef = ref();
+const { setOptions } = useECharts(pieChartRef, {
+  theme
+});
+
+setOptions({
+  tooltip: {
+    trigger: "item"
+  },
+  legend: {
+    icon: "circle",
+    //@ts-expect-error
+    right: true
+  },
+  series: [
+    {
+      name: "饼图",
+      type: "pie",
+      top: "20%",
+      radius: "80%",
+      center: ["40%", "50%"],
+      color: ["#e6a23c", "#f56c6c", "#53a7ff"],
+      data: [
+        { value: 400, name: "watchers" },
+        { value: 1600, name: "forks" },
+        { value: 7200, name: "star" }
+      ]
+    }
+  ]
+});
+</script>
+
+<template>
+  <div ref="pieChartRef" style="width: 100%; height: 35vh" />
+</template>

src/views/welcome/utils.ts

@@ -1,12 +1,6 @@
 export { default as dayjs } from "dayjs";
 export { useResizeObserver } from "@vueuse/core";
-export {
-  useDark,
-  debounce,
-  cloneDeep,
-  randomColor,
-  randomGradient
-} from "@pureadmin/utils";
+export { useDark, debounce, cloneDeep, randomGradient } from "@pureadmin/utils";
 
 export function getRandomIntBetween(min: number, max: number) {
   return Math.floor(Math.random() * (max - min + 1)) + min;