Browse Source

chore: 简化合并路由元数据

master
wangxiang 2 years ago
parent
commit
f46934d572
  1. 4
      src/router/guard/index.ts
  2. 6
      src/views/report/design/index.vue
  3. 2
      src/views/workflow/extension/form/index.vue

4
src/router/guard/index.ts

@ -41,8 +41,8 @@ function createPageGuard(router: Router) {
// 页面已经加载完毕,再次打开会更快,不需要再做加载等处理 // 页面已经加载完毕,再次打开会更快,不需要再做加载等处理
to.meta.loaded = !!loadedPageMap.get(to.path); to.meta.loaded = !!loadedPageMap.get(to.path);
// 处理路由切换动态替换vue-router自定义元数据 // 处理路由切换动态替换vue-router自定义元数据
if (to.query?.meta === '_y') { if (to.query?._meta === 'y') {
merge(to.meta, omit(to.query, 'meta')); merge(to.meta, omit(to.query, '_meta'));
} }
// 通知路由更改 // 通知路由更改
setRouteChange(to); setRouteChange(to);

6
src/views/report/design/index.vue

@ -56,7 +56,7 @@
import { columns, searchFormSchema } from './design.data'; import { columns, searchFormSchema } from './design.data';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import { openWindow } from '/@/utils/index'; import { openWindow } from '/@/utils';
interface TableState { interface TableState {
single: boolean; single: boolean;
@ -113,7 +113,7 @@
function handleDesign(record: Recordable) { function handleDesign(record: Recordable) {
push({ path: '/report/edit', query: { push({ path: '/report/edit', query: {
meta: '_y', _meta: 'y',
title: '编辑报表', title: '编辑报表',
frameSrc: `https://192.168.3.10/ureport/designer?_u=kicc-${record.name}` frameSrc: `https://192.168.3.10/ureport/designer?_u=kicc-${record.name}`
}}); }});
@ -121,7 +121,7 @@
function handlePreview(record: Recordable) { function handlePreview(record: Recordable) {
push({ path: '/report/preview', query: { push({ path: '/report/preview', query: {
meta: '_y', _meta: 'y',
title: '预览报表', title: '预览报表',
frameSrc: `https://192.168.3.10/ureport/preview?_u=kicc-${record.name}` frameSrc: `https://192.168.3.10/ureport/preview?_u=kicc-${record.name}`
}}); }});

2
src/views/workflow/extension/form/index.vue

@ -276,7 +276,7 @@
/** 处理打开工作流版本管理 */ /** 处理打开工作流版本管理 */
function handleWorkFlowVersion(row: Recordable) { function handleWorkFlowVersion(row: Recordable) {
push({ path : `/workflow/formDefinitionJson/${row.id}`, query: { meta: '_y', title: `流程表单【${row.name}` }}); push({ path : `/workflow/formDefinitionJson/${row.id}`, query: { _meta: 'y', title: `流程表单【${row.name}` }});
} }
function handleSelect(selectedKeys: string[]) { function handleSelect(selectedKeys: string[]) {

Loading…
Cancel
Save