From 8a77c947109678c852cdcc9e60111076d85cfc4c Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Wed, 23 Nov 2022 15:18:59 +0800 Subject: [PATCH] refactor: less to scss --- yudao-ui-admin-vue3/README.md | 2 +- yudao-ui-admin-vue3/package.json | 7 +- yudao-ui-admin-vue3/pnpm-lock.yaml | 307 ++++++++---------- yudao-ui-admin-vue3/src/App.vue | 10 +- .../components/Breadcrumb/src/Breadcrumb.vue | 12 +- .../Descriptions/src/Descriptions.vue | 10 +- .../src/components/Dialog/src/Dialog.vue | 21 +- .../src/components/Form/src/Form.vue | 4 +- .../src/components/IFrame/src/IFrame.vue | 1 - .../src/components/Icon/src/IconSelect.vue | 2 +- .../InputPassword/src/InputPassword.vue | 8 +- .../src/components/Menu/src/Menu.vue | 64 ++-- .../src/components/Qrcode/src/Qrcode.vue | 6 +- .../src/components/Setting/src/Setting.vue | 6 +- .../src/components/ColorRadioPicker.vue | 6 +- .../src/components/LayoutRadioPicker.vue | 6 +- .../src/components/TabMenu/src/TabMenu.vue | 6 +- .../src/components/Table/src/Table.vue | 2 +- .../src/components/TagsView/src/TagsView.vue | 24 +- .../src/components/XButton/src/XButton.vue | 2 +- .../components/XButton/src/XTextButton.vue | 2 +- .../src/hooks/web/useDesign.ts | 8 +- yudao-ui-admin-vue3/src/layout/Layout.vue | 10 +- .../src/layout/components/ToolHeader.vue | 6 +- yudao-ui-admin-vue3/src/main.ts | 2 +- .../src/styles/global.module.scss | 6 + yudao-ui-admin-vue3/src/styles/index.less | 3 - yudao-ui-admin-vue3/src/styles/index.scss | 23 ++ yudao-ui-admin-vue3/src/styles/theme.less | 6 - .../src/styles/variables.module.less | 10 - yudao-ui-admin-vue3/src/styles/variables.scss | 4 + yudao-ui-admin-vue3/src/views/Home/Index2.vue | 18 +- yudao-ui-admin-vue3/src/views/Login/Login.vue | 6 +- .../src/views/Login/components/LoginForm.vue | 2 +- .../src/views/Login/components/MobileForm.vue | 2 +- yudao-ui-admin-vue3/vite.config.ts | 6 +- 36 files changed, 293 insertions(+), 327 deletions(-) create mode 100644 yudao-ui-admin-vue3/src/styles/global.module.scss delete mode 100644 yudao-ui-admin-vue3/src/styles/index.less create mode 100644 yudao-ui-admin-vue3/src/styles/index.scss delete mode 100644 yudao-ui-admin-vue3/src/styles/theme.less delete mode 100644 yudao-ui-admin-vue3/src/styles/variables.module.less create mode 100644 yudao-ui-admin-vue3/src/styles/variables.scss diff --git a/yudao-ui-admin-vue3/README.md b/yudao-ui-admin-vue3/README.md index 3d0e0100f..37011e08c 100644 --- a/yudao-ui-admin-vue3/README.md +++ b/yudao-ui-admin-vue3/README.md @@ -9,7 +9,7 @@ Prettier - Less + Sass Taiwind

diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json index 6bbb1c057..8e48a6e1d 100644 --- a/yudao-ui-admin-vue3/package.json +++ b/yudao-ui-admin-vue3/package.json @@ -18,7 +18,7 @@ "clean": "npx rimraf node_modules", "clean:cache": "npx rimraf node_modules/.cache", "lint:eslint": "eslint --fix --ext .js,.ts,.vue ./src", - "lint:format": "prettier --write --loglevel warn \"src/**/*.{js,ts,json,tsx,css,less,vue,html,md}\"", + "lint:format": "prettier --write --loglevel warn \"src/**/*.{js,ts,json,tsx,css,less,scss,vue,html,md}\"", "lint:style": "stylelint --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/", "lint:lint-staged": "lint-staged -c ", "lint:pretty": "pretty-quick --staged", @@ -78,12 +78,13 @@ "eslint-define-config": "^1.12.0", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-vue": "^9.7.0", - "less": "^4.1.3", + "sass": "^1.56.1", + "sass-loader": "^13.2.0", "lint-staged": "^13.0.3", "plop": "^3.1.1", "postcss": "^8.4.19", "postcss-html": "^1.5.0", - "postcss-less": "^6.0.0", + "postcss-scss": "^4.0.5", "prettier": "^2.7.1", "rimraf": "^3.0.2", "rollup": "^3.4.0", diff --git a/yudao-ui-admin-vue3/pnpm-lock.yaml b/yudao-ui-admin-vue3/pnpm-lock.yaml index 420b47a77..be936a64d 100644 --- a/yudao-ui-admin-vue3/pnpm-lock.yaml +++ b/yudao-ui-admin-vue3/pnpm-lock.yaml @@ -37,7 +37,6 @@ specifiers: intro.js: ^6.0.0 js-cookie: ^3.0.1 jsencrypt: ^3.3.1 - less: ^4.1.3 lint-staged: ^13.0.3 lodash-es: ^4.17.21 mitt: ^3.0.0 @@ -46,12 +45,14 @@ specifiers: plop: ^3.1.1 postcss: ^8.4.19 postcss-html: ^1.5.0 - postcss-less: ^6.0.0 + postcss-scss: ^4.0.5 prettier: ^2.7.1 qrcode: ^1.5.1 qs: ^6.11.0 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 @@ -134,15 +135,16 @@ devDependencies: eslint-define-config: registry.npmmirror.com/eslint-define-config/1.12.0 eslint-plugin-prettier: registry.npmmirror.com/eslint-plugin-prettier/4.2.1_pgxuib4rd7wiymfktharf5ydt4 eslint-plugin-vue: registry.npmmirror.com/eslint-plugin-vue/9.7.0_eslint@8.28.0 - less: registry.npmmirror.com/less/4.1.3 lint-staged: registry.npmmirror.com/lint-staged/13.0.3 plop: registry.npmmirror.com/plop/3.1.1 postcss: registry.npmmirror.com/postcss/8.4.19 postcss-html: registry.npmmirror.com/postcss-html/1.5.0 - postcss-less: registry.npmmirror.com/postcss-less/6.0.0_postcss@8.4.19 + postcss-scss: registry.npmmirror.com/postcss-scss/4.0.5_postcss@8.4.19 prettier: registry.npmmirror.com/prettier/2.7.1 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 @@ -150,7 +152,7 @@ devDependencies: stylelint-config-standard: registry.npmmirror.com/stylelint-config-standard/29.0.0_stylelint@14.15.0 stylelint-order: registry.npmmirror.com/stylelint-order/5.0.0_stylelint@14.15.0 typescript: registry.npmmirror.com/typescript/4.9.3 - vite: registry.npmmirror.com/vite/3.2.4_mp5lu76ee5qtwstsyca37sdhqi + vite: registry.npmmirror.com/vite/3.2.4_ajklay5k626t46b6fyghkbup3i vite-plugin-compression: registry.npmmirror.com/vite-plugin-compression/0.5.1_vite@3.2.4 vite-plugin-eslint: registry.npmmirror.com/vite-plugin-eslint/1.8.1_eslint@8.28.0+vite@3.2.4 vite-plugin-html: registry.npmmirror.com/vite-plugin-html/3.2.0_vite@3.2.4 @@ -987,7 +989,7 @@ packages: debug: registry.npmmirror.com/debug/4.3.4 fast-glob: registry.npmmirror.com/fast-glob/3.2.12 source-map: registry.npmmirror.com/source-map/0.6.1 - vite: registry.npmmirror.com/vite/3.2.4_mp5lu76ee5qtwstsyca37sdhqi + vite: registry.npmmirror.com/vite/3.2.4_ajklay5k626t46b6fyghkbup3i vue-i18n: registry.npmmirror.com/vue-i18n/9.2.2_vue@3.2.45 transitivePeerDependencies: - supports-color @@ -1540,7 +1542,7 @@ packages: '@babel/core': registry.npmmirror.com/@babel/core/7.20.2 '@babel/plugin-transform-typescript': registry.npmmirror.com/@babel/plugin-transform-typescript/7.20.2_@babel+core@7.20.2 '@vue/babel-plugin-jsx': registry.npmmirror.com/@vue/babel-plugin-jsx/1.1.1_@babel+core@7.20.2 - vite: registry.npmmirror.com/vite/3.2.4_mp5lu76ee5qtwstsyca37sdhqi + vite: registry.npmmirror.com/vite/3.2.4_ajklay5k626t46b6fyghkbup3i vue: registry.npmmirror.com/vue/3.2.45 transitivePeerDependencies: - supports-color @@ -1556,7 +1558,7 @@ packages: vite: ^3.0.0 vue: ^3.2.25 dependencies: - vite: registry.npmmirror.com/vite/3.2.4_mp5lu76ee5qtwstsyca37sdhqi + vite: registry.npmmirror.com/vite/3.2.4_ajklay5k626t46b6fyghkbup3i vue: registry.npmmirror.com/vue/3.2.45 dev: true @@ -2167,6 +2169,16 @@ packages: engines: {node: '>=12'} dev: true + registry.npmmirror.com/anymatch/3.1.3: + resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz} + name: anymatch + version: 3.1.3 + engines: {node: '>= 8'} + dependencies: + normalize-path: registry.npmmirror.com/normalize-path/3.0.0 + picomatch: registry.npmmirror.com/picomatch/2.3.1 + dev: true + registry.npmmirror.com/arg/4.1.3: resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/arg/-/arg-4.1.3.tgz} name: arg @@ -2362,6 +2374,13 @@ packages: version: 5.2.2 dev: true + registry.npmmirror.com/binary-extensions/2.2.0: + resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz} + name: binary-extensions + version: 2.2.0 + engines: {node: '>=8'} + dev: true + registry.npmmirror.com/bl/4.1.0: resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/bl/-/bl-4.1.0.tgz} name: bl @@ -2625,6 +2644,23 @@ packages: version: 0.7.0 dev: true + registry.npmmirror.com/chokidar/3.5.3: + resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz} + name: chokidar + version: 3.5.3 + engines: {node: '>= 8.10.0'} + dependencies: + anymatch: registry.npmmirror.com/anymatch/3.1.3 + braces: registry.npmmirror.com/braces/3.0.2 + glob-parent: registry.npmmirror.com/glob-parent/5.1.2 + is-binary-path: registry.npmmirror.com/is-binary-path/2.1.0 + is-glob: registry.npmmirror.com/is-glob/4.0.3 + normalize-path: registry.npmmirror.com/normalize-path/3.0.0 + readdirp: registry.npmmirror.com/readdirp/3.6.0 + optionalDependencies: + fsevents: registry.npmmirror.com/fsevents/2.3.2 + dev: true + registry.npmmirror.com/class-utils/0.3.6: resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/class-utils/-/class-utils-0.3.6.tgz} name: class-utils @@ -2923,14 +2959,6 @@ packages: version: 1.9.0 dev: true - registry.npmmirror.com/copy-anything/2.0.6: - resolution: {integrity: sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/copy-anything/-/copy-anything-2.0.6.tgz} - name: copy-anything - version: 2.0.6 - dependencies: - is-what: registry.npmmirror.com/is-what/3.14.1 - dev: true - registry.npmmirror.com/copy-descriptor/0.1.1: resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz} name: copy-descriptor @@ -3111,20 +3139,6 @@ packages: ms: registry.npmmirror.com/ms/2.0.0 dev: true - registry.npmmirror.com/debug/3.2.7: - resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/debug/-/debug-3.2.7.tgz} - name: debug - version: 3.2.7 - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: registry.npmmirror.com/ms/2.1.3 - dev: true - optional: true - registry.npmmirror.com/debug/4.3.4: resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz} name: debug @@ -3514,17 +3528,6 @@ packages: engines: {node: '>=0.12'} dev: true - registry.npmmirror.com/errno/0.1.8: - resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/errno/-/errno-0.1.8.tgz} - name: errno - version: 0.1.8 - hasBin: true - requiresBuild: true - dependencies: - prr: registry.npmmirror.com/prr/1.0.1 - dev: true - optional: true - registry.npmmirror.com/error-ex/1.3.2: resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/error-ex/-/error-ex-1.3.2.tgz} name: error-ex @@ -4903,16 +4906,6 @@ packages: safer-buffer: registry.npmmirror.com/safer-buffer/2.1.2 dev: true - registry.npmmirror.com/iconv-lite/0.6.3: - resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.6.3.tgz} - name: iconv-lite - version: 0.6.3 - engines: {node: '>=0.10.0'} - dependencies: - safer-buffer: registry.npmmirror.com/safer-buffer/2.1.2 - dev: true - optional: true - registry.npmmirror.com/ieee754/1.2.1: resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz} name: ieee754 @@ -4940,6 +4933,12 @@ packages: version: 9.0.16 dev: false + registry.npmmirror.com/immutable/4.1.0: + resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/immutable/-/immutable-4.1.0.tgz} + name: immutable + version: 4.1.0 + dev: true + registry.npmmirror.com/import-fresh/3.3.0: resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/import-fresh/-/import-fresh-3.3.0.tgz} name: import-fresh @@ -5062,6 +5061,15 @@ packages: version: 0.2.1 dev: true + registry.npmmirror.com/is-binary-path/2.1.0: + resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz} + name: is-binary-path + version: 2.1.0 + engines: {node: '>=8'} + dependencies: + binary-extensions: registry.npmmirror.com/binary-extensions/2.2.0 + dev: true + registry.npmmirror.com/is-buffer/1.1.6: resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz} name: is-buffer @@ -5301,12 +5309,6 @@ packages: version: 1.2.4 dev: false - registry.npmmirror.com/is-what/3.14.1: - resolution: {integrity: sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-what/-/is-what-3.14.1.tgz} - name: is-what - version: 3.14.1 - dev: true - registry.npmmirror.com/is-windows/1.0.2: resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/is-windows/-/is-windows-1.0.2.tgz} name: is-windows @@ -5526,6 +5528,13 @@ 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 @@ -5538,28 +5547,6 @@ packages: version: 1.6.0 dev: true - registry.npmmirror.com/less/4.1.3: - resolution: {integrity: sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/less/-/less-4.1.3.tgz} - name: less - version: 4.1.3 - engines: {node: '>=6'} - hasBin: true - dependencies: - copy-anything: registry.npmmirror.com/copy-anything/2.0.6 - parse-node-version: registry.npmmirror.com/parse-node-version/1.0.1 - tslib: registry.npmmirror.com/tslib/2.4.1 - optionalDependencies: - errno: registry.npmmirror.com/errno/0.1.8 - graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10 - image-size: registry.npmmirror.com/image-size/0.5.5 - make-dir: registry.npmmirror.com/make-dir/2.1.0 - mime: registry.npmmirror.com/mime/1.6.0 - needle: registry.npmmirror.com/needle/3.2.0 - source-map: registry.npmmirror.com/source-map/0.6.1 - transitivePeerDependencies: - - supports-color - dev: true - registry.npmmirror.com/levn/0.4.1: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/levn/-/levn-0.4.1.tgz} name: levn @@ -5871,18 +5858,6 @@ packages: sourcemap-codec: registry.npmmirror.com/sourcemap-codec/1.4.8 dev: true - registry.npmmirror.com/make-dir/2.1.0: - resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/make-dir/-/make-dir-2.1.0.tgz} - name: make-dir - version: 2.1.0 - engines: {node: '>=6'} - requiresBuild: true - dependencies: - pify: registry.npmmirror.com/pify/4.0.1 - semver: registry.npmmirror.com/semver/5.7.1 - dev: true - optional: true - registry.npmmirror.com/make-error/1.3.6: resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/make-error/-/make-error-1.3.6.tgz} name: make-error @@ -6064,16 +6039,6 @@ packages: mime-db: registry.npmmirror.com/mime-db/1.52.0 dev: false - registry.npmmirror.com/mime/1.6.0: - resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz} - name: mime - version: 1.6.0 - engines: {node: '>=4'} - hasBin: true - requiresBuild: true - dev: true - optional: true - registry.npmmirror.com/mimic-fn/2.1.0: resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/mimic-fn/-/mimic-fn-2.1.0.tgz} name: mimic-fn @@ -6165,13 +6130,6 @@ packages: version: 2.1.2 dev: true - registry.npmmirror.com/ms/2.1.3: - resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz} - name: ms - version: 2.1.3 - dev: true - optional: true - registry.npmmirror.com/muggle-string/0.1.0: resolution: {integrity: sha512-Tr1knR3d2mKvvWthlk7202rywKbiOm4rVFLsfAaSIhJ6dt9o47W4S+JMtWhd/PW9Wrdew2/S2fSvhz3E2gkfEg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/muggle-string/-/muggle-string-0.1.0.tgz} name: muggle-string @@ -6230,22 +6188,6 @@ packages: version: 1.4.0 dev: true - registry.npmmirror.com/needle/3.2.0: - resolution: {integrity: sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/needle/-/needle-3.2.0.tgz} - name: needle - version: 3.2.0 - engines: {node: '>= 4.4.x'} - hasBin: true - requiresBuild: true - dependencies: - debug: registry.npmmirror.com/debug/3.2.7 - iconv-lite: registry.npmmirror.com/iconv-lite/0.6.3 - sax: registry.npmmirror.com/sax/1.2.4 - transitivePeerDependencies: - - supports-color - dev: true - optional: true - registry.npmmirror.com/neo-async/2.6.2: resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/neo-async/-/neo-async-2.6.2.tgz} name: neo-async @@ -6626,13 +6568,6 @@ packages: lines-and-columns: registry.npmmirror.com/lines-and-columns/1.2.4 dev: true - registry.npmmirror.com/parse-node-version/1.0.1: - resolution: {integrity: sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/parse-node-version/-/parse-node-version-1.0.1.tgz} - name: parse-node-version - version: 1.0.1 - engines: {node: '>= 0.10'} - dev: true - registry.npmmirror.com/parse-passwd/1.0.0: resolution: {integrity: sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/parse-passwd/-/parse-passwd-1.0.0.tgz} name: parse-passwd @@ -6753,14 +6688,6 @@ packages: hasBin: true dev: true - registry.npmmirror.com/pify/4.0.1: - resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pify/-/pify-4.0.1.tgz} - name: pify - version: 4.0.1 - engines: {node: '>=6'} - dev: true - optional: true - registry.npmmirror.com/pinia/2.0.25_mgnvym7yiazkylwwogi5r767ue: resolution: {integrity: sha512-3reAkjJ6bW2D5hZKRMS0c9rUbHVlsVyZd037xO0PJr2AuF/09RRSBnFLlJgmHF4Jx6dEoW/jZBOHTushY7IMlw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/pinia/-/pinia-2.0.25.tgz} id: registry.npmmirror.com/pinia/2.0.25 @@ -6825,18 +6752,6 @@ packages: postcss-safe-parser: registry.npmmirror.com/postcss-safe-parser/6.0.0_postcss@8.4.19 dev: true - registry.npmmirror.com/postcss-less/6.0.0_postcss@8.4.19: - resolution: {integrity: sha512-FPX16mQLyEjLzEuuJtxA8X3ejDLNGGEG503d2YGZR5Ask1SpDN8KmZUMpzCvyalWRywAn1n1VOA5dcqfCLo5rg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/postcss-less/-/postcss-less-6.0.0.tgz} - id: registry.npmmirror.com/postcss-less/6.0.0 - name: postcss-less - version: 6.0.0 - engines: {node: '>=12'} - peerDependencies: - postcss: ^8.3.5 - dependencies: - postcss: registry.npmmirror.com/postcss/8.4.19 - dev: true - registry.npmmirror.com/postcss-media-query-parser/0.2.3: resolution: {integrity: sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz} name: postcss-media-query-parser @@ -6872,6 +6787,18 @@ packages: postcss: registry.npmmirror.com/postcss/8.4.19 dev: true + registry.npmmirror.com/postcss-scss/4.0.5_postcss@8.4.19: + resolution: {integrity: sha512-F7xpB6TrXyqUh3GKdyB4Gkp3QL3DDW1+uI+gxx/oJnUt/qXI4trj5OGlp9rOKdoABGULuqtqeG+3HEVQk4DjmA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/postcss-scss/-/postcss-scss-4.0.5.tgz} + id: registry.npmmirror.com/postcss-scss/4.0.5 + name: postcss-scss + version: 4.0.5 + engines: {node: '>=12.0'} + peerDependencies: + postcss: ^8.3.3 + dependencies: + postcss: registry.npmmirror.com/postcss/8.4.19 + dev: true + registry.npmmirror.com/postcss-selector-parser/6.0.10: resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz} name: postcss-selector-parser @@ -7016,13 +6943,6 @@ packages: version: 1.1.0 dev: false - registry.npmmirror.com/prr/1.0.1: - resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/prr/-/prr-1.0.1.tgz} - name: prr - version: 1.0.1 - dev: true - optional: true - registry.npmmirror.com/punycode/1.3.2: resolution: {integrity: sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/punycode/-/punycode-1.3.2.tgz} name: punycode @@ -7138,6 +7058,15 @@ packages: util-deprecate: registry.npmmirror.com/util-deprecate/1.0.2 dev: true + registry.npmmirror.com/readdirp/3.6.0: + resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz} + name: readdirp + version: 3.6.0 + engines: {node: '>=8.10.0'} + dependencies: + picomatch: registry.npmmirror.com/picomatch/2.3.1 + dev: true + registry.npmmirror.com/rechoir/0.8.0: resolution: {integrity: sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/rechoir/-/rechoir-0.8.0.tgz} name: rechoir @@ -7396,12 +7325,44 @@ packages: version: 2.1.2 dev: true - registry.npmmirror.com/sax/1.2.4: - resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/sax/-/sax-1.2.4.tgz} - name: sax - version: 1.2.4 + 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 + version: 1.56.1 + engines: {node: '>=12.0.0'} + hasBin: true + dependencies: + chokidar: registry.npmmirror.com/chokidar/3.5.3 + immutable: registry.npmmirror.com/immutable/4.1.0 + source-map-js: registry.npmmirror.com/source-map-js/1.0.2 dev: true - optional: true registry.npmmirror.com/scroll-into-view-if-needed/2.2.29: resolution: {integrity: sha512-hxpAR6AN+Gh53AdAimHM6C8oTN1ppwVZITihix+WqalywBeFcQ6LdQP5ABNl26nX8GTEL7VT+b8lKpdqq65wXg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.29.tgz} @@ -8490,7 +8451,7 @@ packages: chalk: registry.npmmirror.com/chalk/4.1.2 debug: registry.npmmirror.com/debug/4.3.4 fs-extra: registry.npmmirror.com/fs-extra/10.1.0 - vite: registry.npmmirror.com/vite/3.2.4_mp5lu76ee5qtwstsyca37sdhqi + vite: registry.npmmirror.com/vite/3.2.4_ajklay5k626t46b6fyghkbup3i transitivePeerDependencies: - supports-color dev: true @@ -8508,7 +8469,7 @@ packages: '@types/eslint': registry.npmmirror.com/@types/eslint/8.4.10 eslint: registry.npmmirror.com/eslint/8.28.0 rollup: registry.npmmirror.com/rollup/2.79.1 - vite: registry.npmmirror.com/vite/3.2.4_mp5lu76ee5qtwstsyca37sdhqi + vite: registry.npmmirror.com/vite/3.2.4_ajklay5k626t46b6fyghkbup3i dev: true registry.npmmirror.com/vite-plugin-html/3.2.0_vite@3.2.4: @@ -8531,7 +8492,7 @@ packages: html-minifier-terser: registry.npmmirror.com/html-minifier-terser/6.1.0 node-html-parser: registry.npmmirror.com/node-html-parser/5.4.2 pathe: registry.npmmirror.com/pathe/0.2.0 - vite: registry.npmmirror.com/vite/3.2.4_mp5lu76ee5qtwstsyca37sdhqi + vite: registry.npmmirror.com/vite/3.2.4_ajklay5k626t46b6fyghkbup3i dev: true registry.npmmirror.com/vite-plugin-progress/0.0.6_vite@3.2.4: @@ -8546,7 +8507,7 @@ packages: picocolors: registry.npmmirror.com/picocolors/1.0.0 progress: registry.npmmirror.com/progress/2.0.3 rd: registry.npmmirror.com/rd/2.0.1 - vite: registry.npmmirror.com/vite/3.2.4_mp5lu76ee5qtwstsyca37sdhqi + vite: registry.npmmirror.com/vite/3.2.4_ajklay5k626t46b6fyghkbup3i dev: true registry.npmmirror.com/vite-plugin-purge-icons/0.9.1_vite@3.2.4: @@ -8561,7 +8522,7 @@ packages: '@purge-icons/core': registry.npmmirror.com/@purge-icons/core/0.9.1 '@purge-icons/generated': registry.npmmirror.com/@purge-icons/generated/0.9.0 rollup-plugin-purge-icons: registry.npmmirror.com/rollup-plugin-purge-icons/0.9.1 - vite: registry.npmmirror.com/vite/3.2.4_mp5lu76ee5qtwstsyca37sdhqi + vite: registry.npmmirror.com/vite/3.2.4_ajklay5k626t46b6fyghkbup3i transitivePeerDependencies: - encoding - supports-color @@ -8582,7 +8543,7 @@ packages: fs-extra: registry.npmmirror.com/fs-extra/10.1.0 magic-string: registry.npmmirror.com/magic-string/0.25.9 pathe: registry.npmmirror.com/pathe/0.2.0 - vite: registry.npmmirror.com/vite/3.2.4_mp5lu76ee5qtwstsyca37sdhqi + vite: registry.npmmirror.com/vite/3.2.4_ajklay5k626t46b6fyghkbup3i dev: true registry.npmmirror.com/vite-plugin-svg-icons/2.0.1_vite@3.2.4: @@ -8601,7 +8562,7 @@ packages: pathe: registry.npmmirror.com/pathe/0.2.0 svg-baker: registry.npmmirror.com/svg-baker/1.7.0 svgo: registry.npmmirror.com/svgo/2.8.0 - vite: registry.npmmirror.com/vite/3.2.4_mp5lu76ee5qtwstsyca37sdhqi + vite: registry.npmmirror.com/vite/3.2.4_ajklay5k626t46b6fyghkbup3i transitivePeerDependencies: - supports-color dev: true @@ -8617,13 +8578,13 @@ packages: '@windicss/plugin-utils': registry.npmmirror.com/@windicss/plugin-utils/1.8.8 debug: registry.npmmirror.com/debug/4.3.4 kolorist: registry.npmmirror.com/kolorist/1.6.0 - vite: registry.npmmirror.com/vite/3.2.4_mp5lu76ee5qtwstsyca37sdhqi + vite: registry.npmmirror.com/vite/3.2.4_ajklay5k626t46b6fyghkbup3i windicss: registry.npmmirror.com/windicss/3.5.6 transitivePeerDependencies: - supports-color dev: true - registry.npmmirror.com/vite/3.2.4_mp5lu76ee5qtwstsyca37sdhqi: + registry.npmmirror.com/vite/3.2.4_ajklay5k626t46b6fyghkbup3i: resolution: {integrity: sha512-Z2X6SRAffOUYTa+sLy3NQ7nlHFU100xwanq1WDwqaiFiCe+25zdxP1TfCS5ojPV2oDDcXudHIoPnI1Z/66B7Yw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/vite/-/vite-3.2.4.tgz} id: registry.npmmirror.com/vite/3.2.4 name: vite @@ -8653,10 +8614,10 @@ packages: dependencies: '@types/node': registry.npmmirror.com/@types/node/18.11.9 esbuild: registry.npmmirror.com/esbuild/0.15.14 - less: registry.npmmirror.com/less/4.1.3 postcss: registry.npmmirror.com/postcss/8.4.19 resolve: registry.npmmirror.com/resolve/1.22.1 rollup: registry.npmmirror.com/rollup/2.79.1 + sass: registry.npmmirror.com/sass/1.56.1 optionalDependencies: fsevents: registry.npmmirror.com/fsevents/2.3.2 dev: true diff --git a/yudao-ui-admin-vue3/src/App.vue b/yudao-ui-admin-vue3/src/App.vue index 1ce059439..6ffa53649 100644 --- a/yudao-ui-admin-vue3/src/App.vue +++ b/yudao-ui-admin-vue3/src/App.vue @@ -33,8 +33,8 @@ const setDefaultTheme = () => { setDefaultTheme() - diff --git a/yudao-ui-admin-vue3/src/components/Breadcrumb/src/Breadcrumb.vue b/yudao-ui-admin-vue3/src/components/Breadcrumb/src/Breadcrumb.vue index bbbbc1970..47aa762fd 100644 --- a/yudao-ui-admin-vue3/src/components/Breadcrumb/src/Breadcrumb.vue +++ b/yudao-ui-admin-vue3/src/components/Breadcrumb/src/Breadcrumb.vue @@ -87,13 +87,13 @@ export default defineComponent({ }) - - diff --git a/yudao-ui-admin-vue3/src/components/Setting/src/components/ColorRadioPicker.vue b/yudao-ui-admin-vue3/src/components/Setting/src/components/ColorRadioPicker.vue index bc40e1067..9787ea7f8 100644 --- a/yudao-ui-admin-vue3/src/components/Setting/src/components/ColorRadioPicker.vue +++ b/yudao-ui-admin-vue3/src/components/Setting/src/components/ColorRadioPicker.vue @@ -54,10 +54,10 @@ watch( - diff --git a/yudao-ui-admin-vue3/src/main.ts b/yudao-ui-admin-vue3/src/main.ts index 03369099d..a7341b7ee 100644 --- a/yudao-ui-admin-vue3/src/main.ts +++ b/yudao-ui-admin-vue3/src/main.ts @@ -20,7 +20,7 @@ import { setupElementPlus } from '@/plugins/elementPlus' import { setupVxeTable } from '@/plugins/vxeTable' // 引入全局样式 -import '@/styles/index.less' +import '@/styles/index.scss' // 引入动画 import '@/plugins/animate.css' diff --git a/yudao-ui-admin-vue3/src/styles/global.module.scss b/yudao-ui-admin-vue3/src/styles/global.module.scss new file mode 100644 index 000000000..8448a9241 --- /dev/null +++ b/yudao-ui-admin-vue3/src/styles/global.module.scss @@ -0,0 +1,6 @@ +@import './variables.scss'; +// 导出变量 +:export { + namespace: $namespace; + elNamespace: $elNamespace; +} diff --git a/yudao-ui-admin-vue3/src/styles/index.less b/yudao-ui-admin-vue3/src/styles/index.less deleted file mode 100644 index 10da30cf4..000000000 --- a/yudao-ui-admin-vue3/src/styles/index.less +++ /dev/null @@ -1,3 +0,0 @@ -@import './var.css'; -@import './vxe.css'; -@import 'element-plus/theme-chalk/dark/css-vars.css'; diff --git a/yudao-ui-admin-vue3/src/styles/index.scss b/yudao-ui-admin-vue3/src/styles/index.scss new file mode 100644 index 000000000..d53c2a6c1 --- /dev/null +++ b/yudao-ui-admin-vue3/src/styles/index.scss @@ -0,0 +1,23 @@ +@import './var.css'; +@import './vxe.css'; +@import 'element-plus/theme-chalk/dark/css-vars.css'; + +.reset-margin [class*='el-icon'] + span { + margin-left: 2px !important; +} + +/* nprogress 适配 element-plus 的主题色 */ +#nprogress { + & .bar { + background-color: var(--el-color-primary) !important; + } + + & .peg { + box-shadow: 0 0 10px var(--el-color-primary), 0 0 5px var(--el-color-primary) !important; + } + + & .spinner-icon { + border-top-color: var(--el-color-primary); + border-left-color: var(--el-color-primary); + } +} diff --git a/yudao-ui-admin-vue3/src/styles/theme.less b/yudao-ui-admin-vue3/src/styles/theme.less deleted file mode 100644 index 39b03b3dd..000000000 --- a/yudao-ui-admin-vue3/src/styles/theme.less +++ /dev/null @@ -1,6 +0,0 @@ -// .text-color { -// color: var(--el-text-color-regular); -// } -// .dark .dark\:text-color { -// color: rgba(255, 255, 255, var(--dark-text-color)); -// } diff --git a/yudao-ui-admin-vue3/src/styles/variables.module.less b/yudao-ui-admin-vue3/src/styles/variables.module.less deleted file mode 100644 index e97028d22..000000000 --- a/yudao-ui-admin-vue3/src/styles/variables.module.less +++ /dev/null @@ -1,10 +0,0 @@ -// 命名空间 -@namespace: v; -// el命名空间 -@elNamespace: el; - -// 导出变量 -:export { - namespace: @namespace; - elNamespace: @elNamespace; -} diff --git a/yudao-ui-admin-vue3/src/styles/variables.scss b/yudao-ui-admin-vue3/src/styles/variables.scss new file mode 100644 index 000000000..00b66f1fc --- /dev/null +++ b/yudao-ui-admin-vue3/src/styles/variables.scss @@ -0,0 +1,4 @@ +// 命名空间 +$namespace: v; +// el命名空间 +$elNamespace: el; diff --git a/yudao-ui-admin-vue3/src/views/Home/Index2.vue b/yudao-ui-admin-vue3/src/views/Home/Index2.vue index fed930406..de91eb54c 100644 --- a/yudao-ui-admin-vue3/src/views/Home/Index2.vue +++ b/yudao-ui-admin-vue3/src/views/Home/Index2.vue @@ -270,10 +270,10 @@ const getAllApi = async () => { getAllApi() -