From 6d73129e17db3273a7b708ad82e4fc61d4a2bda9 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Wed, 2 Aug 2023 00:29:17 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=BE=AE=E5=BA=94=E7=94=A8=E9=87=8D?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/enums/microAppEnum.ts | 12 ++++++------ src/qiankun/index.ts | 8 ++++---- src/qiankun/state.ts | 2 +- src/store/modules/microApp.ts | 6 +++--- .../extension/form/helper/WorkflowFormDesign.vue | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/enums/microAppEnum.ts b/src/enums/microAppEnum.ts index 8d936e5..0b77bcc 100644 --- a/src/enums/microAppEnum.ts +++ b/src/enums/microAppEnum.ts @@ -7,17 +7,17 @@ export enum GlStateEnum { // 表单设计器 - FORM_DESIGN_PROPS_KEY = 'MICRO_FORM_DESIGN_PROPS_KEY', - FORM_DESIGN_EMIT_KEY = 'MICRO_FORM_DESIGN_EMIT_KEY', + FORM_DESIGN_APP_PROPS_KEY = 'MICRO_FORM_DESIGN_APP_PROPS_KEY', + FORM_DESIGN_APP_EMIT_KEY = 'MICRO_FORM_DESIGN_APP_EMIT_KEY', // 工作流设计器 - WORKFLOW_DESIGN_PROPS_KEY = 'MICRO_WORKFLOW_DESIGN_PROPS_KEY', - WORKFLOW_DESIGN_EMIT_KEY = 'MICRO_WORKFLOW_DESIGN_EMIT_KEY', + WORKFLOW_DESIGN_APP_PROPS_KEY = 'MICRO_WORKFLOW_DESIGN_APP_PROPS_KEY', + WORKFLOW_DESIGN_APP_EMIT_KEY = 'MICRO_WORKFLOW_DESIGN_APP_EMIT_KEY', } -export enum FORM_DESIGN_COMPONENTS { +export enum FORM_DESIGN_APP_COMPONENTS { DESIGN = 'MicroDesign', PREVIEW = 'MicroPreview' } -export enum WORKFLOW_DESIGN_COMPONENTS { +export enum WORKFLOW_DESIGN_APP_COMPONENTS { } diff --git a/src/qiankun/index.ts b/src/qiankun/index.ts index a204bdb..bef03b0 100644 --- a/src/qiankun/index.ts +++ b/src/qiankun/index.ts @@ -54,10 +54,10 @@ function registerApps() { addGlobalUncaughtErrorHandler((event) => console.log(event)); // 初始化全局通信 microState = initGlState({ - [GlStateEnum.FORM_DESIGN_PROPS_KEY]: {}, - [GlStateEnum.FORM_DESIGN_EMIT_KEY]: {}, - [GlStateEnum.WORKFLOW_DESIGN_PROPS_KEY]: {}, - [GlStateEnum.WORKFLOW_DESIGN_EMIT_KEY]: {}, + [GlStateEnum.FORM_DESIGN_APP_PROPS_KEY]: {}, + [GlStateEnum.FORM_DESIGN_APP_EMIT_KEY]: {}, + [GlStateEnum.WORKFLOW_DESIGN_APP_PROPS_KEY]: {}, + [GlStateEnum.WORKFLOW_DESIGN_APP_EMIT_KEY]: {}, }); // 启动qiankun start({ diff --git a/src/qiankun/state.ts b/src/qiankun/state.ts index e54c1bb..f324558 100644 --- a/src/qiankun/state.ts +++ b/src/qiankun/state.ts @@ -37,7 +37,7 @@ export function initGlState(state?: Recordable): MicroAppStateActions { const microAppStore = useMicroAppStore(); const actions = initGlobalState(state); actions.onGlobalStateChange((newState, prev) => { - const { [GlStateEnum.FORM_DESIGN_EMIT_KEY]: formDesignEmit, [GlStateEnum.WORKFLOW_DESIGN_EMIT_KEY]: workflowDesignEmit } = newState; + const { [GlStateEnum.FORM_DESIGN_APP_EMIT_KEY]: formDesignEmit, [GlStateEnum.WORKFLOW_DESIGN_APP_EMIT_KEY]: workflowDesignEmit } = newState; !isEmpty(formDesignEmit) && microAppStore.setFormDesignApp(formDesignEmit); !isEmpty(workflowDesignEmit) && microAppStore.setWorkflowDesignApp(workflowDesignEmit); }); diff --git a/src/store/modules/microApp.ts b/src/store/modules/microApp.ts index 3dfee5e..c54a6d6 100644 --- a/src/store/modules/microApp.ts +++ b/src/store/modules/microApp.ts @@ -7,7 +7,7 @@ import { defineStore } from 'pinia'; import { store } from '/@/store'; import { merge } from 'lodash-es'; -import { FORM_DESIGN_COMPONENTS, WORKFLOW_DESIGN_COMPONENTS } from '/@/enums/microAppEnum'; +import { FORM_DESIGN_APP_COMPONENTS, WORKFLOW_DESIGN_APP_COMPONENTS } from '/@/enums/microAppEnum'; interface MicroAppState { formDesignApp: Recordable; @@ -22,10 +22,10 @@ export const useMicroAppStore = defineStore({ }), getters: { getFormDesignApp(): Function { - return (component: FORM_DESIGN_COMPONENTS) => this.formDesignApp[component] || {}; + return (component: FORM_DESIGN_APP_COMPONENTS) => this.formDesignApp[component] || {}; }, getWorkflowDesignApp(): Function { - return (component: WORKFLOW_DESIGN_COMPONENTS) => this.workflowDesignApp[component] || {}; + return (component: WORKFLOW_DESIGN_APP_COMPONENTS) => this.workflowDesignApp[component] || {}; } }, actions: { diff --git a/src/views/workflow/extension/form/helper/WorkflowFormDesign.vue b/src/views/workflow/extension/form/helper/WorkflowFormDesign.vue index 645de52..effbd1e 100644 --- a/src/views/workflow/extension/form/helper/WorkflowFormDesign.vue +++ b/src/views/workflow/extension/form/helper/WorkflowFormDesign.vue @@ -25,7 +25,7 @@ import { apps } from '/@/qiankun/apps'; import { addFormDefinitionJson, editFormDefinitionJson, getFormDefinitionJson } from '/@/api/platform/workflow/extension/controller/formDefinitionJson'; import { FormDefinitionJson } from '/@/api/platform/workflow/extension/entity/formDefinitionJson'; - import { FORM_DESIGN_COMPONENTS } from '/@/enums/microAppEnum'; + import { FORM_DESIGN_APP_COMPONENTS } from '/@/enums/microAppEnum'; interface TableState { tag: string; @@ -60,7 +60,7 @@ props: { ...getSubDefineProps(), // 表单设计器props - [GlStateEnum.FORM_DESIGN_PROPS_KEY]: formDesignProps + [GlStateEnum.FORM_DESIGN_APP_PROPS_KEY]: formDesignProps } }), { sandbox: { experimentalStyleIsolation: true }}); // 处理清除脏数据 @@ -91,7 +91,7 @@ /** 处理弹出框提交 */ async function handleSubmitForm(status: string) { try { - const formDesignApp: Recordable = microAppStore.getFormDesignApp(FORM_DESIGN_COMPONENTS.DESIGN), + const formDesignApp: Recordable = microAppStore.getFormDesignApp(FORM_DESIGN_APP_COMPONENTS.DESIGN), formRef: Recordable = formDesignApp.getRef().$refs['form-design']; state.form.json = formRef.getWidgetFormJson(); state.form.status = status;