更新依赖，调整 element plus 相关代码以便适配最新版本

package.json

@@ -21,7 +21,7 @@
         "@tinymce/tinymce-vue": "^4.0.5",
         "axios": "^0.24.0",
         "dayjs": "^1.10.7",
-        "element-plus": "^1.2.0-beta.6",
+        "element-plus": "^1.3.0-beta.1",
         "hotkeys-js": "^3.8.7",
         "js-cookie": "^3.0.1",
         "mavon-editor": "^3.0.0-beta",
@@ -41,7 +41,7 @@
     "devDependencies": {
         "@vitejs/plugin-vue": "^2.0.1",
         "@vue/compiler-sfc": "^3.2.26",
-        "eslint": "^8.5.0",
+        "eslint": "^8.6.0",
         "eslint-plugin-vue": "^8.2.0",
         "http-server": "^14.0.0",
         "husky": "^7.0.4",
@@ -49,7 +49,7 @@
         "plop": "^3.0.5",
         "postcss-html": "^1.3.0",
         "postcss-scss": "^4.0.2",
-        "sass": "^1.45.1",
+        "sass": "^1.45.2",
         "stylelint": "^14.2.0",
         "stylelint-config-html": "^1.0.0",
         "stylelint-config-recommended": "^6.0.0",
@@ -60,14 +60,14 @@
         "svgo": "^2.8.0",
         "unplugin-auto-import": "^0.5.5",
         "unplugin-vue-components": "^0.17.11",
-        "vite": "^2.7.9",
+        "vite": "^2.7.10",
         "vite-plugin-banner": "^0.1.3",
         "vite-plugin-compression": "^0.4.0",
         "vite-plugin-html": "^2.1.2",
         "vite-plugin-mock": "^2.9.6",
         "vite-plugin-restart": "^0.0.2",
         "vite-plugin-spritesmith": "^0.1.1",
-        "vite-plugin-svg-icons": "^1.0.5",
+        "vite-plugin-svg-icons": "^1.1.0",
         "vite-plugin-vue-setup-extend": "^0.3.0",
         "vue-eslint-parser": "^8.0.1"
     }

pnpm-lock.yaml

@@ -7,8 +7,8 @@ specifiers:
   '@vue/compiler-sfc': ^3.2.26
   axios: ^0.24.0
   dayjs: ^1.10.7
-  element-plus: ^1.2.0-beta.6
+  element-plus: ^1.3.0-beta.1
-  eslint: ^8.5.0
+  eslint: ^8.6.0
   eslint-plugin-vue: ^8.2.0
   hotkeys-js: ^3.8.7
   http-server: ^14.0.0
@@ -27,7 +27,7 @@ specifiers:
   postcss-html: ^1.3.0
   postcss-scss: ^4.0.2
   qs: ^6.10.2
-  sass: ^1.45.1
+  sass: ^1.45.2
   screenfull: ^6.0.0
   stylelint: ^14.2.0
   stylelint-config-html: ^1.0.0
@@ -40,14 +40,14 @@ specifiers:
   tinymce: ^5.10.2
   unplugin-auto-import: ^0.5.5
   unplugin-vue-components: ^0.17.11
-  vite: ^2.7.9
+  vite: ^2.7.10
   vite-plugin-banner: ^0.1.3
   vite-plugin-compression: ^0.4.0
   vite-plugin-html: ^2.1.2
   vite-plugin-mock: ^2.9.6
   vite-plugin-restart: ^0.0.2
   vite-plugin-spritesmith: ^0.1.1
-  vite-plugin-svg-icons: ^1.0.5
+  vite-plugin-svg-icons: ^1.1.0
   vite-plugin-vue-setup-extend: ^0.3.0
   vue: ^3.2.26
   vue-eslint-parser: ^8.0.1
@@ -58,7 +58,7 @@ dependencies:
   '@tinymce/tinymce-vue': 4.0.5_vue@3.2.26
   axios: 0.24.0
   dayjs: 1.10.7
-  element-plus: 1.2.0-beta.6_vue@3.2.26
+  element-plus: 1.3.0-beta.1_vue@3.2.26
   hotkeys-js: 3.8.7
   js-cookie: 3.0.1
   mavon-editor: 3.0.0-beta
@@ -76,17 +76,17 @@ dependencies:
   vue-router: 4.0.12_vue@3.2.26
 
 devDependencies:
-  '@vitejs/plugin-vue': 2.0.1_vite@2.7.9+vue@3.2.26
+  '@vitejs/plugin-vue': 2.0.1_vite@2.7.10+vue@3.2.26
   '@vue/compiler-sfc': 3.2.26
-  eslint: 8.5.0
+  eslint: 8.6.0
-  eslint-plugin-vue: 8.2.0_eslint@8.5.0
+  eslint-plugin-vue: 8.2.0_eslint@8.6.0
   http-server: 14.0.0
   husky: 7.0.4
   lint-staged: 12.1.4
   plop: 3.0.5
   postcss-html: 1.3.0
   postcss-scss: 4.0.2
-  sass: 1.45.1
+  sass: 1.45.2
   stylelint: 14.2.0
   stylelint-config-html: 1.0.0_2d1bcf73d0f2e8e613ccd6d821b0344f
   stylelint-config-recommended: 6.0.0_stylelint@14.2.0
@@ -95,18 +95,18 @@ devDependencies:
   stylelint-config-standard: 24.0.0_stylelint@14.2.0
   stylelint-scss: 4.1.0_stylelint@14.2.0
   svgo: 2.8.0
-  unplugin-auto-import: 0.5.5_vite@2.7.9
+  unplugin-auto-import: 0.5.5_vite@2.7.10
-  unplugin-vue-components: 0.17.11_vite@2.7.9+vue@3.2.26
+  unplugin-vue-components: 0.17.11_vite@2.7.10+vue@3.2.26
-  vite: 2.7.9_sass@1.45.1
+  vite: 2.7.10_sass@1.45.2
   vite-plugin-banner: 0.1.3
-  vite-plugin-compression: 0.4.0_vite@2.7.9
+  vite-plugin-compression: 0.4.0_vite@2.7.10
-  vite-plugin-html: 2.1.2_vite@2.7.9
+  vite-plugin-html: 2.1.2_vite@2.7.10
-  vite-plugin-mock: 2.9.6_mockjs@1.1.0+vite@2.7.9
+  vite-plugin-mock: 2.9.6_mockjs@1.1.0+vite@2.7.10
-  vite-plugin-restart: 0.0.2_vite@2.7.9
+  vite-plugin-restart: 0.0.2_vite@2.7.10
   vite-plugin-spritesmith: 0.1.1
-  vite-plugin-svg-icons: 1.0.5_vite@2.7.9
+  vite-plugin-svg-icons: 1.1.0_vite@2.7.10
-  vite-plugin-vue-setup-extend: 0.3.0_vite@2.7.9
+  vite-plugin-vue-setup-extend: 0.3.0_vite@2.7.10
-  vue-eslint-parser: 8.0.1_eslint@8.5.0
+  vue-eslint-parser: 8.0.1_eslint@8.6.0
 
 packages:
 
@@ -142,6 +142,11 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
 
+  /@ctrl/tinycolor/3.4.0:
+    resolution: {integrity: sha1-w8WuVDyJfKqcKmhjC+01W+X5mQ8=, tarball: '@ctrl/tinycolor/download/@ctrl/tinycolor-3.4.0.tgz'}
+    engines: {node: '>=10'}
+    dev: false
+
   /@element-plus/icons-vue/0.2.4_vue@3.2.26:
     resolution: {integrity: sha512-RsJNyL58rwxtsjeMy34o8txkL6UlME1stWsUlRpTac6UE9Bx9gdJvnDXbIKhOJqBLX17fBjmposdrn6VTqim2w==, tarball: '@element-plus/icons-vue/download/@element-plus/icons-vue-0.2.4.tgz'}
     peerDependencies:
@@ -156,7 +161,7 @@ packages:
     dependencies:
       ajv: 6.12.6
       debug: 4.3.2
-      espree: 9.2.0
+      espree: 9.3.0
       globals: 13.11.0
       ignore: 4.0.6
       import-fresh: 3.3.0
@@ -203,8 +208,8 @@ packages:
       fastq: 1.13.0
     dev: true
 
-  /@popperjs/core/2.10.2:
+  /@popperjs/core/2.11.0:
-    resolution: {integrity: sha1-B5jAM1Hw3qGlpMq93yalWny+5ZA=, tarball: '@popperjs/core/download/@popperjs/core-2.10.2.tgz'}
+    resolution: {integrity: sha512-zrsUxjLOKAzdewIDRWy9nsV1GQsKBCWaGwsZQlCgr6/q+vjyZhFgqedLfFBuI9anTPEUT4APq9Mu0SZBTzIcGQ==, tarball: '@popperjs/core/download/@popperjs/core-2.11.0.tgz'}
     dev: false
 
   /@rollup/plugin-node-resolve/13.0.5:
@@ -330,14 +335,14 @@ packages:
       '@types/node': 16.11.12
     dev: true
 
-  /@vitejs/plugin-vue/2.0.1_vite@2.7.9+vue@3.2.26:
+  /@vitejs/plugin-vue/2.0.1_vite@2.7.10+vue@3.2.26:
     resolution: {integrity: sha512-wtdMnGVvys9K8tg+DxowU1ytTrdVveXr3LzdhaKakysgGXyrsfaeds2cDywtvujEASjWOwWL/OgWM+qoeM8Plg==, tarball: '@vitejs/plugin-vue/download/@vitejs/plugin-vue-2.0.1.tgz'}
     engines: {node: '>=12.0.0'}
     peerDependencies:
       vite: ^2.5.10
       vue: ^3.2.25
     dependencies:
-      vite: 2.7.9_sass@1.45.1
+      vite: 2.7.10_sass@1.45.2
       vue: 3.2.26
     dev: true
 
@@ -426,8 +431,8 @@ packages:
   /@vue/shared/3.2.26:
     resolution: {integrity: sha512-vPV6Cq+NIWbH5pZu+V+2QHE9y1qfuTq49uNWw4f7FDEeZaDU2H2cx5jcUZOAKW7qTrUS4k6qZPbMy1x4N96nbA==, tarball: '@vue/shared/download/@vue/shared-3.2.26.tgz'}
 
-  /@vueuse/core/7.1.2_vue@3.2.26:
+  /@vueuse/core/7.5.1_vue@3.2.26:
-    resolution: {integrity: sha512-SLoOPfhZdNRNUkZfx+wrHj6WycWdSw2RmNS8E4ngQ2kmBoJjRarGy51/GkGdjqHQqmhuwuFoNO2WaU0yBn3ffg==, tarball: '@vueuse/core/download/@vueuse/core-7.1.2.tgz'}
+    resolution: {integrity: sha512-GczfdTWqH483zkUHdDYiLm0Tn51OtsQXYc+eBKKIeolh0mgn682KbSYmkrjNytaF7qGc74YxMDAYjkPBW6V2Pg==, tarball: '@vueuse/core/download/@vueuse/core-7.5.1.tgz'}
     peerDependencies:
       '@vue/composition-api': ^1.1.0
       vue: ^2.6.0 || ^3.2.0
@@ -437,13 +442,13 @@ packages:
       vue:
         optional: true
     dependencies:
-      '@vueuse/shared': 7.1.2_vue@3.2.26
+      '@vueuse/shared': 7.5.1_vue@3.2.26
       vue: 3.2.26
       vue-demi: 0.12.1_vue@3.2.26
     dev: false
 
-  /@vueuse/shared/7.1.2_vue@3.2.26:
+  /@vueuse/shared/7.5.1_vue@3.2.26:
-    resolution: {integrity: sha512-AjYh4y9S5FMOoHDsysqcXY/1mpqNTrnWUD50yaaiyf+5kGWQVIpAkkjKZlYSC/NHKxxCRn0cLR4nWMzceUWewQ==, tarball: '@vueuse/shared/download/@vueuse/shared-7.1.2.tgz'}
+    resolution: {integrity: sha512-zMQEuYJyTmr5Hj2rYgSbb4H/cSI8mdaa9dUuw20j6rPV+xLV11y7vCyIkxo31uODDr0p77FMlProKzNDiK9rAA==, tarball: '@vueuse/shared/download/@vueuse/shared-7.5.1.tgz'}
     peerDependencies:
       '@vue/composition-api': ^1.1.0
       vue: ^2.6.0 || ^3.2.0
@@ -457,16 +462,16 @@ packages:
       vue-demi: 0.12.1_vue@3.2.26
     dev: false
 
-  /acorn-jsx/5.3.2_acorn@8.6.0:
+  /acorn-jsx/5.3.2_acorn@8.7.0:
     resolution: {integrity: sha1-ftW7VZCLOy8bxVxq8WU7rafweTc=, tarball: acorn-jsx/download/acorn-jsx-5.3.2.tgz}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      acorn: 8.6.0
+      acorn: 8.7.0
     dev: true
 
-  /acorn/8.6.0:
+  /acorn/8.7.0:
-    resolution: {integrity: sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==, tarball: acorn/download/acorn-8.6.0.tgz}
+    resolution: {integrity: sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==, tarball: acorn/download/acorn-8.7.0.tgz}
     engines: {node: '>=0.4.0'}
     hasBin: true
     dev: true
@@ -627,7 +632,7 @@ packages:
     dev: true
 
   /async-validator/4.0.7:
-    resolution: {integrity: sha1-A0oP0hA6ay6/AQ2nUYO+wpkkev4=, tarball: async-validator/download/async-validator-4.0.7.tgz}
+    resolution: {integrity: sha1-A0oP0hA6ay6/AQ2nUYO+wpkkev4=, tarball: async-validator/download/async-validator-4.0.7.tgz?cache=0&sync_timestamp=1634529774878&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fasync-validator%2Fdownload%2Fasync-validator-4.0.7.tgz}
     dev: false
 
   /asynckit/0.4.0:
@@ -1432,14 +1437,15 @@ packages:
       jake: 10.8.2
     dev: true
 
-  /element-plus/1.2.0-beta.6_vue@3.2.26:
+  /element-plus/1.3.0-beta.1_vue@3.2.26:
-    resolution: {integrity: sha512-8EdSIR/5/FHcSB8w1diAh+gJMHgxIvxuZoayY99k6taAR1QyEFHuPTgFccZLopJ1+iP4UEsZFz49l57qS08Utw==, tarball: element-plus/download/element-plus-1.2.0-beta.6.tgz}
+    resolution: {integrity: sha512-q3vMaKElPpuSTeIF7kuDmMOE+N1YVCCIG3fshXpz6qgjnxPbgZumVM0qGfhr8DTu9JxRbBoDok49dqtX/BWn3w==, tarball: element-plus/download/element-plus-1.3.0-beta.1.tgz}
     peerDependencies:
       vue: ^3.2.0
     dependencies:
+      '@ctrl/tinycolor': 3.4.0
       '@element-plus/icons-vue': 0.2.4_vue@3.2.26
-      '@popperjs/core': 2.10.2
+      '@popperjs/core': 2.11.0
-      '@vueuse/core': 7.1.2_vue@3.2.26
+      '@vueuse/core': 7.5.1_vue@3.2.26
       async-validator: 4.0.7
       dayjs: 1.10.7
       lodash: 4.17.21
@@ -1674,17 +1680,17 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /eslint-plugin-vue/8.2.0_eslint@8.5.0:
+  /eslint-plugin-vue/8.2.0_eslint@8.6.0:
     resolution: {integrity: sha512-cLIdTuOAMXyHeQ4drYKcZfoyzdwdBpH279X8/N0DgmotEI9yFKb5O/cAgoie/CkQZCH/MOmh0xw/KEfS90zY2A==, tarball: eslint-plugin-vue/download/eslint-plugin-vue-8.2.0.tgz}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.2.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      eslint: 8.5.0
+      eslint: 8.6.0
-      eslint-utils: 3.0.0_eslint@8.5.0
+      eslint-utils: 3.0.0_eslint@8.6.0
       natural-compare: 1.4.0
       semver: 7.3.5
-      vue-eslint-parser: 8.0.1_eslint@8.5.0
+      vue-eslint-parser: 8.0.1_eslint@8.6.0
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -1705,13 +1711,13 @@ packages:
       estraverse: 5.3.0
     dev: true
 
-  /eslint-utils/3.0.0_eslint@8.5.0:
+  /eslint-utils/3.0.0_eslint@8.6.0:
     resolution: {integrity: sha1-iuuvrOc0W7M1WdsKHxOh0tSMNnI=, tarball: eslint-utils/download/eslint-utils-3.0.0.tgz}
     engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
     peerDependencies:
       eslint: '>=5'
     dependencies:
-      eslint: 8.5.0
+      eslint: 8.6.0
       eslint-visitor-keys: 2.1.0
     dev: true
 
@@ -1730,8 +1736,8 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /eslint/8.5.0:
+  /eslint/8.6.0:
-    resolution: {integrity: sha512-tVGSkgNbOfiHyVte8bCM8OmX+xG9PzVG/B4UCF60zx7j61WIVY/AqJECDgpLD4DbbESD0e174gOg3ZlrX15GDg==, tarball: eslint/download/eslint-8.5.0.tgz}
+    resolution: {integrity: sha512-UvxdOJ7mXFlw7iuHZA4jmzPaUqIw54mZrv+XPYKNbKdLR0et4rf60lIZUU9kiNtnzzMzGWxMV+tQ7uG7JG8DPw==, tarball: eslint/download/eslint-8.6.0.tgz}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
     dependencies:
@@ -1745,9 +1751,9 @@ packages:
       enquirer: 2.3.6
       escape-string-regexp: 4.0.0
       eslint-scope: 7.1.0
-      eslint-utils: 3.0.0_eslint@8.5.0
+      eslint-utils: 3.0.0_eslint@8.6.0
       eslint-visitor-keys: 3.1.0
-      espree: 9.2.0
+      espree: 9.3.0
       esquery: 1.4.0
       esutils: 2.0.3
       fast-deep-equal: 3.1.3
@@ -1781,17 +1787,17 @@ packages:
     resolution: {integrity: sha1-6QopZWmCKFAudxx6WEibGp0QcJA=, tarball: espree/download/espree-9.0.0.tgz}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      acorn: 8.6.0
+      acorn: 8.7.0
-      acorn-jsx: 5.3.2_acorn@8.6.0
+      acorn-jsx: 5.3.2_acorn@8.7.0
       eslint-visitor-keys: 3.0.0
     dev: true
 
-  /espree/9.2.0:
+  /espree/9.3.0:
-    resolution: {integrity: sha512-oP3utRkynpZWF/F2x/HZJ+AGtnIclaR7z1pYPxy7NYM2fSO6LgK/Rkny8anRSPK/VwEA1eqm2squui0T7ZMOBg==, tarball: espree/download/espree-9.2.0.tgz}
+    resolution: {integrity: sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==, tarball: espree/download/espree-9.3.0.tgz}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      acorn: 8.6.0
+      acorn: 8.7.0
-      acorn-jsx: 5.3.2_acorn@8.6.0
+      acorn-jsx: 5.3.2_acorn@8.7.0
       eslint-visitor-keys: 3.1.0
     dev: true
 
@@ -3106,7 +3112,7 @@ packages:
     dev: true
 
   /lodash/4.17.21:
-    resolution: {integrity: sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw=, tarball: lodash/download/lodash-4.17.21.tgz}
+    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==, tarball: lodash/download/lodash-4.17.21.tgz}
 
   /log-symbols/4.1.0:
     resolution: {integrity: sha1-P727lbRoOsn8eFER55LlWNSr1QM=, tarball: log-symbols/download/log-symbols-4.1.0.tgz}
@@ -4287,8 +4293,8 @@ packages:
     resolution: {integrity: sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=, tarball: safer-buffer/download/safer-buffer-2.1.2.tgz}
     dev: true
 
-  /sass/1.45.1:
+  /sass/1.45.2:
-    resolution: {integrity: sha512-pwPRiq29UR0o4X3fiQyCtrESldXvUQAAE0QmcJTpsI4kuHHcLzZ54M1oNBVIXybQv8QF2zfkpFcTxp8ta97dUA==, tarball: sass/download/sass-1.45.1.tgz}
+    resolution: {integrity: sha512-cKfs+F9AMPAFlbbTXNsbGvg3y58nV0mXA3E94jqaySKcC8Kq3/8983zVKQ0TLMUrHw7hF9Tnd3Bz9z5Xgtrl9g==, tarball: sass/download/sass-1.45.2.tgz}
     engines: {node: '>=8.9.0'}
     hasBin: true
     dependencies:
@@ -5087,7 +5093,7 @@ packages:
     engines: {node: '>= 0.8'}
     dev: true
 
-  /unplugin-auto-import/0.5.5_vite@2.7.9:
+  /unplugin-auto-import/0.5.5_vite@2.7.10:
     resolution: {integrity: sha512-PAP/6WdqWtGhlQBvlVZ7qmhHbLcTYSsARtFSbY/jaUx/SaQkRT7SvronHIKEvx4bPmS+l4erQ9gQKSBBPzvUnQ==, tarball: unplugin-auto-import/download/unplugin-auto-import-0.5.5.tgz}
     engines: {node: '>=14'}
     peerDependencies:
@@ -5101,14 +5107,14 @@ packages:
       local-pkg: 0.4.0
       magic-string: 0.25.7
       resolve: 1.20.0
-      unplugin: 0.2.21_vite@2.7.9
+      unplugin: 0.2.21_vite@2.7.10
     transitivePeerDependencies:
       - rollup
       - vite
       - webpack
     dev: true
 
-  /unplugin-vue-components/0.17.11_vite@2.7.9+vue@3.2.26:
+  /unplugin-vue-components/0.17.11_vite@2.7.10+vue@3.2.26:
     resolution: {integrity: sha512-u5MQ0TbikszRelCt6EA/HskGtGkGLDxi7tQ4/4tcEPWkH3yXSZRJCOeLF5MSdxN1SiGjaJ0I9zeHjoZFC3FvRw==, tarball: unplugin-vue-components/download/unplugin-vue-components-0.17.11.tgz}
     engines: {node: '>=14'}
     peerDependencies:
@@ -5130,7 +5136,7 @@ packages:
       magic-string: 0.25.7
       minimatch: 3.0.4
       resolve: 1.20.0
-      unplugin: 0.2.21_vite@2.7.9
+      unplugin: 0.2.21_vite@2.7.10
       vue: 3.2.26
     transitivePeerDependencies:
       - rollup
@@ -5139,7 +5145,7 @@ packages:
       - webpack
     dev: true
 
-  /unplugin/0.2.21_vite@2.7.9:
+  /unplugin/0.2.21_vite@2.7.10:
     resolution: {integrity: sha512-IJ15/L5XbhnV7J09Zjk0FT5HEkBjkXucWAXQWRsmEtUxmmxwh23yavrmDbCF6ZPxWiVB28+wnKIHePTRRpQPbQ==, tarball: unplugin/download/unplugin-0.2.21.tgz}
     peerDependencies:
       rollup: ^2.50.0
@@ -5153,7 +5159,7 @@ packages:
       webpack:
         optional: true
     dependencies:
-      vite: 2.7.9_sass@1.45.1
+      vite: 2.7.10_sass@1.45.2
       webpack-virtual-modules: 0.4.3
     dev: true
 
@@ -5261,7 +5267,7 @@ packages:
     resolution: {integrity: sha1-09To4oSt3tNf6qVKuMonOp0zSeA=, tarball: vite-plugin-banner/download/vite-plugin-banner-0.1.3.tgz}
     dev: true
 
-  /vite-plugin-compression/0.4.0_vite@2.7.9:
+  /vite-plugin-compression/0.4.0_vite@2.7.10:
     resolution: {integrity: sha512-CGC8DfIey0k4S4o54ylwFIzT1Mjb9s7cMmlXj6DMM1MZZIeWFjPCJc6YZWjnnS28ul3r7R1nmihvYvGg/lOYsQ==, tarball: vite-plugin-compression/download/vite-plugin-compression-0.4.0.tgz}
     peerDependencies:
       vite: '>=2.0.0'
@@ -5269,12 +5275,12 @@ packages:
       chalk: 4.1.2
       debug: 4.3.3
       fs-extra: 10.0.0
-      vite: 2.7.9_sass@1.45.1
+      vite: 2.7.10_sass@1.45.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /vite-plugin-html/2.1.2_vite@2.7.9:
+  /vite-plugin-html/2.1.2_vite@2.7.10:
     resolution: {integrity: sha512-7HXkL6n7M2qDEaUV4Vnz8yM2glW4gV36d5HSBIM5gOoAG1PkuQb4Vv9FTPgPiQxq4sPRf/6IgABX0MeLVW+CyQ==, tarball: vite-plugin-html/download/vite-plugin-html-2.1.2.tgz}
     peerDependencies:
       vite: '>=2.0.0'
@@ -5285,12 +5291,12 @@ packages:
       ejs: 3.1.6
       fs-extra: 10.0.0
       html-minifier-terser: 6.1.0
-      vite: 2.7.9_sass@1.45.1
+      vite: 2.7.10_sass@1.45.2
     transitivePeerDependencies:
       - acorn
     dev: true
 
-  /vite-plugin-mock/2.9.6_mockjs@1.1.0+vite@2.7.9:
+  /vite-plugin-mock/2.9.6_mockjs@1.1.0+vite@2.7.10:
     resolution: {integrity: sha1-BN0j3muqBS+qW5rTF1FMkNYgXiU=, tarball: vite-plugin-mock/download/vite-plugin-mock-2.9.6.tgz}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -5307,20 +5313,20 @@ packages:
       fast-glob: 3.2.7
       mockjs: 1.1.0
       path-to-regexp: 6.2.0
-      vite: 2.7.9_sass@1.45.1
+      vite: 2.7.10_sass@1.45.2
     transitivePeerDependencies:
       - rollup
       - supports-color
     dev: true
 
-  /vite-plugin-restart/0.0.2_vite@2.7.9:
+  /vite-plugin-restart/0.0.2_vite@2.7.10:
     resolution: {integrity: sha1-EByTLpw8TV/2BuFaTzLOduHuTdc=, tarball: vite-plugin-restart/download/vite-plugin-restart-0.0.2.tgz}
     peerDependencies:
       vite: ^2.0.0-beta.69
     dependencies:
       chalk: 4.1.2
       micromatch: 4.0.4
-      vite: 2.7.9_sass@1.45.1
+      vite: 2.7.10_sass@1.45.2
     dev: true
 
   /vite-plugin-spritesmith/0.1.1:
@@ -5334,35 +5340,35 @@ packages:
       spritesmith: 3.4.0
     dev: true
 
-  /vite-plugin-svg-icons/1.0.5_vite@2.7.9:
+  /vite-plugin-svg-icons/1.1.0_vite@2.7.10:
-    resolution: {integrity: sha1-gHHj2nxQ1WFOk3JlW5uR+vkd9ZE=, tarball: vite-plugin-svg-icons/download/vite-plugin-svg-icons-1.0.5.tgz}
+    resolution: {integrity: sha512-dmpr7Wq8vQN6ajBrVTrBxy8wJjQfcP30i73q+40uAZc8p7EwphBNZ+bVTI0enFaCrsITI8y0Ruo/mN/SaJQ6Hw==, tarball: vite-plugin-svg-icons/download/vite-plugin-svg-icons-1.1.0.tgz}
     peerDependencies:
       vite: '>=2.0.0'
     dependencies:
       '@types/svgo': 2.6.0
       cors: 2.8.5
-      debug: 4.3.2
+      debug: 4.3.3
       etag: 1.8.1
       fs-extra: 10.0.0
       svg-baker: 1.7.0
       svgo: 2.8.0
-      vite: 2.7.9_sass@1.45.1
+      vite: 2.7.10_sass@1.45.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /vite-plugin-vue-setup-extend/0.3.0_vite@2.7.9:
+  /vite-plugin-vue-setup-extend/0.3.0_vite@2.7.10:
     resolution: {integrity: sha512-9Nd7Bj4TftB2CoOAD2ZI4cHLW5zjKMF3LNihWbrnAPx3nuGBn33tM9SVUGBVjBB6uv1mGAPavwKCTU0xAD8qhw==, tarball: vite-plugin-vue-setup-extend/download/vite-plugin-vue-setup-extend-0.3.0.tgz}
     peerDependencies:
       vite: '>=2.0.0'
     dependencies:
       '@vue/compiler-sfc': 3.2.26
       magic-string: 0.25.7
-      vite: 2.7.9_sass@1.45.1
+      vite: 2.7.10_sass@1.45.2
     dev: true
 
-  /vite/2.7.9_sass@1.45.1:
+  /vite/2.7.10_sass@1.45.2:
-    resolution: {integrity: sha512-CyopIJIRrc26Wnbkch5BCHFhQodzeV4jjSegLAEw1RImvXSuoOo2SfpEW9zRVi188WmjJwCqCaoG25C0r4nekw==, tarball: vite/download/vite-2.7.9.tgz}
+    resolution: {integrity: sha512-KEY96ntXUid1/xJihJbgmLZx7QSC2D4Tui0FdS0Old5OokYzFclcofhtxtjDdGOk/fFpPbHv9yw88+rB93Tb8w==, tarball: vite/download/vite-2.7.10.tgz}
     engines: {node: '>=12.2.0'}
     hasBin: true
     peerDependencies:
@@ -5381,7 +5387,7 @@ packages:
       postcss: 8.4.5
       resolve: 1.20.0
       rollup: 2.60.2
-      sass: 1.45.1
+      sass: 1.45.2
     optionalDependencies:
       fsevents: 2.3.2
     dev: true
@@ -5401,14 +5407,14 @@ packages:
       vue: 3.2.26
     dev: false
 
-  /vue-eslint-parser/8.0.1_eslint@8.5.0:
+  /vue-eslint-parser/8.0.1_eslint@8.6.0:
     resolution: {integrity: sha1-JeCLIKQUVRUx8+GfmZkC4ez0XxM=, tarball: vue-eslint-parser/download/vue-eslint-parser-8.0.1.tgz}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: '>=6.0.0'
     dependencies:
       debug: 4.3.2
-      eslint: 8.5.0
+      eslint: 8.6.0
       eslint-scope: 6.0.0
       eslint-visitor-keys: 3.0.0
       espree: 9.0.0

src/App.vue

@@ -1,10 +1,12 @@
 <template>
+    <el-config-provider :size="settingsStore.elementSize">
         <RouterView
             :style="{
                 '--g-main-sidebar-actual-width': mainSidebarActualWidth,
                 '--g-sub-sidebar-actual-width': subSidebarActualWidth
             }"
         />
+    </el-config-provider>
 </template>
 
 <script setup>

src/components/PageHeader/index.vue

@@ -1,12 +1,12 @@
 <template>
     <div class="header">
-        <div>
+        <div class="main">
             <div class="title">{{ title }}</div>
             <div class="content">
                 <slot name="content">{{ content }}</slot>
             </div>
         </div>
-        <div>
+        <div class="sub">
             <slot />
         </div>
     </div>
@@ -34,6 +34,9 @@ defineProps({
     padding: 16px 20px;
     background: #fff;
     border-bottom: 1px solid #e8eaec;
+    .main {
+        flex: 1;
+        margin-right: 20px;
         .title {
             font-size: 22px;
         }
@@ -46,4 +49,8 @@ defineProps({
             }
         }
     }
+    .sub {
+        flex: none;
+    }
+}
 </style>

src/layout/components/ThemeSetting/index.vue

@@ -97,12 +97,11 @@
                         <svg-icon name="el-icon-question-filled" />
                     </el-tooltip>
                 </div>
-                <el-select v-model="elementSize" size="small">
+                <el-radio-group v-model="elementSize" size="small">
-                    <el-option label="默认 (large)" value="large" />
+                    <el-radio-button label="large">较大</el-radio-button>
-                    <el-option label="中等 (medium)" value="medium" />
+                    <el-radio-button label="default">默认</el-radio-button>
-                    <el-option label="小 (small)" value="small" />
+                    <el-radio-button label="small">稍小</el-radio-button>
-                    <el-option label="极小 (mini)" value="mini" />
+                </el-radio-group>
-                </el-select>
             </div>
             <div class="setting-item">
                 <div class="label">底部版权</div>
@@ -148,8 +147,6 @@ const settingsStore = useSettingsStore()
 import { useMenuStore } from '@/store/modules/menu'
 const menuStore = useMenuStore()
 
-const reload = inject('reload')
-
 const isShow = ref(false)
 
 const menuMode = computed({
@@ -169,11 +166,9 @@ const elementSize = computed({
         return settingsStore.elementSize
     },
     set: function(newValue) {
-        proxy.$ELEMENT.size = newValue
         settingsStore.updateThemeSetting({
             'elementSize': newValue
         })
-        reload()
     }
 })
 const enableSidebarCollapse = computed({

src/layout/components/UserMenu/index.vue

@@ -18,9 +18,9 @@
                 <svg-icon name="toolbar-theme" />
             </span>
         </div>
-        <el-dropdown class="user-container" @command="userCommand">
+        <el-dropdown class="user-container" size="default" @command="userCommand">
             <div class="user-wrapper">
-                <el-avatar size="medium">
+                <el-avatar size="small">
                     <el-icon><el-icon-user-filled /></el-icon>
                 </el-avatar>
                 {{ userStore.account }}
@@ -104,16 +104,19 @@ function pro() {
 .tools {
     margin-right: 20px;
     .item {
-        margin-left: 5px;
+        display: inline-flex;
-        padding: 6px 8px;
+        align-items: center;
-        border-radius: 5px;
+        justify-content: center;
-        outline: none;
+        height: 24px;
+        width: 34px;
         cursor: pointer;
         vertical-align: middle;
         transition: all 0.3s;
     }
     .item-pro {
         display: inline-block;
+        width: auto;
+        padding: 0 10px;
         transform-origin: right center;
         animation: pro-text 3s ease-out infinite;
         @keyframes pro-text {

src/settings.js

@@ -14,8 +14,8 @@ let globalSettings = {
      * single 侧边栏模式（无主导航）
      */
     menuMode: 'side',
-    // Element 组件默认尺寸，支持：large、medium、small、mini
+    // Element 组件默认尺寸，支持：large、default、small
-    elementSize: 'large',
+    elementSize: 'default',
     // 是否开启侧边栏展开收起按钮
     enableSidebarCollapse: false,
     // 侧边栏是否收起

src/views/component_basic_example/button.vue

@@ -84,16 +84,14 @@
         </page-main>
         <page-main title="不同尺寸" class="demo">
             <div style="margin-bottom: 10px;">
-                <el-button>默认按钮</el-button>
+                <el-button size="large">大号按钮</el-button>
-                <el-button size="medium">中等按钮</el-button>
+                <el-button size="default">默认按钮</el-button>
-                <el-button size="small">小型按钮</el-button>
+                <el-button size="small">小号按钮</el-button>
-                <el-button size="mini">超小按钮</el-button>
             </div>
             <div>
-                <el-button round>默认按钮</el-button>
+                <el-button size="large" round>大号按钮</el-button>
-                <el-button size="medium" round>中等按钮</el-button>
+                <el-button size="default" round>默认按钮</el-button>
-                <el-button size="small" round>小型按钮</el-button>
+                <el-button size="small" round>小号按钮</el-button>
-                <el-button size="mini" round>超小按钮</el-button>
             </div>
         </page-main>
     </div>

src/views/component_extend_example/actionbar.demo.vue

@@ -129,8 +129,8 @@
             </el-row>
         </page-main>
         <fixed-action-bar>
-            <el-button type="primary">立即创建</el-button>
+            <el-button type="primary" size="large">立即创建</el-button>
-            <el-button>取消</el-button>
+            <el-button size="large">取消</el-button>
         </fixed-action-bar>
     </div>
 </template>

src/views/component_extend_example/batchactionbar.demo.vue

@@ -8,10 +8,10 @@
         </page-header>
         <page-main>
             <batch-action-bar :data="dataList" :selection-data="selectionDataList" @check-all="$refs.table.toggleAllSelection()" @check-null="$refs.table.clearSelection()">
-                <el-button size="small">单个批量操作按钮</el-button>
+                <el-button size="default">单个批量操作按钮</el-button>
                 <el-button-group>
-                    <el-button size="small">批量操作按钮组1</el-button>
+                    <el-button size="default">批量操作按钮组1</el-button>
-                    <el-button size="small">批量操作按钮组2</el-button>
+                    <el-button size="default">批量操作按钮组2</el-button>
                 </el-button-group>
             </batch-action-bar>
             <el-table ref="table" :data="dataList" border stripe highlight-current-row @selection-change="selectionDataList = $event">
@@ -21,10 +21,10 @@
                 <el-table-column prop="address" label="地址" />
             </el-table>
             <batch-action-bar :data="dataList" :selection-data="selectionDataList" @check-all="$refs.table.toggleAllSelection()" @check-null="$refs.table.clearSelection()">
-                <el-button size="small">单个批量操作按钮</el-button>
+                <el-button size="default">单个批量操作按钮</el-button>
                 <el-button-group>
-                    <el-button size="small">批量操作按钮组1</el-button>
+                    <el-button size="default">批量操作按钮组1</el-button>
-                    <el-button size="small">批量操作按钮组2</el-button>
+                    <el-button size="default">批量操作按钮组2</el-button>
                 </el-button-group>
             </batch-action-bar>
         </page-main>

src/views/component_extend_example/result.demo.vue

@@ -3,8 +3,8 @@
         <page-header title="处理结果" content="Result" />
         <page-main>
             <result type="success" title="提交成功" desc="提交结果页用于反馈一系列操作任务的处理结果。">
-                <el-button type="primary" size="small">返回列表</el-button>
+                <el-button type="primary">返回列表</el-button>
-                <el-button size="small">打印</el-button>
+                <el-button>打印</el-button>
             </result>
         </page-main>
         <page-main>
@@ -16,7 +16,7 @@
                         <a href="###">打印</a>
                     </div>
                 </template>
-                <el-button type="primary" size="small">返回修改</el-button>
+                <el-button type="primary">返回修改</el-button>
             </result>
         </page-main>
     </div>

src/views/component_extend_example/searchbar.demo.vue

@@ -3,7 +3,7 @@
         <page-header title="搜索面板" content="SearchBar" />
         <page-main>
             <search-bar show-more @toggle="searchMore = $event">
-                <el-form :model="search" size="small" label-width="120px">
+                <el-form :model="search" size="default" label-width="120px">
                     <el-row>
                         <el-col :span="12">
                             <el-form-item label="姓名 / 手机号">
@@ -57,7 +57,7 @@
         </page-main>
         <page-main title="默认展开">
             <search-bar show-more unfold @toggle="searchMore2 = $event">
-                <el-form :model="search" size="small" label-width="120px">
+                <el-form :model="search" size="default" label-width="120px">
                     <el-row>
                         <el-col :span="12">
                             <el-form-item label="姓名 / 手机号">

src/views/index.vue

@@ -8,8 +8,8 @@
                 </div>
             </template>
             <el-button-group style="margin-right: 10px;">
-                <el-button type="success" plain @click="open(`https://hooray.${locationOrigin.includes('gitee') ? 'gitee' : 'github'}.io/fantastic-admin`)">开发文档</el-button>
+                <el-button type="success" size="large" plain @click="open(`https://hooray.${locationOrigin.includes('gitee') ? 'gitee' : 'github'}.io/fantastic-admin`)">开发文档</el-button>
-                <el-button type="primary" @click="open(`https://${locationOrigin.includes('gitee') ? 'gitee' : 'github'}.com/hooray/fantastic-admin`)">代码仓库</el-button>
+                <el-button type="primary" size="large" @click="open(`https://${locationOrigin.includes('gitee') ? 'gitee' : 'github'}.com/hooray/fantastic-admin`)">代码仓库</el-button>
             </el-button-group>
         </page-header>
         <el-row :gutter="20" style="margin: 0 10px;">

src/views/login.vue

@@ -30,11 +30,11 @@
                     <el-checkbox v-model="loginForm.remember">记住我</el-checkbox>
                     <el-button type="text" @click="formType = 'reset'">忘记密码</el-button>
                 </div>
-                <el-button :loading="loading" type="primary" style="width: 100%;" @click.prevent="handleLogin">登 录</el-button>
+                <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleLogin">登 录</el-button>
                 <div style="margin-top: 20px; margin-bottom: -10px; color: #666; font-size: 14px; text-align: center; font-weight: bold;">
                     <span style="margin-right: 5px;">演示帐号一键登录：</span>
-                    <el-button type="danger" size="mini" @click="testAccount('admin')">admin</el-button>
+                    <el-button type="danger" size="small" @click="testAccount('admin')">admin</el-button>
-                    <el-button type="danger" size="mini" plain @click="testAccount('test')">test</el-button>
+                    <el-button type="danger" size="small" plain @click="testAccount('test')">test</el-button>
                 </div>
             </el-form>
             <el-form v-show="formType == 'reset'" ref="resetFormRef" :model="resetForm" :rules="resetRules" class="login-form" auto-complete="on" label-position="left">
@@ -72,10 +72,10 @@
                 </div>
                 <el-row :gutter="15" style="padding-top: 20px;">
                     <el-col :md="6">
-                        <el-button style="width: 100%;" @click="formType = 'login'">去登录</el-button>
+                        <el-button size="large" style="width: 100%;" @click="formType = 'login'">去登录</el-button>
                     </el-col>
                     <el-col :md="18">
-                        <el-button :loading="loading" type="primary" style="width: 100%;" @click.prevent="handleFind">确 认</el-button>
+                        <el-button :loading="loading" type="primary" size="large" style="width: 100%;" @click.prevent="handleFind">确 认</el-button>
                     </el-col>
                 </el-row>
             </el-form>
@@ -259,6 +259,7 @@ function testAccount(account) {
     }
     .flex-bar {
         display: flex;
+        align-items: center;
         justify-content: space-between;
     }
     .el-checkbox {

src/views/mock_example/index.vue

@@ -10,18 +10,21 @@
 </template>
 
 <script setup>
+const { proxy } = getCurrentInstance()
+
 import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
 
 function getPermission() {
     userStore.getPermissions().then(res => {
-        this.$notify({
+        proxy.$notify({
             title: '当前用户权限',
             dangerouslyUseHTMLString: true,
             message: res.map(p => `<p>${p}</p>`).join('')
         })
     })
 }
+
 function open(url) {
     window.open(url, 'top')
 }

src/views/personal/edit.password.vue

@@ -19,7 +19,7 @@
             </el-row>
         </page-main>
         <fixed-action-bar>
-            <el-button type="primary" @click="onSubmit">提交</el-button>
+            <el-button type="primary" size="large" @click="onSubmit">提交</el-button>
         </fixed-action-bar>
     </div>
 </template>