xiaoxian521 2 роки тому
батько
коміт
7397c315a7

+ 2 - 2
build/plugins.ts

@@ -8,7 +8,7 @@ import WindiCSS from "vite-plugin-windicss";
 import { viteMockServe } from "vite-plugin-mock";
 import styleImport from "vite-plugin-style-import";
 import VueI18n from "@intlify/vite-plugin-vue-i18n";
-import ElementPlus from "unplugin-element-plus/vite";
+// import ElementPlus from "unplugin-element-plus/vite";
 import { visualizer } from "rollup-plugin-visualizer";
 import removeConsole from "vite-plugin-remove-console";
 import themePreprocessorPlugin from "@pureadmin/theme";
@@ -65,7 +65,7 @@ export function getPluginsList(command, VITE_LEGACY) {
         }
       ]
     }),
-    ElementPlus({}),
+    // ElementPlus({}),
     // mock支持
     viteMockServe({
       mockPath: "mock",

+ 9 - 9
package.json

@@ -29,12 +29,12 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@ctrl/tinycolor": "^3.4.0",
-    "@logicflow/core": "0.7.1",
-    "@logicflow/extension": "0.7.1",
+    "@logicflow/core": "^1.1.14",
+    "@logicflow/extension": "^1.1.14",
     "@pureadmin/components": "^1.0.6",
-    "@vueuse/core": "^8.2.5",
+    "@vueuse/core": "^8.3.1",
     "@vueuse/motion": "^2.0.0-beta.12",
-    "@vueuse/shared": "^8.2.5",
+    "@vueuse/shared": "^8.3.1",
     "@wangeditor/editor": "^5.0.1",
     "@wangeditor/editor-for-vue": "^5.1.10",
     "animate.css": "^4.1.1",
@@ -44,7 +44,7 @@
     "dayjs": "^1.11.0",
     "driver.js": "^0.9.8",
     "echarts": "^5.3.2",
-    "element-plus": "^2.1.9",
+    "element-plus": "^2.1.10",
     "element-resize-detector": "^1.2.3",
     "js-cookie": "^3.0.1",
     "lodash": "^4.17.21",
@@ -84,7 +84,7 @@
     "@iconify-icons/uil": "^1.2.1",
     "@iconify/vue": "^3.2.1",
     "@intlify/vite-plugin-vue-i18n": "^3.3.1",
-    "@pureadmin/theme": "^0.0.1",
+    "@pureadmin/theme": "^1.1.0",
     "@types/element-resize-detector": "1.1.3",
     "@types/js-cookie": "^3.0.1",
     "@types/lodash": "^4.14.180",
@@ -100,7 +100,7 @@
     "@vitejs/plugin-vue-jsx": "^1.3.10",
     "@vue/eslint-config-prettier": "^7.0.0",
     "@vue/eslint-config-typescript": "^10.0.0",
-    "autoprefixer": "^10.4.2",
+    "autoprefixer": "^10.4.5",
     "cross-env": "7.0.3",
     "eslint": "^8.8.0",
     "eslint-plugin-prettier": "^4.0.0",
@@ -118,7 +118,7 @@
     "rimraf": "3.0.2",
     "rollup": "^2.70.1",
     "rollup-plugin-visualizer": "^5.6.0",
-    "sass": "^1.49.9",
+    "sass": "^1.50.1",
     "stylelint": "^14.3.0",
     "stylelint-config-html": "^1.0.0",
     "stylelint-config-prettier": "^9.0.3",
@@ -126,7 +126,7 @@
     "stylelint-config-standard": "^24.0.0",
     "stylelint-order": "^5.0.0",
     "typescript": "^4.6.3",
-    "unplugin-element-plus": "^0.3.4",
+    "unplugin-element-plus": "^0.4.0",
     "vite": "^2.9.5",
     "vite-plugin-mock": "^2.9.6",
     "vite-plugin-remove-console": "^0.0.7",

+ 96 - 126
pnpm-lock.yaml

@@ -15,10 +15,10 @@ specifiers:
   "@iconify-icons/uil": ^1.2.1
   "@iconify/vue": ^3.2.1
   "@intlify/vite-plugin-vue-i18n": ^3.3.1
-  "@logicflow/core": 0.7.1
-  "@logicflow/extension": 0.7.1
+  "@logicflow/core": ^1.1.14
+  "@logicflow/extension": ^1.1.14
   "@pureadmin/components": ^1.0.6
-  "@pureadmin/theme": ^0.0.1
+  "@pureadmin/theme": ^1.1.0
   "@types/element-resize-detector": 1.1.3
   "@types/js-cookie": ^3.0.1
   "@types/lodash": ^4.14.180
@@ -34,13 +34,13 @@ specifiers:
   "@vitejs/plugin-vue-jsx": ^1.3.10
   "@vue/eslint-config-prettier": ^7.0.0
   "@vue/eslint-config-typescript": ^10.0.0
-  "@vueuse/core": ^8.2.5
+  "@vueuse/core": ^8.3.1
   "@vueuse/motion": ^2.0.0-beta.12
-  "@vueuse/shared": ^8.2.5
+  "@vueuse/shared": ^8.3.1
   "@wangeditor/editor": ^5.0.1
   "@wangeditor/editor-for-vue": ^5.1.10
   animate.css: ^4.1.1
-  autoprefixer: ^10.4.2
+  autoprefixer: ^10.4.5
   axios: ^0.26.1
   cropperjs: ^1.5.12
   cross-env: 7.0.3
@@ -48,7 +48,7 @@ specifiers:
   dayjs: ^1.11.0
   driver.js: ^0.9.8
   echarts: ^5.3.2
-  element-plus: ^2.1.9
+  element-plus: ^2.1.10
   element-resize-detector: ^1.2.3
   eslint: ^8.8.0
   eslint-plugin-prettier: ^4.0.0
@@ -79,7 +79,7 @@ specifiers:
   rimraf: 3.0.2
   rollup: ^2.70.1
   rollup-plugin-visualizer: ^5.6.0
-  sass: ^1.49.9
+  sass: ^1.50.1
   stylelint: ^14.3.0
   stylelint-config-html: ^1.0.0
   stylelint-config-prettier: ^9.0.3
@@ -87,7 +87,7 @@ specifiers:
   stylelint-config-standard: ^24.0.0
   stylelint-order: ^5.0.0
   typescript: ^4.6.3
-  unplugin-element-plus: ^0.3.4
+  unplugin-element-plus: ^0.4.0
   v-contextmenu: 3.0.0
   vite: ^2.9.5
   vite-plugin-mock: ^2.9.6
@@ -111,12 +111,12 @@ specifiers:
 dependencies:
   "@amap/amap-jsapi-loader": 1.0.1
   "@ctrl/tinycolor": 3.4.0
-  "@logicflow/core": 0.7.1
-  "@logicflow/extension": 0.7.1
+  "@logicflow/core": 1.1.14
+  "@logicflow/extension": 1.1.14
   "@pureadmin/components": 1.0.6_vue@3.2.33
-  "@vueuse/core": 8.2.5_vue@3.2.33
+  "@vueuse/core": 8.3.1_vue@3.2.33
   "@vueuse/motion": 2.0.0-beta.12_vue@3.2.33
-  "@vueuse/shared": 8.2.5_vue@3.2.33
+  "@vueuse/shared": 8.3.1_vue@3.2.33
   "@wangeditor/editor": 5.0.1
   "@wangeditor/editor-for-vue": 5.1.10_9016b5918024e821ee2af40b62ae7476
   animate.css: 4.1.1
@@ -126,7 +126,7 @@ dependencies:
   dayjs: 1.11.0
   driver.js: 0.9.8
   echarts: 5.3.2
-  element-plus: 2.1.9_vue@3.2.33
+  element-plus: 2.1.10_vue@3.2.33
   element-resize-detector: 1.2.4
   js-cookie: 3.0.1
   lodash: 4.17.21
@@ -166,7 +166,7 @@ devDependencies:
   "@iconify-icons/uil": 1.2.1
   "@iconify/vue": 3.2.1_vue@3.2.33
   "@intlify/vite-plugin-vue-i18n": 3.3.1_3d08e1d9025840888da5ae870455a383
-  "@pureadmin/theme": 0.0.1
+  "@pureadmin/theme": 1.1.0
   "@types/element-resize-detector": 1.1.3
   "@types/js-cookie": 3.0.1
   "@types/lodash": 4.14.180
@@ -182,7 +182,7 @@ devDependencies:
   "@vitejs/plugin-vue-jsx": 1.3.10
   "@vue/eslint-config-prettier": 7.0.0_eslint@8.11.0+prettier@2.6.0
   "@vue/eslint-config-typescript": 10.0.0_67e26bb50fed2173443e3fe1262a69b2
-  autoprefixer: 10.4.4_postcss@8.4.12
+  autoprefixer: 10.4.5_postcss@8.4.12
   cross-env: 7.0.3
   eslint: 8.11.0
   eslint-plugin-prettier: 4.0.0_eslint@8.11.0+prettier@2.6.0
@@ -200,7 +200,7 @@ devDependencies:
   rimraf: 3.0.2
   rollup: 2.70.1
   rollup-plugin-visualizer: 5.6.0_rollup@2.70.1
-  sass: 1.49.9
+  sass: 1.50.1
   stylelint: 14.6.0
   stylelint-config-html: 1.0.0_f552817e5b8b1b7dca381d844218922e
   stylelint-config-prettier: 9.0.3_stylelint@14.6.0
@@ -208,8 +208,8 @@ devDependencies:
   stylelint-config-standard: 24.0.0_stylelint@14.6.0
   stylelint-order: 5.0.0_stylelint@14.6.0
   typescript: 4.6.3
-  unplugin-element-plus: 0.3.4_rollup@2.70.1+vite@2.9.5
-  vite: 2.9.5_sass@1.49.9
+  unplugin-element-plus: 0.4.0_rollup@2.70.1+vite@2.9.5
+  vite: 2.9.5_sass@1.50.1
   vite-plugin-mock: 2.9.6_9bee6d01fd796cb52b526d4503041d36
   vite-plugin-remove-console: 0.0.7
   vite-plugin-style-import: 1.4.1_vite@2.9.5
@@ -1152,7 +1152,7 @@ packages:
       debug: 4.3.4
       fast-glob: 3.2.11
       source-map: 0.6.1
-      vite: 2.9.5_sass@1.49.9
+      vite: 2.9.5_sass@1.50.1
       vue-i18n: 9.2.0-beta.35_vue@3.2.33
     transitivePeerDependencies:
       - supports-color
@@ -1194,10 +1194,10 @@ packages:
       "@jridgewell/sourcemap-codec": 1.4.11
     dev: true
 
-  /@logicflow/core/0.7.1:
+  /@logicflow/core/1.1.14:
     resolution:
       {
-        integrity: sha512-fGuBGwLWRzGhurHgZik8ZN6B89fldvoksjPoXr8kyL/WGrLKGpzvMJPbdXFpLN3F9hif307UrSb+S2eD//aMxA==
+        integrity: sha512-3elMVZmw5S/eT93rNr861iDQ40hR2T8A+8g1pbP9U8HdhyUWcORnANsLpA9wa+eNDg1ZERwdcFHelSWX/HY8Xg==
       }
     dependencies:
       "@types/mousetrap": 1.6.9
@@ -1205,12 +1205,13 @@ packages:
       preact: 10.6.6
     dev: false
 
-  /@logicflow/extension/0.7.1:
+  /@logicflow/extension/1.1.14:
     resolution:
       {
-        integrity: sha512-bndx4dLuVI7GdDxRVExR9uCHukS3OVQwMHddzShA9bM+onzm3aWvvXu39Cq/ck1brg6s+VBqLOkTLPL50Loecw==
+        integrity: sha512-60T8tJHrMQMSTHCR8k5m+IKfbKH59QsDyLP29GVgGvEGanwu7MXVY2YAxAsS80rb62PWXf4hTZowX3vmENiKKA==
       }
     dependencies:
+      "@logicflow/core": 1.1.14
       ids: 1.0.0
       preact: 10.6.6
     dev: false
@@ -1265,16 +1266,14 @@ packages:
       vue: 3.2.33
     dev: false
 
-  /@pureadmin/theme/0.0.1:
+  /@pureadmin/theme/1.1.0:
     resolution:
       {
-        integrity: sha512-LqCmIHHlpleqZ93xnZ/JYZmDIBCMAXE3Yo7/RA64e755aWz/QrbBHrU5cN5e7J53N+TSPeWPxrmWMcyApzNgbQ==
+        integrity: sha512-hHCUwxWqt0hdXsErb9NLyRC/7cUUxA4tn+SbBdpslQyJh+5iaIDG4PHgIrUNaBRmOorm2WQ+ryY35b1YbLPpxg==
       }
     dependencies:
       "@zougt/some-loader-utils": 1.4.3
-      cac: 6.7.12
-      chalk: 5.0.1
-      fs-extra: 10.0.1
+      fs-extra: 10.1.0
       string-hash: 1.1.3
     dev: true
 
@@ -1702,7 +1701,7 @@ packages:
       magic-string: 0.26.1
       regenerator-runtime: 0.13.9
       systemjs: 6.12.1
-      vite: 2.9.5_sass@1.49.9
+      vite: 2.9.5_sass@1.50.1
     dev: true
 
   /@vitejs/plugin-vue-jsx/1.3.10:
@@ -1732,7 +1731,7 @@ packages:
       vite: ^2.5.10
       vue: ^3.2.25
     dependencies:
-      vite: 2.9.5_sass@1.49.9
+      vite: 2.9.5_sass@1.50.1
       vue: 3.2.33
     dev: true
 
@@ -1995,10 +1994,10 @@ packages:
       }
     dev: false
 
-  /@vueuse/core/8.2.5_vue@3.2.33:
+  /@vueuse/core/8.3.1_vue@3.2.33:
     resolution:
       {
-        integrity: sha512-5prZAA1Ji2ltwNUnzreu6WIXYqHYP/9U2BiY5mD/650VYLpVcwVlYznJDFcLCmEWI3o3Vd34oS1FUf+6Mh68GQ==
+        integrity: sha512-WiXUgVyPG9elGx3G8UV8g+zqbEJ2hYacrPICogAxDdW6hnxxcUFdF7FtvDroJ/DxWmo2pg8XNNz07ybfnZyJbw==
       }
     peerDependencies:
       "@vue/composition-api": ^1.1.0
@@ -2009,16 +2008,16 @@ packages:
       vue:
         optional: true
     dependencies:
-      "@vueuse/metadata": 8.2.5
-      "@vueuse/shared": 8.2.5_vue@3.2.33
+      "@vueuse/metadata": 8.3.1
+      "@vueuse/shared": 8.3.1_vue@3.2.33
       vue: 3.2.33
       vue-demi: 0.12.4_vue@3.2.33
     dev: false
 
-  /@vueuse/metadata/8.2.5:
+  /@vueuse/metadata/8.3.1:
     resolution:
       {
-        integrity: sha512-Lk9plJjh9cIdiRdcj16dau+2LANxIdFCiTgdfzwYXbflxq0QnMBeOD2qHgKDE7fuVrtPcVWj8VSuZEx1HRfNQA==
+        integrity: sha512-1aZaFL44HzXXkfN6Q7KMDOXBFKTHDClHlOJBxtN8rTBXIIScoGOrJCpxWiQ4kuVg95MzG/pHrd3P4wd8poL9XQ==
       }
     dev: false
 
@@ -2034,8 +2033,8 @@ packages:
       "@vue/composition-api":
         optional: true
     dependencies:
-      "@vueuse/core": 8.2.5_vue@3.2.33
-      "@vueuse/shared": 8.2.5_vue@3.2.33
+      "@vueuse/core": 8.3.1_vue@3.2.33
+      "@vueuse/shared": 8.3.1_vue@3.2.33
       framesync: 6.1.0
       popmotion: 11.0.3
       style-value-types: 5.1.0
@@ -2043,10 +2042,10 @@ packages:
       vue-demi: 0.12.4_vue@3.2.33
     dev: false
 
-  /@vueuse/shared/8.2.5_vue@3.2.33:
+  /@vueuse/shared/8.3.1_vue@3.2.33:
     resolution:
       {
-        integrity: sha512-lNWo+7sk6JCuOj4AiYM+6HZ6fq4xAuVq1sVckMQKgfCJZpZRe4i8es+ZULO5bYTKP+VrOCtqrLR2GzEfrbr3YQ==
+        integrity: sha512-7HKLCcxp4dtONq6QSSoavblo9riYgqzw7jhqiC0/VUYMXKzqj1G/GznOzTmY8Wi8uKKT197JqjKQ1DKt2j/0+A==
       }
     peerDependencies:
       "@vue/composition-api": ^1.1.0
@@ -2311,10 +2310,10 @@ packages:
     hasBin: true
     dependencies:
       cac: 6.7.12
-      color: 4.2.1
-      cssnano: 5.1.5_postcss@8.4.12
+      color: 4.2.3
+      cssnano: 5.1.7_postcss@8.4.12
       cssnano-preset-lite: 2.1.2_postcss@8.4.12
-      fs-extra: 10.0.1
+      fs-extra: 10.1.0
       postcss: 8.4.12
       prettier: 2.6.0
       uuid: 8.3.2
@@ -2578,10 +2577,10 @@ packages:
       }
     dev: false
 
-  /autoprefixer/10.4.4_postcss@8.4.12:
+  /autoprefixer/10.4.5_postcss@8.4.12:
     resolution:
       {
-        integrity: sha512-Tm8JxsB286VweiZ5F0anmbyGiNI3v3wGv3mz9W+cxEDYB/6jbnj6GM9H9mK3wIL8ftgl+C07Lcwb8PG5PCCPzA==
+        integrity: sha512-Fvd8yCoA7lNX/OUllvS+aS1I7WRBclGXsepbvT8ZaPgrH24rgXpZzF0/6Hh3ZEkwg+0AES/Osd196VZmYoEFtw==
       }
     engines: { node: ^10 || ^12 || >=14 }
     hasBin: true
@@ -2589,7 +2588,7 @@ packages:
       postcss: ^8.1.0
     dependencies:
       browserslist: 4.20.2
-      caniuse-lite: 1.0.30001319
+      caniuse-lite: 1.0.30001332
       fraction.js: 4.2.0
       normalize-range: 0.1.2
       picocolors: 1.0.0
@@ -2670,7 +2669,7 @@ packages:
     engines: { node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7 }
     hasBin: true
     dependencies:
-      caniuse-lite: 1.0.30001319
+      caniuse-lite: 1.0.30001332
       electron-to-chromium: 1.4.90
       escalade: 3.1.1
       node-releases: 2.0.2
@@ -2763,15 +2762,15 @@ packages:
       }
     dependencies:
       browserslist: 4.20.2
-      caniuse-lite: 1.0.30001319
+      caniuse-lite: 1.0.30001332
       lodash.memoize: 4.1.2
       lodash.uniq: 4.5.0
     dev: true
 
-  /caniuse-lite/1.0.30001319:
+  /caniuse-lite/1.0.30001332:
     resolution:
       {
-        integrity: sha512-xjlIAFHucBRSMUo1kb5D4LYgcN1M45qdKP++lhqowDpwJwGkpIRTt5qQqnhxjj1vHcI7nrJxWhCC1ATrCEBTcw==
+        integrity: sha512-10T30NYOEQtN6C11YGg411yebhvpnC6Z102+B95eAsN0oB6KUs01ivE8u+G6FMIRtIrVlYXhL+LUwQ3/hXwDWw==
       }
     dev: true
 
@@ -2819,14 +2818,6 @@ packages:
       supports-color: 7.2.0
     dev: true
 
-  /chalk/5.0.1:
-    resolution:
-      {
-        integrity: sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==
-      }
-    engines: { node: ^12.17.0 || ^14.13 || >=16.0.0 }
-    dev: true
-
   /change-case/4.1.2:
     resolution:
       {
@@ -2953,10 +2944,10 @@ packages:
       color-name: 1.1.4
     dev: false
 
-  /color-string/1.9.0:
+  /color-string/1.9.1:
     resolution:
       {
-        integrity: sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==
+        integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
       }
     dependencies:
       color-name: 1.1.4
@@ -2971,15 +2962,15 @@ packages:
       color-string: 0.3.0
     dev: false
 
-  /color/4.2.1:
+  /color/4.2.3:
     resolution:
       {
-        integrity: sha512-MFJr0uY4RvTQUKvPq7dh9grVOTYSFeXja2mBXioCGjnjJoXrAp9jJ1NQTDR73c9nwBSAQiNKloKl5zq9WB9UPw==
+        integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==
       }
     engines: { node: ">=12.5.0" }
     dependencies:
       color-convert: 2.0.1
-      color-string: 1.9.0
+      color-string: 1.9.1
     dev: true
 
   /colord/2.9.2:
@@ -3187,17 +3178,16 @@ packages:
       rgb: 0.1.0
     dev: false
 
-  /css-declaration-sorter/6.1.4_postcss@8.4.12:
+  /css-declaration-sorter/6.2.2_postcss@8.4.12:
     resolution:
       {
-        integrity: sha512-lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw==
+        integrity: sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg==
       }
-    engines: { node: ">= 10" }
+    engines: { node: ^10 || ^12 || >=14 }
     peerDependencies:
       postcss: ^8.0.9
     dependencies:
       postcss: 8.4.12
-      timsort: 0.3.0
     dev: true
 
   /css-functions-list/3.0.1:
@@ -3249,16 +3239,16 @@ packages:
     hasBin: true
     dev: true
 
-  /cssnano-preset-default/5.2.5_postcss@8.4.12:
+  /cssnano-preset-default/5.2.7_postcss@8.4.12:
     resolution:
       {
-        integrity: sha512-WopL7PzN7sos3X8B54/QGl+CZUh1f0qN4ds+y2d5EPwRSSc3jsitVw81O+Uyop0pXyOfPfZxnc+LmA8w/Ki/WQ==
+        integrity: sha512-JiKP38ymZQK+zVKevphPzNSGHSlTI+AOwlasoSRtSVMUU285O7/6uZyd5NbW92ZHp41m0sSHe6JoZosakj63uA==
       }
     engines: { node: ^10 || ^12 || >=14.0 }
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      css-declaration-sorter: 6.1.4_postcss@8.4.12
+      css-declaration-sorter: 6.2.2_postcss@8.4.12
       cssnano-utils: 3.1.0_postcss@8.4.12
       postcss: 8.4.12
       postcss-calc: 8.2.4_postcss@8.4.12
@@ -3268,7 +3258,7 @@ packages:
       postcss-discard-duplicates: 5.1.0_postcss@8.4.12
       postcss-discard-empty: 5.1.1_postcss@8.4.12
       postcss-discard-overridden: 5.1.0_postcss@8.4.12
-      postcss-merge-longhand: 5.1.3_postcss@8.4.12
+      postcss-merge-longhand: 5.1.4_postcss@8.4.12
       postcss-merge-rules: 5.1.1_postcss@8.4.12
       postcss-minify-font-values: 5.1.0_postcss@8.4.12
       postcss-minify-gradients: 5.1.1_postcss@8.4.12
@@ -3318,17 +3308,17 @@ packages:
       postcss: 8.4.12
     dev: true
 
-  /cssnano/5.1.5_postcss@8.4.12:
+  /cssnano/5.1.7_postcss@8.4.12:
     resolution:
       {
-        integrity: sha512-VZO1e+bRRVixMeia1zKagrv0lLN1B/r/u12STGNNUFxnp97LIFgZHQa0JxqlwEkvzUyA9Oz/WnCTAFkdEbONmg==
+        integrity: sha512-pVsUV6LcTXif7lvKKW9ZrmX+rGRzxkEdJuVJcp5ftUjWITgwam5LMZOgaTvUrWPkcORBey6he7JKb4XAJvrpKg==
       }
     engines: { node: ^10 || ^12 || >=14.0 }
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      cssnano-preset-default: 5.2.5_postcss@8.4.12
-      lilconfig: 2.0.4
+      cssnano-preset-default: 5.2.7_postcss@8.4.12
+      lilconfig: 2.0.5
       postcss: 8.4.12
       yaml: 1.10.2
     dev: true
@@ -3619,35 +3609,7 @@ packages:
       "@popperjs/core": 2.11.5
       "@types/lodash": 4.14.181
       "@types/lodash-es": 4.17.6
-      "@vueuse/core": 8.2.5_vue@3.2.33
-      async-validator: 4.0.7
-      dayjs: 1.11.0
-      escape-html: 1.0.3
-      lodash: 4.17.21
-      lodash-es: 4.17.21
-      lodash-unified: 1.0.2_da03a4540fbd16bbaafbb96724306afd
-      memoize-one: 6.0.0
-      normalize-wheel-es: 1.1.2
-      vue: 3.2.33
-    transitivePeerDependencies:
-      - "@vue/composition-api"
-    dev: false
-
-  /element-plus/2.1.9_vue@3.2.33:
-    resolution:
-      {
-        integrity: sha512-6mWqS3YrmJPnouWP4otzL8+MehfOnDFqDbcIdnmC07p+Z0JkWe/CVKc4Wky8AYC8nyDMUQyiZYvooCbqGuM7pg==
-      }
-    peerDependencies:
-      vue: ^3.2.0
-    dependencies:
-      "@ctrl/tinycolor": 3.4.0
-      "@element-plus/icons-vue": 1.1.4_vue@3.2.33
-      "@floating-ui/dom": 0.4.4
-      "@popperjs/core": 2.11.5
-      "@types/lodash": 4.14.181
-      "@types/lodash-es": 4.17.6
-      "@vueuse/core": 8.2.5_vue@3.2.33
+      "@vueuse/core": 8.3.1_vue@3.2.33
       async-validator: 4.0.7
       dayjs: 1.11.0
       escape-html: 1.0.3
@@ -4607,6 +4569,18 @@ packages:
       universalify: 2.0.0
     dev: true
 
+  /fs-extra/10.1.0:
+    resolution:
+      {
+        integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
+      }
+    engines: { node: ">=12" }
+    dependencies:
+      graceful-fs: 4.2.9
+      jsonfile: 6.1.0
+      universalify: 2.0.0
+    dev: true
+
   /fs-extra/5.0.0:
     resolution:
       {
@@ -5378,10 +5352,10 @@ packages:
       type-check: 0.4.0
     dev: true
 
-  /lilconfig/2.0.4:
+  /lilconfig/2.0.5:
     resolution:
       {
-        integrity: sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==
+        integrity: sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==
       }
     engines: { node: ">=10" }
     dev: true
@@ -6375,10 +6349,10 @@ packages:
     resolution: { integrity: sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ= }
     dev: true
 
-  /postcss-merge-longhand/5.1.3_postcss@8.4.12:
+  /postcss-merge-longhand/5.1.4_postcss@8.4.12:
     resolution:
       {
-        integrity: sha512-lX8GPGvZ0iGP/IboM7HXH5JwkXvXod1Rr8H8ixwiA372hArk0zP4ZcCy4z4Prg/bfNlbbTf0KCOjCF9kKnpP/w==
+        integrity: sha512-hbqRRqYfmXoGpzYKeW0/NCZhvNyQIlQeWVSao5iKWdyx7skLvCfQFGIUsP9NUs3dSbPac2IC4Go85/zG+7MlmA==
       }
     engines: { node: ^10 || ^12 || >=14.0 }
     peerDependencies:
@@ -7085,10 +7059,10 @@ packages:
       }
     dev: true
 
-  /sass/1.49.9:
+  /sass/1.50.1:
     resolution:
       {
-        integrity: sha512-YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A==
+        integrity: sha512-noTnY41KnlW2A9P8sdwESpDmo+KBNkukI1i8+hOK3footBUcohNHtdOJbckp46XO95nuvcHDDZ+4tmOnpK3hjw==
       }
     engines: { node: ">=12.0.0" }
     hasBin: true
@@ -7738,10 +7712,6 @@ packages:
       readable-stream: 3.6.0
     dev: true
 
-  /timsort/0.3.0:
-    resolution: { integrity: sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= }
-    dev: true
-
   /tiny-warning/1.0.3:
     resolution:
       {
@@ -7936,17 +7906,17 @@ packages:
     engines: { node: ">= 0.8" }
     dev: true
 
-  /unplugin-element-plus/0.3.4_rollup@2.70.1+vite@2.9.5:
+  /unplugin-element-plus/0.4.0_rollup@2.70.1+vite@2.9.5:
     resolution:
       {
-        integrity: sha512-U6rbBBPzBO1NsCpD5pmp6KnuR4Gwbqphndgix1TW9uMY1+P+gYHolbnECHwRngbPk3+IDIPJhKXz0a6pD7T6fw==
+        integrity: sha512-iE4EZu8pp5Vz/qb9r45sCNSz9Px6KOthBpe6gFBV1E60g9A45HS+JhwAaj4Zki8HZ0YGW3LyrsBCrd+XhOypnQ==
       }
     engines: { node: ">=14.17.0" }
     dependencies:
       "@rollup/pluginutils": 4.2.0
       es-module-lexer: 0.10.5
       magic-string: 0.26.1
-      unplugin: 0.6.1_rollup@2.70.1+vite@2.9.5
+      unplugin: 0.6.2_rollup@2.70.1+vite@2.9.5
     transitivePeerDependencies:
       - esbuild
       - rollup
@@ -7954,10 +7924,10 @@ packages:
       - webpack
     dev: true
 
-  /unplugin/0.6.1_rollup@2.70.1+vite@2.9.5:
+  /unplugin/0.6.2_rollup@2.70.1+vite@2.9.5:
     resolution:
       {
-        integrity: sha512-cQqRCgQ2v/Q4fPIWNVZ6sNIDdl5v8JXOnlsUOsGzT4fblTONoPWaytiYSpu5qJ9lvSDZYAQN6BRVo3XQoZMfUQ==
+        integrity: sha512-+QONc2uBFQbeo4x5mlJHjTKjR6pmuchMpGVrWhwdGFFMb4ttFZ4E9KqhOOrNcm3Q8NNyB1vJ4s5e36IZC7UWYw==
       }
     peerDependencies:
       esbuild: ">=0.13"
@@ -7976,7 +7946,7 @@ packages:
     dependencies:
       chokidar: 3.5.3
       rollup: 2.70.1
-      vite: 2.9.5_sass@1.49.9
+      vite: 2.9.5_sass@1.50.1
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.4.3
     dev: true
@@ -8082,7 +8052,7 @@ packages:
       fast-glob: 3.2.11
       mockjs: 1.1.0
       path-to-regexp: 6.2.0
-      vite: 2.9.5_sass@1.49.9
+      vite: 2.9.5_sass@1.50.1
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -8109,7 +8079,7 @@ packages:
       es-module-lexer: 0.9.3
       fs-extra: 10.0.1
       magic-string: 0.25.9
-      vite: 2.9.5_sass@1.49.9
+      vite: 2.9.5_sass@1.50.1
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -8125,7 +8095,7 @@ packages:
       "@windicss/plugin-utils": 1.8.4
       debug: 4.3.4
       kolorist: 1.5.1
-      vite: 2.9.5_sass@1.49.9
+      vite: 2.9.5_sass@1.50.1
       windicss: 3.5.1
     transitivePeerDependencies:
       - supports-color
@@ -8141,7 +8111,7 @@ packages:
       svgo: 2.8.0
     dev: true
 
-  /vite/2.9.5_sass@1.49.9:
+  /vite/2.9.5_sass@1.50.1:
     resolution:
       {
         integrity: sha512-dvMN64X2YEQgSXF1lYabKXw3BbN6e+BL67+P3Vy4MacnY+UzT1AfkHiioFSi9+uiDUiaDy7Ax/LQqivk6orilg==
@@ -8164,7 +8134,7 @@ packages:
       postcss: 8.4.12
       resolve: 1.22.0
       rollup: 2.70.1
-      sass: 1.49.9
+      sass: 1.50.1
     optionalDependencies:
       fsevents: 2.3.2
     dev: true

+ 29 - 34
src/components/ReFlowChart/src/Control.vue

@@ -24,36 +24,43 @@ let titleLists = ref([
   {
     icon: "icon-zoom-out-hs",
     text: "缩小",
+    size: "18",
     disabled: false
   },
   {
     icon: "icon-enlarge-hs",
     text: "放大",
+    size: "18",
     disabled: false
   },
   {
     icon: "icon-full-screen-hs",
     text: "适应",
+    size: "15",
     disabled: false
   },
   {
     icon: "icon-previous-hs",
     text: "上一步",
+    size: "15",
     disabled: true
   },
   {
     icon: "icon-next-step-hs",
     text: "下一步",
+    size: "17",
     disabled: true
   },
   {
     icon: "icon-download-hs",
     text: "下载图片",
+    size: "17",
     disabled: false
   },
   {
     icon: "icon-watch-hs",
     text: "查看数据",
+    size: "17",
     disabled: false
   }
 ]);
@@ -95,21 +102,29 @@ onMounted(() => {
         v-for="(item, key) in titleLists"
         :key="key"
         :title="item.text"
-        :style="{ background: focusIndex === key ? '#ccc' : '' }"
         @mouseenter.prevent="onEnter(key)"
         @mouseleave.prevent="focusIndex = -1"
       >
-        <button
-          :ref="'controlButton' + key"
-          :disabled="item.disabled"
-          :style="{
-            cursor: item.disabled === false ? 'pointer' : 'not-allowed'
-          }"
-          @click="onControl(item, key)"
+        <el-tooltip
+          :content="item.text"
+          :visible="focusIndex === key"
+          placement="right"
         >
-          <span :class="'iconfont ' + item.icon" />
-          <p>{{ item.text }}</p>
-        </button>
+          <button
+            :ref="'controlButton' + key"
+            :disabled="item.disabled"
+            :style="{
+              cursor: item.disabled === false ? 'pointer' : 'not-allowed',
+              color: item.disabled === false ? '' : '#00000040'
+            }"
+            @click="onControl(item, key)"
+          >
+            <span
+              :class="'iconfont ' + item.icon"
+              :style="{ fontSize: `${item.size}px` }"
+            />
+          </button>
+        </el-tooltip>
       </li>
     </ul>
   </div>
@@ -119,36 +134,16 @@ onMounted(() => {
 @import "./assets/iconfont/iconfont.css";
 
 .control-container {
-  position: absolute;
-  right: 20px;
   background: hsla(0, 0%, 100%, 0.8);
   box-shadow: 0 1px 4px rgb(0 0 0 / 20%);
 }
 
-.iconfont {
-  font-size: 18px;
-}
-
-.control-container p {
-  margin: 0;
-  font-size: 12px;
-}
-
-.control-container ul {
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
-  margin: 2px;
-}
-
 .control-container ul li {
-  width: 60px;
+  margin: 10px;
   text-align: center;
 }
 
-.control-container ul li button {
-  border: none;
-  background-color: transparent;
-  outline: none;
+.control-container ul li span:hover {
+  color: var(--el-color-primary);
 }
 </style>

+ 2 - 3
src/components/ReFlowChart/src/NodePanel.vue

@@ -54,9 +54,8 @@ const nodeDragNode = item => {
 <style scoped>
 .node-panel {
   position: absolute;
-  top: 100px;
-  left: 50px;
-  width: 70px;
+  top: 10px;
+  width: 60px;
   padding: 20px 10px;
   background-color: white;
   box-shadow: 0 0 10px 1px rgb(228, 224, 219);

+ 0 - 6
src/style/element-plus.scss

@@ -53,12 +53,6 @@
   --el-button-active-border-color: var(--el-color-primary) !important;
 }
 
-/* button--primary plain */
-.el-button--primary.is-plain {
-  --el-button-active-bg-color: var(--el-color-primary) !important;
-  --el-button-active-border-color: var(--el-color-primary) !important;
-}
-
 /* nprogress适配ep的primary */
 #nprogress {
   & .bar {

+ 2 - 2
vite.config.ts

@@ -84,8 +84,8 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
         "lodash-es",
         "@vueuse/core",
         "@iconify/vue",
-        "element-plus/lib/locale/lang/en",
-        "element-plus/lib/locale/lang/zh-cn",
+        // "element-plus/lib/locale/lang/en",
+        // "element-plus/lib/locale/lang/zh-cn",
         "vxe-table/lib/locale/lang/zh-CN",
         "vxe-table/lib/locale/lang/en-US"
       ],