diff --git a/src/common/app/app-page-store.ts b/src/common/app/app-page-store.ts index 4da5280..5f315d7 100644 --- a/src/common/app/app-page-store.ts +++ b/src/common/app/app-page-store.ts @@ -5,7 +5,7 @@ import Utils from '@/common/utils' import { SpecialPage } from '@/common/router/constants.ts' export const useAppPageStore = defineStore('AppPage', () => { - const pages = Utils.resetAble(reactive([]))/* as Reactive */ + const pages = Utils.resetAble(reactive([])) const currentPage = Utils.resetAble(reactive({ insId: '', @@ -16,7 +16,7 @@ export const useAppPageStore = defineStore('AppPage', () => { menuId: '', icon: '', breadcrumb: [], - }))/* as Reactive */ + })) const keepAliveInclude = computed(() => { return pages.filter(it => it.keepAlive).map(it => Strings.pascalCase(it.routeName)) diff --git a/src/common/router/nav.ts b/src/common/router/nav.ts index f2342dc..abc66b4 100644 --- a/src/common/router/nav.ts +++ b/src/common/router/nav.ts @@ -12,143 +12,6 @@ import { SpecialPage } from '@/common/router/constants.ts' type Option = Partial> & Pick -/** - * 打开页面并添加标签 - * - * @param option - */ - -/* function open(option: string | Option) { - let ctx: AppTypes.PageContext - const appSettingStore = useAppSettingStore() - if (typeof option === 'string') { - const routeName = option - if (!router.hasRoute(routeName)) { - return reloadUserInfo() - .then(reloadRouter) - .then(() => { - if (!router.hasRoute(routeName)) { - ElMessage.error('页面不存在') - return Promise.reject('页面不存在') - } - const menu = appSettingStore.menus.find(it => it.routeName === routeName) - if (menu == null) { - ElMessage.error('页面不存在') - return Promise.reject('页面不存在') - } - ctx = { - insId: routeName, - title: menu.title, - keepAlive: true, - params: {}, - routeName, - menuId: menu.id, - icon: menu.icon, - breadcrumb: menu.breadcrumb, - } - useAppPageStore().open(ctx) - return router.push({name: ctx.routeName, params: ctx.params}) - .then(err => { - if (err == null) { - Evt.emit('openPage') - return Promise.resolve(true) - } else { - return Promise.reject(err) - } - }) - .catch(err => { - return Promise.reject(err) - }) - }) - } - const menu = appSettingStore.menus.find(it => it.routeName === routeName) - if (menu == null) { - ElMessage.error('页面不存在') - return Promise.reject('页面不存在') - } - ctx = { - insId: routeName , - title: menu.title, - keepAlive: true, - params: {}, - routeName, - menuId: menu.id, - icon: menu.icon, - breadcrumb: menu.breadcrumb, - } - } else { - const routeName = option.routeName - if (!router.hasRoute(routeName)) { - return reloadUserInfo() - .then(reloadRouter) - .then(() => { - if (!router.hasRoute(routeName)) { - ElMessage.error('页面不存在') - return Promise.reject('页面不存在') - } - const menu = appSettingStore.menus.find(it => it.routeName === routeName) - if (menu == null) { - ElMessage.error('页面不存在') - return Promise.reject('页面不存在') - } - const option_ = option as Option - ctx = { - insId: option_.insId ?? routeName, - title: option_.title ?? menu.title, - routeName: routeName, - keepAlive: true, - params: option_.params ?? {}, - menuId: menu.id, - icon: menu.icon, - breadcrumb: menu.breadcrumb, - } - useAppPageStore().open(ctx) - return router.push({name: ctx.routeName, params: ctx.params}) - .then(err => { - if (err == null) { - Evt.emit('openPage') - return Promise.resolve(true) - } else { - return Promise.reject(err) - } - }) - .catch(err => { - return Promise.reject(err) - }) - }) - } - const menu = appSettingStore.menus.find(it => it.routeName === routeName) - if (menu == null) { - ElMessage.error('页面不存在') - return Promise.reject('页面不存在') - } - - ctx = { - insId: option.insId ?? routeName, - title: option.title ?? menu.title, - routeName: routeName, - keepAlive: true, - params: option.params ?? {}, - menuId: menu.id, - icon: menu.icon, - breadcrumb: menu.breadcrumb, - } - } - useAppPageStore().open(ctx) - return router.push({name: ctx.routeName, params: ctx.params}) - .then(err => { - if (err == null) { - Evt.emit('openPage') - return Promise.resolve(true) - } else { - return Promise.reject(err) - } - }) - .catch(err => { - return Promise.reject(err) - }) - } */ - function checkRoute(option: string | Option) { let opt: Option if (typeof option === 'string') { @@ -188,6 +51,11 @@ function jump(ctx: AppTypes.PageContext) { }) } +/** + * 打开页面并添加标签 + * + * @param option + */ function open(option: string | Option) { return checkRoute(option) .then(({option, menu}) => { @@ -276,12 +144,11 @@ const install = (_: App): void => { .filter((it) => it.name !== SpecialPage.Main && it.name !== SpecialPage.Login && it.name !== SpecialPage.NotFound && it.name !== SpecialPage.Home) .map((it) => it.name as string) removeRoutes(routes) - router.push({replace: true, name: SpecialPage.Login}).then(() => { - // console.log(r) - }) + router.push({replace: true, name: SpecialPage.Login}) }) } + export default { open, close, diff --git a/src/common/utils/index.ts b/src/common/utils/index.ts index d3e2d22..97356bb 100644 --- a/src/common/utils/index.ts +++ b/src/common/utils/index.ts @@ -110,7 +110,7 @@ function resetAble(target: T): ResetAble { resetAbleTarget.$reset = (val?: PartialForObject) => { const resetValue = val ?? (initialData as PartialForObject) - if (Array.isArray(val)) { + if (Array.isArray(resetValue)) { const arr = target as unknown as Array const initialArr = resetValue as unknown as Array arr.splice(0, arr.length, ...initialArr) diff --git a/src/pages/a-frame/ATabbar.vue b/src/pages/a-frame/ATabbar.vue index 7d27a30..bc3d994 100644 --- a/src/pages/a-frame/ATabbar.vue +++ b/src/pages/a-frame/ATabbar.vue @@ -54,10 +54,6 @@ watch( }) }) -function reopen(insId: string) { - appPageStore.reopen(insId) -} - function handleCommand(command: 'closeCurrent' | 'closeOther' | 'closeAll') { Nav[command]() }