From f80fbbed20a62dd1ce53a4507b2acce7e52fec1e Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Tue, 22 Mar 2022 00:37:24 +0800 Subject: [PATCH] release: update 3.2.0 --- .eslintrc.js | 12 +++++ package.json | 4 +- pnpm-lock.yaml | 54 +++++++++++----------- public/serverConfig.json | 2 +- src/layout/components/navbar.vue | 11 +++-- src/layout/components/notice/index.vue | 6 +-- src/layout/components/notice/noticeItem.vue | 2 +- src/layout/components/notice/noticeList.vue | 4 +- src/layout/components/panel/index.vue | 2 +- .../components/search/components/SearchModal.vue | 4 +- .../components/search/components/SearchResult.vue | 4 +- src/layout/components/setting/index.vue | 30 +++++------- src/layout/components/sidebar/horizontal.vue | 22 ++++----- src/layout/components/sidebar/logo.vue | 12 +---- src/layout/components/sidebar/mixNav.vue | 22 ++++----- src/layout/components/sidebar/sidebarItem.vue | 19 ++++---- src/layout/components/tag/index.vue | 19 ++++---- src/layout/frameView.vue | 2 +- src/layout/redirect.vue | 2 +- src/style/sidebar.scss | 9 ++-- src/views/permission/button/index.vue | 4 +- 21 files changed, 119 insertions(+), 127 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 7ebe029..2ce4a19 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -61,6 +61,18 @@ module.exports = { "@typescript-eslint/ban-ts-comment": "off", "@typescript-eslint/no-empty-function": "off", "@typescript-eslint/no-non-null-assertion": "off", + "vue/html-self-closing": [ + "error", + { + html: { + void: "always", + normal: "always", + component: "always" + }, + svg: "always", + math: "always" + } + ], "@typescript-eslint/no-unused-vars": [ "error", { diff --git a/package.json b/package.json index cc9ad62..e0a2331 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pure-admin-thin", - "version": "3.1.0", + "version": "3.2.0", "private": true, "scripts": { "dev": "cross-env --max_old_space_size=4096 vite", @@ -105,7 +105,7 @@ "stylelint-order": "^5.0.0", "typescript": "^4.6.2", "unplugin-element-plus": "^0.3.2", - "vite": "^2.9.0-beta.3", + "vite": "^2.9.0-beta.4", "vite-plugin-live-reload": "^2.1.0", "vite-plugin-mock": "^2.9.6", "vite-plugin-remove-console": "^0.0.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ffd0c3e..304fed6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -75,7 +75,7 @@ specifiers: stylelint-order: ^5.0.0 typescript: ^4.6.2 unplugin-element-plus: ^0.3.2 - vite: ^2.9.0-beta.3 + vite: ^2.9.0-beta.4 vite-plugin-live-reload: ^2.1.0 vite-plugin-mock: ^2.9.6 vite-plugin-remove-console: ^0.0.6 @@ -127,7 +127,7 @@ devDependencies: "@iconify-icons/fa-solid": 1.2.2 "@iconify-icons/ri": 1.2.1 "@iconify/vue": 3.1.4_vue@3.2.31 - "@intlify/vite-plugin-vue-i18n": 3.3.1_5005873cfdafd7bccc775c7a0caf8390 + "@intlify/vite-plugin-vue-i18n": 3.3.1_fecf2311320b252734da88aa76ba6360 "@pureadmin/theme": 0.0.1 "@types/element-resize-detector": 1.1.3 "@types/js-cookie": 3.0.1 @@ -139,8 +139,8 @@ devDependencies: "@types/qs": 6.9.7 "@typescript-eslint/eslint-plugin": 5.15.0_f2c49ce7d0e93ebcfdb4b7d25b131b28 "@typescript-eslint/parser": 5.15.0_eslint@8.11.0+typescript@4.6.2 - "@vitejs/plugin-legacy": 1.7.1_vite@2.9.0-beta.3 - "@vitejs/plugin-vue": 2.2.4_vite@2.9.0-beta.3+vue@3.2.31 + "@vitejs/plugin-legacy": 1.7.1_vite@2.9.0-beta.4 + "@vitejs/plugin-vue": 2.2.4_vite@2.9.0-beta.4+vue@3.2.31 "@vitejs/plugin-vue-jsx": 1.3.8 "@vue/eslint-config-prettier": 7.0.0_eslint@8.11.0+prettier@2.6.0 "@vue/eslint-config-typescript": 10.0.0_5e58415d4c9ab0c3da8935a9b8bb8c26 @@ -169,13 +169,13 @@ devDependencies: stylelint-config-standard: 24.0.0_stylelint@14.6.0 stylelint-order: 5.0.0_stylelint@14.6.0 typescript: 4.6.2 - unplugin-element-plus: 0.3.2_rollup@2.70.1+vite@2.9.0-beta.3 - vite: 2.9.0-beta.3_sass@1.49.9 + unplugin-element-plus: 0.3.2_rollup@2.70.1+vite@2.9.0-beta.4 + vite: 2.9.0-beta.4_sass@1.49.9 vite-plugin-live-reload: 2.1.0 - vite-plugin-mock: 2.9.6_0f4f060d71e998e1697ce4d6d1a6c012 + vite-plugin-mock: 2.9.6_cc7e5ded527ea0e0180226d44637e3ca vite-plugin-remove-console: 0.0.6 - vite-plugin-style-import: 1.4.1_vite@2.9.0-beta.3 - vite-plugin-windicss: 1.8.3_vite@2.9.0-beta.3 + vite-plugin-style-import: 1.4.1_vite@2.9.0-beta.4 + vite-plugin-windicss: 1.8.3_vite@2.9.0-beta.4 vite-svg-loader: 2.2.0 vue-eslint-parser: 8.3.0_eslint@8.11.0 windicss: 3.5.1 @@ -1006,7 +1006,7 @@ packages: } engines: { node: ">= 12" } - /@intlify/vite-plugin-vue-i18n/3.3.1_5005873cfdafd7bccc775c7a0caf8390: + /@intlify/vite-plugin-vue-i18n/3.3.1_fecf2311320b252734da88aa76ba6360: resolution: { integrity: sha512-b9HIUANzL4/LmrA5RqeiPabZl2/RiWNAJ90TVZ8kSi3APRZ4BbmwUAclKe8ip+1jCDhqaGO/qfAI7SbQ0Y76Uw== @@ -1028,7 +1028,7 @@ packages: debug: 4.3.3 fast-glob: 3.2.11 source-map: 0.6.1 - vite: 2.9.0-beta.3_sass@1.49.9 + vite: 2.9.0-beta.4_sass@1.49.9 vue-i18n: 9.2.0-beta.32_vue@3.2.31 transitivePeerDependencies: - supports-color @@ -1451,7 +1451,7 @@ packages: eslint-visitor-keys: 3.3.0 dev: true - /@vitejs/plugin-legacy/1.7.1_vite@2.9.0-beta.3: + /@vitejs/plugin-legacy/1.7.1_vite@2.9.0-beta.4: resolution: { integrity: sha512-RqgILXsGpfV7NHodVCdBVau8ss5+ynMXp6JGF/F7nhSy0bnwSQPlMS3KFqh7twfifXK8VuMriqfU4CxOiqmNnA== @@ -1465,7 +1465,7 @@ packages: magic-string: 0.25.9 regenerator-runtime: 0.13.9 systemjs: 6.12.1 - vite: 2.9.0-beta.3_sass@1.49.9 + vite: 2.9.0-beta.4_sass@1.49.9 dev: true /@vitejs/plugin-vue-jsx/1.3.8: @@ -1485,7 +1485,7 @@ packages: - supports-color dev: true - /@vitejs/plugin-vue/2.2.4_vite@2.9.0-beta.3+vue@3.2.31: + /@vitejs/plugin-vue/2.2.4_vite@2.9.0-beta.4+vue@3.2.31: resolution: { integrity: sha512-ev9AOlp0ljCaDkFZF3JwC/pD2N4Hh+r5srl5JHM6BKg5+99jiiK0rE/XaRs3pVm1wzyKkjUy/StBSoXX5fFzcw== @@ -1495,7 +1495,7 @@ packages: vite: ^2.5.10 vue: ^3.2.25 dependencies: - vite: 2.9.0-beta.3_sass@1.49.9 + vite: 2.9.0-beta.4_sass@1.49.9 vue: 3.2.31 dev: true @@ -6869,7 +6869,7 @@ packages: engines: { node: ">= 0.8" } dev: true - /unplugin-element-plus/0.3.2_rollup@2.70.1+vite@2.9.0-beta.3: + /unplugin-element-plus/0.3.2_rollup@2.70.1+vite@2.9.0-beta.4: resolution: { integrity: sha512-/oPbLA1ByrZ3VvN3jrVtVZcGJ147+ccyrL1w9d8wNLTTMH+buxdtiMQQv9R7Muz22ocJvebXZzlRVlA/JeeVPA== @@ -6879,7 +6879,7 @@ packages: "@rollup/pluginutils": 4.2.0 es-module-lexer: 0.10.4 magic-string: 0.26.1 - unplugin: 0.3.3_rollup@2.70.1+vite@2.9.0-beta.3 + unplugin: 0.3.3_rollup@2.70.1+vite@2.9.0-beta.4 transitivePeerDependencies: - esbuild - rollup @@ -6887,7 +6887,7 @@ packages: - webpack dev: true - /unplugin/0.3.3_rollup@2.70.1+vite@2.9.0-beta.3: + /unplugin/0.3.3_rollup@2.70.1+vite@2.9.0-beta.4: resolution: { integrity: sha512-WjZWpUqqcYPQ/efR00Zm2m1+J1LitwoZ4uhHV4VdZ+IpW0Nh/qnDYtVf+nLhozXdGxslMPecOshVR7NiWFl4gA== @@ -6908,7 +6908,7 @@ packages: optional: true dependencies: rollup: 2.70.1 - vite: 2.9.0-beta.3_sass@1.49.9 + vite: 2.9.0-beta.4_sass@1.49.9 webpack-virtual-modules: 0.4.3 dev: true @@ -6992,7 +6992,7 @@ packages: chokidar: 3.5.3 dev: true - /vite-plugin-mock/2.9.6_0f4f060d71e998e1697ce4d6d1a6c012: + /vite-plugin-mock/2.9.6_cc7e5ded527ea0e0180226d44637e3ca: resolution: { integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg== @@ -7012,7 +7012,7 @@ packages: fast-glob: 3.2.11 mockjs: 1.1.0 path-to-regexp: 6.2.0 - vite: 2.9.0-beta.3_sass@1.49.9 + vite: 2.9.0-beta.4_sass@1.49.9 transitivePeerDependencies: - rollup - supports-color @@ -7025,7 +7025,7 @@ packages: } dev: true - /vite-plugin-style-import/1.4.1_vite@2.9.0-beta.3: + /vite-plugin-style-import/1.4.1_vite@2.9.0-beta.4: resolution: { integrity: sha512-lJCRvm7+So0hHdnSJiJPg9gD5mxtL6YY0jmhEph+k7ArpsyvqOh6han2kG5htbWWDZxHkUN9d1BuTFL//yCLLQ== @@ -7039,12 +7039,12 @@ packages: es-module-lexer: 0.9.3 fs-extra: 10.0.1 magic-string: 0.25.9 - vite: 2.9.0-beta.3_sass@1.49.9 + vite: 2.9.0-beta.4_sass@1.49.9 transitivePeerDependencies: - supports-color dev: true - /vite-plugin-windicss/1.8.3_vite@2.9.0-beta.3: + /vite-plugin-windicss/1.8.3_vite@2.9.0-beta.4: resolution: { integrity: sha512-RIw2GD6H6cKNE8wZXVOBs4L1uTicVS0FaAkeqXvy1oyuXLC4SXmvnzEuoK0+qFuWJjW0ECNwE8eU+ZZhzNQKUg== @@ -7055,7 +7055,7 @@ packages: "@windicss/plugin-utils": 1.8.3 debug: 4.3.3 kolorist: 1.5.1 - vite: 2.9.0-beta.3_sass@1.49.9 + vite: 2.9.0-beta.4_sass@1.49.9 windicss: 3.5.1 transitivePeerDependencies: - supports-color @@ -7071,10 +7071,10 @@ packages: svgo: 2.8.0 dev: true - /vite/2.9.0-beta.3_sass@1.49.9: + /vite/2.9.0-beta.4_sass@1.49.9: resolution: { - integrity: sha512-x3G5GGQQlapvyjr2jhFTT16NIbKJdcfYOa6oD8OZuy+WqGTSYolowGJP7tUrTe9y5n641CBKLuhjqXc4gpwUVQ== + integrity: sha512-ToelFqN8lBaiK34VHzTbixOImHoHBw/PCveV5Xynd4ie1twcE0G6t9MFgunuN1hoajWMraGL5bV+pZ3hENR7GA== } engines: { node: ">=12.2.0" } hasBin: true diff --git a/public/serverConfig.json b/public/serverConfig.json index 3cccf6e..bc7d51c 100644 --- a/public/serverConfig.json +++ b/public/serverConfig.json @@ -1,5 +1,5 @@ { - "Version": "3.1.0", + "Version": "3.2.0", "Title": "PureAdmin", "FixedHeader": true, "HiddenSideBar": false, diff --git a/src/layout/components/navbar.vue b/src/layout/components/navbar.vue index 720b322..156b9b4 100644 --- a/src/layout/components/navbar.vue +++ b/src/layout/components/navbar.vue @@ -82,10 +82,11 @@ function translationEn() { English + + English + @@ -106,13 +107,13 @@ function translationEn() { - - + diff --git a/src/layout/components/notice/index.vue b/src/layout/components/notice/index.vue index e864cd0..6aa7885 100644 --- a/src/layout/components/notice/index.vue +++ b/src/layout/components/notice/index.vue @@ -24,9 +24,9 @@ function tabClick() { - + + + diff --git a/src/layout/components/panel/index.vue b/src/layout/components/panel/index.vue index ed2d0fc..aa8ef49 100644 --- a/src/layout/components/panel/index.vue +++ b/src/layout/components/panel/index.vue @@ -26,7 +26,7 @@ emitter.on("openPanel", () => { -
+
diff --git a/src/layout/components/search/components/SearchModal.vue b/src/layout/components/search/components/SearchModal.vue index 4bd1219..5587076 100644 --- a/src/layout/components/search/components/SearchModal.vue +++ b/src/layout/components/search/components/SearchModal.vue @@ -139,9 +139,9 @@ onKeyStroke("ArrowDown", handleDown); @input="handleSearch" >
diff --git a/src/layout/components/search/components/SearchResult.vue b/src/layout/components/search/components/SearchResult.vue index 0099ed7..e70b1eb 100644 --- a/src/layout/components/search/components/SearchResult.vue +++ b/src/layout/components/search/components/SearchResult.vue @@ -11,9 +11,7 @@ @click="handleTo" @mouseenter="handleMouse(item)" > - + {{ t(item.meta?.title) }}
diff --git a/src/layout/components/setting/index.vue b/src/layout/components/setting/index.vue index 91d2aeb..fed0ea0 100644 --- a/src/layout/components/setting/index.vue +++ b/src/layout/components/setting/index.vue @@ -316,8 +316,7 @@ nextTick(() => { :active-icon="dayIcon" :inactive-icon="darkIcon" @change="dataThemeChange" - > - + /> 导航栏模式 @@ -384,8 +383,7 @@ nextTick(() => { active-text="开" inactive-text="关" @change="greyChange" - > - + />
  • 色弱模式 @@ -396,8 +394,7 @@ nextTick(() => { active-text="开" inactive-text="关" @change="weekChange" - > - + />
  • 隐藏标签页 @@ -408,8 +405,7 @@ nextTick(() => { active-text="开" inactive-text="关" @change="tagsChange" - > - + />
  • 侧边栏Logo @@ -422,8 +418,7 @@ nextTick(() => { active-text="开" inactive-text="关" @change="logoChange" - > - + />
  • 标签页持久化 @@ -434,8 +429,7 @@ nextTick(() => { active-text="开" inactive-text="关" @change="multiTagsCacheChange" - > - + />
  • diff --git a/src/layout/components/sidebar/horizontal.vue b/src/layout/components/sidebar/horizontal.vue index 1b7e963..ed66499 100644 --- a/src/layout/components/sidebar/horizontal.vue +++ b/src/layout/components/sidebar/horizontal.vue @@ -69,11 +69,7 @@ function translationEn() { - - + diff --git a/src/layout/components/sidebar/logo.vue b/src/layout/components/sidebar/logo.vue index d439596..34bc4b1 100644 --- a/src/layout/components/sidebar/logo.vue +++ b/src/layout/components/sidebar/logo.vue @@ -18,11 +18,7 @@ const title = class="sidebar-logo-link" to="/" > - + {{ title }} - + {{ title }} diff --git a/src/layout/components/sidebar/mixNav.vue b/src/layout/components/sidebar/mixNav.vue index 85ce671..7308bba 100644 --- a/src/layout/components/sidebar/mixNav.vue +++ b/src/layout/components/sidebar/mixNav.vue @@ -119,11 +119,9 @@ function translationEn() { :index="resolvePath(route) || route.redirect" > @@ -151,15 +149,15 @@ function translationEn() { 简体中文 English @@ -183,13 +181,13 @@ function translationEn() { - - + diff --git a/src/layout/components/sidebar/sidebarItem.vue b/src/layout/components/sidebar/sidebarItem.vue index 8eddd0a..08cb0ee 100644 --- a/src/layout/components/sidebar/sidebarItem.vue +++ b/src/layout/components/sidebar/sidebarItem.vue @@ -148,7 +148,7 @@ function resolvePath(routePath) { :class="{ 'submenu-title-noDropdown': !isNest }" :style="getNoDropdownStyle" > - +
    - + /> +
    + />
    @@ -216,11 +216,14 @@ function resolvePath(routePath) { popper-append-to-body > { {{ transformI18n(item.meta.title, item.meta.i18n) }} - - +
    + /> @@ -710,13 +711,13 @@ const getContextMenuStyle = computed((): CSSProperties => {
    • - - +
    • { placement="bottom-end" @command="handleCommand" > - - - +