From d6af3e9d33f696c052ba089a4f1269cb31294903 Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Mon, 28 Nov 2022 01:47:28 +0800 Subject: [PATCH] release: update `3.8.7` --- build/plugins.ts | 4 +- package.json | 4 +- pnpm-lock.yaml | 271 ++------------------------------------------ public/serverConfig.json | 2 +- src/style/dark.scss | 7 ++ src/style/element-plus.scss | 7 ++ tsconfig.json | 1 - types/global.d.ts | 1 + 8 files changed, 27 insertions(+), 270 deletions(-) diff --git a/build/plugins.ts b/build/plugins.ts index d86aa5a..85c8240 100644 --- a/build/plugins.ts +++ b/build/plugins.ts @@ -4,7 +4,6 @@ import vue from "@vitejs/plugin-vue"; import { viteBuildInfo } from "./info"; import svgLoader from "vite-svg-loader"; import vueJsx from "@vitejs/plugin-vue-jsx"; -import VueMacros from "unplugin-vue-macros/vite"; import { viteMockServe } from "vite-plugin-mock"; import { configCompressPlugin } from "./compress"; import VueI18n from "@intlify/vite-plugin-vue-i18n"; @@ -12,6 +11,7 @@ import VueI18n from "@intlify/vite-plugin-vue-i18n"; import { visualizer } from "rollup-plugin-visualizer"; import removeConsole from "vite-plugin-remove-console"; import themePreprocessorPlugin from "@pureadmin/theme"; +import DefineOptions from "unplugin-vue-define-options/vite"; import { genScssMultipleScopeVars } from "../src/layout/theme"; export function getPluginsList( @@ -33,7 +33,7 @@ export function getPluginsList( vueJsx(), VITE_CDN ? cdn : null, configCompressPlugin(VITE_COMPRESSION), - VueMacros(), + DefineOptions(), // 线上环境删除console removeConsole({ external: ["src/assets/iconfont/iconfont.js"] }), viteBuildInfo(), diff --git a/package.json b/package.json index 30da693..b4caf3e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pure-admin-thin", - "version": "3.8.6", + "version": "3.8.7", "private": true, "scripts": { "dev": "NODE_OPTIONS=--max-old-space-size=4096 vite", @@ -112,7 +112,7 @@ "tailwindcss": "^3.2.4", "terser": "^5.15.1", "typescript": "^4.9.3", - "unplugin-vue-macros": "^1.0.3", + "unplugin-vue-define-options": "^1.0.0", "vite": "3.1.8", "vite-plugin-cdn-import": "^0.3.5", "vite-plugin-compression": "^0.5.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 51b042a..8bd58ba 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -76,7 +76,7 @@ specifiers: tailwindcss: ^3.2.4 terser: ^5.15.1 typescript: ^4.9.3 - unplugin-vue-macros: ^1.0.3 + unplugin-vue-define-options: ^1.0.0 vite: 3.1.8 vite-plugin-cdn-import: ^0.3.5 vite-plugin-compression: ^0.5.1 @@ -176,7 +176,7 @@ devDependencies: tailwindcss: 3.2.4_postcss@8.4.19 terser: 5.16.0 typescript: 4.9.3 - unplugin-vue-macros: 1.0.3_5wosmox4cb7ovevlqdhap7knuu + unplugin-vue-define-options: 1.0.0 vite: 3.1.8_sass@1.56.1+terser@5.16.0 vite-plugin-cdn-import: 0.3.5 vite-plugin-compression: 0.5.1_vite@3.1.8 @@ -198,13 +198,6 @@ packages: "@jridgewell/trace-mapping": 0.3.17 dev: true - /@antfu/utils/0.6.3: - resolution: - { - integrity: sha512-sEYpyyKUPOew9QsXZ8feRVMzW6DWLviwOl+/ap06UQW02A8Srbc95CPHVm4eUbiBzBgD46eyIT+przv//KSSlQ== - } - dev: true - /@babel/code-frame/7.18.6: resolution: { @@ -1419,6 +1412,7 @@ packages: { integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ== } + dev: false /@typescript-eslint/eslint-plugin/5.44.0_fnsv2sbzcckq65bwfk7a5xwslu: resolution: @@ -1680,30 +1674,6 @@ packages: "@volar/vue-language-core": 1.0.9 dev: true - /@vue-macros/api/0.2.0: - resolution: - { - integrity: sha512-E0rhhszd3MSE8l+A78gj9ONs4lsqOLHpONNzrc7H2nlPhEDsp4ZyQt+A9rRfxX+BTeLYfq64mli2qRV0tixiaw== - } - engines: { node: ">=14.19.0" } - dependencies: - "@babel/types": 7.20.2 - "@vue-macros/common": 0.13.4 - dev: true - - /@vue-macros/better-define/1.0.0: - resolution: - { - integrity: sha512-SVQky3fk9wRrSH153Tw1+0sP5i6OB5iiUOtAC/mceH0IN5NGbDXt2YagELEM2+6caDquXNRL6jbG0HfRH6u0cA== - } - engines: { node: ">=14.19.0" } - dependencies: - "@rollup/pluginutils": 4.2.1 - "@vue-macros/api": 0.2.0 - "@vue-macros/common": 0.13.4 - unplugin: 1.0.0 - dev: true - /@vue-macros/common/0.13.4: resolution: { @@ -1716,158 +1686,6 @@ packages: magic-string: 0.26.7 dev: true - /@vue-macros/define-model/1.0.0_@vueuse+core@9.6.0: - resolution: - { - integrity: sha512-Nyh1fidDcfCzEKAo/ljwdQbpgMOrNowdJomB/qnkz/Lx4CVEaRk87LA2o3T99qIOogRfya8af+bLM8dNOq8dAQ== - } - engines: { node: ">=14.19.0" } - peerDependencies: - "@vueuse/core": ^9.0.0 - peerDependenciesMeta: - "@vueuse/core": - optional: true - dependencies: - "@rollup/pluginutils": 4.2.1 - "@vue-macros/common": 0.13.4 - "@vueuse/core": 9.6.0_vue@3.2.45 - ast-walker-scope: 0.3.0 - unplugin: 1.0.0 - dev: true - - /@vue-macros/define-props/0.0.3_vue@3.2.45: - resolution: - { - integrity: sha512-GAiALWSrIogwdjbIe60Hi4CSvWFmZG7KySK8JBf7lszWNgoSirj/NKzmJOaHY0/I217tfq4Ew/brbdvcEhCikg== - } - engines: { node: ">=14.19.0" } - peerDependencies: - vue: ^3.2.25 - dependencies: - "@rollup/pluginutils": 4.2.1 - "@vue-macros/common": 0.13.4 - unplugin: 1.0.0 - vue: 3.2.45 - dev: true - - /@vue-macros/define-render/1.0.1_vue@3.2.45: - resolution: - { - integrity: sha512-B4ttYDZkXqVuciN23WNuVnr6L8dKrxEvz74gaYTXbdybv9jLEYMagSm/nFBLin+32EGYKeZu/D393r2EGAzeNg== - } - engines: { node: ">=14.19.0" } - peerDependencies: - vue: ^2.7.0 || ^3.0.0 - dependencies: - "@rollup/pluginutils": 4.2.1 - "@vue-macros/common": 0.13.4 - unplugin: 1.0.0 - vue: 3.2.45 - dev: true - - /@vue-macros/define-slots/0.0.6_vue@3.2.45: - resolution: - { - integrity: sha512-pK4P/oUjcrP/Rr5clsV2eZ53OJ3QlU2fZlnn91w++L0+lio+0M06ptr/IkHNVLNQ9U9Z43MkjHkMLX8Df8BknA== - } - engines: { node: ">=14.19.0" } - peerDependencies: - vue: ^2.7.0 || ^3.0.0 - dependencies: - "@rollup/pluginutils": 4.2.1 - "@vue-macros/common": 0.13.4 - unplugin: 1.0.0 - vue: 3.2.45 - dev: true - - /@vue-macros/hoist-static/1.0.0: - resolution: - { - integrity: sha512-NcFVAfKM9UjChOXy+yno4vhTsSHT6qUKbmd4/I8ucoiJT8IfFyGCwFoZZ8uqgjIwlzSUDxJ/vYoDRjiziTiNKg== - } - engines: { node: ">=14.19.0" } - dependencies: - "@rollup/pluginutils": 4.2.1 - "@vue-macros/common": 0.13.4 - unplugin: 1.0.0 - dev: true - - /@vue-macros/named-template/0.0.6_vite@3.1.8+vue@3.2.45: - resolution: - { - integrity: sha512-nEoutSYbwu7QC+uWcs90rD28erP6xZ0aU4uYnrxTUnVcbga9xMchxcs3MgI/2ax6dz/EXf1f1utYXXpGgLi+Tw== - } - engines: { node: ">=14.19.0" } - dependencies: - "@rollup/pluginutils": 4.2.1 - "@vitejs/plugin-vue": 3.2.0_vite@3.1.8+vue@3.2.45 - "@vue-macros/common": 0.13.4 - "@vue/compiler-dom": 3.2.45 - unplugin: 1.0.0 - unplugin-combine: 0.2.8_vite@3.1.8 - transitivePeerDependencies: - - esbuild - - rollup - - vite - - vue - - webpack - dev: true - - /@vue-macros/setup-block/0.0.1: - resolution: - { - integrity: sha512-Zr7yudMN7Q+8Rb/4ZuZzNewHTejeH9fbt3104sFK53XqL4uLkDCz0fIG2AD9bR71RA+12H+yqn/jQ3vP4OaKGA== - } - engines: { node: ">=14.19.0" } - dependencies: - "@rollup/pluginutils": 4.2.1 - "@vue-macros/common": 0.13.4 - "@vue/compiler-dom": 3.2.45 - unplugin: 1.0.0 - dev: true - - /@vue-macros/setup-component/0.12.8_vite@3.1.8: - resolution: - { - integrity: sha512-2tRMl8l8OYMpIRYsZyAZfH0dNT7CONMTcmdGEffJb5GvK8XOmdgGk7NFUhaQg3EEnk1SUq1Kdcx+gyH/a0qE4A== - } - engines: { node: ">=14.19.0" } - dependencies: - "@rollup/pluginutils": 4.2.1 - "@vue-macros/common": 0.13.4 - unplugin: 1.0.0 - unplugin-combine: 0.2.8_vite@3.1.8 - transitivePeerDependencies: - - esbuild - - rollup - - vite - - webpack - dev: true - - /@vue-macros/setup-sfc/0.12.8: - resolution: - { - integrity: sha512-eOQxlY53GD/WkJrDHpDvHecWQ70Cw9aSYwS9eT1dQ9vWJVeJ/2R96z09GfYKz6cr9T00OPeZjftU5sC1FO+3xA== - } - engines: { node: ">=14.19.0" } - dependencies: - "@rollup/pluginutils": 4.2.1 - "@vue-macros/common": 0.13.4 - unplugin: 1.0.0 - dev: true - - /@vue-macros/short-emits/1.0.1: - resolution: - { - integrity: sha512-iyCZu35uPOAUJOPrmJrc3pQdY8TswoRrF4Kfcga7xUPvE5ck0Yq4pmOIE+NKz/pGQzzOkxC1qMDc2kaoJ2qAzg== - } - engines: { node: ">=14.19.0" } - dependencies: - "@rollup/pluginutils": 4.2.1 - "@vue-macros/common": 0.13.4 - unplugin: 1.0.0 - dev: true - /@vue/babel-helper-vue-transform-on/1.0.2: resolution: { @@ -2077,6 +1895,7 @@ packages: transitivePeerDependencies: - "@vue/composition-api" - vue + dev: false /@vueuse/metadata/8.9.4: resolution: @@ -2090,6 +1909,7 @@ packages: { integrity: sha512-sIC8R+kWkIdpi5X2z2Gk8TRYzmczDwHRhEFfCu2P+XW2JdPoXrziqsGpDDsN7ykBx4ilwieS7JUIweVGhvZ93w== } + dev: false /@vueuse/motion/2.0.0-beta.12_vue@3.2.45: resolution: @@ -2140,6 +1960,7 @@ packages: transitivePeerDependencies: - "@vue/composition-api" - vue + dev: false /@zougt/some-loader-utils/1.4.3: resolution: @@ -5142,14 +4963,6 @@ packages: wrap-ansi: 7.0.0 dev: true - /local-pkg/0.4.2: - resolution: - { - integrity: sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg== - } - engines: { node: ">=14" } - dev: true - /locate-path/5.0.0: resolution: { @@ -7662,32 +7475,6 @@ packages: engines: { node: ">= 0.8" } dev: true - /unplugin-combine/0.2.8_vite@3.1.8: - resolution: - { - integrity: sha512-Z38AC/TEjXbVyZ5HjVqo+lADj0/dcfwWC0Z4y0LNhybJzJQwmcMxm+ZsqHY3faauj4YigmlRMdptR5JEW9RuLg== - } - engines: { node: ">=14.19.0" } - peerDependencies: - esbuild: ">=0.13" - rollup: ^2.50.0 - vite: ^2.3.0 || ^3.0.0 - webpack: 4 || 5 - peerDependenciesMeta: - esbuild: - optional: true - rollup: - optional: true - vite: - optional: true - webpack: - optional: true - dependencies: - "@antfu/utils": 0.6.3 - unplugin: 0.10.2 - vite: 3.1.8_sass@1.56.1+terser@5.16.0 - dev: true - /unplugin-vue-define-options/1.0.0: resolution: { @@ -7701,51 +7488,6 @@ packages: unplugin: 1.0.0 dev: true - /unplugin-vue-macros/1.0.3_5wosmox4cb7ovevlqdhap7knuu: - resolution: - { - integrity: sha512-QONC2iP0JNmIpbpL2jwsY89Lq6oTZf8JSbhQSVGB7xu+/iY52ZdfEB/bysai3lS5ScTH3M4y0KQHWVcyxBof7g== - } - engines: { node: ">=14.19.0" } - peerDependencies: - vue: ^2.7.0 || ^3.2.25 - dependencies: - "@rollup/pluginutils": 4.2.1 - "@vue-macros/better-define": 1.0.0 - "@vue-macros/define-model": 1.0.0_@vueuse+core@9.6.0 - "@vue-macros/define-props": 0.0.3_vue@3.2.45 - "@vue-macros/define-render": 1.0.1_vue@3.2.45 - "@vue-macros/define-slots": 0.0.6_vue@3.2.45 - "@vue-macros/hoist-static": 1.0.0 - "@vue-macros/named-template": 0.0.6_vite@3.1.8+vue@3.2.45 - "@vue-macros/setup-block": 0.0.1 - "@vue-macros/setup-component": 0.12.8_vite@3.1.8 - "@vue-macros/setup-sfc": 0.12.8 - "@vue-macros/short-emits": 1.0.1 - local-pkg: 0.4.2 - unplugin-combine: 0.2.8_vite@3.1.8 - unplugin-vue-define-options: 1.0.0 - vue: 3.2.45 - transitivePeerDependencies: - - "@vueuse/core" - - esbuild - - rollup - - vite - - webpack - dev: true - - /unplugin/0.10.2: - resolution: - { - integrity: sha512-6rk7GUa4ICYjae5PrAllvcDeuT8pA9+j5J5EkxbMFaV+SalHhxZ7X2dohMzu6C3XzsMT+6jwR/+pwPNR3uK9MA== - } - dependencies: - acorn: 8.8.1 - chokidar: 3.5.3 - webpack-sources: 3.2.3 - webpack-virtual-modules: 0.4.6 - dev: true - /unplugin/1.0.0: resolution: { @@ -7948,6 +7690,7 @@ packages: optional: true dependencies: vue: 3.2.45 + dev: false /vue-eslint-parser/9.1.0_eslint@8.28.0: resolution: diff --git a/public/serverConfig.json b/public/serverConfig.json index 5f04cb1..543163a 100644 --- a/public/serverConfig.json +++ b/public/serverConfig.json @@ -1,5 +1,5 @@ { - "Version": "3.8.6", + "Version": "3.8.7", "Title": "PureAdmin", "FixedHeader": true, "HiddenSideBar": false, diff --git a/src/style/dark.scss b/src/style/dark.scss index 785109c..6546462 100644 --- a/src/style/dark.scss +++ b/src/style/dark.scss @@ -168,5 +168,12 @@ html.dark { pointer-events: all !important; background-image: initial !important; } + + & .el-message__closeBtn { + &:hover { + color: rgba(255, 255, 255, 0.85); + background-color: rgba(255, 255, 255, 0.12); + } + } } } diff --git a/src/style/element-plus.scss b/src/style/element-plus.scss index aa357b9..e21a464 100644 --- a/src/style/element-plus.scss +++ b/src/style/element-plus.scss @@ -86,6 +86,13 @@ } & .el-message__closeBtn { + outline: none; + border-radius: 4px; right: 9px !important; + transition: background-color 0.2s, color 0.2s; + + &:hover { + background-color: rgba(0, 0, 0, 0.06); + } } } diff --git a/tsconfig.json b/tsconfig.json index 4252509..7680e41 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -29,7 +29,6 @@ "element-plus/global", "@pureadmin/table/volar", "@pureadmin/descriptions/volar", - "unplugin-vue-macros/macros-global", "unplugin-vue-define-options/macros-global" ], "typeRoots": ["./node_modules/@types/", "./types"] diff --git a/types/global.d.ts b/types/global.d.ts index ffe427b..cbf7737 100644 --- a/types/global.d.ts +++ b/types/global.d.ts @@ -214,6 +214,7 @@ declare global { /** * @description 当前路由动画效果 * @see {@link https://next.router.vuejs.org/guide/advanced/transitions.html#transitions} + * @see animate.css {@link https://animate.style} */ name?: string; /** 进场动画 */