diff --git a/package-lock.json b/package-lock.json
index 8e926a9..3af5f7a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,6 +38,7 @@
         "@codemirror/lang-sql": "^6.5.4",
         "@vitejs/plugin-vue": "^4.2.1",
         "@vitejs/plugin-vue-jsx": "^3.0.1",
+        "lodash": "^4.17.21",
         "unplugin-auto-import": "^0.15.3",
         "unplugin-vue-components": "^0.24.1",
         "vite": "^4.3.4",
@@ -45,13 +46,13 @@
       }
     },
     "node_modules/@ampproject/remapping": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
@@ -99,9 +100,9 @@
       "integrity": "sha512-4ddpsiHN9Pd4UIlWuKVK1C4IiZIdbwQvy9i7DUSI3xNJ89FPUFt8lxDYj8GzzfdllV0NkJTRxnG+FvLk0llidg=="
     },
     "node_modules/@antv/g-base": {
-      "version": "0.5.15",
-      "resolved": "https://registry.npmjs.org/@antv/g-base/-/g-base-0.5.15.tgz",
-      "integrity": "sha512-QOtq50QpnKez9J75/Z8j2yZ7QDQdk8R8mVQJiHtaEO5eI7DM4ZbrsWff/Ew26JYmPWdq7nbRuARMAD4PX9uuLA==",
+      "version": "0.5.16",
+      "resolved": "https://registry.npmjs.org/@antv/g-base/-/g-base-0.5.16.tgz",
+      "integrity": "sha512-jP06wggTubDPHXoKwFg3/f1lyxBX9ywwN3E/HG74Nd7DXqOXQis8tsIWW+O6dS/h9vyuXLd1/wDWkMMm3ZzXdg==",
       "dependencies": {
         "@antv/event-emitter": "^0.1.1",
         "@antv/g-math": "^0.1.9",
@@ -127,9 +128,9 @@
       }
     },
     "node_modules/@antv/g-canvas": {
-      "version": "0.5.14",
-      "resolved": "https://registry.npmjs.org/@antv/g-canvas/-/g-canvas-0.5.14.tgz",
-      "integrity": "sha512-IUGLEMIMAUYgaBMT8h3FTmYQYz7sjQkKWwh6Psqx+UPK86fySa+G8fMRrh1EqAL07jVB+GRnn6Ym+3FoFUgeFg==",
+      "version": "0.5.17",
+      "resolved": "https://registry.npmjs.org/@antv/g-canvas/-/g-canvas-0.5.17.tgz",
+      "integrity": "sha512-sXYJMWTOlb/Ycb6sTKu00LcJqInXJY4t99+kSM40u2OfqrXYmaXDjHR7D2V0roMkbK/QWiWS9UnEidCR1VtMOA==",
       "dependencies": {
         "@antv/g-base": "^0.5.12",
         "@antv/g-math": "^0.1.9",
@@ -263,43 +264,43 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
-      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
+      "version": "7.24.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz",
+      "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.23.4",
-        "chalk": "^2.4.2"
+        "@babel/highlight": "^7.24.2",
+        "picocolors": "^1.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
-      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.1.tgz",
+      "integrity": "sha512-Pc65opHDliVpRHuKfzI+gSA4zcgr65O4cl64fFJIWEEh8JoHIHh0Oez1Eo8Arz8zq/JhgKodQaxEwUPRtZylVA==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz",
-      "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==",
+      "version": "7.24.3",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.3.tgz",
+      "integrity": "sha512-5FcvN1JHw2sHJChotgx8Ek0lyuh4kCKelgMTTqhYJJtloNvUfpAFMeNQUtdlIaktwrSV9LtCdqwk48wL2wBacQ==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
+        "@babel/code-frame": "^7.24.2",
+        "@babel/generator": "^7.24.1",
         "@babel/helper-compilation-targets": "^7.23.6",
         "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.9",
-        "@babel/parser": "^7.23.9",
-        "@babel/template": "^7.23.9",
-        "@babel/traverse": "^7.23.9",
-        "@babel/types": "^7.23.9",
+        "@babel/helpers": "^7.24.1",
+        "@babel/parser": "^7.24.1",
+        "@babel/template": "^7.24.0",
+        "@babel/traverse": "^7.24.1",
+        "@babel/types": "^7.24.0",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -315,14 +316,14 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
-      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.1.tgz",
+      "integrity": "sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.23.6",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
+        "@babel/types": "^7.24.0",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^2.5.1"
       },
       "engines": {
@@ -358,9 +359,9 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.23.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.10.tgz",
-      "integrity": "sha512-2XpP2XhkXzgxecPNEEK8Vz8Asj9aRxt08oKOqtiZoqV2UGZ5T+EkyP9sXQ9nwMxBIG34a7jmasVqoMop7VdPUw==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.1.tgz",
+      "integrity": "sha512-1yJa9dX9g//V6fDebXoEfEsxkZHk3Hcbm+zLhyu6qVgYFLvmTALTeV+jNU9e5RnYtioBrGEOdoI2joMSNQ/+aA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
@@ -368,7 +369,7 @@
         "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-member-expression-to-functions": "^7.23.0",
         "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.20",
+        "@babel/helper-replace-supers": "^7.24.1",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
         "semver": "^6.3.1"
@@ -427,12 +428,12 @@
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
-      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+      "version": "7.24.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz",
+      "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.15"
+        "@babel/types": "^7.24.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -470,22 +471,22 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
+      "version": "7.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz",
+      "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz",
-      "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.1.tgz",
+      "integrity": "sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ==",
       "dev": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-member-expression-to-functions": "^7.22.15",
+        "@babel/helper-member-expression-to-functions": "^7.23.0",
         "@babel/helper-optimise-call-expression": "^7.22.5"
       },
       "engines": {
@@ -532,9 +533,9 @@
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz",
+      "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -559,37 +560,38 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.9.tgz",
-      "integrity": "sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.1.tgz",
+      "integrity": "sha512-BpU09QqEe6ZCHuIHFphEFgvNSrubve1FtyMton26ekZ85gRGi6LrTF7zArARp2YvyFxloeiRmtSCq5sjh1WqIg==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.23.9",
-        "@babel/traverse": "^7.23.9",
-        "@babel/types": "^7.23.9"
+        "@babel/template": "^7.24.0",
+        "@babel/traverse": "^7.24.1",
+        "@babel/types": "^7.24.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
-      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
+      "version": "7.24.2",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz",
+      "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.22.20",
         "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0"
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz",
-      "integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.1.tgz",
+      "integrity": "sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -598,12 +600,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz",
-      "integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz",
+      "integrity": "sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.24.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -613,12 +615,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz",
-      "integrity": "sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz",
+      "integrity": "sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.24.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -628,15 +630,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-typescript": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.23.6.tgz",
-      "integrity": "sha512-6cBG5mBvUu4VUD04OHKnYzbuHNP8huDsD3EDqqpIpsswTDoqHCjLoHb6+QgsV1WsT2nipRqCPgxD3LXnEO7XfA==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.1.tgz",
+      "integrity": "sha512-liYSESjX2fZ7JyBFkYG78nfvHlMKE6IpNdTVnxmlYUR+j5ZLsitFbaAE+eJSK2zPPkNWNw4mXL51rQ8WrvdK0w==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-typescript": "^7.23.3"
+        "@babel/helper-create-class-features-plugin": "^7.24.1",
+        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/plugin-syntax-typescript": "^7.24.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -646,33 +648,33 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.23.9.tgz",
-      "integrity": "sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==",
+      "version": "7.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
+      "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.23.5",
-        "@babel/parser": "^7.23.9",
-        "@babel/types": "^7.23.9"
+        "@babel/parser": "^7.24.0",
+        "@babel/types": "^7.24.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.9.tgz",
-      "integrity": "sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz",
+      "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
+        "@babel/code-frame": "^7.24.1",
+        "@babel/generator": "^7.24.1",
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.9",
-        "@babel/types": "^7.23.9",
+        "@babel/parser": "^7.24.1",
+        "@babel/types": "^7.24.0",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -681,9 +683,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz",
-      "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==",
+      "version": "7.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz",
+      "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==",
       "dev": true,
       "dependencies": {
         "@babel/helper-string-parser": "^7.23.4",
@@ -695,9 +697,9 @@
       }
     },
     "node_modules/@codemirror/autocomplete": {
-      "version": "6.12.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.12.0.tgz",
-      "integrity": "sha512-r4IjdYFthwbCQyvqnSlx0WBHRHi8nBvU+WjJxFUij81qsBfhNudf/XKKmmC2j3m0LaOYUQTf3qiEK1J8lO1sdg==",
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.15.0.tgz",
+      "integrity": "sha512-G2Zm0mXznxz97JhaaOdoEG2cVupn4JjPaS4AcNvZzhOsnnG9YVN68VzfoUw6dYTsIxT6a/cmoFEN47KAWhXaOg==",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
@@ -733,9 +735,9 @@
       }
     },
     "node_modules/@codemirror/lang-javascript": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.1.tgz",
-      "integrity": "sha512-jlFOXTejVyiQCW3EQwvKH0m99bUYIw40oPmFjSX2VS78yzfe0HELZ+NEo9Yfo1MkGRpGlj3Gnu4rdxV1EnAs5A==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.2.tgz",
+      "integrity": "sha512-VGQfY+FCc285AhWuwjYxQyUQcYurWlxdKYT4bqwr3Twnd5wP5WSeu52t4tvvuWmljT4EmgEgZCqSieokhtY8hg==",
       "dev": true,
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
@@ -748,9 +750,9 @@
       }
     },
     "node_modules/@codemirror/lang-sql": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-sql/-/lang-sql-6.5.5.tgz",
-      "integrity": "sha512-DvOaP2RXLb2xlxJxxydTFfwyYw5YDqEFea6aAfgh9UH0kUD6J1KFZ0xPgPpw1eo/5s2w3L6uh5PVR7GM23GxkQ==",
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-sql/-/lang-sql-6.6.2.tgz",
+      "integrity": "sha512-ZVt7AHflRDFVwxSq7nnj1pko9yR6wKFDtc6Ln7zUs8RX34v5sgVxy3d2lQfORhMPVblEJLaugn+sjwRmAFWNIg==",
       "dev": true,
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
@@ -785,9 +787,9 @@
       }
     },
     "node_modules/@codemirror/search": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.5.tgz",
-      "integrity": "sha512-PIEN3Ke1buPod2EHbJsoQwlbpkz30qGZKcnmH1eihq9+bPQx8gelauUwLYaY4vBOuBAuEhmpDLii4rj/uO0yMA==",
+      "version": "6.5.6",
+      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.6.tgz",
+      "integrity": "sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q==",
       "peer": true,
       "dependencies": {
         "@codemirror/state": "^6.0.0",
@@ -796,14 +798,14 @@
       }
     },
     "node_modules/@codemirror/state": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.0.tgz",
-      "integrity": "sha512-hm8XshYj5Fo30Bb922QX9hXB/bxOAVH+qaqHBzw5TKa72vOeslyGwd4X8M0c1dJ9JqxlaMceOQ8RsL9tC7gU0A=="
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz",
+      "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A=="
     },
     "node_modules/@codemirror/view": {
-      "version": "6.23.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.23.1.tgz",
-      "integrity": "sha512-J2Xnn5lFYT1ZN/5ewEoMBCmLlL71lZ3mBdb7cUEuHhX2ESoSrNEucpsDXpX22EuTGm9LOgC9v4Z0wx+Ez8QmGA==",
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.26.0.tgz",
+      "integrity": "sha512-nSSmzONpqsNzshPOxiKhK203R6BvABepugAe34QfQDbNDslyjkqBuKgrK5ZBvqNXpfxz5iLrlGTmEfhbQyH46A==",
       "dependencies": {
         "@codemirror/state": "^6.4.0",
         "style-mod": "^4.1.0",
@@ -1165,12 +1167,12 @@
       }
     },
     "node_modules/@floating-ui/dom": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.1.tgz",
-      "integrity": "sha512-iA8qE43/H5iGozC3W0YSnVSW42Vh522yyM1gj+BqRwVsTNOyr231PsXDaV04yT39PsO0QL2QpbI/M0ZaLUQgRQ==",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.3.tgz",
+      "integrity": "sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==",
       "dependencies": {
-        "@floating-ui/core": "^1.6.0",
-        "@floating-ui/utils": "^0.2.1"
+        "@floating-ui/core": "^1.0.0",
+        "@floating-ui/utils": "^0.2.0"
       }
     },
     "node_modules/@floating-ui/utils": {
@@ -1184,16 +1186,17 @@
       "integrity": "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg=="
     },
     "node_modules/@iconify/utils": {
-      "version": "2.1.20",
-      "resolved": "https://registry.npmjs.org/@iconify/utils/-/utils-2.1.20.tgz",
-      "integrity": "sha512-t8TeKlYK/5i9yTY9VAGAE4P0qQHd/0vH+VSRO+bdpxlt8wqB6f2I0/IrciRsdeFZPMoL8IICgP7lgl2ZtbG8Tw==",
+      "version": "2.1.22",
+      "resolved": "https://registry.npmjs.org/@iconify/utils/-/utils-2.1.22.tgz",
+      "integrity": "sha512-6UHVzTVXmvO8uS6xFF+L/QTSpTzA/JZxtgU+KYGFyDYMEObZ1bu/b5l+zNJjHy+0leWjHI+C0pXlzGvv3oXZMA==",
       "dependencies": {
         "@antfu/install-pkg": "^0.1.1",
         "@antfu/utils": "^0.7.5",
         "@iconify/types": "^2.0.0",
         "debug": "^4.3.4",
         "kolorist": "^1.8.0",
-        "local-pkg": "^0.5.0"
+        "local-pkg": "^0.5.0",
+        "mlly": "^1.5.0"
       }
     },
     "node_modules/@iconify/utils/node_modules/local-pkg": {
@@ -1212,32 +1215,32 @@
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
       "dev": true,
       "engines": {
         "node": ">=6.0.0"
@@ -1249,9 +1252,9 @@
       "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.22",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz",
-      "integrity": "sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==",
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
       "dev": true,
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
@@ -1337,9 +1340,9 @@
       }
     },
     "node_modules/@polka/url": {
-      "version": "1.0.0-next.24",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.24.tgz",
-      "integrity": "sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ=="
+      "version": "1.0.0-next.25",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz",
+      "integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ=="
     },
     "node_modules/@popperjs/core": {
       "name": "@sxzz/popperjs-es",
@@ -1403,9 +1406,9 @@
       "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
     },
     "node_modules/@types/lodash": {
-      "version": "4.14.202",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz",
-      "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ=="
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.0.tgz",
+      "integrity": "sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA=="
     },
     "node_modules/@types/lodash-es": {
       "version": "4.17.12",
@@ -1458,25 +1461,25 @@
       }
     },
     "node_modules/@vue/babel-helper-vue-transform-on": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.2.1.tgz",
-      "integrity": "sha512-jtEXim+pfyHWwvheYwUwSXm43KwQo8nhOBDyjrUITV6X2tB7lJm6n/+4sqR8137UVZZul5hBzWHdZ2uStYpyRQ==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.2.2.tgz",
+      "integrity": "sha512-nOttamHUR3YzdEqdM/XXDyCSdxMA9VizUKoroLX6yTyRtggzQMHXcmwh8a7ZErcJttIBIc9s68a1B8GZ+Dmvsw==",
       "dev": true
     },
     "node_modules/@vue/babel-plugin-jsx": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.2.1.tgz",
-      "integrity": "sha512-Yy9qGktktXhB39QE99So/BO2Uwm/ZG+gpL9vMg51ijRRbINvgbuhyJEi4WYmGRMx/MSTfK0xjgZ3/MyY+iLCEg==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.2.2.tgz",
+      "integrity": "sha512-nYTkZUVTu4nhP199UoORePsql0l+wj7v/oyQjtThUVhJl1U+6qHuoVhIvR3bf7eVKjbCK+Cs2AWd7mi9Mpz9rA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.22.15",
+        "@babel/helper-module-imports": "~7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-jsx": "^7.23.3",
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.7",
-        "@babel/types": "^7.23.6",
-        "@vue/babel-helper-vue-transform-on": "1.2.1",
-        "@vue/babel-plugin-resolve-type": "1.2.1",
+        "@babel/template": "^7.23.9",
+        "@babel/traverse": "^7.23.9",
+        "@babel/types": "^7.23.9",
+        "@vue/babel-helper-vue-transform-on": "1.2.2",
+        "@vue/babel-plugin-resolve-type": "1.2.2",
         "camelcase": "^6.3.0",
         "html-tags": "^3.3.1",
         "svg-tags": "^1.0.0"
@@ -1490,116 +1493,140 @@
         }
       }
     },
+    "node_modules/@vue/babel-plugin-jsx/node_modules/@babel/helper-module-imports": {
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.22.15"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@vue/babel-plugin-resolve-type": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@vue/babel-plugin-resolve-type/-/babel-plugin-resolve-type-1.2.1.tgz",
-      "integrity": "sha512-IOtnI7pHunUzHS/y+EG/yPABIAp0VN8QhQ0UCS09jeMVxgAnI9qdOzO85RXdQGxq+aWCdv8/+k3W0aYO6j/8fQ==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@vue/babel-plugin-resolve-type/-/babel-plugin-resolve-type-1.2.2.tgz",
+      "integrity": "sha512-EntyroPwNg5IPVdUJupqs0CFzuf6lUrVvCspmv2J1FITLeGnUCuoGNNk78dgCusxEiYj6RMkTJflGSxk5aIC4A==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.23.5",
-        "@babel/helper-module-imports": "^7.22.15",
+        "@babel/helper-module-imports": "~7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/parser": "^7.23.6",
+        "@babel/parser": "^7.23.9",
         "@vue/compiler-sfc": "^3.4.15"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@vue/compiler-core": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.15.tgz",
-      "integrity": "sha512-XcJQVOaxTKCnth1vCxEChteGuwG6wqnUHxAm1DO3gCz0+uXKaJNx8/digSz4dLALCy8n2lKq24jSUs8segoqIw==",
+    "node_modules/@vue/babel-plugin-resolve-type/node_modules/@babel/helper-module-imports": {
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+      "dev": true,
       "dependencies": {
-        "@babel/parser": "^7.23.6",
-        "@vue/shared": "3.4.15",
+        "@babel/types": "^7.22.15"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@vue/compiler-core": {
+      "version": "3.4.21",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.21.tgz",
+      "integrity": "sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==",
+      "dependencies": {
+        "@babel/parser": "^7.23.9",
+        "@vue/shared": "3.4.21",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
         "source-map-js": "^1.0.2"
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.15.tgz",
-      "integrity": "sha512-wox0aasVV74zoXyblarOM3AZQz/Z+OunYcIHe1OsGclCHt8RsRm04DObjefaI82u6XDzv+qGWZ24tIsRAIi5MQ==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.21.tgz",
+      "integrity": "sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==",
       "dependencies": {
-        "@vue/compiler-core": "3.4.15",
-        "@vue/shared": "3.4.15"
+        "@vue/compiler-core": "3.4.21",
+        "@vue/shared": "3.4.21"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.15.tgz",
-      "integrity": "sha512-LCn5M6QpkpFsh3GQvs2mJUOAlBQcCco8D60Bcqmf3O3w5a+KWS5GvYbrrJBkgvL1BDnTp+e8q0lXCLgHhKguBA==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.21.tgz",
+      "integrity": "sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==",
       "dependencies": {
-        "@babel/parser": "^7.23.6",
-        "@vue/compiler-core": "3.4.15",
-        "@vue/compiler-dom": "3.4.15",
-        "@vue/compiler-ssr": "3.4.15",
-        "@vue/shared": "3.4.15",
+        "@babel/parser": "^7.23.9",
+        "@vue/compiler-core": "3.4.21",
+        "@vue/compiler-dom": "3.4.21",
+        "@vue/compiler-ssr": "3.4.21",
+        "@vue/shared": "3.4.21",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.5",
-        "postcss": "^8.4.33",
+        "magic-string": "^0.30.7",
+        "postcss": "^8.4.35",
         "source-map-js": "^1.0.2"
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.15.tgz",
-      "integrity": "sha512-1jdeQyiGznr8gjFDadVmOJqZiLNSsMa5ZgqavkPZ8O2wjHv0tVuAEsw5hTdUoUW4232vpBbL/wJhzVW/JwY1Uw==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.21.tgz",
+      "integrity": "sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==",
       "dependencies": {
-        "@vue/compiler-dom": "3.4.15",
-        "@vue/shared": "3.4.15"
+        "@vue/compiler-dom": "3.4.21",
+        "@vue/shared": "3.4.21"
       }
     },
     "node_modules/@vue/devtools-api": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.1.tgz",
-      "integrity": "sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA=="
+      "version": "6.6.1",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.1.tgz",
+      "integrity": "sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA=="
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.15.tgz",
-      "integrity": "sha512-55yJh2bsff20K5O84MxSvXKPHHt17I2EomHznvFiJCAZpJTNW8IuLj1xZWMLELRhBK3kkFV/1ErZGHJfah7i7w==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.21.tgz",
+      "integrity": "sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==",
       "dependencies": {
-        "@vue/shared": "3.4.15"
+        "@vue/shared": "3.4.21"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.15.tgz",
-      "integrity": "sha512-6E3by5m6v1AkW0McCeAyhHTw+3y17YCOKG0U0HDKDscV4Hs0kgNT5G+GCHak16jKgcCDHpI9xe5NKb8sdLCLdw==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.21.tgz",
+      "integrity": "sha512-pQthsuYzE1XcGZznTKn73G0s14eCJcjaLvp3/DKeYWoFacD9glJoqlNBxt3W2c5S40t6CCcpPf+jG01N3ULyrA==",
       "dependencies": {
-        "@vue/reactivity": "3.4.15",
-        "@vue/shared": "3.4.15"
+        "@vue/reactivity": "3.4.21",
+        "@vue/shared": "3.4.21"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.15.tgz",
-      "integrity": "sha512-EVW8D6vfFVq3V/yDKNPBFkZKGMFSvZrUQmx196o/v2tHKdwWdiZjYUBS+0Ez3+ohRyF8Njwy/6FH5gYJ75liUw==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.21.tgz",
+      "integrity": "sha512-gvf+C9cFpevsQxbkRBS1NpU8CqxKw0ebqMvLwcGQrNpx6gqRDodqKqA+A2VZZpQ9RpK2f9yfg8VbW/EpdFUOJw==",
       "dependencies": {
-        "@vue/runtime-core": "3.4.15",
-        "@vue/shared": "3.4.15",
+        "@vue/runtime-core": "3.4.21",
+        "@vue/shared": "3.4.21",
         "csstype": "^3.1.3"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.15.tgz",
-      "integrity": "sha512-3HYzaidu9cHjrT+qGUuDhFYvF/j643bHC6uUN9BgM11DVy+pM6ATsG6uPBLnkwOgs7BpJABReLmpL3ZPAsUaqw==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.21.tgz",
+      "integrity": "sha512-aV1gXyKSN6Rz+6kZ6kr5+Ll14YzmIbeuWe7ryJl5muJ4uwSwY/aStXTixx76TwkZFJLm1aAlA/HSWEJ4EyiMkg==",
       "dependencies": {
-        "@vue/compiler-ssr": "3.4.15",
-        "@vue/shared": "3.4.15"
+        "@vue/compiler-ssr": "3.4.21",
+        "@vue/shared": "3.4.21"
       },
       "peerDependencies": {
-        "vue": "3.4.15"
+        "vue": "3.4.21"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.15.tgz",
-      "integrity": "sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g=="
+      "version": "3.4.21",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
+      "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g=="
     },
     "node_modules/@vueuse/core": {
       "version": "9.13.0",
@@ -1805,11 +1832,11 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.6.7",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz",
-      "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==",
+      "version": "1.6.8",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
+      "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
       "dependencies": {
-        "follow-redirects": "^1.15.4",
+        "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
       }
@@ -1865,11 +1892,14 @@
       }
     },
     "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/bluebird": {
@@ -1916,9 +1946,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.22.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.3.tgz",
-      "integrity": "sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==",
+      "version": "4.23.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
+      "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
       "dev": true,
       "funding": [
         {
@@ -1935,8 +1965,8 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001580",
-        "electron-to-chromium": "^1.4.648",
+        "caniuse-lite": "^1.0.30001587",
+        "electron-to-chromium": "^1.4.668",
         "node-releases": "^2.0.14",
         "update-browserslist-db": "^1.0.13"
       },
@@ -2003,9 +2033,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001583",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001583.tgz",
-      "integrity": "sha512-acWTYaha8xfhA/Du/z4sNZjHUWjkiuoAi2LM+T/aL+kemKQgPT1xBb/YKjlQ0Qo8gvbHsGNplrEJ+9G3gL7i4Q==",
+      "version": "1.0.30001600",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001600.tgz",
+      "integrity": "sha512-+2S9/2JFhYmYaDpZvo0lKkfvuKIglrx68MwOBqMGHhQsNkLjB5xtc/TGoEPs+MxjSyN/72qer2g97nzR641mOQ==",
       "dev": true,
       "funding": [
         {
@@ -2037,15 +2067,9 @@
       }
     },
     "node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -2058,6 +2082,9 @@
       "engines": {
         "node": ">= 8.10.0"
       },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
       "optionalDependencies": {
         "fsevents": "~2.3.2"
       }
@@ -2373,9 +2400,9 @@
       "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
     },
     "node_modules/d3": {
-      "version": "7.8.5",
-      "resolved": "https://registry.npmjs.org/d3/-/d3-7.8.5.tgz",
-      "integrity": "sha512-JgoahDG51ncUfJu6wX/1vWQEqOflgXyl4MaHqlcSruTez7yhaRKR9i8VjjcQGeS2en/jnFivXuaIMnseMMt0XA==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz",
+      "integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==",
       "dependencies": {
         "d3-array": "3",
         "d3-axis": "3",
@@ -2576,9 +2603,9 @@
       }
     },
     "node_modules/d3-geo": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.0.tgz",
-      "integrity": "sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
+      "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
       "dependencies": {
         "d3-array": "2.5.0 - 3"
       },
@@ -2653,9 +2680,9 @@
       }
     },
     "node_modules/d3-scale-chromatic": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz",
-      "integrity": "sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
+      "integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
       "dependencies": {
         "d3-color": "1 - 3",
         "d3-interpolate": "1 - 3"
@@ -2896,9 +2923,9 @@
       }
     },
     "node_modules/default-browser/node_modules/npm-run-path": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz",
-      "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
+      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
       "dependencies": {
         "path-key": "^4.0.0"
       },
@@ -3051,12 +3078,12 @@
       }
     },
     "node_modules/echarts": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.3.tgz",
-      "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.5.0.tgz",
+      "integrity": "sha512-rNYnNCzqDAPCr4m/fqyUFv7fD9qIsd50S6GDFgO1DxZhncCsNsG7IfUlAlvZe5oSEQxtsjnHiUuppzccry93Xw==",
       "dependencies": {
         "tslib": "2.3.0",
-        "zrender": "5.4.4"
+        "zrender": "5.5.0"
       }
     },
     "node_modules/echarts/node_modules/tslib": {
@@ -3065,15 +3092,15 @@
       "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.656",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.656.tgz",
-      "integrity": "sha512-9AQB5eFTHyR3Gvt2t/NwR0le2jBSUNwCnMbUCejFWHD+so4tH40/dRLgoE+jxlPeWS43XJewyvCv+I8LPMl49Q==",
+      "version": "1.4.717",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.717.tgz",
+      "integrity": "sha512-6Fmg8QkkumNOwuZ/5mIbMU9WI3H2fmn5ajcVya64I5Yr5CcNmO7vcLt0Y7c96DCiMO5/9G+4sI2r6eEvdg1F7A==",
       "dev": true
     },
     "node_modules/element-plus": {
-      "version": "2.5.5",
-      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.5.5.tgz",
-      "integrity": "sha512-yGU/MruLOWI0ImQPFCyFM4cXtHtILJNAi0hhLImcxjRukjgQLYNkvcvbwqNgBUt808KSeKF9MyxENFyBQLTg+Q==",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.6.2.tgz",
+      "integrity": "sha512-WFMv1v83l437Xu+GeeM+ytxd9VUQpR4418BowvTVIPYItsoj6yK0ITIuSv19iCesF405FbAOaCIHXhJch0ilFA==",
       "dependencies": {
         "@ctrl/tinycolor": "^3.4.1",
         "@element-plus/icons-vue": "^2.3.1",
@@ -3160,9 +3187,9 @@
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -3324,9 +3351,9 @@
       }
     },
     "node_modules/fastq": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.0.tgz",
-      "integrity": "sha512-zGygtijUMT7jnk3h26kUms3BkSDp4IfIKjmnqI2tvx6nuBfiF1UqOxbnLfzdv+apBy+53oaImsKtMw/xYbW+1w==",
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
       "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"
@@ -3364,9 +3391,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
-      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "funding": [
         {
           "type": "individual",
@@ -3620,9 +3647,9 @@
       }
     },
     "node_modules/hasown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
       "dependencies": {
         "function-bind": "^1.1.2"
@@ -4138,9 +4165,9 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.6",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.6.tgz",
-      "integrity": "sha512-n62qCLbPjNjyo+owKtveQxZFZTBm+Ms6YoGD23Wew6Vw337PElFNifQpknPruVRQV57kVShPnLGo9vWxVhpPvA==",
+      "version": "0.30.8",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
+      "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.4.15"
       },
@@ -4331,9 +4358,9 @@
       }
     },
     "node_modules/mlly": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.5.0.tgz",
-      "integrity": "sha512-NPVQvAY1xr1QoVeG0cy8yUYC7FQcOx6evl/RjT1wL5FvzPnzOysoqB/jmx/DhssT2dYa8nxECLAaFI/+gVLhDQ==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.6.1.tgz",
+      "integrity": "sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==",
       "dependencies": {
         "acorn": "^8.11.3",
         "pathe": "^1.1.2",
@@ -4787,9 +4814,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.33",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz",
-      "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==",
+      "version": "8.4.38",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
+      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
       "funding": [
         {
           "type": "opencollective",
@@ -4807,7 +4834,7 @@
       "dependencies": {
         "nanoid": "^3.3.7",
         "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
+        "source-map-js": "^1.2.0"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -5134,9 +5161,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.70.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.70.0.tgz",
-      "integrity": "sha512-uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ==",
+      "version": "1.72.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.72.0.tgz",
+      "integrity": "sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==",
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
         "immutable": "^4.0.0",
@@ -5161,9 +5188,9 @@
       }
     },
     "node_modules/scule": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/scule/-/scule-1.2.0.tgz",
-      "integrity": "sha512-CRCmi5zHQnSoeCik9565PONMg0kfkvYmcSqrbOJY4txFfy1wvVULV4FDaiXhUblUgahdqz3F2NwHZ8i4eBTwUw==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/scule/-/scule-1.3.0.tgz",
+      "integrity": "sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==",
       "dev": true
     },
     "node_modules/select": {
@@ -5370,9 +5397,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5539,9 +5566,9 @@
       }
     },
     "node_modules/style-mod": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.0.tgz",
-      "integrity": "sha512-Ca5ib8HrFn+f+0n4N4ScTIA9iTOQ7MaGS1ylHcoVqW9J7w2w8PzN6g9gKmTYgGEBH8e120+RCmhpje6jC5uGWA=="
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
+      "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw=="
     },
     "node_modules/supports-color": {
       "version": "5.5.0",
@@ -5958,9 +5985,9 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/ufo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.2.tgz",
-      "integrity": "sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA=="
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.3.tgz",
+      "integrity": "sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw=="
     },
     "node_modules/unimport": {
       "version": "3.7.1",
@@ -6044,14 +6071,17 @@
       }
     },
     "node_modules/unplugin": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.6.0.tgz",
-      "integrity": "sha512-BfJEpWBu3aE/AyHx8VaNE/WgouoQxgH9baAiH82JjX8cqVyi3uJQstqwD5J+SZxIK326SZIhsSZlALXVBCknTQ==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.10.0.tgz",
+      "integrity": "sha512-CuZtvvO8ua2Wl+9q2jEaqH6m3DoQ38N7pvBYQbbaeNlWGvK2l6GHiKi29aIHDPoSxdUzQ7Unevf1/ugil5X6Pg==",
       "dependencies": {
-        "acorn": "^8.11.2",
-        "chokidar": "^3.5.3",
+        "acorn": "^8.11.3",
+        "chokidar": "^3.6.0",
         "webpack-sources": "^3.2.3",
         "webpack-virtual-modules": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
       }
     },
     "node_modules/unplugin-auto-import": {
@@ -6298,9 +6328,9 @@
       "dev": true
     },
     "node_modules/vite": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz",
-      "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==",
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz",
+      "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==",
       "dependencies": {
         "esbuild": "^0.18.10",
         "postcss": "^8.4.27",
@@ -6413,15 +6443,15 @@
       }
     },
     "node_modules/vue": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.15.tgz",
-      "integrity": "sha512-jC0GH4KkWLWJOEQjOpkqU1bQsBwf4R1rsFtw5GQJbjHVKWDzO6P0nWWBTmjp1xSemAioDFj1jdaK1qa3DnMQoQ==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.21.tgz",
+      "integrity": "sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==",
       "dependencies": {
-        "@vue/compiler-dom": "3.4.15",
-        "@vue/compiler-sfc": "3.4.15",
-        "@vue/runtime-dom": "3.4.15",
-        "@vue/server-renderer": "3.4.15",
-        "@vue/shared": "3.4.15"
+        "@vue/compiler-dom": "3.4.21",
+        "@vue/compiler-sfc": "3.4.21",
+        "@vue/runtime-dom": "3.4.21",
+        "@vue/server-renderer": "3.4.21",
+        "@vue/shared": "3.4.21"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -6467,11 +6497,11 @@
       }
     },
     "node_modules/vue-router": {
-      "version": "4.2.5",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.2.5.tgz",
-      "integrity": "sha512-DIUpKcyg4+PTQKfFPX88UWhlagBEBEfJ5A8XDXRJLUnZOvcpMF8o/dnL90vpVkGaPbjvXazV/rC1qBKrZlFugw==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.3.0.tgz",
+      "integrity": "sha512-dqUcs8tUeG+ssgWhcPbjHvazML16Oga5w34uCUmsk7i0BcnskoLGwjpa15fqMr2Fa5JgVBrdL2MEgqz6XZ/6IQ==",
       "dependencies": {
-        "@vue/devtools-api": "^6.5.0"
+        "@vue/devtools-api": "^6.5.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/posva"
@@ -6541,9 +6571,9 @@
       }
     },
     "node_modules/zrender": {
-      "version": "5.4.4",
-      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.4.tgz",
-      "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.5.0.tgz",
+      "integrity": "sha512-O3MilSi/9mwoovx77m6ROZM7sXShR/O/JIanvzTwjN3FORfLSr81PsUGd7jlaYOeds9d8tw82oP44+3YucVo+w==",
       "dependencies": {
         "tslib": "2.3.0"
       }
@@ -6556,13 +6586,13 @@
   },
   "dependencies": {
     "@ampproject/remapping": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "dev": true,
       "requires": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
     "@ant-design/colors": {
@@ -6601,9 +6631,9 @@
       "integrity": "sha512-4ddpsiHN9Pd4UIlWuKVK1C4IiZIdbwQvy9i7DUSI3xNJ89FPUFt8lxDYj8GzzfdllV0NkJTRxnG+FvLk0llidg=="
     },
     "@antv/g-base": {
-      "version": "0.5.15",
-      "resolved": "https://registry.npmjs.org/@antv/g-base/-/g-base-0.5.15.tgz",
-      "integrity": "sha512-QOtq50QpnKez9J75/Z8j2yZ7QDQdk8R8mVQJiHtaEO5eI7DM4ZbrsWff/Ew26JYmPWdq7nbRuARMAD4PX9uuLA==",
+      "version": "0.5.16",
+      "resolved": "https://registry.npmjs.org/@antv/g-base/-/g-base-0.5.16.tgz",
+      "integrity": "sha512-jP06wggTubDPHXoKwFg3/f1lyxBX9ywwN3E/HG74Nd7DXqOXQis8tsIWW+O6dS/h9vyuXLd1/wDWkMMm3ZzXdg==",
       "requires": {
         "@antv/event-emitter": "^0.1.1",
         "@antv/g-math": "^0.1.9",
@@ -6631,9 +6661,9 @@
       }
     },
     "@antv/g-canvas": {
-      "version": "0.5.14",
-      "resolved": "https://registry.npmjs.org/@antv/g-canvas/-/g-canvas-0.5.14.tgz",
-      "integrity": "sha512-IUGLEMIMAUYgaBMT8h3FTmYQYz7sjQkKWwh6Psqx+UPK86fySa+G8fMRrh1EqAL07jVB+GRnn6Ym+3FoFUgeFg==",
+      "version": "0.5.17",
+      "resolved": "https://registry.npmjs.org/@antv/g-canvas/-/g-canvas-0.5.17.tgz",
+      "integrity": "sha512-sXYJMWTOlb/Ycb6sTKu00LcJqInXJY4t99+kSM40u2OfqrXYmaXDjHR7D2V0roMkbK/QWiWS9UnEidCR1VtMOA==",
       "requires": {
         "@antv/g-base": "^0.5.12",
         "@antv/g-math": "^0.1.9",
@@ -6773,37 +6803,37 @@
       }
     },
     "@babel/code-frame": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
-      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
+      "version": "7.24.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz",
+      "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.23.4",
-        "chalk": "^2.4.2"
+        "@babel/highlight": "^7.24.2",
+        "picocolors": "^1.0.0"
       }
     },
     "@babel/compat-data": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
-      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.1.tgz",
+      "integrity": "sha512-Pc65opHDliVpRHuKfzI+gSA4zcgr65O4cl64fFJIWEEh8JoHIHh0Oez1Eo8Arz8zq/JhgKodQaxEwUPRtZylVA==",
       "dev": true
     },
     "@babel/core": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz",
-      "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==",
+      "version": "7.24.3",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.3.tgz",
+      "integrity": "sha512-5FcvN1JHw2sHJChotgx8Ek0lyuh4kCKelgMTTqhYJJtloNvUfpAFMeNQUtdlIaktwrSV9LtCdqwk48wL2wBacQ==",
       "dev": true,
       "requires": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
+        "@babel/code-frame": "^7.24.2",
+        "@babel/generator": "^7.24.1",
         "@babel/helper-compilation-targets": "^7.23.6",
         "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.9",
-        "@babel/parser": "^7.23.9",
-        "@babel/template": "^7.23.9",
-        "@babel/traverse": "^7.23.9",
-        "@babel/types": "^7.23.9",
+        "@babel/helpers": "^7.24.1",
+        "@babel/parser": "^7.24.1",
+        "@babel/template": "^7.24.0",
+        "@babel/traverse": "^7.24.1",
+        "@babel/types": "^7.24.0",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -6812,14 +6842,14 @@
       }
     },
     "@babel/generator": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
-      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.1.tgz",
+      "integrity": "sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.23.6",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
+        "@babel/types": "^7.24.0",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^2.5.1"
       }
     },
@@ -6846,9 +6876,9 @@
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.23.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.10.tgz",
-      "integrity": "sha512-2XpP2XhkXzgxecPNEEK8Vz8Asj9aRxt08oKOqtiZoqV2UGZ5T+EkyP9sXQ9nwMxBIG34a7jmasVqoMop7VdPUw==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.1.tgz",
+      "integrity": "sha512-1yJa9dX9g//V6fDebXoEfEsxkZHk3Hcbm+zLhyu6qVgYFLvmTALTeV+jNU9e5RnYtioBrGEOdoI2joMSNQ/+aA==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
@@ -6856,7 +6886,7 @@
         "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-member-expression-to-functions": "^7.23.0",
         "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.20",
+        "@babel/helper-replace-supers": "^7.24.1",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
         "semver": "^6.3.1"
@@ -6897,12 +6927,12 @@
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
-      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+      "version": "7.24.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz",
+      "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.22.15"
+        "@babel/types": "^7.24.0"
       }
     },
     "@babel/helper-module-transforms": {
@@ -6928,19 +6958,19 @@
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
+      "version": "7.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz",
+      "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==",
       "dev": true
     },
     "@babel/helper-replace-supers": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz",
-      "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.1.tgz",
+      "integrity": "sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ==",
       "dev": true,
       "requires": {
         "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-member-expression-to-functions": "^7.22.15",
+        "@babel/helper-member-expression-to-functions": "^7.23.0",
         "@babel/helper-optimise-call-expression": "^7.22.5"
       }
     },
@@ -6972,9 +7002,9 @@
       }
     },
     "@babel/helper-string-parser": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz",
+      "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==",
       "dev": true
     },
     "@babel/helper-validator-identifier": {
@@ -6990,95 +7020,96 @@
       "dev": true
     },
     "@babel/helpers": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.9.tgz",
-      "integrity": "sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.1.tgz",
+      "integrity": "sha512-BpU09QqEe6ZCHuIHFphEFgvNSrubve1FtyMton26ekZ85gRGi6LrTF7zArARp2YvyFxloeiRmtSCq5sjh1WqIg==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.23.9",
-        "@babel/traverse": "^7.23.9",
-        "@babel/types": "^7.23.9"
+        "@babel/template": "^7.24.0",
+        "@babel/traverse": "^7.24.1",
+        "@babel/types": "^7.24.0"
       }
     },
     "@babel/highlight": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
-      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
+      "version": "7.24.2",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz",
+      "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==",
       "dev": true,
       "requires": {
         "@babel/helper-validator-identifier": "^7.22.20",
         "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0"
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
       }
     },
     "@babel/parser": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz",
-      "integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA=="
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.1.tgz",
+      "integrity": "sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg=="
     },
     "@babel/plugin-syntax-jsx": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz",
-      "integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz",
+      "integrity": "sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.24.0"
       }
     },
     "@babel/plugin-syntax-typescript": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz",
-      "integrity": "sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz",
+      "integrity": "sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.24.0"
       }
     },
     "@babel/plugin-transform-typescript": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.23.6.tgz",
-      "integrity": "sha512-6cBG5mBvUu4VUD04OHKnYzbuHNP8huDsD3EDqqpIpsswTDoqHCjLoHb6+QgsV1WsT2nipRqCPgxD3LXnEO7XfA==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.1.tgz",
+      "integrity": "sha512-liYSESjX2fZ7JyBFkYG78nfvHlMKE6IpNdTVnxmlYUR+j5ZLsitFbaAE+eJSK2zPPkNWNw4mXL51rQ8WrvdK0w==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-typescript": "^7.23.3"
+        "@babel/helper-create-class-features-plugin": "^7.24.1",
+        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/plugin-syntax-typescript": "^7.24.1"
       }
     },
     "@babel/template": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.23.9.tgz",
-      "integrity": "sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==",
+      "version": "7.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
+      "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.23.5",
-        "@babel/parser": "^7.23.9",
-        "@babel/types": "^7.23.9"
+        "@babel/parser": "^7.24.0",
+        "@babel/types": "^7.24.0"
       }
     },
     "@babel/traverse": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.9.tgz",
-      "integrity": "sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==",
+      "version": "7.24.1",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz",
+      "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
+        "@babel/code-frame": "^7.24.1",
+        "@babel/generator": "^7.24.1",
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.9",
-        "@babel/types": "^7.23.9",
+        "@babel/parser": "^7.24.1",
+        "@babel/types": "^7.24.0",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz",
-      "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==",
+      "version": "7.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz",
+      "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==",
       "dev": true,
       "requires": {
         "@babel/helper-string-parser": "^7.23.4",
@@ -7087,9 +7118,9 @@
       }
     },
     "@codemirror/autocomplete": {
-      "version": "6.12.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.12.0.tgz",
-      "integrity": "sha512-r4IjdYFthwbCQyvqnSlx0WBHRHi8nBvU+WjJxFUij81qsBfhNudf/XKKmmC2j3m0LaOYUQTf3qiEK1J8lO1sdg==",
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.15.0.tgz",
+      "integrity": "sha512-G2Zm0mXznxz97JhaaOdoEG2cVupn4JjPaS4AcNvZzhOsnnG9YVN68VzfoUw6dYTsIxT6a/cmoFEN47KAWhXaOg==",
       "requires": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
@@ -7119,9 +7150,9 @@
       }
     },
     "@codemirror/lang-javascript": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.1.tgz",
-      "integrity": "sha512-jlFOXTejVyiQCW3EQwvKH0m99bUYIw40oPmFjSX2VS78yzfe0HELZ+NEo9Yfo1MkGRpGlj3Gnu4rdxV1EnAs5A==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.2.tgz",
+      "integrity": "sha512-VGQfY+FCc285AhWuwjYxQyUQcYurWlxdKYT4bqwr3Twnd5wP5WSeu52t4tvvuWmljT4EmgEgZCqSieokhtY8hg==",
       "dev": true,
       "requires": {
         "@codemirror/autocomplete": "^6.0.0",
@@ -7134,9 +7165,9 @@
       }
     },
     "@codemirror/lang-sql": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-sql/-/lang-sql-6.5.5.tgz",
-      "integrity": "sha512-DvOaP2RXLb2xlxJxxydTFfwyYw5YDqEFea6aAfgh9UH0kUD6J1KFZ0xPgPpw1eo/5s2w3L6uh5PVR7GM23GxkQ==",
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-sql/-/lang-sql-6.6.2.tgz",
+      "integrity": "sha512-ZVt7AHflRDFVwxSq7nnj1pko9yR6wKFDtc6Ln7zUs8RX34v5sgVxy3d2lQfORhMPVblEJLaugn+sjwRmAFWNIg==",
       "dev": true,
       "requires": {
         "@codemirror/autocomplete": "^6.0.0",
@@ -7171,9 +7202,9 @@
       }
     },
     "@codemirror/search": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.5.tgz",
-      "integrity": "sha512-PIEN3Ke1buPod2EHbJsoQwlbpkz30qGZKcnmH1eihq9+bPQx8gelauUwLYaY4vBOuBAuEhmpDLii4rj/uO0yMA==",
+      "version": "6.5.6",
+      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.6.tgz",
+      "integrity": "sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q==",
       "peer": true,
       "requires": {
         "@codemirror/state": "^6.0.0",
@@ -7182,14 +7213,14 @@
       }
     },
     "@codemirror/state": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.0.tgz",
-      "integrity": "sha512-hm8XshYj5Fo30Bb922QX9hXB/bxOAVH+qaqHBzw5TKa72vOeslyGwd4X8M0c1dJ9JqxlaMceOQ8RsL9tC7gU0A=="
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz",
+      "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A=="
     },
     "@codemirror/view": {
-      "version": "6.23.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.23.1.tgz",
-      "integrity": "sha512-J2Xnn5lFYT1ZN/5ewEoMBCmLlL71lZ3mBdb7cUEuHhX2ESoSrNEucpsDXpX22EuTGm9LOgC9v4Z0wx+Ez8QmGA==",
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.26.0.tgz",
+      "integrity": "sha512-nSSmzONpqsNzshPOxiKhK203R6BvABepugAe34QfQDbNDslyjkqBuKgrK5ZBvqNXpfxz5iLrlGTmEfhbQyH46A==",
       "requires": {
         "@codemirror/state": "^6.4.0",
         "style-mod": "^4.1.0",
@@ -7348,12 +7379,12 @@
       }
     },
     "@floating-ui/dom": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.1.tgz",
-      "integrity": "sha512-iA8qE43/H5iGozC3W0YSnVSW42Vh522yyM1gj+BqRwVsTNOyr231PsXDaV04yT39PsO0QL2QpbI/M0ZaLUQgRQ==",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.3.tgz",
+      "integrity": "sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==",
       "requires": {
-        "@floating-ui/core": "^1.6.0",
-        "@floating-ui/utils": "^0.2.1"
+        "@floating-ui/core": "^1.0.0",
+        "@floating-ui/utils": "^0.2.0"
       }
     },
     "@floating-ui/utils": {
@@ -7367,16 +7398,17 @@
       "integrity": "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg=="
     },
     "@iconify/utils": {
-      "version": "2.1.20",
-      "resolved": "https://registry.npmjs.org/@iconify/utils/-/utils-2.1.20.tgz",
-      "integrity": "sha512-t8TeKlYK/5i9yTY9VAGAE4P0qQHd/0vH+VSRO+bdpxlt8wqB6f2I0/IrciRsdeFZPMoL8IICgP7lgl2ZtbG8Tw==",
+      "version": "2.1.22",
+      "resolved": "https://registry.npmjs.org/@iconify/utils/-/utils-2.1.22.tgz",
+      "integrity": "sha512-6UHVzTVXmvO8uS6xFF+L/QTSpTzA/JZxtgU+KYGFyDYMEObZ1bu/b5l+zNJjHy+0leWjHI+C0pXlzGvv3oXZMA==",
       "requires": {
         "@antfu/install-pkg": "^0.1.1",
         "@antfu/utils": "^0.7.5",
         "@iconify/types": "^2.0.0",
         "debug": "^4.3.4",
         "kolorist": "^1.8.0",
-        "local-pkg": "^0.5.0"
+        "local-pkg": "^0.5.0",
+        "mlly": "^1.5.0"
       },
       "dependencies": {
         "local-pkg": {
@@ -7391,26 +7423,26 @@
       }
     },
     "@jridgewell/gen-mapping": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
       "dev": true,
       "requires": {
-        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
     "@jridgewell/resolve-uri": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true
     },
     "@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
       "dev": true
     },
     "@jridgewell/sourcemap-codec": {
@@ -7419,9 +7451,9 @@
       "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
     },
     "@jridgewell/trace-mapping": {
-      "version": "0.3.22",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz",
-      "integrity": "sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==",
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
       "dev": true,
       "requires": {
         "@jridgewell/resolve-uri": "^3.1.0",
@@ -7498,9 +7530,9 @@
       }
     },
     "@polka/url": {
-      "version": "1.0.0-next.24",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.24.tgz",
-      "integrity": "sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ=="
+      "version": "1.0.0-next.25",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz",
+      "integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ=="
     },
     "@popperjs/core": {
       "version": "npm:@sxzz/popperjs-es@2.11.7",
@@ -7542,9 +7574,9 @@
       "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
     },
     "@types/lodash": {
-      "version": "4.14.202",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz",
-      "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ=="
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.0.tgz",
+      "integrity": "sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA=="
     },
     "@types/lodash-es": {
       "version": "4.17.12",
@@ -7584,134 +7616,156 @@
       }
     },
     "@vue/babel-helper-vue-transform-on": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.2.1.tgz",
-      "integrity": "sha512-jtEXim+pfyHWwvheYwUwSXm43KwQo8nhOBDyjrUITV6X2tB7lJm6n/+4sqR8137UVZZul5hBzWHdZ2uStYpyRQ==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.2.2.tgz",
+      "integrity": "sha512-nOttamHUR3YzdEqdM/XXDyCSdxMA9VizUKoroLX6yTyRtggzQMHXcmwh8a7ZErcJttIBIc9s68a1B8GZ+Dmvsw==",
       "dev": true
     },
     "@vue/babel-plugin-jsx": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.2.1.tgz",
-      "integrity": "sha512-Yy9qGktktXhB39QE99So/BO2Uwm/ZG+gpL9vMg51ijRRbINvgbuhyJEi4WYmGRMx/MSTfK0xjgZ3/MyY+iLCEg==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.2.2.tgz",
+      "integrity": "sha512-nYTkZUVTu4nhP199UoORePsql0l+wj7v/oyQjtThUVhJl1U+6qHuoVhIvR3bf7eVKjbCK+Cs2AWd7mi9Mpz9rA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.22.15",
+        "@babel/helper-module-imports": "~7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-jsx": "^7.23.3",
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.7",
-        "@babel/types": "^7.23.6",
-        "@vue/babel-helper-vue-transform-on": "1.2.1",
-        "@vue/babel-plugin-resolve-type": "1.2.1",
+        "@babel/template": "^7.23.9",
+        "@babel/traverse": "^7.23.9",
+        "@babel/types": "^7.23.9",
+        "@vue/babel-helper-vue-transform-on": "1.2.2",
+        "@vue/babel-plugin-resolve-type": "1.2.2",
         "camelcase": "^6.3.0",
         "html-tags": "^3.3.1",
         "svg-tags": "^1.0.0"
+      },
+      "dependencies": {
+        "@babel/helper-module-imports": {
+          "version": "7.22.15",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+          "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.22.15"
+          }
+        }
       }
     },
     "@vue/babel-plugin-resolve-type": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@vue/babel-plugin-resolve-type/-/babel-plugin-resolve-type-1.2.1.tgz",
-      "integrity": "sha512-IOtnI7pHunUzHS/y+EG/yPABIAp0VN8QhQ0UCS09jeMVxgAnI9qdOzO85RXdQGxq+aWCdv8/+k3W0aYO6j/8fQ==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@vue/babel-plugin-resolve-type/-/babel-plugin-resolve-type-1.2.2.tgz",
+      "integrity": "sha512-EntyroPwNg5IPVdUJupqs0CFzuf6lUrVvCspmv2J1FITLeGnUCuoGNNk78dgCusxEiYj6RMkTJflGSxk5aIC4A==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.23.5",
-        "@babel/helper-module-imports": "^7.22.15",
+        "@babel/helper-module-imports": "~7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/parser": "^7.23.6",
+        "@babel/parser": "^7.23.9",
         "@vue/compiler-sfc": "^3.4.15"
+      },
+      "dependencies": {
+        "@babel/helper-module-imports": {
+          "version": "7.22.15",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+          "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.22.15"
+          }
+        }
       }
     },
     "@vue/compiler-core": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.15.tgz",
-      "integrity": "sha512-XcJQVOaxTKCnth1vCxEChteGuwG6wqnUHxAm1DO3gCz0+uXKaJNx8/digSz4dLALCy8n2lKq24jSUs8segoqIw==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.21.tgz",
+      "integrity": "sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==",
       "requires": {
-        "@babel/parser": "^7.23.6",
-        "@vue/shared": "3.4.15",
+        "@babel/parser": "^7.23.9",
+        "@vue/shared": "3.4.21",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
         "source-map-js": "^1.0.2"
       }
     },
     "@vue/compiler-dom": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.15.tgz",
-      "integrity": "sha512-wox0aasVV74zoXyblarOM3AZQz/Z+OunYcIHe1OsGclCHt8RsRm04DObjefaI82u6XDzv+qGWZ24tIsRAIi5MQ==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.21.tgz",
+      "integrity": "sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==",
       "requires": {
-        "@vue/compiler-core": "3.4.15",
-        "@vue/shared": "3.4.15"
+        "@vue/compiler-core": "3.4.21",
+        "@vue/shared": "3.4.21"
       }
     },
     "@vue/compiler-sfc": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.15.tgz",
-      "integrity": "sha512-LCn5M6QpkpFsh3GQvs2mJUOAlBQcCco8D60Bcqmf3O3w5a+KWS5GvYbrrJBkgvL1BDnTp+e8q0lXCLgHhKguBA==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.21.tgz",
+      "integrity": "sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==",
       "requires": {
-        "@babel/parser": "^7.23.6",
-        "@vue/compiler-core": "3.4.15",
-        "@vue/compiler-dom": "3.4.15",
-        "@vue/compiler-ssr": "3.4.15",
-        "@vue/shared": "3.4.15",
+        "@babel/parser": "^7.23.9",
+        "@vue/compiler-core": "3.4.21",
+        "@vue/compiler-dom": "3.4.21",
+        "@vue/compiler-ssr": "3.4.21",
+        "@vue/shared": "3.4.21",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.5",
-        "postcss": "^8.4.33",
+        "magic-string": "^0.30.7",
+        "postcss": "^8.4.35",
         "source-map-js": "^1.0.2"
       }
     },
     "@vue/compiler-ssr": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.15.tgz",
-      "integrity": "sha512-1jdeQyiGznr8gjFDadVmOJqZiLNSsMa5ZgqavkPZ8O2wjHv0tVuAEsw5hTdUoUW4232vpBbL/wJhzVW/JwY1Uw==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.21.tgz",
+      "integrity": "sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==",
       "requires": {
-        "@vue/compiler-dom": "3.4.15",
-        "@vue/shared": "3.4.15"
+        "@vue/compiler-dom": "3.4.21",
+        "@vue/shared": "3.4.21"
       }
     },
     "@vue/devtools-api": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.1.tgz",
-      "integrity": "sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA=="
+      "version": "6.6.1",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.1.tgz",
+      "integrity": "sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA=="
     },
     "@vue/reactivity": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.15.tgz",
-      "integrity": "sha512-55yJh2bsff20K5O84MxSvXKPHHt17I2EomHznvFiJCAZpJTNW8IuLj1xZWMLELRhBK3kkFV/1ErZGHJfah7i7w==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.21.tgz",
+      "integrity": "sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==",
       "requires": {
-        "@vue/shared": "3.4.15"
+        "@vue/shared": "3.4.21"
       }
     },
     "@vue/runtime-core": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.15.tgz",
-      "integrity": "sha512-6E3by5m6v1AkW0McCeAyhHTw+3y17YCOKG0U0HDKDscV4Hs0kgNT5G+GCHak16jKgcCDHpI9xe5NKb8sdLCLdw==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.21.tgz",
+      "integrity": "sha512-pQthsuYzE1XcGZznTKn73G0s14eCJcjaLvp3/DKeYWoFacD9glJoqlNBxt3W2c5S40t6CCcpPf+jG01N3ULyrA==",
       "requires": {
-        "@vue/reactivity": "3.4.15",
-        "@vue/shared": "3.4.15"
+        "@vue/reactivity": "3.4.21",
+        "@vue/shared": "3.4.21"
       }
     },
     "@vue/runtime-dom": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.15.tgz",
-      "integrity": "sha512-EVW8D6vfFVq3V/yDKNPBFkZKGMFSvZrUQmx196o/v2tHKdwWdiZjYUBS+0Ez3+ohRyF8Njwy/6FH5gYJ75liUw==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.21.tgz",
+      "integrity": "sha512-gvf+C9cFpevsQxbkRBS1NpU8CqxKw0ebqMvLwcGQrNpx6gqRDodqKqA+A2VZZpQ9RpK2f9yfg8VbW/EpdFUOJw==",
       "requires": {
-        "@vue/runtime-core": "3.4.15",
-        "@vue/shared": "3.4.15",
+        "@vue/runtime-core": "3.4.21",
+        "@vue/shared": "3.4.21",
         "csstype": "^3.1.3"
       }
     },
     "@vue/server-renderer": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.15.tgz",
-      "integrity": "sha512-3HYzaidu9cHjrT+qGUuDhFYvF/j643bHC6uUN9BgM11DVy+pM6ATsG6uPBLnkwOgs7BpJABReLmpL3ZPAsUaqw==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.21.tgz",
+      "integrity": "sha512-aV1gXyKSN6Rz+6kZ6kr5+Ll14YzmIbeuWe7ryJl5muJ4uwSwY/aStXTixx76TwkZFJLm1aAlA/HSWEJ4EyiMkg==",
       "requires": {
-        "@vue/compiler-ssr": "3.4.15",
-        "@vue/shared": "3.4.15"
+        "@vue/compiler-ssr": "3.4.21",
+        "@vue/shared": "3.4.21"
       }
     },
     "@vue/shared": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.15.tgz",
-      "integrity": "sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g=="
+      "version": "3.4.21",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
+      "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g=="
     },
     "@vueuse/core": {
       "version": "9.13.0",
@@ -7835,11 +7889,11 @@
       "dev": true
     },
     "axios": {
-      "version": "1.6.7",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz",
-      "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==",
+      "version": "1.6.8",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
+      "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
       "requires": {
-        "follow-redirects": "^1.15.4",
+        "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
       }
@@ -7885,9 +7939,9 @@
       "dev": true
     },
     "binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw=="
     },
     "bluebird": {
       "version": "3.7.2",
@@ -7927,13 +7981,13 @@
       }
     },
     "browserslist": {
-      "version": "4.22.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.3.tgz",
-      "integrity": "sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==",
+      "version": "4.23.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
+      "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001580",
-        "electron-to-chromium": "^1.4.648",
+        "caniuse-lite": "^1.0.30001587",
+        "electron-to-chromium": "^1.4.668",
         "node-releases": "^2.0.14",
         "update-browserslist-db": "^1.0.13"
       }
@@ -7978,9 +8032,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001583",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001583.tgz",
-      "integrity": "sha512-acWTYaha8xfhA/Du/z4sNZjHUWjkiuoAi2LM+T/aL+kemKQgPT1xBb/YKjlQ0Qo8gvbHsGNplrEJ+9G3gL7i4Q==",
+      "version": "1.0.30001600",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001600.tgz",
+      "integrity": "sha512-+2S9/2JFhYmYaDpZvo0lKkfvuKIglrx68MwOBqMGHhQsNkLjB5xtc/TGoEPs+MxjSyN/72qer2g97nzR641mOQ==",
       "dev": true
     },
     "chalk": {
@@ -7995,9 +8049,9 @@
       }
     },
     "chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "requires": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -8255,9 +8309,9 @@
       "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
     },
     "d3": {
-      "version": "7.8.5",
-      "resolved": "https://registry.npmjs.org/d3/-/d3-7.8.5.tgz",
-      "integrity": "sha512-JgoahDG51ncUfJu6wX/1vWQEqOflgXyl4MaHqlcSruTez7yhaRKR9i8VjjcQGeS2en/jnFivXuaIMnseMMt0XA==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz",
+      "integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==",
       "requires": {
         "d3-array": "3",
         "d3-axis": "3",
@@ -8432,9 +8486,9 @@
       "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA=="
     },
     "d3-geo": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.0.tgz",
-      "integrity": "sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
+      "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
       "requires": {
         "d3-array": "2.5.0 - 3"
       }
@@ -8485,9 +8539,9 @@
       }
     },
     "d3-scale-chromatic": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz",
-      "integrity": "sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz",
+      "integrity": "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==",
       "requires": {
         "d3-color": "1 - 3",
         "d3-interpolate": "1 - 3"
@@ -8622,9 +8676,9 @@
           "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw=="
         },
         "npm-run-path": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz",
-          "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==",
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
+          "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
           "requires": {
             "path-key": "^4.0.0"
           }
@@ -8745,12 +8799,12 @@
       }
     },
     "echarts": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.3.tgz",
-      "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.5.0.tgz",
+      "integrity": "sha512-rNYnNCzqDAPCr4m/fqyUFv7fD9qIsd50S6GDFgO1DxZhncCsNsG7IfUlAlvZe5oSEQxtsjnHiUuppzccry93Xw==",
       "requires": {
         "tslib": "2.3.0",
-        "zrender": "5.4.4"
+        "zrender": "5.5.0"
       },
       "dependencies": {
         "tslib": {
@@ -8761,15 +8815,15 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.656",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.656.tgz",
-      "integrity": "sha512-9AQB5eFTHyR3Gvt2t/NwR0le2jBSUNwCnMbUCejFWHD+so4tH40/dRLgoE+jxlPeWS43XJewyvCv+I8LPMl49Q==",
+      "version": "1.4.717",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.717.tgz",
+      "integrity": "sha512-6Fmg8QkkumNOwuZ/5mIbMU9WI3H2fmn5ajcVya64I5Yr5CcNmO7vcLt0Y7c96DCiMO5/9G+4sI2r6eEvdg1F7A==",
       "dev": true
     },
     "element-plus": {
-      "version": "2.5.5",
-      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.5.5.tgz",
-      "integrity": "sha512-yGU/MruLOWI0ImQPFCyFM4cXtHtILJNAi0hhLImcxjRukjgQLYNkvcvbwqNgBUt808KSeKF9MyxENFyBQLTg+Q==",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.6.2.tgz",
+      "integrity": "sha512-WFMv1v83l437Xu+GeeM+ytxd9VUQpR4418BowvTVIPYItsoj6yK0ITIuSv19iCesF405FbAOaCIHXhJch0ilFA==",
       "requires": {
         "@ctrl/tinycolor": "^3.4.1",
         "@element-plus/icons-vue": "^2.3.1",
@@ -8834,9 +8888,9 @@
       }
     },
     "escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
       "dev": true
     },
     "escape-html": {
@@ -8967,9 +9021,9 @@
       }
     },
     "fastq": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.0.tgz",
-      "integrity": "sha512-zGygtijUMT7jnk3h26kUms3BkSDp4IfIKjmnqI2tvx6nuBfiF1UqOxbnLfzdv+apBy+53oaImsKtMw/xYbW+1w==",
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
       "dev": true,
       "requires": {
         "reusify": "^1.0.4"
@@ -8998,9 +9052,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.15.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
-      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw=="
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA=="
     },
     "for-in": {
       "version": "1.0.2",
@@ -9182,9 +9236,9 @@
       }
     },
     "hasown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
       "requires": {
         "function-bind": "^1.1.2"
@@ -9556,9 +9610,9 @@
       }
     },
     "magic-string": {
-      "version": "0.30.6",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.6.tgz",
-      "integrity": "sha512-n62qCLbPjNjyo+owKtveQxZFZTBm+Ms6YoGD23Wew6Vw337PElFNifQpknPruVRQV57kVShPnLGo9vWxVhpPvA==",
+      "version": "0.30.8",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
+      "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
       "requires": {
         "@jridgewell/sourcemap-codec": "^1.4.15"
       }
@@ -9709,9 +9763,9 @@
       }
     },
     "mlly": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.5.0.tgz",
-      "integrity": "sha512-NPVQvAY1xr1QoVeG0cy8yUYC7FQcOx6evl/RjT1wL5FvzPnzOysoqB/jmx/DhssT2dYa8nxECLAaFI/+gVLhDQ==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.6.1.tgz",
+      "integrity": "sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==",
       "requires": {
         "acorn": "^8.11.3",
         "pathe": "^1.1.2",
@@ -10026,13 +10080,13 @@
       "dev": true
     },
     "postcss": {
-      "version": "8.4.33",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz",
-      "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==",
+      "version": "8.4.38",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
+      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
       "requires": {
         "nanoid": "^3.3.7",
         "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
+        "source-map-js": "^1.2.0"
       }
     },
     "postcss-prefix-selector": {
@@ -10257,9 +10311,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.70.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.70.0.tgz",
-      "integrity": "sha512-uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ==",
+      "version": "1.72.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.72.0.tgz",
+      "integrity": "sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==",
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
         "immutable": "^4.0.0",
@@ -10275,9 +10329,9 @@
       }
     },
     "scule": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/scule/-/scule-1.2.0.tgz",
-      "integrity": "sha512-CRCmi5zHQnSoeCik9565PONMg0kfkvYmcSqrbOJY4txFfy1wvVULV4FDaiXhUblUgahdqz3F2NwHZ8i4eBTwUw==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/scule/-/scule-1.3.0.tgz",
+      "integrity": "sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==",
       "dev": true
     },
     "select": {
@@ -10448,9 +10502,9 @@
       "dev": true
     },
     "source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg=="
     },
     "source-map-resolve": {
       "version": "0.5.3",
@@ -10585,9 +10639,9 @@
       }
     },
     "style-mod": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.0.tgz",
-      "integrity": "sha512-Ca5ib8HrFn+f+0n4N4ScTIA9iTOQ7MaGS1ylHcoVqW9J7w2w8PzN6g9gKmTYgGEBH8e120+RCmhpje6jC5uGWA=="
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
+      "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw=="
     },
     "supports-color": {
       "version": "5.5.0",
@@ -10915,9 +10969,9 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "ufo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.2.tgz",
-      "integrity": "sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA=="
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.3.tgz",
+      "integrity": "sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw=="
     },
     "unimport": {
       "version": "3.7.1",
@@ -10985,12 +11039,12 @@
       "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw=="
     },
     "unplugin": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.6.0.tgz",
-      "integrity": "sha512-BfJEpWBu3aE/AyHx8VaNE/WgouoQxgH9baAiH82JjX8cqVyi3uJQstqwD5J+SZxIK326SZIhsSZlALXVBCknTQ==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.10.0.tgz",
+      "integrity": "sha512-CuZtvvO8ua2Wl+9q2jEaqH6m3DoQ38N7pvBYQbbaeNlWGvK2l6GHiKi29aIHDPoSxdUzQ7Unevf1/ugil5X6Pg==",
       "requires": {
-        "acorn": "^8.11.2",
-        "chokidar": "^3.5.3",
+        "acorn": "^8.11.3",
+        "chokidar": "^3.6.0",
         "webpack-sources": "^3.2.3",
         "webpack-virtual-modules": "^0.6.1"
       }
@@ -11133,9 +11187,9 @@
       "dev": true
     },
     "vite": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz",
-      "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==",
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz",
+      "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==",
       "requires": {
         "esbuild": "^0.18.10",
         "fsevents": "~2.3.2",
@@ -11187,15 +11241,15 @@
       }
     },
     "vue": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.15.tgz",
-      "integrity": "sha512-jC0GH4KkWLWJOEQjOpkqU1bQsBwf4R1rsFtw5GQJbjHVKWDzO6P0nWWBTmjp1xSemAioDFj1jdaK1qa3DnMQoQ==",
+      "version": "3.4.21",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.21.tgz",
+      "integrity": "sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==",
       "requires": {
-        "@vue/compiler-dom": "3.4.15",
-        "@vue/compiler-sfc": "3.4.15",
-        "@vue/runtime-dom": "3.4.15",
-        "@vue/server-renderer": "3.4.15",
-        "@vue/shared": "3.4.15"
+        "@vue/compiler-dom": "3.4.21",
+        "@vue/compiler-sfc": "3.4.21",
+        "@vue/runtime-dom": "3.4.21",
+        "@vue/server-renderer": "3.4.21",
+        "@vue/shared": "3.4.21"
       }
     },
     "vue-clipboard3": {
@@ -11226,11 +11280,11 @@
       }
     },
     "vue-router": {
-      "version": "4.2.5",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.2.5.tgz",
-      "integrity": "sha512-DIUpKcyg4+PTQKfFPX88UWhlagBEBEfJ5A8XDXRJLUnZOvcpMF8o/dnL90vpVkGaPbjvXazV/rC1qBKrZlFugw==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.3.0.tgz",
+      "integrity": "sha512-dqUcs8tUeG+ssgWhcPbjHvazML16Oga5w34uCUmsk7i0BcnskoLGwjpa15fqMr2Fa5JgVBrdL2MEgqz6XZ/6IQ==",
       "requires": {
-        "@vue/devtools-api": "^6.5.0"
+        "@vue/devtools-api": "^6.5.1"
       }
     },
     "vuedraggable": {
@@ -11276,9 +11330,9 @@
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
     },
     "zrender": {
-      "version": "5.4.4",
-      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.4.tgz",
-      "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.5.0.tgz",
+      "integrity": "sha512-O3MilSi/9mwoovx77m6ROZM7sXShR/O/JIanvzTwjN3FORfLSr81PsUGd7jlaYOeds9d8tw82oP44+3YucVo+w==",
       "requires": {
         "tslib": "2.3.0"
       },
diff --git a/package.json b/package.json
index f378b51..afaa0d7 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,7 @@
     "@codemirror/lang-sql": "^6.5.4",
     "@vitejs/plugin-vue": "^4.2.1",
     "@vitejs/plugin-vue-jsx": "^3.0.1",
+    "lodash": "^4.17.21",
     "unplugin-auto-import": "^0.15.3",
     "unplugin-vue-components": "^0.24.1",
     "vite": "^4.3.4",
diff --git a/src/api/role/role.js b/src/api/role/role.js
index 73f3376..6aa7b3d 100644
--- a/src/api/role/role.js
+++ b/src/api/role/role.js
@@ -37,6 +37,13 @@ export const getRoleExcludeMenuId = (params) => {
     params
   });
 };
+
+// 新增修改
+export const operate = (data) => {
+  if(data.roleId) return editRole(data)
+  return addRole(data)
+}
+
 // 新增角色
 export const addRole = (data) => {
   return request({
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 9a4f08f..5c1a3c7 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -224,16 +224,18 @@ html, body, #app, .el-container, .el-aside, .el-main {
   position: relative;
 
   .branch-merge {
-    font-size: 12px;
     display: flex;
-    width: 38px;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    font-size: 12px;
+    width: 30px;
+    height: 30px;
     border-radius: 50%;
     left: 0;
     right: 0;
     margin: -20px auto 0;
     background: #fff;
-    justify-content: center;
-    flex-direction: column;
     box-shadow: 0 0 5px 0 #d8d8d8;
     z-index: 0;
     position: relative;
@@ -246,6 +248,10 @@ html, body, #app, .el-container, .el-aside, .el-main {
     justify-content: center;
     z-index: 0;
     position: relative;
+    .el-icon{
+      width: 1.4em;
+      height: 1.4em;
+    }
   }
 
   .el-button {
@@ -263,7 +269,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
     margin: auto;
     width: 2px;
     height: 100%;
-    background-color: #CACACA;
+    background-color: #000000;
   }
 }
 
@@ -439,7 +445,10 @@ html, body, #app, .el-container, .el-aside, .el-main {
   overflow: hidden;
   margin-right: 5px;
 }
-
+.fen-icon{
+  width: 1.8em;
+  height: 1.7em;
+}
 .middle-icon {
   width: 1.4em;
   height: 1.4em;
diff --git a/src/assets/svg/fenzhi.svg b/src/assets/svg/fenzhi.svg
new file mode 100644
index 0000000..0759fb8
--- /dev/null
+++ b/src/assets/svg/fenzhi.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1711286414943" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="24248" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M480.246 771.968a128 128 0 1 0 63.488 0 32.32 32.32 0 0 0 0.256-3.96800001c0-75.648 51.392-140.16 180.672-249.59999999 96.256-81.408 102.528-86.912 132.416-118.912C903.414 349.76 927.99 304.25599999 927.99 256c0-1.34399999-0.064-2.688-0.256-3.968a128 128 0 1 0-63.488 0 32.32 32.32 0 0 0-0.256 3.96800001c0 28.672-17.408 60.8-53.76 99.83999999-27.264 29.248-33.6 34.816-126.912 113.728-60.992 51.648-106.816 94.71999999-139.328 135.04L543.99 256.00000001c0-1.34399999-0.064-2.688-0.256-3.96800001a128 128 0 1 0-63.488 0 32.32 32.32 0 0 0-0.256 3.968L479.99 604.608c-32.512-40.32-78.336-83.392-139.328-135.03999999-93.312-78.912-99.648-84.48-126.912-113.72800001-36.352-39.04-53.76-71.168-53.76-99.84 0-1.34399999-0.064-2.688-0.256-3.968a128 128 0 1 0-63.488 0 32.32 32.32 0 0 0-0.25600001 3.968c0 48.256 24.576 93.76 70.91200001 143.488 29.888 32 36.16 37.504 132.416 118.976C428.598 627.84 479.98999999 692.352 479.99 768a32.32 32.32 0 0 0 0.256 3.968zM511.99 192a64 64 0 1 1 0-128 64 64 0 0 1 0 128z m384 0a64 64 0 1 1 0-128 64 64 0 0 1 0 128z m-768 0a64 64 0 1 1 0-128 64 64 0 0 1 0 128z m384 768a64 64 0 1 1 0-128 64 64 0 0 1 0 128z" p-id="24249" fill="#2E7CF0"></path></svg>
\ No newline at end of file
diff --git a/src/fvcomponents/fvTable/index.vue b/src/fvcomponents/fvTable/index.vue
index 8833ea9..1b42ff2 100644
--- a/src/fvcomponents/fvTable/index.vue
+++ b/src/fvcomponents/fvTable/index.vue
@@ -19,7 +19,7 @@
         v-loading="localData.loading"
         :row-key="tableConfig?.rowKey || 'id'"
         v-bind="$attrs"
-        table-layout="fixed"
+        table-layout="auto"
         :show-overflow-tooltip="true"
         highlight-current-row
         @selection-change="selectionChange"
diff --git a/src/layout/appmain/AppMain.vue b/src/layout/appmain/AppMain.vue
index 7585e4b..50a43c4 100644
--- a/src/layout/appmain/AppMain.vue
+++ b/src/layout/appmain/AppMain.vue
@@ -3,20 +3,24 @@
     <router-view v-slot="{ Component, route }">
       <transition name="fade-transform" type="transition" appear mode="out-in">
         <div>
-          <keep-alive>
+          <template v-if="!route.meta.noCache">
+            <keep-alive>
+              <suspense>
+                <component :is="Component" :key="route.fullPath" />
+                <template #fallback>
+                  <div>Loading...</div>
+                </template>
+              </suspense>
+            </keep-alive>
+          </template>
+          <template v-else>
             <suspense>
-              <component v-if="!route.meta.noCache" :is="Component" :key="route.fullPath" />
+              <component :is="Component" :key="route.fullPath" />
               <template #fallback>
                 <div>Loading...</div>
               </template>
             </suspense>
-          </keep-alive>
-          <suspense>
-            <component v-if="route.meta.noCache" :is="Component" :key="route.fullPath" />
-            <template #fallback>
-              <div>Loading...</div>
-            </template>
-          </suspense>
+          </template>
         </div>
       </transition>
     </router-view>
diff --git a/src/layout/navbar/BellSocket.vue b/src/layout/navbar/BellSocket.vue
index a864ed2..ba6aac4 100644
--- a/src/layout/navbar/BellSocket.vue
+++ b/src/layout/navbar/BellSocket.vue
@@ -73,56 +73,56 @@ const handleViewDetails = (noticeId) => {
     viewForm.value = res.data
   })
 }
-const setWsUrl=(url)=>{
-  return (window.location.protocol === 'http:' ? "ws://" : "wss://")+window.location.host + import.meta.env.VITE_BASE_URL + url;
-}
-const initWebSocket = () => {
-  try {
-    //怎么区分http  https  /url(全局url)  封装url  只填个url？
-    const wsUrl=setWsUrl('/notice-ws/notice')
-    const socket = new WebSocket(wsUrl)
-    // 2. ws.send()给服务器发送信息
-    //连接发生错误的回调方法
-    socket.onerror = function () {
-      console.log("ws连接发生错误");
-    };
-    //连接成功建立的回调方法
-    socket.onopen = function () {
-      let authInfo = {
-        token: getToken(),
-        type: "auth",
-        cluster: "notice"
-      }
-      socket.send(JSON.stringify(authInfo))
-      console.log("ws连接成功");
-    }
-    //接收到消息的回调方法
-    socket.onmessage = function (event) {
-      let data = JSON.parse(event.data)
-      console.log('测试铃铛',data)
-      if (data.type === 'notice') {
-        noticeList.value.push(data.notice)
-        total.value += 1
-      } else if(!data.type&&data.cluster==="notice"){
-        noticeList.value.push(data)
-        total.value += 1
-      }
-      // console.log("服务器返回的信息: ", JSON.parse(event.data));
-    }
-    //连接关闭的回调方法
-    socket.onclose = function () {
-      // initWebSocket()
-      console.log("ws连接关闭");
-    }
-    setInterval(() => {
-      socket.send(JSON.stringify(send))
-    }, 30000)
-  } catch (e) {
-    console.log(e)
-    console.log("ws连接失败");
-  }
-}
-initWebSocket()
+// const setWsUrl=(url)=>{
+//   return (window.location.protocol === 'http:' ? "ws://" : "wss://")+window.location.host + import.meta.env.VITE_BASE_URL + url;
+// }
+// const initWebSocket = () => {
+//   try {
+//     //怎么区分http  https  /url(全局url)  封装url  只填个url？
+//     const wsUrl=setWsUrl('/notice-ws/notice')
+//     const socket = new WebSocket(wsUrl)
+//     // 2. ws.send()给服务器发送信息
+//     //连接发生错误的回调方法
+//     socket.onerror = function () {
+//       console.log("ws连接发生错误");
+//     };
+//     //连接成功建立的回调方法
+//     socket.onopen = function () {
+//       let authInfo = {
+//         token: getToken(),
+//         type: "auth",
+//         cluster: "notice"
+//       }
+//       socket.send(JSON.stringify(authInfo))
+//       console.log("ws连接成功");
+//     }
+//     //接收到消息的回调方法
+//     socket.onmessage = function (event) {
+//       let data = JSON.parse(event.data)
+//       console.log('测试铃铛',data)
+//       if (data.type === 'notice') {
+//         noticeList.value.push(data.notice)
+//         total.value += 1
+//       } else if(!data.type&&data.cluster==="notice"){
+//         noticeList.value.push(data)
+//         total.value += 1
+//       }
+//       // console.log("服务器返回的信息: ", JSON.parse(event.data));
+//     }
+//     //连接关闭的回调方法
+//     socket.onclose = function () {
+//       // initWebSocket()
+//       console.log("ws连接关闭");
+//     }
+//     setInterval(() => {
+//       socket.send(JSON.stringify(send))
+//     }, 30000)
+//   } catch (e) {
+//     console.log(e)
+//     console.log("ws连接失败");
+//   }
+// }
+// initWebSocket()
 
 const searchNotifyList = () => {
   let params = {
diff --git a/src/router/index.js b/src/router/index.js
index a816fda..9c643ac 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -70,6 +70,15 @@ const router = createRouter({
             breadcrumb: true
           }
         },
+        {
+          path: '/workflow/process',
+          name: 'process',
+          component: () => import('@/views/workflow/process/index.vue'),
+          meta: {
+              title: '流程管理',
+              breadcrumb: true
+          }
+        },
         {
           path: '/workflow/process/edit',
           name: 'processAdd',
diff --git a/src/stores/processStore.js b/src/stores/processStore.js
index a882029..4934b93 100644
--- a/src/stores/processStore.js
+++ b/src/stores/processStore.js
@@ -35,7 +35,6 @@ export const useProcessStore = defineStore('process', () => {
     }
 
     const addProcess = (val) => {
-        console.log("添加节点成功")
         processData.value.process.push(val)
     }
     const delProcess = (delNode) => {
@@ -109,4 +108,4 @@ export const useProcessStore = defineStore('process', () => {
         getAssignedUser,
         addAssignedUser
     }
-})
\ No newline at end of file
+})
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index db53e3a..414ea2b 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -148,6 +148,8 @@ const getList = async () => {
       list.value = res.data.rows
       total.value = res.data.total
       loading.value = false
+    }else {
+      ElMessage.error(res.msg);
     }
   })
 }
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index f696c3f..8facdbf 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -78,6 +78,8 @@ const getList = async () => {
       list.value = res.data.rows
       total.value = res.data.total
       loading.value = false
+    }else {
+      ElMessage.error(res.msg);
     }
   })
 }
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index e68fa14..a117696 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -247,6 +247,8 @@ const getList = async () => {
       list.value = res.data.rows;
       total.value = res.data.total;
       loading.value = false;
+    }else {
+      ElMessage.error(res.msg);
     }
   });
 };
@@ -318,3 +320,8 @@ const handleCurrentChange = (val) => {
 };
 getList();
 </script>
+<style scoped>
+:deep(.el-breadcrumb__item){
+  line-height: normal;
+}
+</style>
diff --git a/src/views/rapid/gen/index.vue b/src/views/rapid/gen/index.vue
index a3b4cf0..d9bce77 100644
--- a/src/views/rapid/gen/index.vue
+++ b/src/views/rapid/gen/index.vue
@@ -271,6 +271,8 @@ const getList = async () => {
       list.value = res.data.rows
       total.value = res.data.total
       loading.value = false
+    }else {
+      ElMessage.error(res.msg);
     }
   })
 }
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 643cdbf..0b311d8 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -18,7 +18,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="handleSearch()" :icon="Search">搜索</el-button>
+        <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
         <el-button @click="handleReset" :icon="Refresh">重置</el-button>
       </el-form-item>
     </el-form>
@@ -160,10 +160,7 @@ const formRules = ref({
     {required: true, message: "系统内置不能为空", trigger: "change"},
   ],
 })
-//搜索功能
-const handleSearch = () => {
-  getList()
-}
+
 //重置搜索
 const handleReset = () => {
   queryForm.value.resetFields()
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 912478c..e00ad03 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -182,8 +182,12 @@ const getEditOption = (deptId) => {
 const getList = async () => {
   loading.value = true
   getDeptList(queryParams).then(res => {
-    list.value = res.data
-    loading.value = false
+    if (res.code === 1000) {
+      list.value = res.data
+      loading.value = false
+    } else {
+      ElMessage.error(res.msg);
+    }
   })
 }
 const getDetail = (deptId) => {
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index f59efb9..b1ee86f 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -44,8 +44,10 @@
       <el-table-column prop="createTime" label="创建时间"/>
       <el-table-column label="操作" prop="operation">
         <template #default="scope">
-          <el-button type="primary" v-if="scope.row.menuType!=='B'" size="mini" @click="handleAdd(scope.row)" link>新增</el-button>
-          <div v-else style="display: inline-block">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
+          <el-button type="primary" v-if="scope.row.menuType!=='B'" size="mini" @click="handleAdd(scope.row)" link>新增
+          </el-button>
+          <div v-else style="display: inline-block">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          </div>
           <el-button type="primary" size="mini" @click="handleEdit(scope.row.menuId)" link>修改</el-button>
           <el-button type="primary" size="mini" @click="handleAssignRoles(scope.row)" link>分配角色</el-button>
           <popover-delete :name="scope.row.menuName" :type="'菜单'" @delete="handleDel(scope.row.menuId)"/>
@@ -230,8 +232,12 @@ const getSelectIcon = (val) => {
 const getList = async () => {
   loading.value = true
   getMenuList(queryParams).then(res => {
-    list.value = res.data
-    loading.value = false
+    if (res.code === 1000) {
+      list.value = res.data
+      loading.value = false
+    } else {
+      ElMessage.error(res.msg);
+    }
   })
 }
 
diff --git a/src/views/system/notice/inform/index.vue b/src/views/system/notice/inform/index.vue
index 01fed25..d403663 100644
--- a/src/views/system/notice/inform/index.vue
+++ b/src/views/system/notice/inform/index.vue
@@ -100,7 +100,9 @@ const getList = async () => {
     } else {
       ElMessage.error(res.msg);
     }
-  });
+  }).catch(err => {
+    loading.value = false;
+  })
 };
 //查看详情
 const handleViewDetails = (noticeId) => {
diff --git a/src/views/system/notice/publish/index.vue b/src/views/system/notice/publish/index.vue
index 6ddb9c6..7f3a637 100644
--- a/src/views/system/notice/publish/index.vue
+++ b/src/views/system/notice/publish/index.vue
@@ -332,7 +332,9 @@ const getList = async () => {
     } else {
       ElMessage.error(res.msg);
     }
-  });
+  }).catch(err => {
+    loading.value = false;
+  })
 };
 //查看公告详情
 const handleViewDetails = async (row) => {
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 7a61e50..096a330 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -141,12 +141,16 @@ const getList = async () => {
     ...queryParams,
     ...pageInfo
   }).then(res => {
-    res.data.rows = res.data.rows.sort((a, b) => {
-      return a.postSort - b.postSort
-    })
-    total.value = res.data.total;
-    list.value = res.data.rows
-    loading.value = false
+    if (res.code === 1000) {
+      res.data.rows = res.data.rows.sort((a, b) => {
+        return a.postSort - b.postSort
+      })
+      total.value = res.data.total;
+      list.value = res.data.rows
+      loading.value = false
+    } else {
+      ElMessage.error(res.msg);
+    }
   })
 }
 const handleReset = (instance) => {
diff --git a/src/views/system/role/add.vue b/src/views/system/role/add.vue
new file mode 100644
index 0000000..f988177
--- /dev/null
+++ b/src/views/system/role/add.vue
@@ -0,0 +1,230 @@
+<template>
+  <div v-loading="loading">
+    <baseTitle title="角色信息录入"></baseTitle>
+    <fvForm :schema="schame" @getInstance="getInstance" :rules="rules"></fvForm>
+    <baseTitle title="分配菜单"></baseTitle>
+    <fvCheckbox :options="localData.checkOptions" v-model="localData.checkList" @change="checkBoxChange" />
+    <el-input v-model="localData.filterText" placeholder="请输入关键词" style="width: 400px;" />
+    <div class="menu-assign">
+      <el-tree 
+        ref="menuTree"
+        :data="localData.menuData"
+        :filter-node-method="filterMenu"
+        :props="localData.menuTreeProps"
+        :check-strictly="localData.checkStrictly"
+        show-checkbox
+        node-key="menuId"
+        @check-change="checkChange"
+      />
+    </div>
+    <div class="oper-page-btn">
+      <el-button type="primary" @click="handleSubmit">提交</el-button>
+      <el-button type="primary" @click="handleBack">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import { useTagsView } from '@/stores/tagsview.js'
+import { useAuthStore } from '@/stores/userstore.js'
+import fvRadio from '@/fvcomponents/fvRadio/index.vue'
+import { ElLoading, ElNotification } from 'element-plus';
+import { getMenuList } from '@/api/system/menuman.js'
+import { getRoleDetail, operate} from "@/api/role/role";
+
+const tagsViewStore = useTagsView()
+const authStore = useAuthStore()
+const route = useRoute()
+
+const form = ref(null)
+const menuTree = ref(null)
+const loading = ref(false)
+
+const isExpand = ref('展开')
+const isAllChose = ref('全选')
+const localData = reactive({
+  filterText: '',
+  menuData: [],
+  menuTreeProps: {
+    value: "menuId",
+    label: 'menuName',
+    children: 'children'
+  },
+  checkStrictly: false,
+  checkList: ['3'],
+  checkOptions: [
+    {
+      label: isExpand.value,
+      value: '1'
+    },
+    {
+      label: isAllChose.value,
+      value: '2'
+    },
+    {
+      label: '父子联动',
+      value: '3'
+    },
+  ]
+})
+
+const schame = computed(()=>{
+  let arr = [
+    {
+      label: '角色名称',
+      prop: 'roleName',
+      component: 'el-input',
+      props: {
+        placeholder: '请输入'
+      }
+    },
+    {
+      label: '角色权限',
+      prop: 'roleKey',
+      component: 'el-input',
+      props: {
+        placeholder: '请输入'
+      }
+    },
+    {
+      label: '显示顺序',
+      prop: 'roleSort',
+      component: 'el-input',
+      props: {
+        placeholder: '请输入',
+        type: 'number'
+      }
+    },
+    {
+      label: '状态',
+      prop: 'state',
+      component: markRaw(fvRadio),
+      props: {
+        cacheKey: 'normal_disable'
+      }
+    },
+    {
+      label: '是否为模版',
+      prop: 'template',
+      component: markRaw(fvRadio),
+      props: {
+        options: [
+          { label: '是', value: true },
+          { label: '否', value: false },
+        ]
+      }
+    },
+  ]
+  return !authStore.roles.includes('superAdmin') ? arr.slice(-1) : arr
+})
+
+const rules = reactive({
+  roleName: [{required: true, message: '请输入', trigger: 'change'}],
+  roleKey: [{required: true, message: '请输入', trigger: 'change'}],
+  roleSort: [{required: true, message: '请输入', trigger: 'change'}],
+})
+
+const getInstance = (e) => {
+  form.value = e
+}
+
+const init = async () => {
+  form.value.setValues({state: '1', template: false})
+  const { data } = await getMenuList()
+  localData.menuData = data
+}
+
+const getInfo = async () => {
+  if(!route.query.id) return
+  const { data } = await getRoleDetail(route.query.id)
+  data.menuIds.forEach(key=>{
+    menuTree.value.setChecked(key, true, false)
+  })
+  if(route.query.isAdd) {
+    delete data.roleId
+    delete data.roleName
+    delete data.roleKey
+  }
+  form.value.setValues(data)
+}
+
+const filterMenu = (value, data) => {
+  if(!value) return true
+  return data.menuName.includes(value)
+}
+
+const checkChange = (data) => {
+  // 获取已选
+  const checkedKeys = menuTree.value.getCheckedKeys()
+  // 获取半选
+  const halfCheckedKeys = menuTree.value.getHalfCheckedKeys()
+  return [...checkedKeys, ...halfCheckedKeys]
+}
+
+const checkBoxChange = (val) => {
+  localData.checkStrictly = val.includes('3')
+  let nodes = menuTree.value.store.nodesMap
+  if (val.includes('1')) {
+    for (const node in nodes) {
+      nodes[node].expanded = true;
+    }
+    isExpand.value = '折叠'
+  } else {
+    for (const node in nodes) {
+      nodes[node].expanded = false;
+    }
+    isExpand.value = '展开'
+  }
+  if (val.includes('2')) {
+    menuTree.value.setCheckedNodes(localData.menuData)
+    isAllChose.value = '不全选'
+  } else {
+    menuTree.value.setCheckedNodes([])
+    isAllChose.value = '全选'
+  }
+}
+
+const handleSubmit = async () => {
+  const loading = ElLoading.service({fullscreen: true})
+  const { isValidate } = await form.value.validate()
+  if(!isValidate) return Promise.reject()
+  const values = form.value.getValues()
+  values.menuIds = checkChange()
+  operate(values).then(res=>{
+    ElNotification({
+      title: route.query.isAdd ? '新增' : '编辑',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    loading.close()
+    res.code === 1000 ? tagsViewStore.delViewAndGoView('/system/role') : null
+  }).finally(()=>{
+    loading.close()
+  })
+}
+
+const handleBack = () => {
+  history.back()
+}
+
+watch(localData, (val)=>{
+  menuTree.value.filter(val.filterText)
+})
+
+onMounted( async ()=>{
+  loading.value = true
+  await init()
+  if(route.query.id) {
+    await getInfo()
+  }
+  loading.value = false
+})
+</script>
+
+<style lang="scss" scoped>
+.menu-assign {
+  width: 400px;
+  max-height: 500px;
+  overflow: auto;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index b0488cd..0e0247b 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,222 +1,18 @@
 <template>
-  <div>
-    <!-- 角色管理 -->
-    <el-form :model="queryParams" class="query-form" inline ref="roleForm">
-      <el-form-item label="角色名称" prop="roleName">
-        <el-input
-            v-model="queryParams.roleName"
-            placeholder="请输入角色名称"
-            clearable
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="权限字符" prop="roleKey">
-        <el-input
-            v-model="queryParams.roleKey"
-            placeholder="请输入权限字符"
-            clearable
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="状态" prop="state">
-        <el-select
-            v-model="queryParams.state"
-            placeholder="请选择角色状态"
-            clearable
-            filterable
-        >
-          <el-option
-              v-for="item in cacheStore.getDict('normal_disable')"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="登录时间" prop="dateValue">
-        <el-config-provider>
-          <el-date-picker
-              v-model="dateValue"
-              type="datetimerange"
-              :shortcuts="shortcuts"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              value-format="YYYY-MM-DD HH:mm:ss"
-          />
-        </el-config-provider>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
-        <el-button @click="handleReset" :icon="Refresh">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <div class="table-header-btn">
-      <el-button type="primary" @click="handleAdd" :icon="Plus">新增</el-button>
-    </div>
-    <div class="table">
-      <el-table
-          :data="list"
-          ref="table"
-          row-key="roleId"
-          :lazy="true"
-          v-loading="loading"
-          v-tabh
-      >
-        <el-table-column label="序号" type="index" align="center" width="60"/>
-        <!--      <el-table-column prop="roleId" label="角色编号" align="center"/>-->
-        <el-table-column prop="roleName" label="角色名称" align="center"/>
-        <el-table-column prop="roleKey" label="角色权限" align="center"/>
-        <el-table-column prop="dataScope" label="数据范围" align="center">
-          <template #default="scope">
-            <el-text v-if="scope.row.dataScope == '1'">所有数据权限</el-text>
-            <el-text v-if="scope.row.dataScope == '2'">自定义数据权限</el-text>
-            <el-text v-if="scope.row.dataScope == '3'">本部门数据权限</el-text>
-            <el-text v-if="scope.row.dataScope == '4'">本部门及以下数据权限</el-text>
-          </template>
-        </el-table-column>
-        <el-table-column prop="roleSort" label="显示顺序" align="center" width="100px"/>
-        <el-table-column prop="state" label="状态" align="center">
-          <template #default="scope">
-            <tag dict-type="normal_disable" :value="scope.row.state"/>
-          </template>
-        </el-table-column>
-        <el-table-column prop="createTime" label="创建时间" align="center"/>
-        <el-table-column label="操作" align="center">
-          <template #default="scope">
-            <el-button type="primary" size="mini"  @click="handleEdit(scope.row.roleId)" link>修改
-            </el-button>
-            <el-button type="primary" size="mini"  @click="handleAssignedUser(scope.row)" link>分配用户
-            </el-button>
-            <popover-delete :name="scope.row.roleName" :type="'角色'"
-                            @delete="handleDel(scope.row.roleId)"/>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <paging :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[10, 20, 30, 40,50]"
-            :total="total" @changeSize="handleSizeChange" @goPage="handleCurrentChange"/>
-
-    <el-dialog v-model="isVisited" :title="title" width="700px">
-      <el-form :model="form" ref="formInstance" label-width="100px" :rules="rules">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="角色名称" prop="roleName">
-              <el-input v-model="form.roleName" placeholder="请输入角色名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="角色权限" prop="roleKey">
-              <el-input v-model="form.roleKey" placeholder="请输入角色权限"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11">
-            <el-form-item label="显示顺序" prop="roleSort">
-              <el-input-number v-model="form.roleSort"></el-input-number>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="数据范围" prop="dataScope">
-              <el-radio-group v-model="form.dataScope" size="mini">
-                <el-radio
-                    v-for="role in [{value:'1',label:'所有数据权限'},{value:'2',label:'自定义数据权限'},{value:'3',label:'本部门数据权限'},{value:'4',label:'本部门及以下数据权限'}]"
-                    :key="role.value" :label="role.value">
-                  {{ role.label }}
-                </el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="状态" prop="state">
-              <el-radio-group v-model="form.state" size="mini">
-                <el-radio v-for="role in cacheStore.getDict('normal_disable')" :key="role.value"
-                          :label="role.value">
-                  {{ role.label }}
-                </el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="菜单权限" prop="menuIds">
-              <div style="display: flex;flex-direction: column">
-                <el-checkbox-group v-model="checkList" @change="changeCheckbox">
-                  <el-checkbox label="1">{{ isExpand }}</el-checkbox>
-                  <el-checkbox label="2">{{ isAllChose }}</el-checkbox>
-                  <el-checkbox label="3">父子联动</el-checkbox>
-                </el-checkbox-group>
-                <div class="dialog-tree ">
-                  <el-tree
-                      :data="treeData"
-                      :props="treeProps"
-                      node-key="menuId"
-                      ref="tree"
-                      :check-strictly="checkStrictly"
-                      show-checkbox
-                      @check-change="handleCheckChange"
-                  />
-                </div>
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-      <span>
-        <el-button @click="handleCancel">取消</el-button>
-        <el-button type="primary" @click="handleSubmit(formInstance)">确定</el-button>
-      </span>
-      </template>
-    </el-dialog>
-  </div>
+  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
+  <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable>
 </template>
 
-<script setup>
-import {Plus} from "@element-plus/icons-vue";
-import {useRouter} from 'vue-router'
-import {ElMessage, ElMessageBox} from "element-plus";
-import {useCacheStore} from "@/stores/cache.js";
-import {getMenuList} from '@/api/system/menuman.js'
-import {getRoleList, getRoleDetail, deleteRole, addRole, editRole} from "@/api/role/role";
-import {Search, Refresh, EditPen, Delete, User} from '@element-plus/icons-vue'
+<script setup lang="jsx">
+import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import Tag from '@/components/Tag.vue'
-import Paging from "@/components/pagination/index.vue";
+import { ElMessageBox, ElNotification } from 'element-plus';
+import { deleteRole } from "@/api/role/role";
+import { useAuthStore } from '@/stores/userstore.js'
 
+const authStore = useAuthStore()
 const router = useRouter()
-const pageInfo = reactive({
-  pageSize: 10,
-  pageNum: 1
-})
-const cacheStore = useCacheStore();
-const queryParams = reactive({
-  roleName: "",
-  roleKey: "",
-  state: "",
-  startTime: '',
-  endTime: ''
-});
-const treeData = ref([])
-const tree = ref()
-const isExpand = ref('展开')
-const isAllChose = ref('全选')
-const table = ref()
-const menuIds = ref([])
-const checkStrictly = ref(false)
-const rules = reactive({
-  roleName: [
-    {required: true, message: '请输入角色名称', trigger: 'blur'},
-  ],
-  roleKey: [
-    {required: true, message: '请输入角色权限', trigger: 'blur'},
-  ],
-  roleSort: [
-    {required: true, message: '请选择显示顺序', trigger: 'blur'},
-  ]
-})
-const checkList = ref(['3'])
-const treeProps = {
-  value: "menuId",
-  label: 'menuName',
-  children: 'children'
-}
-const dateValue = ref()
-const total = ref()
+
 const shortcuts = [
   {
     text: '上周',
@@ -246,239 +42,233 @@ const shortcuts = [
     },
   },
 ]
-const loading = ref(true);
-const roleForm = ref();
-const list = ref([]);
-const isVisited = ref(false);
-const title = ref();
-const form = ref();
-const formInstance = ref();
-//重置from表单
-const restForm = () => {
-  form.value = {
-    roleId: '',
-    roleName: null,
-    roleSort: 0,
-    state: '1',
-    roleKey: null,
-    dataScope: '1',
-    menuIds: []
-  };
-};
-const getList = async () => {
-  let params = {
-    ...queryParams,
-    ...pageInfo
-  }
-  let date = dateValue.value
-  if (date !== undefined && date !== null) {
-    params.startTime = date[0]
-    params.endTime = date[1]
-  }
-  loading.value = true
-  getRoleList(params).then(res => {
-    if (res.code === 1000) {
-      res.data.rows = res.data.rows.sort((a, b) => {
-        return a.roleSort - b.roleSort
-      })
-      list.value = res.data.rows
-      total.value = res.data.total
-      loading.value = false
+
+const searchConfig = reactive([
+  {
+    label: '角色名称',
+    prop: 'roleName',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入',
+      clearable: true
     }
-  })
-};
+  },
+  {
+    label: '权限字符',
+    prop: 'roleKey',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入',
+      clearable: true
+    }
+  },
+  {
+    label: '状态',
+    prop: 'state',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择',
+      clearable: true,
+      cacheKey: 'normal_disable'
+    }
+  },
+  {
+    label: '登录时间',
+    prop: 'dateValue',
+    component: 'el-date-picker',
+    props: {
+      placeholder: '请选择',
+      clearable: true,
+      type: 'datetimerange',
+      startPlaceholder: '开始日期',
+      endPlaceholder: '结束日期',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      shortcuts: shortcuts
+    }
+  },
+])
 
+const tableIns = ref()
 
-//重置功能
-const handleReset = () => {
-  dateValue.value = []
-  roleForm.value.resetFields()
-  getList()
+const auths = {
+  edit: ['admin:role:edit'],
+  del: ['admin:role:del'],
+  add: ['admin:role:add'],
+}
+
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'roleName',
+      label: '角色名称',
+      align: 'center'
+    },
+    {
+      prop: 'roleKey',
+      label: '角色权限',
+      align: 'center'
+    },
+    {
+      prop: 'template',
+      label: '是否为模版角色',
+      align: 'center',
+      currentRender: ({row, index}) => (<Tag dictType={'yes_no'} value={row.template ? '1' : '0'} />)
+    },
+    {
+      prop: 'roleSort',
+      label: '显示顺序',
+      align: 'center'
+    },
+    {
+      prop: 'state',
+      label: '状态',
+      align: 'center',
+      currentRender: ({row, index}) => (<Tag dictType={'normal_disable'} value={row.state} />)
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'right',
+      currentRender: ({row, index}) => {
+        let btn = [{label: '修改', auth: auths.edit, func: ()=>handleEdit(row) , type: 'primary'}]
+        row.template ?
+        btn.push(
+          {
+            label: '使用模版',
+            auth: auths.edit,
+            func: ()=>handleUseTemp(row),
+            type: 'primary'
+          }
+        ) :
+        btn.push(
+          {
+            label: '分配用户',
+            auth: auths.edit,
+            func: ()=>handleAssign(row),
+            type: 'primary'
+          }
+        )
+        if(authStore.roles.includes('superAdmin')) {
+          btn.push({label: '删除', auth: auths.edit, func: ()=>handleDel(row) , type: 'danger'}) 
+        } else if(!row.template) {
+          btn.push({label: '删除', auth: auths.edit, func: ()=>handleDel(row) , type: 'danger'})
+        }
+        return (
+          <div style={{width: '100%'}}>
+            {
+              btn.map(item=>(
+                <el-button 
+                  type={item.type} 
+                  v-perm={item.auth} 
+                  onClick={()=>item.func()}
+                  link
+                  >
+                  {item.label}
+                </el-button>
+              ))
+            }
+          </div>
+        )
+      },
+    }
+  ],
+  api: '/admin/role',
+  btns: [{name: '新增', key: 'add', auth: auths.add, type: 'primary'}],
+  params: {}
+})
+
+const search = (val) => {
+  let obj = {...val}
+  if(obj.dateValue) {
+    obj.startTime = obj.dateValue[0]
+    obj.endTime = obj.dateValue[1]
+    delete obj.dateValue
+  }
+  tableConfig.params = obj
+  tableIns.value.refresh()
+}
+
+const formatDataScope = (dataScope) => {
+  let text = '--'
+  switch(dataScope) {
+    case '1': text = '所有数据权限'
+      break
+    case '2': text = '自定义数据权限'
+      break
+    case '3': text = '本部门数据权限'
+      break
+    case '4': text = '本部门及以下数据权限'
+      break
+  }
+  return text
 }
 
-//添加功能
 const handleAdd = () => {
-  if( tree.value!==undefined){
-    tree.value.setCheckedKeys([])
-  }
-  // getMenu()
-  getMenuList().then(res => {
-    treeData.value = res.data
-  })
-  restForm();
-  rules.roleKey[0].required = true
-  title.value = "新增角色";
-  isVisited.value = true;
-  nextTick(()=>{
-    // 清空校验
-    formInstance.value.clearValidate()
-  })
-};
-
-//修改功能
-const handleEdit = (roleId) => {
-  restForm();
-  //查看详情
-  getRoleDetail(roleId).then(res => {
-    if (res.code === 1000) {
-      console.log('角色详情', res.data)
-      rules.roleKey[0].required = false
-      menuIds.value = res.data.menuIds
-      form.value = res.data
-      title.value = "修改角色";
-      isVisited.value = true;
-      nextTick(()=>{
-        // 清空校验
-        formInstance.value.clearValidate()
-      })
-    }
-  })
-  getMenu()
-};
-//删除功能
-const handleDel = (roleId) => {
-  // ElMessageBox.confirm(`确认删除角色名称为${row.roleName}的数据吗?`, "系统提示", {
-  //   confirmButtonText: "确定",
-  //   cancelButtonText: "取消",
-  //   type: "warning",
-  // }).then(() => {
-    deleteRole(roleId).then(res => {
-      if (res.code === 1000) {
-        ElMessage.success(res.msg);
-        getList();
-      } else {
-        ElMessage.error(res.msg);
-      }
-    });
-  // });
-};
-//分配用户
-const handleAssignedUser = (row) => {
-  //路由跳转，携带参数
-  router.push('/role-auth/user/' + row.roleId+'/'+ row.roleName)
-}
-//获取菜单名称
-const getMenu = async () => {
-  let params = {
-    ...queryParams
-  }
-  getMenuList(params).then(res => {
-    tree.value.setCheckedKeys(menuIds.value)
-    treeData.value = res.data
-  })
-}
-//多选框事件
-const changeCheckbox = (checked) => {
-  //父子联动
-  checkStrictly.value = checked.indexOf("3") === -1;
-  let nodes = tree.value.store.nodesMap;
-  console.log('checked',checked)
-  //展开/折叠
-  if (checked.indexOf("1") === 1) {
-    for (const node in nodes) {
-      nodes[node].expanded = true;
-    }
-    isExpand.value = '折叠'
-  } else {
-    for (const node in nodes) {
-      nodes[node].expanded = false;
-    }
-    isExpand.value = '展开'
-  }
-  //全选/全不选
-  if (checked.indexOf("2") === 1) {
-    tree.value.setCheckedNodes(treeData.value)
-    isAllChose.value = '不全选'
-  } else {
-    tree.value.setCheckedNodes([])
-    isAllChose.value = '全选'
-  }
-}
-
-//点击新增/修改弹窗上的tree节点的左边选择框
-const handleCheckChange = (data) => {
-  form.value.menuIds = tree.value.getCheckedKeys()
-}
-
-
-//取消操作
-const handleCancel = () => {
-  restForm();
-  isVisited.value = false;
-};
-
-const handleSubmit = async (formInstance) => {
-  if (!formInstance) return;
-  formInstance.validate(async (valid) => {
-    if (!valid) return;
-    if (title.value == "新增角色") {
-      console.log('新增角色', form.value)
-      addRole(form.value).then(res => {
-        console.log('res', res)
-        if (res.code === 1000) {
-          ElMessage.success(res.msg);
-          getList();
-          isVisited.value = false;
-        } else {
-          ElMessage.error(res.msg);
-        }
-      });
-    } else {
-      // form.value.menuIds = tree.value.getCheckedKeys()
-      console.log('form.value修改', form.value)
-      editRole(form.value).then(res => {
-        if (res.code === 1000) {
-          ElMessage.success(res.msg);
-          isVisited.value = false;
-          getList();
-        } else {
-          ElMessage.error(res.msg);
-        }
-      });
+  router.push({
+    path: '/system/roleadd',
+    query: {
+      isAdd: 1
     }
   })
 }
-//切换每页显示条数
-const handleSizeChange = (val) => {
-  pageInfo.pageSize = val
-  getList()
+
+const handleEdit = (row) => {
+  router.push({
+    path: '/system/roleedit',
+    query: {
+      id: row.roleId
+    }
+  })
 }
-//点击页码进行分页功能
-const handleCurrentChange = (val) => {
-  pageInfo.pageNum = val
-  getList()
+
+const handleUseTemp = (row) => {
+  router.push({
+    path: '/system/roleadd',
+    query: {
+      id: row.roleId,
+      isAdd: 1
+    }
+  })
 }
-getList();
+
+const handleAssign = (row) => {
+
+}
+
+const handleDel = (row) => {
+  if (!(row.template && authStore.roles.includes('superAdmin'))) {
+    ElNotification({
+      title: '提示',
+      message: '模版角色只能由超级管理员删除!',
+      type: 'warning'
+    })
+    return
+  }
+  
+  ElMessageBox.confirm('确定删除该条数据吗?', '确定删除', {
+    type: 'warning',
+    confirmButtonText: '确定',
+    cancelButtonText: '取消'
+  }).then(async res => {
+    const { code, msg } = await deleteRole(row.roleId)
+    ElNotification({
+      title: '删除',
+      message: msg,
+      type: code === 1000 ? 'success' : 'error'
+    })
+    tableIns.value.refresh()
+  }).catch(()=>{})
+}
+
+const headBtnClick = (key) => {
+  switch(key) {
+    case 'add': handleAdd()
+      break;
+  }
+}
+
 </script>
 
 <style lang="scss" scoped>
-.dialog-tree {
-  border: 1px solid #ad8383;
-  height: 300px;
-  overflow: auto;
-}
-.dialog-tree::-webkit-scrollbar {
-  width: 6px;
-}
 
-// 滚动条轨道
-.dialog-tree::-webkit-scrollbar-track {
-  background: rgb(239, 239, 239);
-  border-radius: 2px;
-}
-
-// 小滑块
-.dialog-tree::-webkit-scrollbar-thumb {
-  background: rgba(80, 81, 82, 0.29);
-  border-radius: 10px;
-}
-.el-input-number {
-  width: 100%;
-}
-
-.el-tree-select {
-  :deep(.el-select) {
-    width: 100%;
-  }
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/tool/interface-switch/index.vue b/src/views/tool/interface-switch/index.vue
index 076abac..a7de731 100644
--- a/src/views/tool/interface-switch/index.vue
+++ b/src/views/tool/interface-switch/index.vue
@@ -113,11 +113,12 @@ const getList =  () => {
   }
   loading.value = true
   getMappingList(params).then(res => {
-    // console.log('res',res)
     if (res.code === 1000) {
       loading.value = false
       list.value = res.data.rows
       total.value = res.data.total
+    }else {
+      ElMessage.error(res.msg);
     }
   })
 };
diff --git a/src/views/workflow/about/index.vue b/src/views/workflow/about/index.vue
index 0aad3e5..c415c85 100644
--- a/src/views/workflow/about/index.vue
+++ b/src/views/workflow/about/index.vue
@@ -118,11 +118,12 @@ const getList = async () => {
     if (res.code === 1000) {
       list.value = res.data.rows
       total.value = res.data.total
-      loading.value = false
     } else {
       ElMessage.error(res.msg)
     }
-
+    loading.value = false
+  }).catch(err => {
+    loading.value = false;
   })
 }
 
diff --git a/src/views/workflow/approve/index.vue b/src/views/workflow/approve/index.vue
index 436752d..0562011 100644
--- a/src/views/workflow/approve/index.vue
+++ b/src/views/workflow/approve/index.vue
@@ -140,11 +140,12 @@ const getList = async () => {
     if (res.code === 1000) {
       list.value = res.data.rows
       total.value = res.data.total
-      loading.value = false
     } else {
       ElMessage.error(res.msg)
     }
-
+    loading.value = false
+  }).catch(err => {
+    loading.value = false;
   })
 }
 //切换每页显示条数
diff --git a/src/views/workflow/form/components/UserPicker.vue b/src/views/workflow/form/components/UserPicker.vue
index f70a165..4f8cf6a 100644
--- a/src/views/workflow/form/components/UserPicker.vue
+++ b/src/views/workflow/form/components/UserPicker.vue
@@ -12,22 +12,25 @@
         <user-picker :multiple="multiple" ref="userPicker" title="请选择人员" v-model:value="userList" @ok="selected"/>
         <span class="placeholder"> {{ placeholder }}</span>
         <div style="display: flex;">
-          <div class="userStyle" v-for="(user, i) in userList" :key="i">
-            <span @click="delDept(i)">×</span>
-            <el-avatar :src="user.avatar"/>
-            <el-tooltip class="item" effect="dark" :content="user.name" placement="bottom-start">
-              <span>{{ user.name }}</span>
-            </el-tooltip>
-          </div>
+          <role-items v-model="userList"/>
+<!--          <div class="userStyle" v-for="(user, i) in userList" :key="i">-->
+<!--            <span @click="delDept(i)">×</span>-->
+<!--&lt;!&ndash;            <el-avatar :src="user.avatar"/>&ndash;&gt;-->
+<!--            <el-tooltip class="item" effect="dark" :content="user.name" placement="bottom-start">-->
+<!--              <span>{{ user.name }}</span>-->
+<!--            </el-tooltip>-->
+<!--          </div>-->
         </div>
       </template>
       <template v-else-if="perm === 'R'">
         <div style="display: flex;">
-          <div v-for="(user, i) in userList" :key="i" class="view_user">
-            <el-avatar :src="user.avatar"/>
-            <el-tooltip effect="dark" :content="user.name" placement="bottom-start">
-              <span>{{ user.name }}</span>
-            </el-tooltip>
+<!--          class="view_user"-->
+          <div v-for="(user, i) in userList" :key="i" >
+<!--            <el-avatar :src="user.avatar"/>-->
+            <el-tag>{{ user.name }}</el-tag>
+<!--            <el-tooltip effect="dark" :content="user.name" placement="bottom-start">-->
+<!--              <span>{{ user.name }}</span>-->
+<!--            </el-tooltip>-->
           </div>
         </div>
       </template>
@@ -37,7 +40,8 @@
 </template>
 
 <script setup>
-import UserPicker from "../../process/common/UserPicker.vue";
+import UserPicker from "@/views/workflow/process/common/UserPicker.vue";
+import RoleItems from "@/views/workflow/process/common/RoleItems.vue";
 import {computed, defineProps} from "vue";
 const emit = defineEmits(["input"])
 const showPickerSelect = ref(false)
diff --git a/src/views/workflow/initiated/index.vue b/src/views/workflow/initiated/index.vue
index 171ede8..0d5086f 100644
--- a/src/views/workflow/initiated/index.vue
+++ b/src/views/workflow/initiated/index.vue
@@ -120,10 +120,12 @@ const getList = async () => {
     if (res.code === 1000) {
       list.value = res.data.rows
       total.value = res.data.total
-      loading.value = false
     } else {
       ElMessage.error(res.msg)
     }
+    loading.value = false
+  }).catch(err => {
+    loading.value = false;
   })
 }
 
diff --git a/src/views/workflow/listen/index.vue b/src/views/workflow/listen/index.vue
index 24be07c..0c3b274 100644
--- a/src/views/workflow/listen/index.vue
+++ b/src/views/workflow/listen/index.vue
@@ -204,10 +204,12 @@ const getList = async () => {
     if (res.code === 1000) {
       list.value = res.data.rows
       total.value = res.data.total
-      loading.value = false
     } else {
       ElMessage.error(res.msg)
     }
+    loading.value = false
+  }).catch(err => {
+    loading.value = false;
   })
 }
 
diff --git a/src/views/workflow/process/ProcessEdit.vue b/src/views/workflow/process/ProcessEdit.vue
index 2506511..5850c1b 100644
--- a/src/views/workflow/process/ProcessEdit.vue
+++ b/src/views/workflow/process/ProcessEdit.vue
@@ -74,7 +74,8 @@ const visible = ref(false)
 const timer = ref(null)
 const validComponents = ref(['processSetting', 'formDesign', 'processDesign'])
 // const activeSelect = ref('formDesign')
-const activeSelect = ref('processSetting')
+// const activeSelect = ref('processSetting')
+const activeSelect = ref('processDesign')
 const validVisible = ref(false)
 const validStep = ref(0)
 const validResult = ref({})
@@ -289,7 +290,7 @@ const doPublish = () => {
     addProcessDefinition(template).then(res => {
       if (res.code === 1000) {
         ElMessage.success(res.msg)
-        // this.$router.push("/formsPanel")
+        router.push("/workflow/process")
       } else {
         ElMessage.error(res.msg)
       }
diff --git a/src/views/workflow/process/ProcessSetting.vue b/src/views/workflow/process/ProcessSetting.vue
index ec0c8fe..24d6950 100644
--- a/src/views/workflow/process/ProcessSetting.vue
+++ b/src/views/workflow/process/ProcessSetting.vue
@@ -7,7 +7,6 @@
 import {useProcessStore} from '@/stores/processStore.js'
 import {computed, defineExpose} from "vue";
 const processStore = useProcessStore()
-console.log(processStore.getDesign)
 
 const processData = computed(() => {
   return processStore.getDesign()
@@ -27,4 +26,4 @@ defineExpose({
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/workflow/process/ProcessTree.vue b/src/views/workflow/process/ProcessTree.vue
index 5c12211..f4c1d11 100644
--- a/src/views/workflow/process/ProcessTree.vue
+++ b/src/views/workflow/process/ProcessTree.vue
@@ -11,6 +11,7 @@ import MergeNode from './nodes/MergeNode.vue'
 import DelayNode from './nodes/DelayNode.vue'
 import AddBranchNode from './nodes/AddBranchNode.vue'
 
+import {debounce} from 'lodash'
 import {defineExpose, h, render, ref} from 'vue'
 import DefaultProps from "./DefaultNodeProps"
 import {ElMessage, ElMessageBox} from 'element-plus'
@@ -47,7 +48,6 @@ const init = () => {
 
 // 初始化map集合,以便数据整理
 const initMapping = (node) => {
-  console.log("初始化数据", node)
   node.forEach(nodeItem => {
     processStore.nodeMap.set(nodeItem.id, nodeItem)
     processStore.parentMap.set(nodeItem.parentId, nodeItem)
@@ -290,7 +290,7 @@ const selectNode = (node) => {
 }
 
 //处理节点插入逻辑
-const insertNode = (type, parentNode) => {
+const insertNode = debounce((type, parentNode) => {
   //插入新节点
   let id = getRandomId();
   updateParentId(id, parentNode.id)
@@ -321,9 +321,8 @@ const insertNode = (type, parentNode) => {
     default:
       break;
   }
-  console.log('开始刷新')
   init()
-}
+}, 100)
 /**
  * 更新父id
  * @param newId
@@ -476,7 +475,7 @@ const addBranchNode = (node) => {
 }
 
 //删除当前节点
-const delNode = (node) => {
+const delNode = debounce((node) => {
   //获取该节点的父节点
   let parentNode = processStore.nodeMap.get(node.parentId)
   if (parentNode) {
@@ -489,8 +488,7 @@ const delNode = (node) => {
   } else {
     ElMessage.warning("出现错误，找不到上级节点😥")
   }
-}
-
+}, 100)
 
 /**
  * 从dom中删除
@@ -667,9 +665,8 @@ defineExpose({
 }
 
 .process-end {
-  width: 60px;
-  margin: 0 auto;
-  margin-bottom: 20px;
+  width: 77px;
+  margin: 0 auto 20px auto;
   border-radius: 15px;
   text-align: center;
   padding: 5px 10px;
@@ -690,8 +687,8 @@ defineExpose({
   display: flex;
   justify-content: center;
   position: relative;
-  /*border-top: 2px solid #cccccc;
-  border-bottom: 2px solid #cccccc;*/
+  //border-top: 2px solid #cccccc;
+  //border-bottom: 2px solid #cccccc;
 }
 
 .branch-node-item {
@@ -700,8 +697,8 @@ defineExpose({
   //background: #f5f6f6;
   flex-direction: column;
   align-items: center;
-  border-top: 2px solid #cccccc;
-  border-bottom: 2px solid #cccccc;
+  border-top: 2px solid #000000;
+  border-bottom: 2px solid #000000;
 
   &:before {
     content: "";
@@ -711,7 +708,7 @@ defineExpose({
     margin: auto;
     width: 2px;
     height: 100%;
-    background-color: #CACACA;
+    background-color: #000000;
   }
 
   .line-top-left, .line-top-right, .line-bot-left, .line-bot-right {
@@ -746,6 +743,10 @@ defineExpose({
   position: absolute;
   width: 80px;
 
+  .el-button {
+    border-color: #000000;
+  }
+
   .add-branch-btn-el {
     z-index: 999;
     position: absolute;
diff --git a/src/views/workflow/process/common/DeptPicker.vue b/src/views/workflow/process/common/DeptPicker.vue
index ee8e558..4ae984a 100644
--- a/src/views/workflow/process/common/DeptPicker.vue
+++ b/src/views/workflow/process/common/DeptPicker.vue
@@ -224,7 +224,7 @@ getDepartmentTreeList();
 </script>
 
 <style lang="scss" scoped>
-$containWidth: 278px;
+$containWidth: 264px;
 
 ///deep/ .el-tree-node {
 //  .is-leaf + .el-checkbox .el-checkbox__inner {
diff --git a/src/views/workflow/process/common/InsertButton.vue b/src/views/workflow/process/common/InsertButton.vue
index feae65a..b9a297c 100644
--- a/src/views/workflow/process/common/InsertButton.vue
+++ b/src/views/workflow/process/common/InsertButton.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-popover :visible="visible" placement="bottom-start" title="添加流程节点" width="350">
+  <el-popover :visible="visible" placement="bottom-start" title="添加流程节点" width="306">
     <div class="node-select">
       <div @click="addApprovalNode">
         <el-icon style="color:rgb(255, 148, 62);">
@@ -39,18 +39,29 @@
       </div>
     </div>
     <template #reference>
-      <el-button :icon="Plus" slot="reference" type="primary" @click="visible = !visible" size="small" circle></el-button>
+<!--      <el-button :icon="Plus" slot="reference" type="primary" @click="visible = !visible"  size="small"-->
+<!--                 circle></el-button>-->
+      <el-icon @click="visible = !visible" color="#fff" style="background-color:#2E7CF0;border-radius: 50%;cursor: pointer" ><Plus /></el-icon>
     </template>
   </el-popover>
 </template>
 
 <script setup>
-import {Plus } from '@element-plus/icons-vue'
-
+import {Plus, Clock, SetUp, Operation, Share, Promotion, Coordinate} from '@element-plus/icons-vue'
 const emit = defineEmits(['insertNode'])
 const visible = ref(false)
 
-
+onMounted(() => {
+  document.addEventListener('click', nullBlockClick)
+})
+/**
+ * 点击空白处, 清除选项选中状态
+ */
+const nullBlockClick = (e) => {
+  if(!(e.target.tagName==='svg'||e.target.tagName==='path')){
+    disVisible()
+  }
+}
 const addApprovalNode = () => {
   emit('insertNode', "APPROVAL")
   disVisible()
@@ -93,6 +104,7 @@ const disVisible = () =>{
     background-color: #F8F9F9;
     border-radius: 10px;
     width: 130px;
+    line-height: 7px;
     position: relative;
 
     span {
diff --git a/src/views/workflow/process/common/RoleItems.vue b/src/views/workflow/process/common/RoleItems.vue
index 22cf2b6..02e4fe0 100644
--- a/src/views/workflow/process/common/RoleItems.vue
+++ b/src/views/workflow/process/common/RoleItems.vue
@@ -2,7 +2,7 @@
   <div style="margin-top: 10px">
     <el-tag class="role-item" v-model="_value" v-for="(role, index) in _value" :key="index + '_role'"
             closable size="mini" @close="removeRoleItem(index)">
-      {{ role.roleName }}
+      {{ role.name }}
     </el-tag>
   </div>
 </template>
diff --git a/src/views/workflow/process/common/RolePicker.vue b/src/views/workflow/process/common/RolePicker.vue
index c61bf2a..6fe8864 100644
--- a/src/views/workflow/process/common/RolePicker.vue
+++ b/src/views/workflow/process/common/RolePicker.vue
@@ -177,7 +177,7 @@ defineExpose({
 </script>
 
 <style lang="scss" scoped>
-$containWidth: 278px;
+$containWidth: 264px;
 .el-dialog__body {
   padding: 10px 20px;
 }
diff --git a/src/views/workflow/process/common/UserPicker.vue b/src/views/workflow/process/common/UserPicker.vue
index d744aa1..bb896d1 100644
--- a/src/views/workflow/process/common/UserPicker.vue
+++ b/src/views/workflow/process/common/UserPicker.vue
@@ -21,12 +21,12 @@
             <div class="tree">
               <el-tree :data="dataList" ref="tree" :props="defaultProps" empty-text="" node-key="value"
                        :default-expanded-keys="expandedKeys" lazy accordion
-                       @node-click="handleChange"
+                       @node-click="handleChange" @node-expand="handleChange"
               >
                 <template #default="{ node, data }">
                   <div class="tree-node">
                     <div v-if="data.type === 0" style="display: flex;align-items: center;padding: 3px 0">
-                      <el-avatar :src="data.avatar"></el-avatar>
+<!--                      <el-avatar :src="data.avatar"></el-avatar>-->
                       {{ node.label }}
                     </div>
                     <div v-else-if="data.type ===1">
@@ -44,7 +44,6 @@
                   </div>
                 </template>
               </el-tree>
-
             </div>
           </el-scrollbar>
         </div>
@@ -56,7 +55,7 @@
           <div class="org-items" style="height: 350px;">
             <el-empty :image-size="100" description="请点击左侧列表选择数据" v-show="selectList.length === 0"/>
             <div v-for="(selectItem, selectIndex) in selectList" :key="selectIndex" class="org-item">
-              <el-avatar :src="selectItem.avatar" style="margin-right: 5px;"></el-avatar>
+<!--              <el-avatar :src="selectItem.avatar" style="margin-right: 5px;"></el-avatar>-->
               {{ selectItem.name}}
               <i class="el-icon-close" @click="noSelected(selectItem)"></i>
             </div>
@@ -110,9 +109,13 @@ const expandedKeys = ref([]);
 const defaultProps = {
   value: "value",
   label: "name",
-  children: "children"
-  // isLeaf: function (data, node) {
-  //   return data.type === 0;
+  children: "children",
+  isLeaf:(data, node) => {
+    if (node.level === 2) {
+      return true
+    }
+  }
+
 };
 const emit = defineEmits();
 
@@ -187,20 +190,31 @@ const showUserPicker = () => {
 const handleChange = (item, data, node) => {
   //渲染子节点用户或部门及用户数据
   selectItem = item;
-  if(expandedKeys.value.indexOf(item.value)==-1){
-    expandedKeys.value.push(item.value);
-  }else {
-   return;
-  }
-  if (data.expanded === true) {
-    if (item.type !== 0) {
-      chooseId.value = item.id;
-      getList();
-      return;
+  if (data.expanded) {
+    if(expandedKeys.value.indexOf(item.value)===-1){
+      expandedKeys.value.push(item.value);
+      if (item.type !== 0) {
+        chooseId.value = item.id;
+        getList();
+        return;
+      }
     }
   }
+
+  // if(expandedKeys.value.indexOf(item.value)==-1){
+  //   expandedKeys.value.push(item.value);
+  // }else {
+  //   if (data.expanded === true) {
+  //     if (item.type !== 0) {
+  //       chooseId.value = item.id;
+  //       getList();
+  //       return;
+  //     }
+  //   }
+  // }
+
   //仅选择用户
-  if (item.avatar !== null) {
+  if (item.type === 0) {
     if (props.multiple) {
       //不添加重复的数据到右边
       for (let i = 0; i < selectList.value.length; i++) {
@@ -249,14 +263,14 @@ defineExpose({
 </script>
 
 <style lang="scss" scoped>
-$containWidth: 278px;
+$containWidth: 264px;
 :deep(.tree) {
   .el-tree {
     .el-tree-node {
       .el-tree-node__children {
         .el-tree-node {
           .el-tree-node__content {
-            height: 45px !important;
+            //height: 45px !important;
 
             .tree-node {
             }
diff --git a/src/views/workflow/process/config/ApprovalNodeConfig.vue b/src/views/workflow/process/config/ApprovalNodeConfig.vue
index 1224ba3..e69328a 100644
--- a/src/views/workflow/process/config/ApprovalNodeConfig.vue
+++ b/src/views/workflow/process/config/ApprovalNodeConfig.vue
@@ -9,7 +9,8 @@
           选择人员
         </el-button>
         <user-picker title="请选择系统角色" :multiple="false" ref="sysRolePicker" :v-model="assignedUser" @ok="selectedUser"/>
-        <avatar-ellipsis :row="3" :user-info="assignedUser"/>
+<!--        <ellipsis :row="3" :user-info="assignedUser"/>-->
+        <role-items v-model="assignedUser"/>
       </div>
       <div v-else-if="nodeProps.assignedType === 'SELF_SELECT'">
         <el-radio-group size="mini" v-model="nodeProps.selfSelect.multiple">
@@ -42,11 +43,11 @@
         </el-form-item>
       </div>
       <div v-else-if="nodeProps.assignedType === 'ROLE'">
-        <el-button size="mini" icon="Plus" type="primary" @click="showRolePicker()" round>
+        <el-button size="mini" icon="Plus" type="primary" @click="showRolePicker" round>
           选择系统角色
         </el-button>
         <role-picker title="请选择人员" :multiple="false" ref="rolePicker" :v-model="roleList" @ok="selectedRole"/>
-        <role-items v-model="nodeProps.roleList"/>
+        <role-items v-model="roleList"/>
       </div>
       <div v-else-if="nodeProps.assignedType === 'FORM_USER'">
         <el-form-item label="选择表单联系人项" prop="text" class="approve-end">
@@ -73,7 +74,7 @@
         </el-button>
         <user-picker title="请指定用户" :multiple="false" ref="toUserPicker" :v-model="nobodyAssignedUser"
                      @ok="selectNoSetUser"/>
-        <avatar-ellipsis :row="3" :user-info="nobodyAssignedUser"/>
+        <ellipsis :row="3" :user-info="nobodyAssignedUser"/>
       </div>
     </el-form-item>
 
@@ -216,7 +217,7 @@
 import {useProcessStore} from '@/stores/processStore.js'
 import UserPicker from '../common/UserPicker.vue'
 import RolePicker from '../common/RolePicker.vue'
-import AvatarEllipsis from '../common/AvatarEllipsis.vue'
+import Ellipsis from '../common/Ellipsis.vue'
 import RoleItems from "../common/RoleItems.vue";
 import {computed, defineProps} from 'vue'
 
@@ -375,8 +376,8 @@ const selectedRole = (select) => {
   let roleInfoList = []
   for (let val of select) {
     let userInfo = {
-      roleId: val.roleId,
-      roleName: val.roleName
+      value: val.roleId,
+      name: val.roleName
     }
     roleInfoList.push(userInfo)
   }
diff --git a/src/views/workflow/process/index.vue b/src/views/workflow/process/index.vue
index aa0971f..e2101e1 100644
--- a/src/views/workflow/process/index.vue
+++ b/src/views/workflow/process/index.vue
@@ -161,10 +161,12 @@ const getList = async () => {
     if (res.code === 1000) {
       list.value = res.data.rows
       total.value = res.data.total
-      loading.value = false
     } else {
       ElMessage.error(res.msg)
     }
+    loading.value = false
+  }).catch(err => {
+    loading.value = false;
   })
 }
 
diff --git a/src/views/workflow/process/nodes/ApprovalNode.vue b/src/views/workflow/process/nodes/ApprovalNode.vue
index 6e4292d..dbe8789 100644
--- a/src/views/workflow/process/nodes/ApprovalNode.vue
+++ b/src/views/workflow/process/nodes/ApprovalNode.vue
@@ -46,7 +46,7 @@ const assignedUser = computed(() => {
 
 const headerBgc = computed(() => {
   if (props.mode === 'design' || props.mode === 'view') {
-    return '#ff943e'
+    return '#F0A32E'
   } else {
     return props.config.props.headerBgc
   }
@@ -86,7 +86,7 @@ const content = computed(() => {
     case "ROLE":
       if (config.roleList.length > 0) {
         return config.roleList.map(role => {
-          return role.roleName;
+          return role.name;
         }).join("、")
       } else {
         return '指定角色（未设置）'
diff --git a/src/views/workflow/process/nodes/CcNode.vue b/src/views/workflow/process/nodes/CcNode.vue
index 0f2b305..082ccfb 100644
--- a/src/views/workflow/process/nodes/CcNode.vue
+++ b/src/views/workflow/process/nodes/CcNode.vue
@@ -27,7 +27,7 @@ import {Promotion} from '@element-plus/icons-vue'
 
 const headerBgc = computed(() => {
   if (props.mode === 'design' || props.mode === 'view') {
-    return '#3296fa'
+    return '#2EC2F0'
   } else {
     return props.config.props.headerBgc
   }
diff --git a/src/views/workflow/process/nodes/ConcurrentNode.vue b/src/views/workflow/process/nodes/ConcurrentNode.vue
index ccec08f..a769572 100644
--- a/src/views/workflow/process/nodes/ConcurrentNode.vue
+++ b/src/views/workflow/process/nodes/ConcurrentNode.vue
@@ -149,18 +149,18 @@ const designStart = () => {
       display: inline-block;
 
       .node-body-main-header {
-        padding: 10px 0px 5px;
-        font-size: xx-small;
+        padding: 10px 0 5px;
         position: relative;
-
+        font-size: 14px;
+        display: flex;
+        align-items: center;
         .title {
-          color: #718dff;
-
+          color: #2E7CF0;
+          height: auto;
+          display: flex;
+          align-items: center;
           .name {
-            display: inline-block;
-            height: 14px;
-            width: 130px;
-            margin-left: 2px;
+            height: auto;
           }
         }
 
diff --git a/src/views/workflow/process/nodes/ConditionNode.vue b/src/views/workflow/process/nodes/ConditionNode.vue
index 62e0d1e..47c8f04 100644
--- a/src/views/workflow/process/nodes/ConditionNode.vue
+++ b/src/views/workflow/process/nodes/ConditionNode.vue
@@ -51,8 +51,9 @@
 import InsertButton from '../common/InsertButton.vue'
 import Ellipsis from '../common/Ellipsis.vue'
 import {ValueType} from '@/views/workflow/form/ComponentsConfigExport.js'
-import {ArrowRightBold,ArrowLeftBold,CopyDocument,CloseBold,Warning} from '@element-plus/icons-vue'
+import {ArrowRightBold, ArrowLeftBold, CopyDocument, CloseBold, Warning} from '@element-plus/icons-vue'
 import {defineProps, defineEmits, defineExpose} from "vue";
+
 const emit = defineEmits()
 
 const props = defineProps({
@@ -112,7 +113,7 @@ const content = computed(() => {
   return String(confitions).replaceAll(',', (props.config.props.groupsType === 'AND' ? ' 且 ' : ' 或 '))
 })
 
-const designState = computed(()=>{
+const designState = computed(() => {
   return props.mode === 'design'
 })
 
@@ -146,23 +147,23 @@ const getOrdinaryConditionContent = (subCondition) => {
 //校验数据配置的合法性
 const validate = (err) => {
   const defineProps = props.config.props
-  if (defineProps.groups.length <= 0){
+  if (defineProps.groups.length <= 0) {
     showError.value = true
     errorInfo.value = '请设置分支条件'
     err.push(`${defineProps.config.name} 未设置条件`)
-  }else {
+  } else {
     for (let i = 0; i < defineProps.groups.length; i++) {
-      if (defineProps.groups[i].cids.length === 0){
+      if (defineProps.groups[i].cids.length === 0) {
         showError.value = true
         errorInfo.value = `请设置条件组${groupNames.value[i]}内的条件`
         err.push(`条件 ${props.config.name} 条件组${groupNames.value[i]}内未设置条件`)
         break
-      }else {
+      } else {
         let conditions = defineProps.groups[i].conditions
         for (let ci = 0; ci < conditions.length; ci++) {
           let subc = conditions[ci]
           showError.value = subc.value.length === 0;
-          if (showError.value){
+          if (showError.value) {
             errorInfo.value = `请完善条件组${groupNames.value[i]}内的${subc.title}条件`
             err.push(`条件 ${props.config.name} 条件组${groupNames.value[i]}内${subc.title}条件未完善`)
             return false
@@ -247,17 +248,22 @@ defineExpose({
       display: inline-block;
 
       .node-body-main-header {
-        padding: 10px 0px 5px;
-        font-size: xx-small;
+        padding: 10px 0 5px;
         position: relative;
+        font-size: 14px;
+        display: flex;
+        align-items: center;
 
         .title {
-          color: #15bca3;
-          display: inline-block;
-          height: 14px;
           width: 125px;
+          color: #2E7CF0;
+          height: auto;
+          display: flex;
+          align-items: center;
+          .name {
+            height: auto;
+          }
         }
-
         .level {
           position: absolute;
           right: 15px;
diff --git a/src/views/workflow/process/nodes/DelayNode.vue b/src/views/workflow/process/nodes/DelayNode.vue
index 9f12185..8666f6a 100644
--- a/src/views/workflow/process/nodes/DelayNode.vue
+++ b/src/views/workflow/process/nodes/DelayNode.vue
@@ -29,7 +29,7 @@ const errorInfo = ref('')
 
 const headerBgc = computed(() => {
   if (props.mode === 'design' || props.mode === 'view') {
-    return '#f25643'
+    return '#F05D2E'
   } else {
     return props.config.props.headerBgc
   }
diff --git a/src/views/workflow/process/nodes/Node.vue b/src/views/workflow/process/nodes/Node.vue
index 8150ada..8bcaae5 100644
--- a/src/views/workflow/process/nodes/Node.vue
+++ b/src/views/workflow/process/nodes/Node.vue
@@ -1,53 +1,59 @@
 <template>
   <div :class="{'node': true, 'root': isRoot || !show, 'node-error-state': showError}">
     <div v-if="show" @click="emit('selected')" :class="{'node-body': true, 'error': showError}">
-        <div class="node-body-header" :style="{'background-color': headerBgc}">
-          <el-icon v-if="headerIcon" size="15">
-            <component :is="headerIcon"/>
-          </el-icon>
-          <ellipsis class="name" hover-tip :content="title"/>
-          <el-icon v-if="!isRoot && designState" size="15" style="float:right;" @click="emit('delNode')">
-            <Close/>
-          </el-icon>
-        </div>
-        <div class="node-body-content">
-          <el-icon v-if="leftIcon">
-            <component :is="leftIcon"/>
-          </el-icon>
-          <template v-if="selectUser.show && mode === 'view'">
-            <div class="avatar_button">
-              <avatar-ellipsis :row="3" v-if="userInfo.length > 0" :user-info="userInfo"/>
-              <el-button type="primary" :icon="Plus" circle/>
-            </div>
-          </template>
-          <template v-else-if="showAvatar">
-            <span class="placeholder" v-if="userInfo.length === 0">{{ placeholder }}</span>
-            <avatar-ellipsis :row="3" :user-info="userInfo" v-else/>
-          </template>
-          <template v-else>
-            <span class="placeholder" v-if="(content || '').trim() === ''">{{ placeholder }}</span>
-            <ellipsis :row="3" :content="content" v-else/>
-          </template>
-        </div>
-        <div class="node-error" v-if="showError">
-          <el-tooltip effect="dark" :content="errorInfo" placement="top-start">
-            <el-icon><Warning /></el-icon>
-          </el-tooltip>
-        </div>
+      <div class="node-body-header" :style="{'background-color': headerBgc}">
+        <el-icon v-if="headerIcon" size="20">
+          <component :is="headerIcon"/>
+        </el-icon>
+        <ellipsis class="name" hover-tip :content="title"/>
+        <el-icon v-if="!isRoot && designState" size="20" style="float:right;cursor: pointer" @click.stop="emit('delNode')">
+          <Close/>
+        </el-icon>
       </div>
+      <div class="node-body-content">
+        <el-icon v-if="leftIcon">
+          <component :is="leftIcon"/>
+        </el-icon>
+        <template v-if="selectUser.show && mode === 'view'">
+          <div class="avatar_button">
+            <avatar-ellipsis :row="3" v-if="userInfo.length > 0" :user-info="userInfo"/>
+            <el-button type="primary" :icon="Plus" circle/>
+          </div>
+        </template>
+        <template v-else-if="showAvatar">
+          <span class="placeholder" v-if="userInfo.length === 0">{{ placeholder }}</span>
+          <div  v-else v-for="item in userInfo" class="circle-user">
+            <span >{{item.name}}</span>
+          </div>
+<!--          <avatar-ellipsis :row="3" :user-info="userInfo"/>-->
+        </template>
+        <template v-else>
+          <span class="placeholder" v-if="(content || '').trim() === ''">{{ placeholder }}</span>
+          <ellipsis :row="3" :content="content" v-else/>
+        </template>
+      </div>
+      <div class="node-error" v-if="showError">
+        <el-tooltip effect="dark" :content="errorInfo" placement="top-start">
+          <el-icon>
+            <Warning/>
+          </el-icon>
+        </el-tooltip>
+      </div>
+    </div>
     <div class="node-footer">
       <div v-if="merge" class="branch-merge">
-        <img data-v-1e7b1da5=""
-             src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAABXlJREFUeF7tmm2IVGUUx3/nLkQUqxmkpAVhSPUllZX8EEGhvVgZQWCU6wcpsqi2mXtnoaBwoqLCufeO9oJYUJQiFZWlZPQCfYiIXkylstTyS1oWWeYWCe6cuLsz7t3r3Ll3du6907oz35bnPM9z/r895zznmWeECf6RCa6fDoBOBExwAp0UmOAB0CmCnRTopECbCZi2nivK1CMD7FpXlH+ydqctKZBz9QyjwkqFG4HzfKK/0gpvl/ulmBWIzAHkVmlRDFY2EihwwLFkRhYQxgzAtHW2CpcBc4CpOsg26eK7yVPYVFwu/9ZzPufq2VLhQBxhAk85lvSF2Y5l/3prjQlAvqR3IjwJTKqz6DeGssQuyLfBsbyjz6PcFgeAZyOwzLFk/QnrjHH/RACYtj6ncHuUCDWYXs7Lz367XEn3inB+1NzauMLGsiW3+u1b2b9lAH22LuiCD2IJED5yTbmiZpt3dAbKT7Hmjhjtdi25oPZnK/uH7dtUCpi2vqVwQ1wRWuHhWkW3StpTEb6IO3fIThhwTemuzWll/0QA5G39FTgrtghhs2vKELA7inra6d38HXvusOEnriWXHo+iFvZvGUDfap3VdYzdzQgIHmd5W7cBc2Ovoax1C3KXZ5/E/i3VgCQciNMD+J1Ug55yXjxo7QfgOdFKCvjyeL/C9MgoEBa5przrt0ti/+C+mRVB/8amrWsU7m2Ql/c5lqwJjre9CDZ1DMFnriXzw0SatvZW4FqBW6o2vwGvCGxyLPmw3rym9g8cwy0XQV8Ix2qEgH0C1ziWNCyceVu1uvZrriVLGqVGsainHO7mRyDynlCvEWupCI7Kxcat6BFg+OwW9ohyfSMIcQF44v/sZovAlRH1I7QVTwyAt1Cjy8hfh9hYvepGQogDoI74HYbSXzHwusTYl7FEAURVcdPWN+NAiAJQTzzCda4p+6N8iDPe1CkQZ8FAtY+E0AhA2uKHszTlT1QkhAHIQnwmAKr1IjQS6gHISnxmABpBCALIUnymAMIgKHxf6wMmH6E3cNTtSLLgZXoKNOgAR6UDyqyq7esKk3znfOriM48AXzc5AmGE1EFgWvXPTMS3DcAJ6TA6XDIT31YAoRCEc5JqcuKc8Kn3AVFO+E4BryvJVHzbI8BzwAdgi2vJ4ihgSY//nyIg8jqctPi2RYBp61wV5qsyR2BFVdhBhBe0wtdisNU15VAagoNrZh4BOVsfFcVCODVUoLBn6E2hIBvShpApgLyt3nvhRXFFCWxwLOmNaz8Wu8wA5G31ntQWNOukwD2OJc80Oy+ufSYAciVdJsJLcZ0K2nV1MbuUk51jnd9oXuoACmW9eHCQj49/T+j3RtiJslPgFxXmoVxe11nhPdeUq8clANPWPoXVQef9D6e1saEHVINHUBYF7Q1lnl2QL5OGkHoE5G19GRhVyBQ+L1tyST0xoa/Iygq3IOvGI4BdwIWjHBeecE15IExM3tYfgJmBOetcU2o9Q2IcsoiAw8Gf0qhyU7kgb4QCcPRTlNGvSspmtzD81J7kJ30AJX0fYeHo2seLjiXLG0TA78CZ/nGFB8uWPJakeG+t9AE4+jjK/XGLWtgTusBix5It4w5ArqRLRTjhl14IW40KD/kre66ki0R4p57IrgozS/2yb9wByDvqhbKX07Xv/oIavMfOP6pFb0pdgcqrbkFuTlp8JingbRIaBfEUHUOYltbtMPUaUNNo2rpeYWk8zSNWqvSmeSvMDIAnybT1boWnY0I4aigL7YJ4bXRqn0wBeCqG7gYVVqFcFapKWXt0gP5nizKQmvLqwpkDqAkaanmhB4MelOkI27XCDjHY7pqyN23htfXbBiArgVH7dABEETrZxzsRcLL/h6P0/Qc1qphfvB2K3wAAAABJRU5ErkJggg=="
-             alt="">
+        <svg-icon name="fenzhi" :class-name="'fen-icon'"/>
+<!--        <img data-v-1e7b1da5=""-->
+<!--             src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAABXlJREFUeF7tmm2IVGUUx3/nLkQUqxmkpAVhSPUllZX8EEGhvVgZQWCU6wcpsqi2mXtnoaBwoqLCufeO9oJYUJQiFZWlZPQCfYiIXkylstTyS1oWWeYWCe6cuLsz7t3r3Ll3du6907oz35bnPM9z/r895zznmWeECf6RCa6fDoBOBExwAp0UmOAB0CmCnRTopECbCZi2nivK1CMD7FpXlH+ydqctKZBz9QyjwkqFG4HzfKK/0gpvl/ulmBWIzAHkVmlRDFY2EihwwLFkRhYQxgzAtHW2CpcBc4CpOsg26eK7yVPYVFwu/9ZzPufq2VLhQBxhAk85lvSF2Y5l/3prjQlAvqR3IjwJTKqz6DeGssQuyLfBsbyjz6PcFgeAZyOwzLFk/QnrjHH/RACYtj6ncHuUCDWYXs7Lz367XEn3inB+1NzauMLGsiW3+u1b2b9lAH22LuiCD2IJED5yTbmiZpt3dAbKT7Hmjhjtdi25oPZnK/uH7dtUCpi2vqVwQ1wRWuHhWkW3StpTEb6IO3fIThhwTemuzWll/0QA5G39FTgrtghhs2vKELA7inra6d38HXvusOEnriWXHo+iFvZvGUDfap3VdYzdzQgIHmd5W7cBc2Ovoax1C3KXZ5/E/i3VgCQciNMD+J1Ug55yXjxo7QfgOdFKCvjyeL/C9MgoEBa5przrt0ti/+C+mRVB/8amrWsU7m2Ql/c5lqwJjre9CDZ1DMFnriXzw0SatvZW4FqBW6o2vwGvCGxyLPmw3rym9g8cwy0XQV8Ix2qEgH0C1ziWNCyceVu1uvZrriVLGqVGsainHO7mRyDynlCvEWupCI7Kxcat6BFg+OwW9ohyfSMIcQF44v/sZovAlRH1I7QVTwyAt1Cjy8hfh9hYvepGQogDoI74HYbSXzHwusTYl7FEAURVcdPWN+NAiAJQTzzCda4p+6N8iDPe1CkQZ8FAtY+E0AhA2uKHszTlT1QkhAHIQnwmAKr1IjQS6gHISnxmABpBCALIUnymAMIgKHxf6wMmH6E3cNTtSLLgZXoKNOgAR6UDyqyq7esKk3znfOriM48AXzc5AmGE1EFgWvXPTMS3DcAJ6TA6XDIT31YAoRCEc5JqcuKc8Kn3AVFO+E4BryvJVHzbI8BzwAdgi2vJ4ihgSY//nyIg8jqctPi2RYBp61wV5qsyR2BFVdhBhBe0wtdisNU15VAagoNrZh4BOVsfFcVCODVUoLBn6E2hIBvShpApgLyt3nvhRXFFCWxwLOmNaz8Wu8wA5G31ntQWNOukwD2OJc80Oy+ufSYAciVdJsJLcZ0K2nV1MbuUk51jnd9oXuoACmW9eHCQj49/T+j3RtiJslPgFxXmoVxe11nhPdeUq8clANPWPoXVQef9D6e1saEHVINHUBYF7Q1lnl2QL5OGkHoE5G19GRhVyBQ+L1tyST0xoa/Iygq3IOvGI4BdwIWjHBeecE15IExM3tYfgJmBOetcU2o9Q2IcsoiAw8Gf0qhyU7kgb4QCcPRTlNGvSspmtzD81J7kJ30AJX0fYeHo2seLjiXLG0TA78CZ/nGFB8uWPJakeG+t9AE4+jjK/XGLWtgTusBix5It4w5ArqRLRTjhl14IW40KD/kre66ki0R4p57IrgozS/2yb9wByDvqhbKX07Xv/oIavMfOP6pFb0pdgcqrbkFuTlp8JingbRIaBfEUHUOYltbtMPUaUNNo2rpeYWk8zSNWqvSmeSvMDIAnybT1boWnY0I4aigL7YJ4bXRqn0wBeCqG7gYVVqFcFapKWXt0gP5nizKQmvLqwpkDqAkaanmhB4MelOkI27XCDjHY7pqyN23htfXbBiArgVH7dABEETrZxzsRcLL/h6P0/Qc1qphfvB2K3wAAAABJRU5ErkJggg=="-->
+<!--             alt="">-->
       </div>
       <div class="btn">
         <insert-button v-if="designState" @insertNode="type => emit('insertNode', type)"/>
       </div>
     </div>
-<!--    <user-picker v-if="selectUser.show" title="请选择系统用户" :multiple="selectUser.multiple" ref="userPicker"-->
-<!--                 :selected="_userInfo"-->
-<!--                 @ok="selectedUser"/>-->
+    <!--    <user-picker v-if="selectUser.show" title="请选择系统用户" :multiple="selectUser.multiple" ref="userPicker"-->
+    <!--                 :selected="_userInfo"-->
+    <!--                 @ok="selectedUser"/>-->
   </div>
 </template>
 
@@ -55,18 +61,19 @@
 import InsertButton from '../common/InsertButton.vue'
 import Ellipsis from '../common/Ellipsis.vue'
 import AvatarEllipsis from '../common/AvatarEllipsis.vue'
-import {defineProps,defineEmits} from "vue";
+import SvgIcon from '@/components/svgIcon/index.vue'
+import {Close, Warning, Plus} from '@element-plus/icons-vue'
+
 const emit = defineEmits(['insertNode'])
-import {Close,Warning,Plus} from '@element-plus/icons-vue'
 const props = defineProps({
   //是否为根节点
   isRoot: {
     type: Boolean,
     default: false
   },
-  nodeId:{
-    type:String,
-    default:()=>{
+  nodeId: {
+    type: String,
+    default: () => {
       return "";
     }
   },
@@ -144,7 +151,7 @@ const props = defineProps({
   }
 })
 
-const designState = computed(()=>{
+const designState = computed(() => {
   return props.mode === 'design'
 })
 
@@ -165,11 +172,19 @@ const init = () => {
   // }
 }
 
-init()
+// init()
 </script>
 
 <style lang="scss" scoped>
-
+.circle-user{
+  width: 50px;
+  height: 50px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 50%;
+  border: 1px solid #ACACAC;
+}
 .root {
   &:before {
     display: none !important;
@@ -185,19 +200,19 @@ init()
   &:before {
     content: '';
     position: absolute;
-    top: -12px;
+    top: -9px;
     left: 50%;
     -webkit-transform: translateX(-50%);
     transform: translateX(-50%);
     width: 0;
     border-style: solid;
     border-width: 8px 6px 4px;
-    border-color: #CACACA transparent transparent;
-    background: #F5F5F7;
+    border-color: #000000 transparent transparent;
+    background: #ffffff;
   }
 
   .node-body {
-    cursor: pointer;
+
     min-height: 63px;
     position: relative;
     border-radius: 5px;
@@ -216,6 +231,7 @@ init()
     }
 
     .node-body-header {
+      text-align: center;
       border-top-left-radius: 5px;
       border-top-right-radius: 5px;
       padding: 5px 15px;
@@ -227,13 +243,15 @@ init()
       }
 
       .name {
-        height: 14px;
-        width: 150px;
-        display: inline-block
+        //height: 14px;
+        //width: 150px;
+        display: inline-block;
+        font-size: 16px;
       }
     }
 
     .node-body-content {
+      cursor: pointer;
       padding: 18px;
       color: #656363;
       font-size: 14px;
@@ -243,6 +261,7 @@ init()
         display: flex;
         //flex: 1;
         flex-wrap: wrap;
+
         button {
           margin-top: 3px;
           height: 40px;
diff --git a/src/views/workflow/process/nodes/RootNode.vue b/src/views/workflow/process/nodes/RootNode.vue
index 18c943b..a0fabc3 100644
--- a/src/views/workflow/process/nodes/RootNode.vue
+++ b/src/views/workflow/process/nodes/RootNode.vue
@@ -1,13 +1,13 @@
 <template>
   <node title="发起人" :is-root="true" :mode="mode" :content="content" show-avatar :user-info="config.props.assignedUser"
         @selected="emit('selected')" @insertNode="type => emit('insertNode', type)"
-        placeholder="所有人" :header-bgc="config.props.headerBgc" :header-icon="UserFilled"/>
+        placeholder="所有人" :header-bgc="headerBgc" :header-icon="UserFilled"/>
 </template>
 
 <script setup>
 import Node from './Node.vue'
 import {UserFilled} from '@element-plus/icons-vue'
-import {defineExpose, defineProps} from "vue";
+import {computed, defineExpose, defineProps} from "vue";
 const emit = defineEmits(['insertNode','selected'])
 
 const props = defineProps({
@@ -34,6 +34,14 @@ const content = computed(() => {
   }
 })
 
+const headerBgc = computed(() => {
+  if (props.mode === 'design' || props.mode === 'view') {
+    return '#2E7CF0'
+  } else {
+    return props.config.props.headerBgc
+  }
+})
+
 
 const validate = () => {
   console.log("调用成功")
diff --git a/src/views/workflow/process/nodes/TriggerNode.vue b/src/views/workflow/process/nodes/TriggerNode.vue
index d3992ed..71500dc 100644
--- a/src/views/workflow/process/nodes/TriggerNode.vue
+++ b/src/views/workflow/process/nodes/TriggerNode.vue
@@ -31,12 +31,11 @@ const preview = computed(() => {
 })
 
 const headerBgc = computed(() => {
-  return '#47bc82'
-  // if (preview || !viewer) {
-  //   return '#ff943e'
-  // } else {
-  //   return props.config.props.headerBgc
-  // }
+  if (props.mode === 'design' || props.mode === 'view') {
+    return '#BE2EF0'
+  } else {
+    return props.config.props.headerBgc
+  }
 })
 const content = computed(() => {
   return '请设置触发器'
diff --git a/src/views/workflow/task/index.vue b/src/views/workflow/task/index.vue
index d55d671..58f11c4 100644
--- a/src/views/workflow/task/index.vue
+++ b/src/views/workflow/task/index.vue
@@ -56,6 +56,7 @@ import {useProcessStore} from '@/stores/processStore.js'
 import Paging from "@/components/pagination/index.vue";
 import {useCacheStore} from '@/stores/cache.js'
 import PointTag from "@/components/PointTag.vue";
+import {ElMessage} from "element-plus";
 
 const processStore = useProcessStore()
 const dictStore = useCacheStore()
@@ -100,9 +101,15 @@ const getList = async () => {
   }
   loading.value = true
   getTaskList(params).then(res => {
-    list.value = res.data.rows
-    total.value = res.data.total
+    if (res.code === 1000) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    } else {
+      ElMessage.error(res.msg)
+    }
     loading.value = false
+  }).catch(err => {
+    loading.value = false;
   })
 }
 
diff --git a/vite.config.js b/vite.config.js
index 257398a..f8e0c64 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -69,21 +69,21 @@ export default defineConfig({
     strictPort: false,
     open: true,
     proxy: {
-      '/api/admin': {
-        target: 'http://dev-mosr.frp.feashow.cn/',
-        // target: 'http://192.168.31.175:8000',
-        changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/api/, '')
-      },
+      // '/api/admin': {
+      //   target: 'http://dev-mosr.frp.feashow.cn/',
+      //   // target: 'http://192.168.31.175:8000',
+      //   changeOrigin: true,
+      //   rewrite: (path) => path.replace(/^\/api/, '')
+      // },
       '/api': {
         target: 'http://mosr.feashow.cn',
         changeOrigin: true,
       },
-      '/api/notice-ws': {
-        target: 'ws://mosr.feashow.cn/api/notice-ws',
-        ws: true,
-        changeOrigin: true,
-      }
+      // '/api/notice-ws': {
+      //   target: 'ws://mosr.feashow.cn/api/notice-ws',
+      //   ws: true,
+      //   changeOrigin: true,
+      // }
     }
   }
 })