diff --git a/src/enums/editPageEnum.ts b/src/enums/editPageEnum.ts index df395653..bfb51ef0 100644 --- a/src/enums/editPageEnum.ts +++ b/src/enums/editPageEnum.ts @@ -9,6 +9,12 @@ export enum DragKeyEnum { DRAG_KEY = 'ChartData' } +// 不同页面保存操作 +export enum SavePageEnum { + CHART = 'SaveChart', + JSON = 'SaveJSON' +} + // 操作枚举 export enum MenuEnum { // 移动 @@ -42,6 +48,8 @@ export enum MenuEnum { BACK = 'back', // 前进 FORWORD = 'forward', + // 保存 + SAVE = 'save', // 锁定 LOCK = 'lock', // 解除锁定 diff --git a/src/enums/pageEnum.ts b/src/enums/pageEnum.ts index d709043c..5f3b4baf 100644 --- a/src/enums/pageEnum.ts +++ b/src/enums/pageEnum.ts @@ -12,6 +12,12 @@ export enum PreviewEnum { CHART_PREVIEW_NAME = 'ChartPreview', } +export enum EditEnum { + // 图表JSON编辑 + CHART_EDIT = '/chart/edit/:id(.*)*', + CHART_EDIT_NAME = 'ChartEdit', +} + export enum PageEnum { // 登录 BASE_LOGIN = '/login', diff --git a/src/router/index.ts b/src/router/index.ts index 88e42395..5fd12a68 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -21,7 +21,8 @@ const RootRoute: Array = [ ...HttpErrorPage, modules.projectRoutes, modules.chartRoutes, - modules.previewRoutes + modules.previewRoutes, + modules.editRoutes ] } ] diff --git a/src/router/modules/edit.route.ts b/src/router/modules/edit.route.ts new file mode 100644 index 00000000..50b8168b --- /dev/null +++ b/src/router/modules/edit.route.ts @@ -0,0 +1,20 @@ +import { RouteRecordRaw } from 'vue-router' +import { EditEnum } from '@/enums/pageEnum' + +// 引入路径 +const importPath = { + [EditEnum.CHART_EDIT_NAME]: () => import('@/views/edit/index.vue') +} + +const chartRoutes: RouteRecordRaw = { + path: EditEnum.CHART_EDIT, + name: EditEnum.CHART_EDIT_NAME, + component: importPath[EditEnum.CHART_EDIT_NAME], + meta: { + title: '编辑', + isRoot: true + } +} + + +export default chartRoutes \ No newline at end of file diff --git a/src/router/modules/index.ts b/src/router/modules/index.ts index 3be2427b..c134d953 100644 --- a/src/router/modules/index.ts +++ b/src/router/modules/index.ts @@ -1,9 +1,11 @@ import projectRoutes from './project.router' import chartRoutes from './chart.route' import previewRoutes from './preview.route' +import editRoutes from './edit.route' export default { projectRoutes, chartRoutes, - previewRoutes + previewRoutes, + editRoutes } \ No newline at end of file diff --git a/src/router/modules/preview.route.ts b/src/router/modules/preview.route.ts index d6741008..ae3d9191 100644 --- a/src/router/modules/preview.route.ts +++ b/src/router/modules/preview.route.ts @@ -3,7 +3,7 @@ import { PreviewEnum } from '@/enums/pageEnum' // 引入路径 const importPath = { - 'PreviewEnum.CHART_PREVIEW_NAME': () => import('@/views/preview/index.vue') + 'PreviewEnum.CHART_PREVIEW_NAME': () => import('@/views/preview/wrapper.vue') } const chartRoutes: RouteRecordRaw = { diff --git a/src/views/chart/ContentEdit/components/EditTools/index.vue b/src/views/chart/ContentEdit/components/EditTools/index.vue index 4c66016f..3582ee75 100644 --- a/src/views/chart/ContentEdit/components/EditTools/index.vue +++ b/src/views/chart/ContentEdit/components/EditTools/index.vue @@ -58,17 +58,65 @@ + + diff --git a/src/views/preview/wrapper.vue b/src/views/preview/wrapper.vue new file mode 100644 index 00000000..242910be --- /dev/null +++ b/src/views/preview/wrapper.vue @@ -0,0 +1,25 @@ + + +