From fc0b26266005dcd0baf90323a9146929d0619aa4 Mon Sep 17 00:00:00 2001 From: jzfai <869653722@qq.com> Date: Thu, 20 Apr 2023 13:50:48 +0800 Subject: [PATCH] add init loading page and remove $ref --- eslintrc/.eslintrc-auto-import.json | 3 - index.html | 26 ++- mock/{example.ts => example.js} | 0 mock/system.js | 25 +++ src/api/system.js | 31 +++ src/api/user.js | 31 --- src/assets/gif/dianchi.gif | Bin 0 -> 17972 bytes src/icons/SvgIcon.vue | 16 +- src/layout/app-main/Navbar.vue | 13 +- src/layout/app-main/TagsView.vue | 2 + src/layout/sidebar/MenuIcon.vue | 21 +- src/lib/el-svg-icon.js | 10 + src/main.js | 4 + src/permission.js | 26 +-- src/router/index.js | 80 +------ src/settings.js | 2 +- src/styles/init-loading.css | 17 ++ src/styles/reset-elemenet-plus-style.scss | 5 + src/views/charts/index.vue | 7 - src/views/dashboard/index.vue | 12 +- src/views/error-log/error-generator.vue | 79 ------- src/views/error-log/index.vue | 148 ------------- src/views/error-page/401.vue | 93 -------- src/views/error-page/404.vue | 225 -------------------- src/views/excel/index.vue | 7 - src/views/guid/index.vue | 7 - src/views/login/index.vue | 65 +++--- src/views/other/index.vue | 7 - src/views/rbac-test/TestAddEdit.vue | 5 - src/views/rbac-test/TestButton.vue | 14 -- src/views/rbac-test/TestDetail.vue | 5 - src/views/rbac-test/TestMenu.vue | 22 -- src/views/rich-text/index.vue | 7 - src/views/roles-codes/button-permission.vue | 7 - src/views/roles-codes/code-index.vue | 4 - src/views/roles-codes/index.vue | 29 --- src/views/roles-codes/role-index.vue | 3 - src/views/table/index.vue | 7 - typings/auto-imports.d.ts | 3 - vite.config.js | 4 +- 40 files changed, 185 insertions(+), 887 deletions(-) rename mock/{example.ts => example.js} (100%) create mode 100644 mock/system.js create mode 100644 src/api/system.js delete mode 100644 src/api/user.js create mode 100644 src/assets/gif/dianchi.gif create mode 100644 src/lib/el-svg-icon.js create mode 100644 src/styles/init-loading.css delete mode 100644 src/views/charts/index.vue delete mode 100644 src/views/error-log/error-generator.vue delete mode 100644 src/views/error-log/index.vue delete mode 100644 src/views/error-page/401.vue delete mode 100644 src/views/error-page/404.vue delete mode 100644 src/views/excel/index.vue delete mode 100644 src/views/guid/index.vue delete mode 100644 src/views/other/index.vue delete mode 100644 src/views/rbac-test/TestAddEdit.vue delete mode 100644 src/views/rbac-test/TestButton.vue delete mode 100644 src/views/rbac-test/TestDetail.vue delete mode 100644 src/views/rbac-test/TestMenu.vue delete mode 100644 src/views/rich-text/index.vue delete mode 100644 src/views/roles-codes/button-permission.vue delete mode 100644 src/views/roles-codes/code-index.vue delete mode 100644 src/views/roles-codes/index.vue delete mode 100644 src/views/roles-codes/role-index.vue delete mode 100644 src/views/table/index.vue diff --git a/eslintrc/.eslintrc-auto-import.json b/eslintrc/.eslintrc-auto-import.json index 4653a7a..c195699 100644 --- a/eslintrc/.eslintrc-auto-import.json +++ b/eslintrc/.eslintrc-auto-import.json @@ -36,8 +36,6 @@ "isReadonly": true, "isRef": true, "langTitle": true, - "loginOutReq": true, - "loginReq": true, "markRaw": true, "nextTick": true, "onActivated": true, @@ -93,7 +91,6 @@ "useSlots": true, "useTable": true, "useTagsViewStore": true, - "userInfoReq": true, "watch": true, "watchEffect": true, "watchPostEffect": true, diff --git a/index.html b/index.html index 210b9eb..b88bb8e 100644 --- a/index.html +++ b/index.html @@ -1,13 +1,19 @@ - - - - - <%= title %> - - -
- - + + + + + + <%= title %> + + +
+
+ +
正在加载系统资源，请耐心等待
+
+
+ + diff --git a/mock/example.ts b/mock/example.js similarity index 100% rename from mock/example.ts rename to mock/example.js diff --git a/mock/system.js b/mock/system.js new file mode 100644 index 0000000..abd877f --- /dev/null +++ b/mock/system.js @@ -0,0 +1,25 @@ +const system = { + url: '/mock/login', + method: 'post', + response: () => { + return { + code: 20000, + jwtToken:"666666" + } + } +} + +const loginOut = { + url: '/mock/loginOut', + method: 'post', + response: () => { + return { + code: 200, + title: 'mock请求测试' + } + } +} + +export default [ + system,loginOut +] diff --git a/src/api/system.js b/src/api/system.js new file mode 100644 index 0000000..1029b74 --- /dev/null +++ b/src/api/system.js @@ -0,0 +1,31 @@ +//获取用户信息 +import axiosReq from 'axios' +// export const userInfoReq = (): Promise => { +// return new Promise((resolve) => { +// const reqConfig = { +// url: '/basis-func/user/getUserInfo', +// params: { plateFormId: 2 }, +// method: 'post' +// } +// axiosReq(reqConfig).then(({ data }) => { +// resolve(data) +// }) +// }) +// } + +//登录 +export const loginReq = (subForm) => { + return axiosReq({ + url: '/mock/login', + params: subForm, + method: 'post' + }) +} + +//退出登录 +export const loginOutReq = () => { + return axiosReq({ + url: '/mock/loginOut', + method: 'post' + }) +} diff --git a/src/api/user.js b/src/api/user.js deleted file mode 100644 index 11df21f..0000000 --- a/src/api/user.js +++ /dev/null @@ -1,31 +0,0 @@ -//获取用户信息 -import axiosReq from '@/utils/axios-req' -export const userInfoReq = () => { - return new Promise((resolve) => { - const reqConfig = { - url: '/basis-func/user/getUserInfo', - params: { plateFormId: 2 }, - method: 'post' - } - axiosReq(reqConfig).then(({ data }) => { - resolve(data) - }) - }) -} - -//登录 -export const loginReq = (subForm) => { - return axiosReq({ - url: '/basis-func/user/loginValid', - params: subForm, - method: 'post' - }) -} - -//退出登录 -export const loginOutReq = () => { - return axiosReq({ - url: '/basis-func/user/loginValid', - method: 'post' - }) -} diff --git a/src/assets/gif/dianchi.gif b/src/assets/gif/dianchi.gif new file mode 100644 index 0000000000000000000000000000000000000000..a54aa66de82cb121352344fd6e1848d3383fc080 GIT binary patch literal 17972 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 @@ -14,7 +14,11 @@ const props = defineProps({ className: { type: String, default: '' - } + }, + color: { + type: String, + default: '' + }, }) const iconName = computed(() => `#icon-${props.iconClass}`) @@ -27,14 +31,6 @@ const svgClass = computed(() => { diff --git a/src/lib/el-svg-icon.js b/src/lib/el-svg-icon.js new file mode 100644 index 0000000..4431719 --- /dev/null +++ b/src/lib/el-svg-icon.js @@ -0,0 +1,10 @@ +import * as components from '@element-plus/icons-vue' + +export default { + install: (app) => { + for (const key in components) { + const componentConfig = components[key]; + app.component(componentConfig.name, componentConfig); + } + }, +}; diff --git a/src/main.js b/src/main.js index 5fff7dd..524e81c 100644 --- a/src/main.js +++ b/src/main.js @@ -28,6 +28,10 @@ import './permission' import 'element-plus/dist/index.css' const app = createApp(App) + +//import element-plus svg icon +import ElSvgIcon from "@/lib/el-svg-icon" +app.use(ElSvgIcon) //router app.use(router) diff --git a/src/permission.js b/src/permission.js index 6b4ea67..0964f25 100644 --- a/src/permission.js +++ b/src/permission.js @@ -1,9 +1,8 @@ import router from '@/router' -import { filterAsyncRouter, progressClose, progressStart } from '@/hooks/use-permission' +import {progressClose, progressStart } from '@/hooks/use-permission' import { useBasicStore } from '@/store/basic' -import { userInfoReq } from '@/api/user' import { langTitle } from '@/hooks/use-common' -import settings from './settings' +import settings from "@/settings"; //路由进入前拦截 //to:将要进入的页面 vue-router4.0 不推荐使用next() @@ -22,25 +21,8 @@ router.beforeEach(async (to) => { if (to.path === '/login') { return '/' } else { - //2.判断是否获取用户信息 - if (!basicStore.getUserInfo) { - try { - const userData = await userInfoReq() - //3.动态路由权限筛选 - filterAsyncRouter(userData) - //4.保存用户信息到store - basicStore.setUserInfo(userData) - //5.再次执行路由跳转 - return { ...to, replace: true } - } catch (e) { - console.error(`route permission error${e}`) - basicStore.resetState() - progressClose() - return `/login?redirect=${to.path}` - } - } else { - return true - } + basicStore.setFilterAsyncRoutes([]) + return true } } else { if (!whiteList.includes(to.path)) { diff --git a/src/router/index.js b/src/router/index.js index f695527..c1e84a1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,6 +1,5 @@ import { createRouter, createWebHashHistory } from 'vue-router' import basicDemo from './modules/basic-demo' - import Layout from '@/layout/index.vue' export const constantRoutes = [ @@ -15,7 +14,6 @@ export const constantRoutes = [ } ] }, - { path: '/login', component: () => import('@/views/login/index.vue'), @@ -41,50 +39,21 @@ export const constantRoutes = [ name: 'Dashboard', component: () => import('@/views/dashboard/index.vue'), //using el svg icon, the elSvgIcon first when at the same time using elSvgIcon and icon - meta: { title: 'Dashboard', elSvgIcon: 'Fold', affix: true } + meta: { title: 'Dashboard', icon: 'dashboard', affix: true } } ] }, - // { - // path: '/RBAC', - // component: Layout, - // children: [ - // { - // path: 'https://github.jzfai.top/low-code-platform/#/permission-center/user-table-query', - // meta: { title: 'RBAC', icon: 'skill' } - // } - // ] - // }, { path: '/setting-switch', component: Layout, + alwaysShow:true, + meta: { title: 'Setting Switch', elSvgIcon: 'Fold' }, children: [ { path: 'index', component: () => import('@/views/setting-switch/index.vue'), name: 'SettingSwitch', - meta: { title: 'Setting Switch', icon: 'example' } - } - ] - }, - - { - path: '/error-log', - component: Layout, - meta: { title: 'Error Log', icon: 'eye' }, - alwaysShow: true, - children: [ - { - path: 'error-log', - component: () => import('@/views/error-log/index.vue'), - name: 'ErrorLog', - meta: { title: 'Error Index' } - }, - { - path: 'error-generator', - component: () => import('@/views/error-log/error-generator.vue'), - name: 'ErrorGenerator', - meta: { title: 'Error Generator' } + meta: { title: 'Setting Switch', elSvgIcon: 'example' } } ] }, @@ -146,49 +115,12 @@ export const constantRoutes = [ } ] }, - basicDemo + basicDemo, ] //角色和code数组动态路由 export const roleCodeRoutes = [ - { - path: '/roles-codes', - component: Layout, - redirect: '/roles-codes/page', - alwaysShow: true, // will always show the root menu - name: 'Permission', - meta: { - title: 'Permission', - icon: 'lock', - roles: ['admin', 'editor'] // you can set roles in root nav - }, - children: [ - { - path: 'index', - component: () => import('@/views/roles-codes/index.vue'), - name: 'RolesCodes', - meta: { title: 'Permission Switch' } - }, - { - path: 'roleIndex', - component: () => import('@/views/roles-codes/role-index.vue'), - name: 'RoleIndex', - meta: { title: 'Role Index', roles: ['admin'] } - }, - { - path: 'code-index', - component: () => import('@/views/roles-codes/code-index.vue'), - name: 'CodeIndex', - meta: { title: 'Code Index', code: 16 } - }, - { - path: 'button-permission', - component: () => import('@/views/roles-codes/button-permission.vue'), - name: 'ButtonPermission', - meta: { title: 'Button Permission' } - } - ] - } + ] /** * asyncRoutes diff --git a/src/settings.js b/src/settings.js index 15ffc99..e56fca8 100644 --- a/src/settings.js +++ b/src/settings.js @@ -45,7 +45,7 @@ export const settings = { * @type {boolean} true | false * @description Whether need animation of main area */ - mainNeedAnimation: false, + mainNeedAnimation: true, /** * @type {boolean} true | false * @description Whether need nprogress diff --git a/src/styles/init-loading.css b/src/styles/init-loading.css new file mode 100644 index 0000000..169110f --- /dev/null +++ b/src/styles/init-loading.css @@ -0,0 +1,17 @@ +/*开屏loading样式设置*/ +.loader-wrapper{ + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + height: 80vh; +} + +.loading-gif{ + +} + +.load_title{ + margin-top: 30px; + font-size: 16px; +} diff --git a/src/styles/reset-elemenet-plus-style.scss b/src/styles/reset-elemenet-plus-style.scss index c7a101f..8b0ba95 100644 --- a/src/styles/reset-elemenet-plus-style.scss +++ b/src/styles/reset-elemenet-plus-style.scss @@ -2,3 +2,8 @@ .el-scrollbar__view { padding-bottom: 80px; } + + +.el-scrollbar{ + --el-menu-base-level-padding:15px; +} diff --git a/src/views/charts/index.vue b/src/views/charts/index.vue deleted file mode 100644 index a6ab424..0000000 --- a/src/views/charts/index.vue +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index ffc4aff..3cd6551 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,29 +1,29 @@