diff --git a/package.json b/package.json index a1bdbe634..dcdcc5008 100644 --- a/package.json +++ b/package.json @@ -2,13 +2,6 @@ "name": "vue-pure-admin", "version": "2.1.0", "private": true, - "packageManager": "pnpm@6.20.1", - "workspaces": [ - "build/**", - "mock/**", - "src/**", - "types/**" - ], "engines": { "node": ">= 16", "pnpm": ">= 6" @@ -63,7 +56,7 @@ "sortablejs": "1.13.0", "typescript-cookie": "^1.0.0", "v-contextmenu": "3.0.0", - "vue": "^3.2.20", + "vue": "^3.2.21", "vue-i18n": "^9.2.0-beta.3", "vue-json-pretty": "^2.0.2", "vue-router": "^4.0.11", @@ -84,9 +77,9 @@ "@types/nprogress": "0.2.0", "@typescript-eslint/eslint-plugin": "4.31.0", "@typescript-eslint/parser": "4.31.0", - "@vitejs/plugin-vue": "1.6.0", - "@vitejs/plugin-vue-jsx": "1.1.7", - "@vue/compiler-sfc": "3.2.20", + "@vitejs/plugin-vue": "^1.9.4", + "@vitejs/plugin-vue-jsx": "^1.2.0", + "@vue/compiler-sfc": "^3.2.21", "@vue/eslint-config-prettier": "6.0.0", "@vue/eslint-config-typescript": "7.0.0", "@zougt/vite-plugin-theme-preprocessor": "^1.3.4", @@ -104,7 +97,7 @@ "prettier": "2.3.2", "pretty-quick": "3.1.1", "rimraf": "3.0.2", - "sass": "1.38.0", + "sass": "1.32.8", "sass-loader": "12.1.0", "stylelint": "13.13.1", "stylelint-config-prettier": "8.0.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 161a651f1..d64ae700b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,170 +1,170 @@ lockfileVersion: 5.3 -importers: - .: - specifiers: - "@amap/amap-jsapi-loader": ^1.0.1 - "@commitlint/cli": 13.1.0 - "@commitlint/config-conventional": 13.1.0 - "@element-plus/icons": ^0.0.11 - "@logicflow/core": 0.7.1 - "@logicflow/extension": 0.7.1 - "@types/element-resize-detector": 1.1.3 - "@types/mockjs": 1.0.3 - "@types/node": 14.14.14 - "@types/nprogress": 0.2.0 - "@typescript-eslint/eslint-plugin": 4.31.0 - "@typescript-eslint/parser": 4.31.0 - "@vitejs/plugin-vue": 1.6.0 - "@vitejs/plugin-vue-jsx": 1.1.7 - "@vue/compiler-sfc": 3.2.20 - "@vue/eslint-config-prettier": 6.0.0 - "@vue/eslint-config-typescript": 7.0.0 - "@vueuse/core": ^6.7.1 - "@vueuse/motion": ^2.0.0-beta.4 - "@zougt/vite-plugin-theme-preprocessor": ^1.3.4 - animate.css: ^4.1.1 - autoprefixer: 10.2.4 - await-to-js: ^3.0.0 - axios: ^0.21.1 - babel-plugin-transform-remove-console: 6.9.4 - chalk: 2.4.2 - cropperjs: ^1.5.11 - cross-env: 7.0.3 - dayjs: ^1.10.7 - echarts: ^5.2.1 - element-plus: ^1.2.0-beta.2 - element-resize-detector: ^1.2.3 - eslint: 7.30.0 - eslint-plugin-prettier: 3.4.0 - eslint-plugin-vue: 7.17.0 - font-awesome: ^4.7.0 - husky: 7.0.2 - lint-staged: 11.1.2 - lodash-es: ^4.17.21 - lowdb: ^3.0.0 - mitt: ^3.0.0 - mockjs: ^1.1.0 - nprogress: ^0.2.0 - path: ^0.12.7 - path-to-regexp: ^6.2.0 - pinia: ^2.0.0-rc.14 - postcss: 8.2.6 - postcss-import: 14.0.0 - prettier: 2.3.2 - pretty-quick: 3.1.1 - resize-observer-polyfill: ^1.5.1 - responsive-storage: ^1.0.11 - rimraf: 3.0.2 - sass: 1.38.0 - sass-loader: 12.1.0 - sortablejs: 1.13.0 - stylelint: 13.13.1 - stylelint-config-prettier: 8.0.2 - stylelint-config-standard: 22.0.0 - stylelint-order: 4.1.0 - typescript: 4.4.2 - typescript-cookie: ^1.0.0 - unplugin-element-plus: ^0.1.0 - v-contextmenu: 3.0.0 - vite: latest - vite-plugin-mock: ^2.9.6 - vite-plugin-style-import: ^1.2.1 - vite-svg-loader: ^2.2.0 - vue: ^3.2.20 - vue-eslint-parser: 7.10.0 - vue-i18n: ^9.2.0-beta.3 - vue-json-pretty: ^2.0.2 - vue-router: ^4.0.11 - vue-types: ^4.1.0 - vuedraggable: 4.1.0 - vxe-table: 4.0.30 - wangeditor: 4.7.7 - xe-ajax: 4.0.5 - xe-utils: 3.4.0 - xgplayer: 2.28.0 - dependencies: - "@amap/amap-jsapi-loader": 1.0.1 - "@element-plus/icons": 0.0.11 - "@logicflow/core": 0.7.1 - "@logicflow/extension": 0.7.1 - "@vueuse/core": 6.7.4_vue@3.2.21 - "@vueuse/motion": 2.0.0-beta.4_vue@3.2.21 - animate.css: 4.1.1 - await-to-js: 3.0.0 - axios: 0.21.4 - cropperjs: 1.5.12 - dayjs: 1.10.7 - echarts: 5.2.2 - element-plus: 1.2.0-beta.2_vue@3.2.21 - element-resize-detector: 1.2.3 - font-awesome: 4.7.0 - lodash-es: 4.17.21 - lowdb: 3.0.0 - mitt: 3.0.0 - mockjs: 1.1.0 - nprogress: 0.2.0 - path: 0.12.7 - path-to-regexp: 6.2.0 - pinia: 2.0.0_typescript@4.4.2+vue@3.2.21 - resize-observer-polyfill: 1.5.1 - responsive-storage: 1.0.11_vue@3.2.21 - sortablejs: 1.13.0 - typescript-cookie: 1.0.0 - v-contextmenu: 3.0.0_vue@3.2.21 - vue: 3.2.21 - vue-i18n: 9.2.0-beta.17_vue@3.2.21 - vue-json-pretty: 2.0.4_vue@3.2.21 - vue-router: 4.0.12_vue@3.2.21 - vue-types: 4.1.1_vue@3.2.21 - vuedraggable: 4.1.0_vue@3.2.21 - vxe-table: 4.0.30_vue@3.2.21+xe-utils@3.4.0 - wangeditor: 4.7.7 - xe-ajax: 4.0.5 - xe-utils: 3.4.0 - xgplayer: 2.28.0 - devDependencies: - "@commitlint/cli": 13.1.0 - "@commitlint/config-conventional": 13.1.0 - "@types/element-resize-detector": 1.1.3 - "@types/mockjs": 1.0.3 - "@types/node": 14.14.14 - "@types/nprogress": 0.2.0 - "@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.6.0_@vue+compiler-sfc@3.2.20 - "@vitejs/plugin-vue-jsx": 1.1.7 - "@vue/compiler-sfc": 3.2.20 - "@vue/eslint-config-prettier": 6.0.0_82e4252401b0cc5be86f7c2133946f49 - "@vue/eslint-config-typescript": 7.0.0_e03d82996bd4a66fb128f33523d782ea - "@zougt/vite-plugin-theme-preprocessor": 1.3.4_sass@1.38.0 - autoprefixer: 10.2.4_postcss@8.2.6 - babel-plugin-transform-remove-console: 6.9.4 - chalk: 2.4.2 - cross-env: 7.0.3 - eslint: 7.30.0 - eslint-plugin-prettier: 3.4.0_eslint@7.30.0+prettier@2.3.2 - eslint-plugin-vue: 7.17.0_eslint@7.30.0 - husky: 7.0.2 - lint-staged: 11.1.2 - postcss: 8.2.6 - postcss-import: 14.0.0_postcss@8.2.6 - prettier: 2.3.2 - pretty-quick: 3.1.1_prettier@2.3.2 - rimraf: 3.0.2 - sass: 1.38.0 - sass-loader: 12.1.0_sass@1.38.0 - stylelint: 13.13.1 - stylelint-config-prettier: 8.0.2_stylelint@13.13.1 - stylelint-config-standard: 22.0.0_stylelint@13.13.1 - stylelint-order: 4.1.0_stylelint@13.13.1 - typescript: 4.4.2 - unplugin-element-plus: 0.1.3_vite@2.6.13+vue@3.2.21 - vite: 2.6.13_sass@1.38.0 - vite-plugin-mock: 2.9.6_mockjs@1.1.0+vite@2.6.13 - vite-plugin-style-import: 1.3.0_vite@2.6.13 - vite-svg-loader: 2.2.0 - vue-eslint-parser: 7.10.0_eslint@7.30.0 +specifiers: + "@amap/amap-jsapi-loader": ^1.0.1 + "@commitlint/cli": 13.1.0 + "@commitlint/config-conventional": 13.1.0 + "@element-plus/icons": ^0.0.11 + "@logicflow/core": 0.7.1 + "@logicflow/extension": 0.7.1 + "@types/element-resize-detector": 1.1.3 + "@types/mockjs": 1.0.3 + "@types/node": 14.14.14 + "@types/nprogress": 0.2.0 + "@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 + "@vue/compiler-sfc": ^3.2.21 + "@vue/eslint-config-prettier": 6.0.0 + "@vue/eslint-config-typescript": 7.0.0 + "@vueuse/core": ^6.7.1 + "@vueuse/motion": ^2.0.0-beta.4 + "@zougt/vite-plugin-theme-preprocessor": ^1.3.4 + animate.css: ^4.1.1 + autoprefixer: 10.2.4 + await-to-js: ^3.0.0 + axios: ^0.21.1 + babel-plugin-transform-remove-console: 6.9.4 + chalk: 2.4.2 + cropperjs: ^1.5.11 + cross-env: 7.0.3 + dayjs: ^1.10.7 + echarts: ^5.2.1 + element-plus: ^1.2.0-beta.2 + element-resize-detector: ^1.2.3 + eslint: 7.30.0 + eslint-plugin-prettier: 3.4.0 + eslint-plugin-vue: 7.17.0 + font-awesome: ^4.7.0 + husky: 7.0.2 + lint-staged: 11.1.2 + lodash-es: ^4.17.21 + lowdb: ^3.0.0 + mitt: ^3.0.0 + mockjs: ^1.1.0 + nprogress: ^0.2.0 + path: ^0.12.7 + path-to-regexp: ^6.2.0 + pinia: ^2.0.0-rc.14 + postcss: 8.2.6 + postcss-import: 14.0.0 + prettier: 2.3.2 + pretty-quick: 3.1.1 + resize-observer-polyfill: ^1.5.1 + responsive-storage: ^1.0.11 + rimraf: 3.0.2 + sass: 1.32.8 + sass-loader: 12.1.0 + sortablejs: 1.13.0 + stylelint: 13.13.1 + stylelint-config-prettier: 8.0.2 + stylelint-config-standard: 22.0.0 + stylelint-order: 4.1.0 + typescript: 4.4.2 + typescript-cookie: ^1.0.0 + unplugin-element-plus: ^0.1.0 + v-contextmenu: 3.0.0 + vite: latest + vite-plugin-mock: ^2.9.6 + vite-plugin-style-import: ^1.2.1 + vite-svg-loader: ^2.2.0 + vue: ^3.2.21 + vue-eslint-parser: 7.10.0 + vue-i18n: ^9.2.0-beta.3 + vue-json-pretty: ^2.0.2 + vue-router: ^4.0.11 + vue-types: ^4.1.0 + vuedraggable: 4.1.0 + vxe-table: 4.0.30 + wangeditor: 4.7.7 + xe-ajax: 4.0.5 + xe-utils: 3.4.0 + xgplayer: 2.28.0 + +dependencies: + "@amap/amap-jsapi-loader": 1.0.1 + "@element-plus/icons": 0.0.11 + "@logicflow/core": 0.7.1 + "@logicflow/extension": 0.7.1 + "@vueuse/core": 6.7.5_vue@3.2.21 + "@vueuse/motion": 2.0.0-beta.4_vue@3.2.21 + animate.css: 4.1.1 + await-to-js: 3.0.0 + axios: 0.21.4 + cropperjs: 1.5.12 + dayjs: 1.10.7 + echarts: 5.2.2 + element-plus: 1.2.0-beta.2_vue@3.2.21 + element-resize-detector: 1.2.3 + font-awesome: 4.7.0 + lodash-es: 4.17.21 + lowdb: 3.0.0 + mitt: 3.0.0 + mockjs: 1.1.0 + nprogress: 0.2.0 + path: 0.12.7 + path-to-regexp: 6.2.0 + pinia: 2.0.2_typescript@4.4.2+vue@3.2.21 + resize-observer-polyfill: 1.5.1 + responsive-storage: 1.0.11_vue@3.2.21 + sortablejs: 1.13.0 + typescript-cookie: 1.0.0 + v-contextmenu: 3.0.0_vue@3.2.21 + vue: 3.2.21 + vue-i18n: 9.2.0-beta.17_vue@3.2.21 + vue-json-pretty: 2.0.4_vue@3.2.21 + vue-router: 4.0.12_vue@3.2.21 + vue-types: 4.1.1_vue@3.2.21 + vuedraggable: 4.1.0_vue@3.2.21 + vxe-table: 4.0.30_vue@3.2.21+xe-utils@3.4.0 + wangeditor: 4.7.7 + xe-ajax: 4.0.5 + xe-utils: 3.4.0 + xgplayer: 2.28.0 + +devDependencies: + "@commitlint/cli": 13.1.0 + "@commitlint/config-conventional": 13.1.0 + "@types/element-resize-detector": 1.1.3 + "@types/mockjs": 1.0.3 + "@types/node": 14.14.14 + "@types/nprogress": 0.2.0 + "@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.13 + "@vitejs/plugin-vue-jsx": 1.2.0 + "@vue/compiler-sfc": 3.2.21 + "@vue/eslint-config-prettier": 6.0.0_82e4252401b0cc5be86f7c2133946f49 + "@vue/eslint-config-typescript": 7.0.0_e03d82996bd4a66fb128f33523d782ea + "@zougt/vite-plugin-theme-preprocessor": 1.3.5_sass@1.32.8 + autoprefixer: 10.2.4_postcss@8.2.6 + babel-plugin-transform-remove-console: 6.9.4 + chalk: 2.4.2 + cross-env: 7.0.3 + eslint: 7.30.0 + eslint-plugin-prettier: 3.4.0_eslint@7.30.0+prettier@2.3.2 + eslint-plugin-vue: 7.17.0_eslint@7.30.0 + husky: 7.0.2 + lint-staged: 11.1.2 + postcss: 8.2.6 + postcss-import: 14.0.0_postcss@8.2.6 + prettier: 2.3.2 + pretty-quick: 3.1.1_prettier@2.3.2 + rimraf: 3.0.2 + sass: 1.32.8 + sass-loader: 12.1.0_sass@1.32.8 + stylelint: 13.13.1 + stylelint-config-prettier: 8.0.2_stylelint@13.13.1 + stylelint-config-standard: 22.0.0_stylelint@13.13.1 + stylelint-order: 4.1.0_stylelint@13.13.1 + typescript: 4.4.2 + unplugin-element-plus: 0.1.3_vite@2.6.13+vue@3.2.21 + vite: 2.6.13_sass@1.32.8 + vite-plugin-mock: 2.9.6_mockjs@1.1.0+vite@2.6.13 + vite-plugin-style-import: 1.3.0_vite@2.6.13 + vite-svg-loader: 2.2.0 + vue-eslint-parser: 7.10.0_eslint@7.30.0 packages: /@amap/amap-jsapi-loader/1.0.1: @@ -1263,10 +1263,10 @@ packages: eslint-visitor-keys: 2.1.0 dev: true - /@vitejs/plugin-vue-jsx/1.1.7: + /@vitejs/plugin-vue-jsx/1.2.0: resolution: { - integrity: sha512-lomCrTZ/LXUk8L+1fBX4dpW+L/S7qY4+pzS5BRG2NuLpjo26Efh4yb8nDkYM7b8COS3ea7otis0SsqD8vGOSlg== + integrity: sha512-Y4Er2bn8bHNiUziJizcVT1yQKTq6oOJeBrKkxvjo2yKT/RTSK1ZlkP/qnzchxxuBkx0tYG4Aaxbb9xuVnNNDEA== } engines: { node: ">=12.0.0" } dependencies: @@ -1280,16 +1280,16 @@ packages: - supports-color dev: true - /@vitejs/plugin-vue/1.6.0_@vue+compiler-sfc@3.2.20: + /@vitejs/plugin-vue/1.9.4_vite@2.6.13: resolution: { - integrity: sha512-n3i8htn8pTg9M+kM3cnEfsPZx/6ngInlTroth6fA1LQTJq5aTVQ8ggaE5pPoAy9vCgHPtcaXMzwpldhqRAkebQ== + integrity: sha512-0CZqaCoChriPTTtGkERy1LGPcYjGFpi2uYRhBPIkqJqUGV5JnJFhQAgh6oH9j5XZHfrRaisX8W0xSpO4T7S78A== } engines: { node: ">=12.0.0" } peerDependencies: - "@vue/compiler-sfc": ^3.2.6 + vite: ^2.5.10 dependencies: - "@vue/compiler-sfc": 3.2.20 + vite: 2.6.13_sass@1.32.8 dev: true /@vue/babel-helper-vue-transform-on/1.0.2: @@ -1319,18 +1319,6 @@ packages: - supports-color dev: true - /@vue/compiler-core/3.2.20: - resolution: - { - integrity: sha512-vcEXlKXoPwBXFP5aUTHN9GTZaDfwCofa9Yu9bbW2C5O/QSa9Esdt7OG4+0RRd3EHEMxUvEdj4RZrd/KpQeiJbA== - } - dependencies: - "@babel/parser": 7.16.2 - "@vue/shared": 3.2.20 - estree-walker: 2.0.2 - source-map: 0.6.1 - dev: true - /@vue/compiler-core/3.2.21: resolution: { @@ -1341,17 +1329,6 @@ packages: "@vue/shared": 3.2.21 estree-walker: 2.0.2 source-map: 0.6.1 - dev: false - - /@vue/compiler-dom/3.2.20: - resolution: - { - integrity: sha512-QnI77ec/JtV7R0YBbcVayYTDCRcI9OCbxiUQK6izVyqQO0658n0zQuoNwe+bYgtqnvGAIqTR3FShTd5y4oOjdg== - } - dependencies: - "@vue/compiler-core": 3.2.20 - "@vue/shared": 3.2.20 - dev: true /@vue/compiler-dom/3.2.21: resolution: @@ -1361,25 +1338,6 @@ packages: dependencies: "@vue/compiler-core": 3.2.21 "@vue/shared": 3.2.21 - dev: false - - /@vue/compiler-sfc/3.2.20: - resolution: - { - integrity: sha512-03aZo+6tQKiFLfunHKSPZvdK4Jsn/ftRCyaro8AQIWkuxJbvSosbKK6HTTn+D2c3nPScG155akJoxKENw7rftQ== - } - dependencies: - "@babel/parser": 7.16.2 - "@vue/compiler-core": 3.2.20 - "@vue/compiler-dom": 3.2.20 - "@vue/compiler-ssr": 3.2.20 - "@vue/ref-transform": 3.2.20 - "@vue/shared": 3.2.20 - estree-walker: 2.0.2 - magic-string: 0.25.7 - postcss: 8.2.6 - source-map: 0.6.1 - dev: true /@vue/compiler-sfc/3.2.21: resolution: @@ -1397,17 +1355,6 @@ packages: magic-string: 0.25.7 postcss: 8.3.11 source-map: 0.6.1 - dev: false - - /@vue/compiler-ssr/3.2.20: - resolution: - { - integrity: sha512-rzzVVYivm+EjbfiGQvNeyiYZWzr6Hkej97RZLZvcumacQlnKv9176Xo9rRyeWwFbBlxmtNdrVMslRXtipMXk2w== - } - dependencies: - "@vue/compiler-dom": 3.2.20 - "@vue/shared": 3.2.20 - dev: true /@vue/compiler-ssr/3.2.21: resolution: @@ -1417,12 +1364,11 @@ packages: dependencies: "@vue/compiler-dom": 3.2.21 "@vue/shared": 3.2.21 - dev: false - /@vue/devtools-api/6.0.0-beta.19: + /@vue/devtools-api/6.0.0-beta.20: resolution: { - integrity: sha512-ObzQhgkoVeoyKv+e8+tB/jQBL2smtk/NmC9OmFK8UqdDpoOdv/Kf9pyDWL+IFyM7qLD2C75rszJujvGSPSpGlw== + integrity: sha512-21u2jFOk8jbAneeGpDwZQ0W66RJa0IBDUyVl6SgKnn2cRFjLWzKj+ukXjpLhYr1KASyCe5E5U4jXwChVo0YUAw== } dev: false @@ -1472,19 +1418,6 @@ packages: "@vue/shared": 3.2.21 dev: false - /@vue/ref-transform/3.2.20: - resolution: - { - integrity: sha512-Y42d3PGlYZ1lXcF3dbd3+qU/C/a3wYEZ949fyOI5ptzkjDWlkfU6vn74fmOjsLjEcjs10BXK2qO99FqQIK2r1Q== - } - dependencies: - "@babel/parser": 7.16.2 - "@vue/compiler-core": 3.2.20 - "@vue/shared": 3.2.20 - estree-walker: 2.0.2 - magic-string: 0.25.7 - dev: true - /@vue/ref-transform/3.2.21: resolution: { @@ -1496,7 +1429,6 @@ packages: "@vue/shared": 3.2.21 estree-walker: 2.0.2 magic-string: 0.25.7 - dev: false /@vue/runtime-core/3.2.21: resolution: @@ -1532,24 +1464,16 @@ packages: vue: 3.2.21 dev: false - /@vue/shared/3.2.20: - resolution: - { - integrity: sha512-FbpX+hD5BvXCQerEYO7jtAGHlhAkhTQ4KIV73kmLWNlawWhTiVuQxizgVb0BOkX5oG9cIRZ42EG++d/k/Efp0w== - } - dev: true - /@vue/shared/3.2.21: resolution: { integrity: sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA== } - dev: false - /@vueuse/core/6.7.4_vue@3.2.21: + /@vueuse/core/6.7.5_vue@3.2.21: resolution: { - integrity: sha512-y39SD+pxDkv7/Fe369c02FQpr/148otQr64ScPDTpw4fGnspc8ONXCNU3gTrvDFRuiylirdPBpXgmt/GDQO7RA== + integrity: sha512-zgWai0i38TbfWGMVs1ybyEEdwwhjjMloQflRTMU0+pTmp3kEtQTDiVZiOrr758s+yRdr2OQiMQ323dyiKgKMFQ== } peerDependencies: "@vue/composition-api": ^1.1.0 @@ -1560,9 +1484,9 @@ packages: vue: optional: true dependencies: - "@vueuse/shared": 6.7.4_vue@3.2.21 + "@vueuse/shared": 6.7.5_vue@3.2.21 vue: 3.2.21 - vue-demi: 0.12.0_vue@3.2.21 + vue-demi: 0.12.1_vue@3.2.21 dev: false /@vueuse/motion/2.0.0-beta.4_vue@3.2.21: @@ -1577,16 +1501,16 @@ packages: "@vue/composition-api": optional: true dependencies: - "@vueuse/core": 6.7.4_vue@3.2.21 + "@vueuse/core": 6.7.5_vue@3.2.21 popmotion: 10.0.2 vue: 3.2.21 - vue-demi: 0.12.0_vue@3.2.21 + vue-demi: 0.12.1_vue@3.2.21 dev: false - /@vueuse/shared/6.7.4_vue@3.2.21: + /@vueuse/shared/6.7.5_vue@3.2.21: resolution: { - integrity: sha512-Lkm8myEiOj0sIqSXck5EXDbu0W705Q10BxydGLMfiV6wAY4U1zu+YgEgR37Wy2/mT1545pwQqiJ7bd3kQQFCMw== + integrity: sha512-wUDMPTGUSTYsbiftKq7dYLKD2i3n0m8utbHBCyoxdyeKsmtQGIM2/XeeXjtALB7UXD6rqPsVgCMepNrPPt8zvw== } peerDependencies: "@vue/composition-api": ^1.1.0 @@ -1598,10 +1522,10 @@ packages: optional: true dependencies: vue: 3.2.21 - vue-demi: 0.12.0_vue@3.2.21 + vue-demi: 0.12.1_vue@3.2.21 dev: false - /@zougt/some-loader-utils/1.3.3_sass@1.38.0: + /@zougt/some-loader-utils/1.3.3_sass@1.32.8: resolution: { integrity: sha512-94xWLhku6OpnJeplK+oXH60ug5dsR8bxc0KPAN7QvM36/EpI4PqLCrgbHCdbozSPsRYwF5vKrGIyjkShN/2JIQ== @@ -1613,17 +1537,17 @@ packages: dependencies: parse-color: 1.0.0 postcss: 8.3.11 - sass: 1.38.0 + sass: 1.32.8 dev: true - /@zougt/vite-plugin-theme-preprocessor/1.3.4_sass@1.38.0: + /@zougt/vite-plugin-theme-preprocessor/1.3.5_sass@1.32.8: resolution: { - integrity: sha512-8XJFHl//aydnUenRJACE8u2NFe9thM2/AUAgn3AEG6AgxjoOZlE4WBHSoM2g48dy/CLE8FCLOQ/9iy7Ch6T0Ag== + integrity: sha512-vOp/nIKLe3oKY6W50iJjPgh/vw5RwCX0hMcaDvBdEhTdQjw9jBLosvBCoe5LuM/Wx0eNmng0b/3Svw+/Iji4yw== } engines: { node: ">= 12.0.0" } dependencies: - "@zougt/some-loader-utils": 1.3.3_sass@1.38.0 + "@zougt/some-loader-utils": 1.3.3_sass@1.32.8 fs-extra: 9.1.0 string-hash: 1.1.3 transitivePeerDependencies: @@ -1848,7 +1772,7 @@ packages: postcss: ^8.1.0 dependencies: browserslist: 4.17.6 - caniuse-lite: 1.0.30001275 + caniuse-lite: 1.0.30001276 colorette: 1.4.0 fraction.js: 4.1.1 normalize-range: 0.1.2 @@ -1864,7 +1788,7 @@ packages: hasBin: true dependencies: browserslist: 4.17.6 - caniuse-lite: 1.0.30001275 + caniuse-lite: 1.0.30001276 normalize-range: 0.1.2 num2fraction: 1.2.2 picocolors: 0.2.1 @@ -1960,8 +1884,8 @@ packages: engines: { node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7 } hasBin: true dependencies: - caniuse-lite: 1.0.30001275 - electron-to-chromium: 1.3.887 + caniuse-lite: 1.0.30001276 + electron-to-chromium: 1.3.888 escalade: 3.1.1 node-releases: 2.0.1 picocolors: 1.0.0 @@ -2028,10 +1952,10 @@ packages: engines: { node: ">=10" } dev: true - /caniuse-lite/1.0.30001275: + /caniuse-lite/1.0.30001276: resolution: { - integrity: sha512-ihJVvj8RX0kn9GgP43HKhb5q9s2XQn4nEQhdldEJvZhCsuiB2XOq6fAMYQZaN6FPWfsr2qU0cdL0CSbETwbJAg== + integrity: sha512-psUNoaG1ilknZPxi8HuhQWobuhLqtYSRUxplfVkEJdgZNB9TETVYGSBtv4YyfAdGvE6gn2eb0ztiXqHoWJcGnw== } dev: true @@ -2702,10 +2626,10 @@ packages: resolution: { integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= } dev: true - /electron-to-chromium/1.3.887: + /electron-to-chromium/1.3.888: resolution: { - integrity: sha512-QQUumrEjFDKSVYVdaeBmFdyQGoaV+fCSMyWHvfx/u22bRHSTeBQYt6P4jMY+gFd4kgKB9nqk7RMtWkDB49OYPA== + integrity: sha512-5iD1zgyPpFER4kJ716VsA4MxQ6x405dxdFNCEK2mITL075VHO5ResjY0xzQUZguCww/KlBxCA6JmBA9sDt1PRw== } dev: true @@ -2719,7 +2643,7 @@ packages: dependencies: "@element-plus/icons": 0.0.11 "@popperjs/core": 2.10.2 - "@vueuse/core": 6.7.4_vue@3.2.21 + "@vueuse/core": 6.7.5_vue@3.2.21 async-validator: 4.0.7 dayjs: 1.10.7 lodash: 4.17.21 @@ -3801,7 +3725,7 @@ packages: array-union: 2.1.0 dir-glob: 3.0.1 fast-glob: 3.2.7 - ignore: 5.1.8 + ignore: 5.1.9 merge2: 1.4.1 slash: 3.0.0 dev: true @@ -3960,10 +3884,10 @@ packages: engines: { node: ">= 4" } dev: true - /ignore/5.1.8: + /ignore/5.1.9: resolution: { - integrity: sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== + integrity: sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ== } engines: { node: ">= 4" } dev: true @@ -5113,13 +5037,13 @@ packages: engines: { node: ">=0.10.0" } dev: true - /pinia/2.0.0_typescript@4.4.2+vue@3.2.21: + /pinia/2.0.2_typescript@4.4.2+vue@3.2.21: resolution: { - integrity: sha512-pqnQv1m7oEwYExGl//EtOn9rgFn7gtXECP/hZHy+WicmHXmWWkbsvpR+9z1xxrIgDOmVYuh1eYfRULJklzOKsQ== + integrity: sha512-ljN+9p9XHE8YrMBgxLbpo5rdVPj7Fri4Bl9qswz5dJPeoK6ra66YOLrGpBoCsHjAqu9jOBC3oJeErocicf51oA== } peerDependencies: - "@vue/composition-api": ^1.2.4 + "@vue/composition-api": ^1.3.0 typescript: ^4.4.4 vue: ^2.6.14 || ^3.2.0 peerDependenciesMeta: @@ -5128,10 +5052,10 @@ packages: typescript: optional: true dependencies: - "@vue/devtools-api": 6.0.0-beta.19 + "@vue/devtools-api": 6.0.0-beta.20 typescript: 4.4.2 vue: 3.2.21 - vue-demi: 0.12.0_vue@3.2.21 + vue-demi: 0.12.1_vue@3.2.21 dev: false /please-upgrade-node/3.2.0: @@ -5353,7 +5277,7 @@ packages: chalk: 3.0.0 execa: 4.1.0 find-up: 4.1.0 - ignore: 5.1.8 + ignore: 5.1.9 mri: 1.2.0 multimatch: 4.0.0 prettier: 2.3.2 @@ -5666,7 +5590,7 @@ packages: } dev: true - /sass-loader/12.1.0_sass@1.38.0: + /sass-loader/12.1.0_sass@1.32.8: resolution: { integrity: sha512-FVJZ9kxVRYNZTIe2xhw93n3xJNYZADr+q69/s98l9nTCrWASo+DR2Ot0s5xTKQDDEosUkatsGeHxcH4QBp5bSg== @@ -5687,13 +5611,13 @@ packages: dependencies: klona: 2.0.5 neo-async: 2.6.2 - sass: 1.38.0 + sass: 1.32.8 dev: true - /sass/1.38.0: + /sass/1.32.8: resolution: { - integrity: sha512-WBccZeMigAGKoI+NgD7Adh0ab1HUq+6BmyBUEaGxtErbUtWUevEbdgo5EZiJQofLUGcKtlNaO2IdN73AHEua5g== + integrity: sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ== } engines: { node: ">=8.9.0" } hasBin: true @@ -6110,7 +6034,7 @@ packages: globby: 11.0.4 globjoin: 0.1.4 html-tags: 3.1.0 - ignore: 5.1.8 + ignore: 5.1.9 import-lazy: 4.0.0 imurmurhash: 0.1.4 known-css-properties: 0.21.0 @@ -6537,7 +6461,7 @@ packages: webpack: optional: true dependencies: - vite: 2.6.13_sass@1.38.0 + vite: 2.6.13_sass@1.32.8 webpack-virtual-modules: 0.4.3 dev: true @@ -6657,7 +6581,7 @@ packages: fast-glob: 3.2.7 mockjs: 1.1.0 path-to-regexp: 6.2.0 - vite: 2.6.13_sass@1.38.0 + vite: 2.6.13_sass@1.32.8 transitivePeerDependencies: - rollup - supports-color @@ -6676,7 +6600,7 @@ packages: debug: 4.3.2 es-module-lexer: 0.9.3 magic-string: 0.25.7 - vite: 2.6.13_sass@1.38.0 + vite: 2.6.13_sass@1.32.8 transitivePeerDependencies: - supports-color dev: true @@ -6687,11 +6611,11 @@ packages: integrity: sha512-FP6qCN57coIOwmtah68ofpi4dewGmfzPcoKe76RMnJoz7qBTXxQVm2BlnH0YzGeCbOcjm9NKauJ1I6J9OlUUtg== } dependencies: - "@vue/compiler-sfc": 3.2.20 + "@vue/compiler-sfc": 3.2.21 svgo: 2.8.0 dev: true - /vite/2.6.13_sass@1.38.0: + /vite/2.6.13_sass@1.32.8: resolution: { integrity: sha512-+tGZ1OxozRirTudl4M3N3UTNJOlxdVo/qBl2IlDEy/ZpTFcskp+k5ncNjayR3bRYTCbqSOFz2JWGN1UmuDMScA== @@ -6714,15 +6638,15 @@ packages: postcss: 8.3.11 resolve: 1.20.0 rollup: 2.59.0 - sass: 1.38.0 + sass: 1.32.8 optionalDependencies: fsevents: 2.3.2 dev: true - /vue-demi/0.12.0_vue@3.2.21: + /vue-demi/0.12.1_vue@3.2.21: resolution: { - integrity: sha512-eggsbQSQEJKlvQrtrJLx4J44MIVq5+Z7QetIEh1Na+ZWLgt5Fq0qskQ1QmckTTEoFcUdn36c4K23EjtXZhws7w== + integrity: sha512-QL3ny+wX8c6Xm1/EZylbgzdoDolye+VpCXRhI2hug9dJTP3OUJ3lmiKN3CsVV3mOJKwFi0nsstbgob0vG7aoIw== } engines: { node: ">=12" } hasBin: true @@ -6770,7 +6694,7 @@ packages: "@intlify/core-base": 9.2.0-beta.17 "@intlify/shared": 9.2.0-beta.17 "@intlify/vue-devtools": 9.2.0-beta.17 - "@vue/devtools-api": 6.0.0-beta.19 + "@vue/devtools-api": 6.0.0-beta.20 vue: 3.2.21 dev: false @@ -6794,7 +6718,7 @@ packages: peerDependencies: vue: ^3.0.0 dependencies: - "@vue/devtools-api": 6.0.0-beta.19 + "@vue/devtools-api": 6.0.0-beta.20 vue: 3.2.21 dev: false diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml deleted file mode 100644 index 025fb7861..000000000 --- a/pnpm-workspace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# -packages: - - "build/**" - - "mock/**" - - "src/**" - - "types/**" diff --git a/src/api/user.ts b/src/api/user.ts index 23a385ff6..64758b0e8 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -15,8 +15,3 @@ export const getVerify = (): userType => { export const getLogin = (data: object) => { return http.request("post", "/login", data); }; - -// 注册 -export const getRegist = (data: object): userType => { - return http.request("post", "/register", data); -}; diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css index 6f9180ecc..09ee98714 100644 --- a/src/assets/iconfont/iconfont.css +++ b/src/assets/iconfont/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 2208059 */ - src: url("iconfont.woff2?t=1636070926069") format("woff2"), - url("iconfont.woff?t=1636070926069") format("woff"), - url("iconfont.ttf?t=1636070926069") format("truetype"); + src: url("iconfont.woff2?t=1636197082361") format("woff2"), + url("iconfont.woff?t=1636197082361") format("woff"), + url("iconfont.ttf?t=1636197082361") format("truetype"); } .iconfont { @@ -13,11 +13,7 @@ -moz-osx-font-smoothing: grayscale; } -.team-iconshuijin::before { - content: "\e621"; -} - -.team-iconzu2148::before { +.team-iconlogo::before { content: "\e620"; } diff --git a/src/assets/iconfont/iconfont.js b/src/assets/iconfont/iconfont.js index 6cb632212..e180203e7 100644 --- a/src/assets/iconfont/iconfont.js +++ b/src/assets/iconfont/iconfont.js @@ -4,15 +4,15 @@ e, i, a, - h = - '', - n = (n = document.getElementsByTagName("script"))[ - n.length - 1 + n = + '', + h = (h = document.getElementsByTagName("script"))[ + h.length - 1 ].getAttribute("data-injectcss"), o = function (c, l) { l.parentNode.insertBefore(c, l); }; - if (n && !c.__iconfont__svg__cssinject__) { + if (h && !c.__iconfont__svg__cssinject__) { c.__iconfont__svg__cssinject__ = !0; try { document.write( @@ -35,8 +35,8 @@ } (l = function () { var c, l; - ((l = document.createElement("div")).innerHTML = h), - (h = null), + ((l = document.createElement("div")).innerHTML = n), + (n = null), (c = l.getElementsByTagName("svg")[0]) && (c.setAttribute("aria-hidden", "true"), (c.style.position = "absolute"), diff --git a/src/assets/iconfont/iconfont.json b/src/assets/iconfont/iconfont.json index 2d2f17cd0..58756c7f9 100644 --- a/src/assets/iconfont/iconfont.json +++ b/src/assets/iconfont/iconfont.json @@ -5,17 +5,10 @@ "css_prefix_text": "team-icon", "description": "pure-admin", "glyphs": [ - { - "icon_id": "11758211", - "name": "水浸", - "font_class": "shuijin", - "unicode": "e621", - "unicode_decimal": 58913 - }, { "icon_id": "22129506", "name": "水能", - "font_class": "zu2148", + "font_class": "logo", "unicode": "e620", "unicode_decimal": 58912 }, diff --git a/src/assets/login/avatar.svg b/src/assets/login/avatar.svg new file mode 100644 index 000000000..453efaae6 --- /dev/null +++ b/src/assets/login/avatar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/login/bg.png b/src/assets/login/bg.png new file mode 100644 index 000000000..8cdd3001f Binary files /dev/null and b/src/assets/login/bg.png differ diff --git a/src/assets/login/illustration0.svg b/src/assets/login/illustration0.svg new file mode 100644 index 000000000..6d17e36b5 --- /dev/null +++ b/src/assets/login/illustration0.svg @@ -0,0 +1 @@ +special_event \ No newline at end of file diff --git a/src/assets/login/illustration1.svg b/src/assets/login/illustration1.svg new file mode 100644 index 000000000..d8c3d047c --- /dev/null +++ b/src/assets/login/illustration1.svg @@ -0,0 +1 @@ +air support \ No newline at end of file diff --git a/src/assets/login/illustration2.svg b/src/assets/login/illustration2.svg new file mode 100644 index 000000000..35e5c1b23 --- /dev/null +++ b/src/assets/login/illustration2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/login/illustration3.svg b/src/assets/login/illustration3.svg new file mode 100644 index 000000000..33016d552 --- /dev/null +++ b/src/assets/login/illustration3.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/login/illustration4.svg b/src/assets/login/illustration4.svg new file mode 100644 index 000000000..8a06605ab --- /dev/null +++ b/src/assets/login/illustration4.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/login/illustration5.svg b/src/assets/login/illustration5.svg new file mode 100644 index 000000000..eeb961624 --- /dev/null +++ b/src/assets/login/illustration5.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/login/illustration6.svg b/src/assets/login/illustration6.svg new file mode 100644 index 000000000..d46f01fbe --- /dev/null +++ b/src/assets/login/illustration6.svg @@ -0,0 +1 @@ +working_out \ No newline at end of file diff --git a/src/components/ReInfo/index.vue b/src/components/ReInfo/index.vue deleted file mode 100644 index 48ec647a7..000000000 --- a/src/components/ReInfo/index.vue +++ /dev/null @@ -1,232 +0,0 @@ - - - - - diff --git a/src/layout/components/sidebar/horizontal.vue b/src/layout/components/sidebar/horizontal.vue index 6d7d17e51..9e43bc62f 100644 --- a/src/layout/components/sidebar/horizontal.vue +++ b/src/layout/components/sidebar/horizontal.vue @@ -118,7 +118,7 @@ onMounted(() => {