element ui 版本升级

e178beaf · matian · 0e01c7d5 · e178beaf · e178beaf · e178beaf
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
        "@vant/area-data": "^1.3.1",
        "axios": "^0.27.2",
        "blueimp-md5": "^2.19.0",
-        "element-plus": "^2.2.2",
+        "element-plus": "^2.2.6",
        "pinia": "^2.0.14",
        "qs": "^6.10.3",
        "vue": "^3.2.36",
@@ -154,16 +154,16 @@
      }
    },
    "node_modules/@floating-ui/core": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-0.7.1.tgz",
-      "integrity": "sha512-grcqEmI8DTIolufpxhJagVeJmvloxBXE6xxSrVnSXz/Wz1uUIsC85ad+UNBqAoBOvzLxE42wvDj3YkmSGqWRxA=="
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-0.7.3.tgz",
+      "integrity": "sha512-buc8BXHmG9l82+OQXOFU3Kr2XQx9ys01U/Q9HMIrZ300iLc8HLMgh7dcCqgYzAzf4BkoQvDcXf5Y+CuEZ5JBYg=="
    },
    "node_modules/@floating-ui/dom": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-0.5.1.tgz",
-      "integrity": "sha512-dkPSy5JPiQEtljc3VpG9lauYctxfLlqj/8N9f+lmsR92gQaSVMAWuBbFBH2keY5DmdQn3p4Dv1dQd+e8osH+/g==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-0.5.4.tgz",
+      "integrity": "sha512-419BMceRLq0RrmTSDxn8hf9R3VCJv2K9PUfugh5JyEFmdjzDo+e8U5EdR8nzKq8Yj1htzLm3b6eQEEam3/rrtg==",
      "dependencies": {
-        "@floating-ui/core": "^0.7.1"
+        "@floating-ui/core": "^0.7.3"
      }
    },
    "node_modules/@humanwhocodes/config-array": {
@@ -307,6 +307,11 @@
      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
      "dev": true
    },
+    "node_modules/@types/web-bluetooth": {
+      "version": "0.0.14",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.14.tgz",
+      "integrity": "sha512-5d2RhCard1nQUC3aHcq/gHzWYO6K0WJmAbjO7mQJgCQKtZpgXxv1rOM6O/dBDhDYYVutk1sciOgNSe+5YyfM8A=="
+    },
    "node_modules/@typescript-eslint/eslint-plugin": {
      "version": "5.23.0",
      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.23.0.tgz",
@@ -706,12 +711,13 @@
      }
    },
    "node_modules/@vueuse/core": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-8.5.0.tgz",
-      "integrity": "sha512-VEJ6sGNsPlUp0o9BGda2YISvDZbhWJSOJu5zlp2TufRGVrLcYUKr31jyFEOj6RXzG3k/H4aCYeZyjpItfU8glw==",
+      "version": "8.7.5",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-8.7.5.tgz",
+      "integrity": "sha512-tqgzeZGoZcXzoit4kOGLWJibDMLp0vdm6ZO41SSUQhkhtrPhAg6dbIEPiahhUu6sZAmSYvVrZgEr5aKD51nrLA==",
      "dependencies": {
-        "@vueuse/metadata": "8.5.0",
-        "@vueuse/shared": "8.5.0",
+        "@types/web-bluetooth": "^0.0.14",
+        "@vueuse/metadata": "8.7.5",
+        "@vueuse/shared": "8.7.5",
        "vue-demi": "*"
      },
      "funding": {
@@ -731,9 +737,9 @@
      }
    },
    "node_modules/@vueuse/core/node_modules/@vueuse/shared": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-8.5.0.tgz",
-      "integrity": "sha512-qKG+SZb44VvGD4dU5cQ63z4JE2Yk39hQUecR0a9sEdJA01cx+XrxAvFKJfPooxwoiqalAVw/ktWK6xbyc/jS3g==",
+      "version": "8.7.5",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-8.7.5.tgz",
+      "integrity": "sha512-THXPvMBFmg6Gf6AwRn/EdTh2mhqwjGsB2Yfp374LNQSQVKRHtnJ0I42bsZTn7nuEliBxqUrGQm/lN6qUHmhJLw==",
      "dependencies": {
        "vue-demi": "*"
      },
@@ -754,9 +760,9 @@
      }
    },
    "node_modules/@vueuse/core/node_modules/vue-demi": {
-      "version": "0.12.5",
-      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.12.5.tgz",
-      "integrity": "sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==",
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.1.tgz",
+      "integrity": "sha512-xmkJ56koG3ptpLnpgmIzk9/4nFf4CqduSJbUM0OdPoU87NwRuZ6x49OLhjSa/fC15fV+5CbEnrxU4oyE022svg==",
      "hasInstallScript": true,
      "bin": {
        "vue-demi-fix": "bin/vue-demi-fix.js",
@@ -779,9 +785,9 @@
      }
    },
    "node_modules/@vueuse/metadata": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-8.5.0.tgz",
-      "integrity": "sha512-WxsD+Cd+bn+HcjpY6Dl9FJ8ywTRTT9pTwk3bCQpzEhXVYAyNczKDSahk50fCfIJKeWHhyI4B2+/ZEOxQAkUr0g==",
+      "version": "8.7.5",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-8.7.5.tgz",
+      "integrity": "sha512-emJZKRQSaEnVqmlu39NpNp8iaW+bPC2kWykWoWOZMSlO/0QVEmO/rt8A5VhOEJTKLX3vwTevqbiRy9WJRwVOQg==",
      "funding": {
        "url": "https://github.com/sponsors/antfu"
      }
@@ -1287,9 +1293,9 @@
      }
    },
    "node_modules/dayjs": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.2.tgz",
-      "integrity": "sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw=="
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.3.tgz",
+      "integrity": "sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A=="
    },
    "node_modules/debug": {
      "version": "4.3.4",
@@ -1423,19 +1429,19 @@
      "dev": true
    },
    "node_modules/element-plus": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.2.2.tgz",
-      "integrity": "sha512-yGcj2Ayb0jZO1WbI51tHJ4efhlfWKlBqqGtWbzhq+tcpfaKzJZN+IHRouuFasqn0ZV3tWCDu1jggDR1+9y7XfQ==",
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.2.6.tgz",
+      "integrity": "sha512-N9G4yWSxDt1YtreCJgt7UaSsXKuR4Fzb3ThzlBjbGDYDhcHijsrLL3qkdLZgeoSB13LRyr9pgP1ljNXdaYGa+g==",
      "dependencies": {
        "@ctrl/tinycolor": "^3.4.1",
-        "@element-plus/icons-vue": "^1.1.4",
-        "@floating-ui/dom": "^0.5.0",
+        "@element-plus/icons-vue": "^2.0.5",
+        "@floating-ui/dom": "^0.5.3",
        "@popperjs/core": "npm:@sxzz/popperjs-es@^2.11.7",
        "@types/lodash": "^4.14.182",
        "@types/lodash-es": "^4.17.6",
-        "@vueuse/core": "^8.5.0",
+        "@vueuse/core": "^8.6.0",
        "async-validator": "^4.1.1",
-        "dayjs": "^1.11.2",
+        "dayjs": "^1.11.3",
        "escape-html": "^1.0.3",
        "lodash": "^4.17.21",
        "lodash-es": "^4.17.21",
@@ -1447,6 +1453,14 @@
        "vue": "^3.2.0"
      }
    },
+    "node_modules/element-plus/node_modules/@element-plus/icons-vue": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@element-plus/icons-vue/-/icons-vue-2.0.6.tgz",
+      "integrity": "sha512-lPpG8hYkjL/Z97DH5Ei6w6o22Z4YdNglWCNYOPcB33JCF2A4wye6HFgSI7hEt9zdLyxlSpiqtgf9XcYU+m5mew==",
+      "peerDependencies": {
+        "vue": "^3.2.0"
+      }
+    },
    "node_modules/end-of-stream": {
      "version": "1.4.4",
      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -4842,16 +4856,16 @@
      }
    },
    "@floating-ui/core": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-0.7.1.tgz",
-      "integrity": "sha512-grcqEmI8DTIolufpxhJagVeJmvloxBXE6xxSrVnSXz/Wz1uUIsC85ad+UNBqAoBOvzLxE42wvDj3YkmSGqWRxA=="
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-0.7.3.tgz",
+      "integrity": "sha512-buc8BXHmG9l82+OQXOFU3Kr2XQx9ys01U/Q9HMIrZ300iLc8HLMgh7dcCqgYzAzf4BkoQvDcXf5Y+CuEZ5JBYg=="
    },
    "@floating-ui/dom": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-0.5.1.tgz",
-      "integrity": "sha512-dkPSy5JPiQEtljc3VpG9lauYctxfLlqj/8N9f+lmsR92gQaSVMAWuBbFBH2keY5DmdQn3p4Dv1dQd+e8osH+/g==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-0.5.4.tgz",
+      "integrity": "sha512-419BMceRLq0RrmTSDxn8hf9R3VCJv2K9PUfugh5JyEFmdjzDo+e8U5EdR8nzKq8Yj1htzLm3b6eQEEam3/rrtg==",
      "requires": {
-        "@floating-ui/core": "^0.7.1"
+        "@floating-ui/core": "^0.7.3"
      }
    },
    "@humanwhocodes/config-array": {
@@ -4969,6 +4983,11 @@
      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
      "dev": true
    },
+    "@types/web-bluetooth": {
+      "version": "0.0.14",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.14.tgz",
+      "integrity": "sha512-5d2RhCard1nQUC3aHcq/gHzWYO6K0WJmAbjO7mQJgCQKtZpgXxv1rOM6O/dBDhDYYVutk1sciOgNSe+5YyfM8A=="
+    },
    "@typescript-eslint/eslint-plugin": {
      "version": "5.23.0",
      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.23.0.tgz",
@@ -5260,35 +5279,36 @@
      "requires": {}
    },
    "@vueuse/core": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-8.5.0.tgz",
-      "integrity": "sha512-VEJ6sGNsPlUp0o9BGda2YISvDZbhWJSOJu5zlp2TufRGVrLcYUKr31jyFEOj6RXzG3k/H4aCYeZyjpItfU8glw==",
+      "version": "8.7.5",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-8.7.5.tgz",
+      "integrity": "sha512-tqgzeZGoZcXzoit4kOGLWJibDMLp0vdm6ZO41SSUQhkhtrPhAg6dbIEPiahhUu6sZAmSYvVrZgEr5aKD51nrLA==",
      "requires": {
-        "@vueuse/metadata": "8.5.0",
-        "@vueuse/shared": "8.5.0",
+        "@types/web-bluetooth": "^0.0.14",
+        "@vueuse/metadata": "8.7.5",
+        "@vueuse/shared": "8.7.5",
        "vue-demi": "*"
      },
      "dependencies": {
        "@vueuse/shared": {
-          "version": "8.5.0",
-          "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-8.5.0.tgz",
-          "integrity": "sha512-qKG+SZb44VvGD4dU5cQ63z4JE2Yk39hQUecR0a9sEdJA01cx+XrxAvFKJfPooxwoiqalAVw/ktWK6xbyc/jS3g==",
+          "version": "8.7.5",
+          "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-8.7.5.tgz",
+          "integrity": "sha512-THXPvMBFmg6Gf6AwRn/EdTh2mhqwjGsB2Yfp374LNQSQVKRHtnJ0I42bsZTn7nuEliBxqUrGQm/lN6qUHmhJLw==",
          "requires": {
            "vue-demi": "*"
          }
        },
        "vue-demi": {
-          "version": "0.12.5",
-          "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.12.5.tgz",
-          "integrity": "sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==",
+          "version": "0.13.1",
+          "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.1.tgz",
+          "integrity": "sha512-xmkJ56koG3ptpLnpgmIzk9/4nFf4CqduSJbUM0OdPoU87NwRuZ6x49OLhjSa/fC15fV+5CbEnrxU4oyE022svg==",
          "requires": {}
        }
      }
    },
    "@vueuse/metadata": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-8.5.0.tgz",
-      "integrity": "sha512-WxsD+Cd+bn+HcjpY6Dl9FJ8ywTRTT9pTwk3bCQpzEhXVYAyNczKDSahk50fCfIJKeWHhyI4B2+/ZEOxQAkUr0g=="
+      "version": "8.7.5",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-8.7.5.tgz",
+      "integrity": "sha512-emJZKRQSaEnVqmlu39NpNp8iaW+bPC2kWykWoWOZMSlO/0QVEmO/rt8A5VhOEJTKLX3vwTevqbiRy9WJRwVOQg=="
    },
    "acorn": {
      "version": "8.7.1",
@@ -5686,9 +5706,9 @@
      "dev": true
    },
    "dayjs": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.2.tgz",
-      "integrity": "sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw=="
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.3.tgz",
+      "integrity": "sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A=="
    },
    "debug": {
      "version": "4.3.4",
@@ -5788,25 +5808,33 @@
      "dev": true
    },
    "element-plus": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.2.2.tgz",
-      "integrity": "sha512-yGcj2Ayb0jZO1WbI51tHJ4efhlfWKlBqqGtWbzhq+tcpfaKzJZN+IHRouuFasqn0ZV3tWCDu1jggDR1+9y7XfQ==",
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.2.6.tgz",
+      "integrity": "sha512-N9G4yWSxDt1YtreCJgt7UaSsXKuR4Fzb3ThzlBjbGDYDhcHijsrLL3qkdLZgeoSB13LRyr9pgP1ljNXdaYGa+g==",
      "requires": {
        "@ctrl/tinycolor": "^3.4.1",
-        "@element-plus/icons-vue": "^1.1.4",
-        "@floating-ui/dom": "^0.5.0",
+        "@element-plus/icons-vue": "^2.0.5",
+        "@floating-ui/dom": "^0.5.3",
        "@popperjs/core": "npm:@sxzz/popperjs-es@^2.11.7",
        "@types/lodash": "^4.14.182",
        "@types/lodash-es": "^4.17.6",
-        "@vueuse/core": "^8.5.0",
+        "@vueuse/core": "^8.6.0",
        "async-validator": "^4.1.1",
-        "dayjs": "^1.11.2",
+        "dayjs": "^1.11.3",
        "escape-html": "^1.0.3",
        "lodash": "^4.17.21",
        "lodash-es": "^4.17.21",
        "lodash-unified": "^1.0.2",
        "memoize-one": "^6.0.0",
        "normalize-wheel-es": "^1.1.2"
+      },
+      "dependencies": {
+        "@element-plus/icons-vue": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/@element-plus/icons-vue/-/icons-vue-2.0.6.tgz",
+          "integrity": "sha512-lPpG8hYkjL/Z97DH5Ei6w6o22Z4YdNglWCNYOPcB33JCF2A4wye6HFgSI7hEt9zdLyxlSpiqtgf9XcYU+m5mew==",
+          "requires": {}
+        }
      }
    },
    "end-of-stream": {

--- a/package.json
+++ b/package.json
@@ -15,14 +15,14 @@
  "dependencies": {
    "@element-plus/icons-vue": "^1.1.4",
    "@tinymce/tinymce-vue": "^5.0.0",
+    "@vant/area-data": "^1.3.1",
    "axios": "^0.27.2",
    "blueimp-md5": "^2.19.0",
-    "element-plus": "^2.2.2",
+    "element-plus": "^2.2.6",
    "pinia": "^2.0.14",
    "qs": "^6.10.3",
    "vue": "^3.2.36",
-    "vue-router": "^4.0.15",
-    "@vant/area-data": "^1.3.1"
+    "vue-router": "^4.0.15"
  },
  "devDependencies": {
    "@rushstack/eslint-patch": "^1.1.3",

--- a/src/main.ts
+++ b/src/main.ts
@@ -5,7 +5,6 @@ import App from './App.vue'
 import router from './router'

 import ElementPlus from 'element-plus'
-import 'element-plus/dist/index.css'
 import '@/assets/styles/element/index.scss'
 import zhCn from 'element-plus/es/locale/lang/zh-cn'