xiaoxian521 3 жил өмнө
parent
commit
113e5f9db2

+ 3 - 3
package.json

@@ -85,8 +85,8 @@
     "@types/qs": "^6.9.7",
     "@typescript-eslint/eslint-plugin": "4.31.0",
     "@typescript-eslint/parser": "4.31.0",
-    "@vitejs/plugin-vue": "^1.9.4",
-    "@vitejs/plugin-vue-jsx": "^1.2.0",
+    "@vitejs/plugin-vue": "^1.10.2",
+    "@vitejs/plugin-vue-jsx": "^1.3.1",
     "@vue/compiler-sfc": "^3.2.21",
     "@vue/eslint-config-prettier": "6.0.0",
     "@vue/eslint-config-typescript": "7.0.0",
@@ -113,7 +113,7 @@
     "stylelint-order": "4.1.0",
     "typescript": "4.4.2",
     "unplugin-element-plus": "^0.1.0",
-    "vite": "latest",
+    "vite": "2.6.14",
     "vite-plugin-mock": "^2.9.6",
     "vite-plugin-style-import": "^1.2.1",
     "vite-svg-loader": "^2.2.0",

+ 69 - 69
pnpm-lock.yaml

@@ -18,8 +18,8 @@ specifiers:
   "@types/qs": ^6.9.7
   "@typescript-eslint/eslint-plugin": 4.31.0
   "@typescript-eslint/parser": 4.31.0
-  "@vitejs/plugin-vue": ^1.9.4
-  "@vitejs/plugin-vue-jsx": ^1.2.0
+  "@vitejs/plugin-vue": ^1.10.2
+  "@vitejs/plugin-vue-jsx": ^1.3.1
   "@vue/compiler-sfc": ^3.2.21
   "@vue/eslint-config-prettier": 6.0.0
   "@vue/eslint-config-typescript": 7.0.0
@@ -73,7 +73,7 @@ specifiers:
   typescript-cookie: ^1.0.0
   unplugin-element-plus: ^0.1.0
   v-contextmenu: 3.0.0
-  vite: latest
+  vite: 2.6.14
   vite-plugin-mock: ^2.9.6
   vite-plugin-style-import: ^1.2.1
   vite-svg-loader: ^2.2.0
@@ -148,8 +148,8 @@ devDependencies:
   "@types/qs": 6.9.7
   "@typescript-eslint/eslint-plugin": 4.31.0_f4e6dc0776b3600ef484e3c64a523136
   "@typescript-eslint/parser": 4.31.0_eslint@7.30.0+typescript@4.4.2
-  "@vitejs/plugin-vue": 1.9.4_vite@2.6.14
-  "@vitejs/plugin-vue-jsx": 1.2.0
+  "@vitejs/plugin-vue": 1.10.2_vite@2.6.14
+  "@vitejs/plugin-vue-jsx": 1.3.1
   "@vue/compiler-sfc": 3.2.21
   "@vue/eslint-config-prettier": 6.0.0_82e4252401b0cc5be86f7c2133946f49
   "@vue/eslint-config-typescript": 7.0.0_e03d82996bd4a66fb128f33523d782ea
@@ -1337,10 +1337,10 @@ packages:
       eslint-visitor-keys: 2.1.0
     dev: true
 
-  /@vitejs/plugin-vue-jsx/1.2.0:
+  /@vitejs/plugin-vue-jsx/1.3.1:
     resolution:
       {
-        integrity: sha512-Y4Er2bn8bHNiUziJizcVT1yQKTq6oOJeBrKkxvjo2yKT/RTSK1ZlkP/qnzchxxuBkx0tYG4Aaxbb9xuVnNNDEA==
+        integrity: sha512-Ku0pnlG0CuFfkvwOe3TEHS7noqBIBR61JbdvH6F6i3IqJv8+0+tcyusR+EoFwi7YrA2vdP26oorWyGv3wDt5kg==
       }
     engines: { node: ">=12.0.0" }
     dependencies:
@@ -1354,10 +1354,10 @@ packages:
       - supports-color
     dev: true
 
-  /@vitejs/plugin-vue/1.9.4_vite@2.6.14:
+  /@vitejs/plugin-vue/1.10.2_vite@2.6.14:
     resolution:
       {
-        integrity: sha512-0CZqaCoChriPTTtGkERy1LGPcYjGFpi2uYRhBPIkqJqUGV5JnJFhQAgh6oH9j5XZHfrRaisX8W0xSpO4T7S78A==
+        integrity: sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==
       }
     engines: { node: ">=12.0.0" }
     peerDependencies:
@@ -1385,7 +1385,7 @@ packages:
       "@babel/traverse": 7.16.0
       "@babel/types": 7.16.0
       "@vue/babel-helper-vue-transform-on": 1.0.2
-      camelcase: 6.2.0
+      camelcase: 6.2.1
       html-tags: 3.1.0
       svg-tags: 1.0.0
     transitivePeerDependencies:
@@ -2028,10 +2028,10 @@ packages:
     engines: { node: ">=6" }
     dev: true
 
-  /camelcase/6.2.0:
+  /camelcase/6.2.1:
     resolution:
       {
-        integrity: sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
+        integrity: sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==
       }
     engines: { node: ">=10" }
     dev: true
@@ -2837,10 +2837,10 @@ packages:
       ext: 1.6.0
     dev: false
 
-  /esbuild-android-arm64/0.13.12:
+  /esbuild-android-arm64/0.13.15:
     resolution:
       {
-        integrity: sha512-TSVZVrb4EIXz6KaYjXfTzPyyRpXV5zgYIADXtQsIenjZ78myvDGaPi11o4ZSaHIwFHsuwkB6ne5SZRBwAQ7maw==
+        integrity: sha512-m602nft/XXeO8YQPUDVoHfjyRVPdPgjyyXOxZ44MK/agewFFkPa8tUo6lAzSWh5Ui5PB4KR9UIFTSBKh/RrCmg==
       }
     cpu: [arm64]
     os: [android]
@@ -2848,10 +2848,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-darwin-64/0.13.12:
+  /esbuild-darwin-64/0.13.15:
     resolution:
       {
-        integrity: sha512-c51C+N+UHySoV2lgfWSwwmlnLnL0JWj/LzuZt9Ltk9ub1s2Y8cr6SQV5W3mqVH1egUceew6KZ8GyI4nwu+fhsw==
+        integrity: sha512-ihOQRGs2yyp7t5bArCwnvn2Atr6X4axqPpEdCFPVp7iUj4cVSdisgvEKdNR7yH3JDjW6aQDw40iQFoTqejqxvQ==
       }
     cpu: [x64]
     os: [darwin]
@@ -2859,10 +2859,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-darwin-arm64/0.13.12:
+  /esbuild-darwin-arm64/0.13.15:
     resolution:
       {
-        integrity: sha512-JvAMtshP45Hd8A8wOzjkY1xAnTKTYuP/QUaKp5eUQGX+76GIie3fCdUUr2ZEKdvpSImNqxiZSIMziEiGB5oUmQ==
+        integrity: sha512-i1FZssTVxUqNlJ6cBTj5YQj4imWy3m49RZRnHhLpefFIh0To05ow9DTrXROTE1urGTQCloFUXTX8QfGJy1P8dQ==
       }
     cpu: [arm64]
     os: [darwin]
@@ -2870,10 +2870,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-freebsd-64/0.13.12:
+  /esbuild-freebsd-64/0.13.15:
     resolution:
       {
-        integrity: sha512-r6On/Skv9f0ZjTu6PW5o7pdXr8aOgtFOEURJZYf1XAJs0IQ+gW+o1DzXjVkIoT+n1cm3N/t1KRJfX71MPg/ZUA==
+        integrity: sha512-G3dLBXUI6lC6Z09/x+WtXBXbOYQZ0E8TDBqvn7aMaOCzryJs8LyVXKY4CPnHFXZAbSwkCbqiPuSQ1+HhrNk7EA==
       }
     cpu: [x64]
     os: [freebsd]
@@ -2881,10 +2881,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-freebsd-arm64/0.13.12:
+  /esbuild-freebsd-arm64/0.13.15:
     resolution:
       {
-        integrity: sha512-F6LmI2Q1gii073kmBE3NOTt/6zLL5zvZsxNLF8PMAwdHc+iBhD1vzfI8uQZMJA1IgXa3ocr3L3DJH9fLGXy6Yw==
+        integrity: sha512-KJx0fzEDf1uhNOZQStV4ujg30WlnwqUASaGSFPhznLM/bbheu9HhqZ6mJJZM32lkyfGJikw0jg7v3S0oAvtvQQ==
       }
     cpu: [arm64]
     os: [freebsd]
@@ -2892,10 +2892,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-32/0.13.12:
+  /esbuild-linux-32/0.13.15:
     resolution:
       {
-        integrity: sha512-U1UZwG3UIwF7/V4tCVAo/nkBV9ag5KJiJTt+gaCmLVWH3bPLX7y+fNlhIWZy8raTMnXhMKfaTvWZ9TtmXzvkuQ==
+        integrity: sha512-ZvTBPk0YWCLMCXiFmD5EUtB30zIPvC5Itxz0mdTu/xZBbbHJftQgLWY49wEPSn2T/TxahYCRDWun5smRa0Tu+g==
       }
     cpu: [ia32]
     os: [linux]
@@ -2903,10 +2903,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-64/0.13.12:
+  /esbuild-linux-64/0.13.15:
     resolution:
       {
-        integrity: sha512-YpXSwtu2NxN3N4ifJxEdsgd6Q5d8LYqskrAwjmoCT6yQnEHJSF5uWcxv783HWN7lnGpJi9KUtDvYsnMdyGw71Q==
+        integrity: sha512-eCKzkNSLywNeQTRBxJRQ0jxRCl2YWdMB3+PkWFo2BBQYC5mISLIVIjThNtn6HUNqua1pnvgP5xX0nHbZbPj5oA==
       }
     cpu: [x64]
     os: [linux]
@@ -2914,10 +2914,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-arm/0.13.12:
+  /esbuild-linux-arm/0.13.15:
     resolution:
       {
-        integrity: sha512-SyiT/JKxU6J+DY2qUiSLZJqCAftIt3uoGejZ0HDnUM2MGJqEGSGh7p1ecVL2gna3PxS4P+j6WAehCwgkBPXNIw==
+        integrity: sha512-wUHttDi/ol0tD8ZgUMDH8Ef7IbDX+/UsWJOXaAyTdkT7Yy9ZBqPg8bgB/Dn3CZ9SBpNieozrPRHm0BGww7W/jA==
       }
     cpu: [arm]
     os: [linux]
@@ -2925,10 +2925,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-arm64/0.13.12:
+  /esbuild-linux-arm64/0.13.15:
     resolution:
       {
-        integrity: sha512-sgDNb8kb3BVodtAlcFGgwk+43KFCYjnFOaOfJibXnnIojNWuJHpL6aQJ4mumzNWw8Rt1xEtDQyuGK9f+Y24jGA==
+        integrity: sha512-bYpuUlN6qYU9slzr/ltyLTR9YTBS7qUDymO8SV7kjeNext61OdmqFAzuVZom+OLW1HPHseBfJ/JfdSlx8oTUoA==
       }
     cpu: [arm64]
     os: [linux]
@@ -2936,10 +2936,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-mips64le/0.13.12:
+  /esbuild-linux-mips64le/0.13.15:
     resolution:
       {
-        integrity: sha512-qQJHlZBG+QwVIA8AbTEtbvF084QgDi4DaUsUnA+EolY1bxrG+UyOuGflM2ZritGhfS/k7THFjJbjH2wIeoKA2g==
+        integrity: sha512-KlVjIG828uFPyJkO/8gKwy9RbXhCEUeFsCGOJBepUlpa7G8/SeZgncUEz/tOOUJTcWMTmFMtdd3GElGyAtbSWg==
       }
     cpu: [mips64el]
     os: [linux]
@@ -2947,10 +2947,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-ppc64le/0.13.12:
+  /esbuild-linux-ppc64le/0.13.15:
     resolution:
       {
-        integrity: sha512-2dSnm1ldL7Lppwlo04CGQUpwNn5hGqXI38OzaoPOkRsBRWFBozyGxTFSee/zHFS+Pdh3b28JJbRK3owrrRgWNw==
+        integrity: sha512-h6gYF+OsaqEuBjeesTBtUPw0bmiDu7eAeuc2OEH9S6mV9/jPhPdhOWzdeshb0BskRZxPhxPOjqZ+/OqLcxQwEQ==
       }
     cpu: [ppc64]
     os: [linux]
@@ -2958,10 +2958,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-netbsd-64/0.13.12:
+  /esbuild-netbsd-64/0.13.15:
     resolution:
       {
-        integrity: sha512-D4raxr02dcRiQNbxOLzpqBzcJNFAdsDNxjUbKkDMZBkL54Z0vZh4LRndycdZAMcIdizC/l/Yp/ZsBdAFxc5nbA==
+        integrity: sha512-3+yE9emwoevLMyvu+iR3rsa+Xwhie7ZEHMGDQ6dkqP/ndFzRHkobHUKTe+NCApSqG5ce2z4rFu+NX/UHnxlh3w==
       }
     cpu: [x64]
     os: [netbsd]
@@ -2969,10 +2969,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-openbsd-64/0.13.12:
+  /esbuild-openbsd-64/0.13.15:
     resolution:
       {
-        integrity: sha512-KuLCmYMb2kh05QuPJ+va60bKIH5wHL8ypDkmpy47lzwmdxNsuySeCMHuTv5o2Af1RUn5KLO5ZxaZeq4GEY7DaQ==
+        integrity: sha512-wTfvtwYJYAFL1fSs8yHIdf5GEE4NkbtbXtjLWjM3Cw8mmQKqsg8kTiqJ9NJQe5NX/5Qlo7Xd9r1yKMMkHllp5g==
       }
     cpu: [x64]
     os: [openbsd]
@@ -2980,10 +2980,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-sunos-64/0.13.12:
+  /esbuild-sunos-64/0.13.15:
     resolution:
       {
-        integrity: sha512-jBsF+e0woK3miKI8ufGWKG3o3rY9DpHvCVRn5eburMIIE+2c+y3IZ1srsthKyKI6kkXLvV4Cf/E7w56kLipMXw==
+        integrity: sha512-lbivT9Bx3t1iWWrSnGyBP9ODriEvWDRiweAs69vI+miJoeKwHWOComSRukttbuzjZ8r1q0mQJ8Z7yUsDJ3hKdw==
       }
     cpu: [x64]
     os: [sunos]
@@ -2991,10 +2991,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-windows-32/0.13.12:
+  /esbuild-windows-32/0.13.15:
     resolution:
       {
-        integrity: sha512-L9m4lLFQrFeR7F+eLZXG82SbXZfUhyfu6CexZEil6vm+lc7GDCE0Q8DiNutkpzjv1+RAbIGVva9muItQ7HVTkQ==
+        integrity: sha512-fDMEf2g3SsJ599MBr50cY5ve5lP1wyVwTe6aLJsM01KtxyKkB4UT+fc5MXQFn3RLrAIAZOG+tHC+yXObpSn7Nw==
       }
     cpu: [ia32]
     os: [win32]
@@ -3002,10 +3002,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-windows-64/0.13.12:
+  /esbuild-windows-64/0.13.15:
     resolution:
       {
-        integrity: sha512-k4tX4uJlSbSkfs78W5d9+I9gpd+7N95W7H2bgOMFPsYREVJs31+Q2gLLHlsnlY95zBoPQMIzHooUIsixQIBjaQ==
+        integrity: sha512-9aMsPRGDWCd3bGjUIKG/ZOJPKsiztlxl/Q3C1XDswO6eNX/Jtwu4M+jb6YDH9hRSUflQWX0XKAfWzgy5Wk54JQ==
       }
     cpu: [x64]
     os: [win32]
@@ -3013,10 +3013,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-windows-arm64/0.13.12:
+  /esbuild-windows-arm64/0.13.15:
     resolution:
       {
-        integrity: sha512-2tTv/BpYRIvuwHpp2M960nG7uvL+d78LFW/ikPItO+2GfK51CswIKSetSpDii+cjz8e9iSPgs+BU4o8nWICBwQ==
+        integrity: sha512-zzvyCVVpbwQQATaf3IG8mu1IwGEiDxKkYUdA4FpoCHi1KtPa13jeScYDjlW0Qh+ebWzpKfR2ZwvqAQkSWNcKjA==
       }
     cpu: [arm64]
     os: [win32]
@@ -3033,31 +3033,31 @@ packages:
     requiresBuild: true
     dev: true
 
-  /esbuild/0.13.12:
+  /esbuild/0.13.15:
     resolution:
       {
-        integrity: sha512-vTKKUt+yoz61U/BbrnmlG9XIjwpdIxmHB8DlPR0AAW6OdS+nBQBci6LUHU2q9WbBobMEIQxxDpKbkmOGYvxsow==
+        integrity: sha512-raCxt02HBKv8RJxE8vkTSCXGIyKHdEdGfUmiYb8wnabnaEmHzyW7DCHb5tEN0xU8ryqg5xw54mcwnYkC4x3AIw==
       }
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      esbuild-android-arm64: 0.13.12
-      esbuild-darwin-64: 0.13.12
-      esbuild-darwin-arm64: 0.13.12
-      esbuild-freebsd-64: 0.13.12
-      esbuild-freebsd-arm64: 0.13.12
-      esbuild-linux-32: 0.13.12
-      esbuild-linux-64: 0.13.12
-      esbuild-linux-arm: 0.13.12
-      esbuild-linux-arm64: 0.13.12
-      esbuild-linux-mips64le: 0.13.12
-      esbuild-linux-ppc64le: 0.13.12
-      esbuild-netbsd-64: 0.13.12
-      esbuild-openbsd-64: 0.13.12
-      esbuild-sunos-64: 0.13.12
-      esbuild-windows-32: 0.13.12
-      esbuild-windows-64: 0.13.12
-      esbuild-windows-arm64: 0.13.12
+      esbuild-android-arm64: 0.13.15
+      esbuild-darwin-64: 0.13.15
+      esbuild-darwin-arm64: 0.13.15
+      esbuild-freebsd-64: 0.13.15
+      esbuild-freebsd-arm64: 0.13.15
+      esbuild-linux-32: 0.13.15
+      esbuild-linux-64: 0.13.15
+      esbuild-linux-arm: 0.13.15
+      esbuild-linux-arm64: 0.13.15
+      esbuild-linux-mips64le: 0.13.15
+      esbuild-linux-ppc64le: 0.13.15
+      esbuild-netbsd-64: 0.13.15
+      esbuild-openbsd-64: 0.13.15
+      esbuild-sunos-64: 0.13.15
+      esbuild-windows-32: 0.13.15
+      esbuild-windows-64: 0.13.15
+      esbuild-windows-arm64: 0.13.15
     dev: true
 
   /escalade/3.1.1:
@@ -5680,10 +5680,10 @@ packages:
       glob: 7.2.0
     dev: true
 
-  /rollup/2.59.0:
+  /rollup/2.60.2:
     resolution:
       {
-        integrity: sha512-l7s90JQhCQ6JyZjKgo7Lq1dKh2RxatOM+Jr6a9F7WbS9WgKbocyUSeLmZl8evAse7y96Ae98L2k1cBOwWD8nHw==
+        integrity: sha512-1Bgjpq61sPjgoZzuiDSGvbI1tD91giZABgjCQBKM5aYLnzjq52GoDuWVwT/cm/MCxCMPU8gqQvkj8doQ5C8Oqw==
       }
     engines: { node: ">=10.0.0" }
     hasBin: true
@@ -6778,10 +6778,10 @@ packages:
       stylus:
         optional: true
     dependencies:
-      esbuild: 0.13.12
+      esbuild: 0.13.15
       postcss: 8.3.11
       resolve: 1.20.0
-      rollup: 2.59.0
+      rollup: 2.60.2
       sass: 1.43.4
     optionalDependencies:
       fsevents: 2.3.2

+ 4 - 0
src/layout/components/navbar.vue

@@ -253,8 +253,12 @@ function translationEn() {
 }
 
 .logout {
+  max-width: 120px;
+
   .el-dropdown-menu__item {
+    min-width: 100%;
     display: inline-flex;
+    flex-wrap: wrap;
     padding: 0 18px !important;
   }
 

+ 4 - 0
src/layout/components/sidebar/horizontal.vue

@@ -224,8 +224,12 @@ onMounted(() => {
 }
 
 .logout {
+  max-width: 120px;
+
   .el-dropdown-menu__item {
+    min-width: 100%;
     display: inline-flex;
+    flex-wrap: wrap;
     padding: 0 18px !important;
   }