From 79482ddbea26d4426c467febaff81d11b7635d15 Mon Sep 17 00:00:00 2001 From: lyt <1105290566@qq.com> Date: Fri, 4 Mar 2022 18:26:27 +0800 Subject: [PATCH] =?UTF-8?q?'admin-22.03.04:=E5=90=8C=E6=AD=A5master?= =?UTF-8?q?=E5=88=86=E6=94=AFv2.0.2=E7=89=88=E6=9C=AC=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=8C=E5=85=B7=E4=BD=93=E6=9F=A5=E7=9C=8Bmaster=E7=9A=84CHA?= =?UTF-8?q?NGELOG.md'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 + README.md | 8 +- package.json | 42 +- plugins.d.ts | 2 + src/App.vue | 19 +- src/api/login/index.ts | 39 +- src/api/menu/index.ts | 46 +- src/assets/login-icon-two.svg | 1 + src/assets/logo-mini.svg | 9 + src/components/iconSelector/index.vue | 29 +- src/components/svgIcon/index.vue | 32 +- src/layout/component/aside.vue | 28 +- src/layout/component/columnsAside.vue | 45 +- src/layout/component/header.vue | 6 +- src/layout/component/main.vue | 45 +- src/layout/footer/index.vue | 16 +- src/layout/index.vue | 24 +- src/layout/lockScreen/index.vue | 38 +- src/layout/logo/index.vue | 17 +- src/layout/main/classic.vue | 6 +- src/layout/main/columns.vue | 6 +- src/layout/main/defaults.vue | 8 +- src/layout/navBars/breadcrumb/breadcrumb.vue | 49 +- src/layout/navBars/breadcrumb/closeFull.vue | 12 +- src/layout/navBars/breadcrumb/index.vue | 25 +- src/layout/navBars/breadcrumb/search.vue | 24 +- src/layout/navBars/breadcrumb/setings.vue | 345 ++++--- src/layout/navBars/breadcrumb/user.vue | 73 +- src/layout/navBars/breadcrumb/userNews.vue | 20 +- src/layout/navBars/index.vue | 6 +- src/layout/navBars/tagsView/contextmenu.vue | 14 +- src/layout/navBars/tagsView/tagsView.vue | 190 ++-- src/layout/navMenu/horizontal.vue | 35 +- src/layout/navMenu/subItem.vue | 26 +- src/layout/navMenu/vertical.vue | 28 +- src/layout/routerView/iframes.vue | 2 +- src/layout/routerView/link.vue | 30 +- src/layout/routerView/parent.vue | 22 +- src/main.ts | 3 +- src/router/backEnd.ts | 8 +- src/router/index.ts | 8 +- src/router/route.ts | 6 +- src/store/interface/index.ts | 29 +- src/store/modules/keepAliveNames.ts | 1 - src/store/modules/requestOldRoutes.ts | 1 - src/store/modules/routesList.ts | 1 - src/store/modules/tagsViewRoutes.ts | 1 - src/store/modules/themeConfig.ts | 43 +- src/store/modules/userInfos.ts | 13 +- src/theme/app.scss | 39 +- src/theme/base.scss | 2 - src/theme/common/transition.scss | 11 +- src/theme/common/var.scss | 127 --- src/theme/dark.scss | 254 ++++- src/theme/element.scss | 936 ++----------------- src/theme/iconSelector.scss | 16 +- src/theme/index.scss | 2 +- src/theme/loading.scss | 2 +- src/theme/media/date.scss | 25 + src/theme/media/home.scss | 17 +- src/theme/media/index.scss | 30 +- src/theme/media/login.scss | 40 +- src/theme/media/media.scss | 1 + src/theme/media/scrollbar.scss | 4 +- src/theme/mixins/element-mixins.scss | 34 - src/theme/mixins/function.scss | 5 - src/theme/mixins/{mixins.scss => index.scss} | 0 src/utils/arrayOperation.ts | 2 +- src/utils/commonFunction.ts | 24 +- src/utils/getStyleSheets.ts | 4 +- src/utils/loading.ts | 21 +- src/utils/other.ts | 31 +- src/utils/request.ts | 2 +- src/utils/theme.ts | 4 +- src/utils/viteBuild.ts | 31 - src/utils/wartermark.ts | 4 +- src/views/error/401.vue | 5 +- src/views/error/404.vue | 5 +- src/views/home/index.vue | 863 ++++++++++------- src/views/home/mock.ts | 89 -- src/views/login/component/account.vue | 105 +-- src/views/login/component/mobile.vue | 70 +- src/views/login/component/scan.vue | 42 +- src/views/login/index.vue | 166 ++-- src/views/system/dept/component/addDept.vue | 46 +- src/views/system/dept/component/editDept.vue | 49 +- src/views/system/dept/index.vue | 57 +- src/views/system/dic/component/addDic.vue | 22 +- src/views/system/dic/component/editDic.vue | 46 +- src/views/system/dic/index.vue | 54 +- src/views/system/menu/component/addMenu.vue | 32 +- src/views/system/menu/component/editMenu.vue | 34 +- src/views/system/menu/index.vue | 27 +- src/views/system/role/component/addRole.vue | 37 +- src/views/system/role/component/editRole.vue | 40 +- src/views/system/role/index.vue | 55 +- src/views/system/user/component/addUser.vue | 49 +- src/views/system/user/component/editUser.vue | 52 +- src/views/system/user/index.vue | 63 +- vite.config.ts | 108 ++- 100 files changed, 2492 insertions(+), 2777 deletions(-) create mode 100644 src/assets/login-icon-two.svg create mode 100644 src/assets/logo-mini.svg delete mode 100644 src/theme/base.scss delete mode 100644 src/theme/common/var.scss create mode 100644 src/theme/media/date.scss delete mode 100644 src/theme/mixins/element-mixins.scss delete mode 100644 src/theme/mixins/function.scss rename src/theme/mixins/{mixins.scss => index.scss} (100%) delete mode 100644 src/utils/viteBuild.ts delete mode 100644 src/views/home/mock.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index f6e9a61..c727b8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ 🎉🎉🔥 `vue-next-admin-template` 基于 （vue-next-admin-v1.1.2 版本） vue3.x 、Typescript、vite、Element plus 等，适配手机、平板、pc 的后台开源免费模板库（vue2.x 请切换 vue-prev-admin 分支） +## 2.0.2 + +- 🎉 同步 master 分支 v2.0.2 版本内容，具体查看 master CHANGELOG.md + ## 0.2.2 `2021.12.21` diff --git a/README.md b/README.md index 2490c31..0437481 100644 --- a/README.md +++ b/README.md @@ -82,18 +82,22 @@ cnpm run build #### 💯 学习交流加 QQ 群 -- 若加群了没同意（一般不会超过一天），那就是群满了，请换一个群试试 +- 若加群了没同意（一般秒过），那就是群满了（500 人群），请换一个群试试，3 群未满 - 查看开发文档、vue-next-admin 开发文档正在编写中... - 群号码： 1 群：665452019 2 群：766356862 + 3 群：795345435 - vue-next-admin 讨论群 + vue-next-admin 讨论群1 vue-next-admin 讨论群 + + vue-next-admin 讨论群3 + #### ❤️ 鸣谢列表 diff --git a/package.json b/package.json index f2c9d84..ea7659b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-next-admin-template", - "version": "0.2.2", + "version": "2.0.3", "description": "vue3 vite next admin template", "author": "lyt_20201208", "license": "MIT", @@ -10,38 +10,38 @@ "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/" }, "dependencies": { - "@element-plus/icons-vue": "^0.2.4", - "axios": "^0.24.0", - "echarts": "^5.2.2", - "element-plus": "^1.2.0-beta.6", + "@element-plus/icons-vue": "^1.0.0", + "axios": "^0.26.0", + "echarts": "^5.3.0", + "element-plus": "^2.0.4", "mitt": "^3.0.0", "nprogress": "^0.2.0", "qrcodejs2-fixes": "^0.0.2", - "screenfull": "^6.0.0", + "screenfull": "^6.0.1", "sortablejs": "^1.14.0", - "vue": "^3.2.20", + "vue": "^3.2.31", "vue-clipboard3": "^1.0.1", - "vue-router": "^4.0.12", + "vue-router": "^4.0.13", "vuex": "^4.0.2" }, "devDependencies": { "@types/axios": "^0.14.0", "@types/clipboard": "^2.0.1", - "@types/node": "^17.0.2", + "@types/node": "^17.0.21", "@types/nprogress": "^0.2.0", - "@typescript-eslint/eslint-plugin": "^5.8.0", - "@typescript-eslint/parser": "^5.8.0", - "@vitejs/plugin-vue": "^2.0.1", - "@vue/compiler-sfc": "^3.2.26", - "dotenv": "^10.0.0", - "eslint": "^8.5.0", - "eslint-plugin-vue": "^8.2.0", + "@typescript-eslint/eslint-plugin": "^5.13.0", + "@typescript-eslint/parser": "^5.13.0", + "@vitejs/plugin-vue": "^2.2.4", + "@vue/compiler-sfc": "^3.2.31", + "dotenv": "^16.0.0", + "eslint": "^8.10.0", + "eslint-plugin-vue": "^8.5.0", "prettier": "^2.5.1", - "sass": "^1.45.1", - "sass-loader": "^12.4.0", - "typescript": "^4.5.4", - "vite": "^2.7.4", - "vue-eslint-parser": "^8.0.1" + "sass": "^1.49.9", + "sass-loader": "^12.6.0", + "typescript": "^4.6.2", + "vite": "^2.8.6", + "vue-eslint-parser": "^8.3.0" }, "browserslist": [ "> 1%", diff --git a/plugins.d.ts b/plugins.d.ts index 8578ca4..57d1f32 100644 --- a/plugins.d.ts +++ b/plugins.d.ts @@ -1 +1,3 @@ declare module 'vue-grid-layout'; +declare module 'sortablejs'; +declare module 'qrcodejs2-fixes'; diff --git a/src/App.vue b/src/App.vue index f840c80..d4d00f7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,14 +1,17 @@ diff --git a/src/components/svgIcon/index.vue b/src/components/svgIcon/index.vue index b3b6304..d80a2f2 100644 --- a/src/components/svgIcon/index.vue +++ b/src/components/svgIcon/index.vue @@ -1,7 +1,15 @@ diff --git a/src/layout/component/aside.vue b/src/layout/component/aside.vue index d8714eb..b5a3309 100644 --- a/src/layout/component/aside.vue +++ b/src/layout/component/aside.vue @@ -10,23 +10,19 @@ diff --git a/src/layout/component/columnsAside.vue b/src/layout/component/columnsAside.vue index bdd02d0..8b7e9ec 100644 --- a/src/layout/component/columnsAside.vue +++ b/src/layout/component/columnsAside.vue @@ -43,19 +43,32 @@ diff --git a/src/layout/index.vue b/src/layout/index.vue index 237d1b0..8d13cd3 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -1,23 +1,21 @@ diff --git a/src/layout/lockScreen/index.vue b/src/layout/lockScreen/index.vue index bf6669c..a992dc9 100644 --- a/src/layout/lockScreen/index.vue +++ b/src/layout/lockScreen/index.vue @@ -20,7 +20,7 @@
{{ time.mdq }}
- +
上滑解锁
@@ -41,7 +41,7 @@ @@ -49,9 +49,9 @@
- - - + + +
@@ -64,13 +64,33 @@ import { nextTick, onMounted, reactive, toRefs, ref, onUnmounted, getCurrentInst import { useStore } from '/@/store/index'; import { formatDate } from '/@/utils/formatTime'; import { Local } from '/@/utils/storage'; + +// 定义接口来定义对象的类型 +interface LockScreenState { + transparency: number; + downClientY: number; + moveDifference: number; + isShowLoockLogin: boolean; + isFlags: boolean; + querySelectorEl: HTMLElement | string; + time: { + hm: string; + s: string; + mdq: string; + }; + setIntervalTime: number; + isShowLockScreen: boolean; + isShowLockScreenIntervalTime: number; + lockScreenPassword: string; +} + export default defineComponent({ name: 'layoutLockScreen', setup() { - const { proxy } = getCurrentInstance() as any; + const { proxy } = getCurrentInstance(); const layoutLockScreenInputRef = ref(); const store = useStore(); - const state: any = reactive({ + const state = reactive({ transparency: 1, downClientY: 0, moveDifference: 0, @@ -95,7 +115,7 @@ export default defineComponent({ // 鼠标移动 const onMove = (move: any) => { if (state.isFlags) { - const el = state.querySelectorEl; + const el = state.querySelectorEl; const opacitys = (state.transparency -= 1 / 200); if (move.touches) { state.moveDifference = move.touches[0].clientY - state.downClientY; @@ -122,7 +142,7 @@ export default defineComponent({ state.isFlags = false; state.transparency = 1; if (state.moveDifference >= -400) { - state.querySelectorEl.setAttribute('style', `top:0px;opacity:1;transition:all 0.3s ease;`); + (state.querySelectorEl).setAttribute('style', `top:0px;opacity:1;transition:all 0.3s ease;`); } }; // 获取要拖拽的初始元素 diff --git a/src/layout/logo/index.vue b/src/layout/logo/index.vue index f0b24d2..ff727d9 100644 --- a/src/layout/logo/index.vue +++ b/src/layout/logo/index.vue @@ -1,20 +1,21 @@ diff --git a/src/layout/navBars/breadcrumb/closeFull.vue b/src/layout/navBars/breadcrumb/closeFull.vue index 6599e4f..8332676 100644 --- a/src/layout/navBars/breadcrumb/closeFull.vue +++ b/src/layout/navBars/breadcrumb/closeFull.vue @@ -1,19 +1,18 @@ diff --git a/src/layout/navBars/breadcrumb/search.vue b/src/layout/navBars/breadcrumb/search.vue index bfd92b4..22b6f22 100644 --- a/src/layout/navBars/breadcrumb/search.vue +++ b/src/layout/navBars/breadcrumb/search.vue @@ -11,7 +11,7 @@ > - - diff --git a/src/views/system/menu/component/addMenu.vue b/src/views/system/menu/component/addMenu.vue index 01ac32e..ef74c43 100644 --- a/src/views/system/menu/component/addMenu.vue +++ b/src/views/system/menu/component/addMenu.vue @@ -1,7 +1,7 @@ diff --git a/src/views/system/menu/component/editMenu.vue b/src/views/system/menu/component/editMenu.vue index 00f791b..430cb95 100644 --- a/src/views/system/menu/component/editMenu.vue +++ b/src/views/system/menu/component/editMenu.vue @@ -1,7 +1,7 @@ diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index f1be8a2..0392f8a 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -2,16 +2,16 @@
- - + + - + 查询 - + - + 新增菜单 @@ -46,9 +46,9 @@ @@ -59,12 +59,13 @@ diff --git a/src/views/system/role/component/addRole.vue b/src/views/system/role/component/addRole.vue index 09e4489..0ec8209 100644 --- a/src/views/system/role/component/addRole.vue +++ b/src/views/system/role/component/addRole.vue @@ -1,7 +1,7 @@ diff --git a/src/views/system/user/component/addUser.vue b/src/views/system/user/component/addUser.vue index 25821bc..4a78153 100644 --- a/src/views/system/user/component/addUser.vue +++ b/src/views/system/user/component/addUser.vue @@ -1,7 +1,7 @@ diff --git a/src/views/system/user/component/editUser.vue b/src/views/system/user/component/editUser.vue index 5e46fbc..b7a0793 100644 --- a/src/views/system/user/component/editUser.vue +++ b/src/views/system/user/component/editUser.vue @@ -1,7 +1,7 @@ diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 424374f..c5b8aad 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -2,22 +2,22 @@
- - + + - + 查询 - + - + 新增用户
- + @@ -34,8 +34,8 @@ @@ -59,17 +59,45 @@ - - diff --git a/vite.config.ts b/vite.config.ts index 7418959..7a9a347 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,65 +1,79 @@ import vue from '@vitejs/plugin-vue'; import { resolve } from 'path'; -import type { UserConfig } from 'vite'; -import { loadEnv } from './src/utils/viteBuild'; +import { defineConfig, loadEnv, ConfigEnv } from 'vite'; const pathResolve = (dir: string): any => { return resolve(__dirname, '.', dir); }; -const { VITE_PORT, VITE_OPEN, VITE_PUBLIC_PATH } = loadEnv(); - const alias: Record = { '/@': pathResolve('./src/'), }; -const viteConfig: UserConfig = { - plugins: [vue()], - root: process.cwd(), - resolve: { alias }, - base: process.env.NODE_ENV === 'production' ? VITE_PUBLIC_PATH : './', - server: { - host: '0.0.0.0', - port: VITE_PORT, - open: VITE_OPEN, - proxy: { - '/gitee': { - target: 'https://gitee.com', - ws: true, - changeOrigin: true, - rewrite: (path) => path.replace(/^\/gitee/, ''), +const viteConfig = defineConfig((mode: ConfigEnv) => { + const env = loadEnv(mode.mode, process.cwd()); + return { + plugins: [vue()], + root: process.cwd(), + resolve: { alias }, + base: mode.command === 'serve' ? './' : env.VITE_PUBLIC_PATH, + server: { + host: '0.0.0.0', + port: env.VITE_PORT as unknown as number, + open: env.VITE_OPEN, + proxy: { + '/gitee': { + target: 'https://gitee.com', + ws: true, + changeOrigin: true, + rewrite: (path) => path.replace(/^\/gitee/, ''), + }, }, }, - }, - build: { - outDir: 'dist', - minify: 'esbuild', - sourcemap: false, - chunkSizeWarningLimit: 1500, - rollupOptions: { - output: { - entryFileNames: `assets/[name].${new Date().getTime()}.js`, - chunkFileNames: `assets/[name].${new Date().getTime()}.js`, - assetFileNames: `assets/[name].${new Date().getTime()}.[ext]`, - }, - }, - }, - css: { - postcss: { - plugins: [ - { - postcssPlugin: 'internal:charset-removal', - AtRule: { - charset: (atRule) => { - if (atRule.name === 'charset') { - atRule.remove(); - } - }, + build: { + outDir: 'dist', + sourcemap: false, + chunkSizeWarningLimit: 1500, + rollupOptions: { + output: { + entryFileNames: `assets/[name].${new Date().getTime()}.js`, + chunkFileNames: `assets/[name].${new Date().getTime()}.js`, + assetFileNames: `assets/[name].${new Date().getTime()}.[ext]`, + compact: true, + manualChunks: { + vue: ['vue', 'vue-router', 'vuex'], + echarts: ['echarts'], }, }, - ], + }, + terserOptions: { + compress: { + drop_console: true, + drop_debugger: true, + }, + ie8: true, + output: { + comments: true, + }, + }, }, - }, -}; + css: { + postcss: { + plugins: [ + { + postcssPlugin: 'internal:charset-removal', + AtRule: { + charset: (atRule) => { + if (atRule.name === 'charset') { + atRule.remove(); + } + }, + }, + }, + ], + }, + }, + }; +}); export default viteConfig;