diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json index 0eadafb73..458e9d444 100644 --- a/yudao-ui-admin-vue3/package.json +++ b/yudao-ui-admin-vue3/package.json @@ -78,8 +78,6 @@ "eslint-define-config": "^1.12.0", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-vue": "^9.7.0", - "sass": "^1.56.1", - "sass-loader": "^13.2.0", "lint-staged": "^13.0.3", "plop": "^3.1.1", "postcss": "^8.4.19", @@ -88,6 +86,7 @@ "prettier": "^2.8.0", "rimraf": "^3.0.2", "rollup": "^3.4.0", + "sass": "^1.56.1", "stylelint": "^14.15.0", "stylelint-config-html": "^1.1.0", "stylelint-config-prettier": "^9.0.4", @@ -103,6 +102,7 @@ "vite-plugin-purge-icons": "^0.9.1", "vite-plugin-style-import": "2.0.0", "vite-plugin-svg-icons": "^2.0.1", + "vite-plugin-vue-setup-extend": "^0.4.0", "vite-plugin-windicss": "^1.8.8", "vue-tsc": "^1.0.9", "windicss": "^3.5.6" diff --git a/yudao-ui-admin-vue3/pnpm-lock.yaml b/yudao-ui-admin-vue3/pnpm-lock.yaml index 01f5a3a61..e231af9b7 100644 --- a/yudao-ui-admin-vue3/pnpm-lock.yaml +++ b/yudao-ui-admin-vue3/pnpm-lock.yaml @@ -52,7 +52,6 @@ specifiers: rimraf: ^3.0.2 rollup: ^3.4.0 sass: ^1.56.1 - sass-loader: ^13.2.0 stylelint: ^14.15.0 stylelint-config-html: ^1.1.0 stylelint-config-prettier: ^9.0.4 @@ -69,6 +68,7 @@ specifiers: vite-plugin-purge-icons: ^0.9.1 vite-plugin-style-import: 2.0.0 vite-plugin-svg-icons: ^2.0.1 + vite-plugin-vue-setup-extend: ^0.4.0 vite-plugin-windicss: ^1.8.8 vue: 3.2.45 vue-cropper: ^1.0.3 @@ -144,7 +144,6 @@ devDependencies: rimraf: registry.npmmirror.com/rimraf/3.0.2 rollup: registry.npmmirror.com/rollup/3.4.0 sass: registry.npmmirror.com/sass/1.56.1 - sass-loader: registry.npmmirror.com/sass-loader/13.2.0_sass@1.56.1 stylelint: registry.npmmirror.com/stylelint/14.15.0 stylelint-config-html: registry.npmmirror.com/stylelint-config-html/1.1.0_qendsqix7hqecpnpx4fjs6qry4 stylelint-config-prettier: registry.npmmirror.com/stylelint-config-prettier/9.0.4_stylelint@14.15.0 @@ -160,6 +159,7 @@ devDependencies: vite-plugin-purge-icons: registry.npmmirror.com/vite-plugin-purge-icons/0.9.1_vite@3.2.4 vite-plugin-style-import: registry.npmmirror.com/vite-plugin-style-import/2.0.0_vite@3.2.4 vite-plugin-svg-icons: registry.npmmirror.com/vite-plugin-svg-icons/2.0.1_vite@3.2.4 + vite-plugin-vue-setup-extend: registry.npmmirror.com/vite-plugin-vue-setup-extend/0.4.0_vite@3.2.4 vite-plugin-windicss: registry.npmmirror.com/vite-plugin-windicss/1.8.8_vite@3.2.4 vue-tsc: registry.npmmirror.com/vue-tsc/1.0.9_typescript@4.9.3 windicss: registry.npmmirror.com/windicss/3.5.6 @@ -5528,13 +5528,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - registry.npmmirror.com/klona/2.0.5: - resolution: {integrity: sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/klona/-/klona-2.0.5.tgz} - name: klona - version: 2.0.5 - engines: {node: '>= 8'} - dev: true - registry.npmmirror.com/known-css-properties/0.26.0: resolution: {integrity: sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/known-css-properties/-/known-css-properties-0.26.0.tgz} name: known-css-properties @@ -7325,33 +7318,6 @@ packages: version: 2.1.2 dev: true - registry.npmmirror.com/sass-loader/13.2.0_sass@1.56.1: - resolution: {integrity: sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sass-loader/-/sass-loader-13.2.0.tgz} - id: registry.npmmirror.com/sass-loader/13.2.0 - name: sass-loader - version: 13.2.0 - engines: {node: '>= 14.15.0'} - peerDependencies: - fibers: '>= 3.1.0' - node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 - sass: ^1.3.0 - sass-embedded: '*' - webpack: ^5.0.0 - peerDependenciesMeta: - fibers: - optional: true - node-sass: - optional: true - sass: - optional: true - sass-embedded: - optional: true - dependencies: - klona: registry.npmmirror.com/klona/2.0.5 - neo-async: registry.npmmirror.com/neo-async/2.6.2 - sass: registry.npmmirror.com/sass/1.56.1 - dev: true - registry.npmmirror.com/sass/1.56.1: resolution: {integrity: sha512-VpEyKpyBPCxE7qGDtOcdJ6fFbcpOM+Emu7uZLxVrkX8KVU/Dp5UF7WLvzqRuUhB6mqqQt1xffLoG+AndxTZrCQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sass/-/sass-1.56.1.tgz} name: sass @@ -8567,6 +8533,19 @@ packages: - supports-color dev: true + registry.npmmirror.com/vite-plugin-vue-setup-extend/0.4.0_vite@3.2.4: + resolution: {integrity: sha512-WMbjPCui75fboFoUTHhdbXzu4Y/bJMv5N9QT9a7do3wNMNHHqrk+Tn2jrSJU0LS5fGl/EG+FEDBYVUeWIkDqXQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite-plugin-vue-setup-extend/-/vite-plugin-vue-setup-extend-0.4.0.tgz} + id: registry.npmmirror.com/vite-plugin-vue-setup-extend/0.4.0 + name: vite-plugin-vue-setup-extend + version: 0.4.0 + peerDependencies: + vite: '>=2.0.0' + dependencies: + '@vue/compiler-sfc': registry.npmmirror.com/@vue/compiler-sfc/3.2.45 + magic-string: registry.npmmirror.com/magic-string/0.25.9 + vite: registry.npmmirror.com/vite/3.2.4_ajklay5k626t46b6fyghkbup3i + dev: true + registry.npmmirror.com/vite-plugin-windicss/1.8.8_vite@3.2.4: resolution: {integrity: sha512-iyu+ZX0NmhNEUaLPv7xtC+EFRBpWMmw0nhd9a9upayfuNG/thwslKiQKmRB7U/dG0k/2oWLvPDvN/B9i7oRgSA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite-plugin-windicss/-/vite-plugin-windicss-1.8.8.tgz} id: registry.npmmirror.com/vite-plugin-windicss/1.8.8 diff --git a/yudao-ui-admin-vue3/src/views/system/dept/index.vue b/yudao-ui-admin-vue3/src/views/system/dept/index.vue index d7df0348c..a4d2f9ec9 100644 --- a/yudao-ui-admin-vue3/src/views/system/dept/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/dept/index.vue @@ -75,19 +75,19 @@ -