From f67cef340b49dc436ab754b0dfd834aafcad88d7 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Fri, 27 Oct 2023 17:50:16 +0800
Subject: [PATCH] chore: work flow patch

---
 .../workflow/extension/button/ButtonModal.vue |  8 +++-
 src/views/workflow/extension/button/index.vue |  2 +-
 .../extension/category/category.data.ts       |  7 +++-
 .../extension/condition/ConditionModal.vue    |  8 +++-
 .../workflow/extension/condition/index.vue    |  2 +-
 .../extension/formJson/FormJsonModal.vue      | 42 +++++++++----------
 .../workflow/extension/formJson/index.vue     |  6 +--
 .../extension/listener/ListenerModal.vue      |  8 +++-
 .../workflow/extension/listener/index.vue     |  2 +-
 .../extension/listener/listener.data.ts       |  1 -
 .../workflow/extension/workflowCopy/index.vue |  4 +-
 11 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/src/views/workflow/extension/button/ButtonModal.vue b/src/views/workflow/extension/button/ButtonModal.vue
index ee7e4d9..3e0d854 100644
--- a/src/views/workflow/extension/button/ButtonModal.vue
+++ b/src/views/workflow/extension/button/ButtonModal.vue
@@ -37,7 +37,7 @@
   const tag = ref<Nullable<string>>('');
   /** https://v3.cn.vuejs.org/api/options-data.html#emits */
   const emit = defineEmits(['success', 'register']);
-  const [registerForm, { resetFields, setFieldsValue, validate, clearValidate, updateSchema }] = useForm({
+  const [registerForm, { resetFields, setFieldsValue, validate, clearValidate, updateSchema, setProps }] = useForm({
     labelWidth: 100,
     schemas: formSchema,
     showActionButtonGroup: false,
@@ -81,9 +81,15 @@
       case 'add':
         props.title = '新增按钮';
         break;
+      case 'view':
+        props.title = '查看按钮';
+        await setFieldsValue(await getButton(id));
+        await setProps({ disabled: true });
+        break;
       case 'edit':
         props.title = '编辑按钮';
         await setFieldsValue(await getButton(id));
+        await setProps({ disabled: false });
         break;
     }
     // 尾部:设置处理后的最终配置数据
diff --git a/src/views/workflow/extension/button/index.vue b/src/views/workflow/extension/button/index.vue
index 479b9de..9369ca8 100644
--- a/src/views/workflow/extension/button/index.vue
+++ b/src/views/workflow/extension/button/index.vue
@@ -26,7 +26,7 @@
             :actions="[
               {
                 label: '查看',
-                icon: 'fa6-regular:pen-to-square',
+                icon: 'fa6-solid:eye',
                 onClick: handleView.bind(null, record)
               },
               {
diff --git a/src/views/workflow/extension/category/category.data.ts b/src/views/workflow/extension/category/category.data.ts
index 8982602..ef4356d 100644
--- a/src/views/workflow/extension/category/category.data.ts
+++ b/src/views/workflow/extension/category/category.data.ts
@@ -1,5 +1,7 @@
+import { h } from 'vue';
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
+import {Tag} from 'ant-design-vue';
 
 /** 表格列配置 */
 export const columns: BasicColumn[] = [
@@ -18,7 +20,10 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '备注信息',
-    dataIndex: 'remarks'
+    dataIndex: 'remarks',
+    customRender: ({record}) => {
+      return  record.permission ||  h(Tag, { color: 'warning' }, () => '暂无备注');
+    }
   },
 ];
 
diff --git a/src/views/workflow/extension/condition/ConditionModal.vue b/src/views/workflow/extension/condition/ConditionModal.vue
index 5b05aa4..878749c 100644
--- a/src/views/workflow/extension/condition/ConditionModal.vue
+++ b/src/views/workflow/extension/condition/ConditionModal.vue
@@ -25,7 +25,7 @@
   const tag = ref<Nullable<string>>('');
   /** https://v3.cn.vuejs.org/api/options-data.html#emits */
   const emit = defineEmits(['success', 'register']);
-  const [registerForm, { resetFields, setFieldsValue, validate, clearValidate, updateSchema }] = useForm({
+  const [registerForm, { resetFields, setFieldsValue, validate, clearValidate, updateSchema, setProps }] = useForm({
     labelWidth: 100,
     schemas: formSchema,
     showActionButtonGroup: false,
@@ -44,9 +44,15 @@
       case 'add':
         props.title = '新增表达式';
         break;
+      case 'view':
+        props.title = '查看表达式';
+        await setFieldsValue(await getCondition(id));
+        await setProps({ disabled: true });
+        break;
       case 'edit':
         props.title = '编辑表达式';
         await setFieldsValue(await getCondition(id));
+        await setProps({ disabled: false });
         break;
     }
     // 尾部:设置处理后的最终配置数据
diff --git a/src/views/workflow/extension/condition/index.vue b/src/views/workflow/extension/condition/index.vue
index 76593c3..6cbbb7c 100644
--- a/src/views/workflow/extension/condition/index.vue
+++ b/src/views/workflow/extension/condition/index.vue
@@ -26,7 +26,7 @@
             :actions="[
               {
                 label: '查看',
-                icon: 'fa6-regular:pen-to-square',
+                icon: 'fa6-solid:eye',
                 onClick: handleView.bind(null, record)
               },
               {
diff --git a/src/views/workflow/extension/formJson/FormJsonModal.vue b/src/views/workflow/extension/formJson/FormJsonModal.vue
index a1984d1..1026391 100644
--- a/src/views/workflow/extension/formJson/FormJsonModal.vue
+++ b/src/views/workflow/extension/formJson/FormJsonModal.vue
@@ -5,18 +5,16 @@
     cancelText="关闭"
     :showOkBtn="false"
     @register="registerModal"
-    @visible-change="handleVisibleChange"
   >
     <div id="formPreview"/>
   </BasicModal>
 </template>
 <script lang="ts" setup>
-  import { reactive } from 'vue';
+  import { onBeforeUnmount, reactive } from 'vue';
   import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
   import { loadMicroApp, MicroApp } from 'qiankun';
   import { getSubDefineProps } from '/@/qiankun/state';
   import { GlStateEnum } from '/@/enums/microAppEnum';
-  import { useMicroAppStore } from '/@/store/modules/microApp';
   import { apps } from '/@/qiankun/apps';
   import { FORM_DESIGN_APP_COMPONENTS } from '/@/enums/microAppEnum';
 
@@ -27,39 +25,41 @@
   const state = reactive<TableState>({
     formDesignApp: undefined!,
   });
+
   const formPreviewProps = {
     style: { height: 'calc(100vh - 160px)' },
     options: {},
     disabled: false,
-    readonly: false,
+    readonly: true,
     formSubmitSuccess: () => {},
     formSubmitError: () => {},
     formResetChange: () => {}
   };
   const emit = defineEmits(['success', 'register']);
-  const microAppStore = useMicroAppStore();
   const [registerModal, { setModalProps, closeModal, changeLoading }] = useModalInner(async (data: BoxPayload = { _tag: '' }) => {
-    changeLoading();
-    state.formDesignApp = loadMicroApp(Object.assign({} , apps.find(item => item.name == 'form-design'), {
-      container: '#formPreview',
-      props: {
-        ...getSubDefineProps(),
-        // 表单设计器props
-        [GlStateEnum.FORM_DESIGN_APP_PROPS_KEY]: formPreviewProps,
-        mountApp: FORM_DESIGN_APP_COMPONENTS.PREVIEW
-      }
-    }), { sandbox: { experimentalStyleIsolation: true }});
-    state.formDesignApp.mountPromise.then(() => {
-      changeLoading(false);
-    });
     data?.json && (formPreviewProps.options = eval('(' + data.json + ')') );
     const props: Partial<ModalProps> = { confirmLoading: false };
     props.title = '预览流程表单';
     setModalProps(props);
+    if (!state.formDesignApp || state.formDesignApp.getStatus() === 'NOT_MOUNTED') {
+      changeLoading();
+      state.formDesignApp = loadMicroApp(Object.assign({} , apps.find(item => item.name == 'form-design'), {
+        container: '#formPreview',
+        props: {
+          ...getSubDefineProps(),
+          mountApp: FORM_DESIGN_APP_COMPONENTS.PREVIEW,
+          // 表单设计器props
+          [GlStateEnum.FORM_DESIGN_APP_PROPS_KEY]: formPreviewProps,
+        }
+      }), { sandbox: { experimentalStyleIsolation: true }});
+      state.formDesignApp.mountPromise.then(() => {
+        changeLoading(false);
+      });
+    }
   });
 
-  function handleVisibleChange(visible: boolean) {
-    !visible && state.formDesignApp.unmount();
-  }
+  onBeforeUnmount(() => {
+    state.formDesignApp?.getStatus() === 'MOUNTED' && state.formDesignApp.unmount();
+  });
 
 </script>
diff --git a/src/views/workflow/extension/formJson/index.vue b/src/views/workflow/extension/formJson/index.vue
index 8872d80..a6bd1d5 100644
--- a/src/views/workflow/extension/formJson/index.vue
+++ b/src/views/workflow/extension/formJson/index.vue
@@ -17,17 +17,17 @@
             :actions="[
               {
                 label: '预览',
-                icon: 'fa6-brands:dev',
+                icon: 'fa6-solid:eye',
                 onClick: handleFormPreview.bind(null, record)
               },
               {
                 label: '设置为主版本',
-                icon: 'fa6-brands:dev',
+                icon: 'fa6-solid:arrow-up-short-wide',
                 onClick: handleSetFormPrimaryVersion.bind(null, record)
               },
               {
                 label: '删除',
-                icon: 'fa6-brands:dev',
+                icon: 'fa6-solid:trash',
                 color: 'error',
                 onClick: handleDel.bind(null, record)
               }]"
diff --git a/src/views/workflow/extension/listener/ListenerModal.vue b/src/views/workflow/extension/listener/ListenerModal.vue
index 73feb7f..c9b614e 100644
--- a/src/views/workflow/extension/listener/ListenerModal.vue
+++ b/src/views/workflow/extension/listener/ListenerModal.vue
@@ -25,7 +25,7 @@
   const tag = ref<Nullable<string>>('');
   /** https://v3.cn.vuejs.org/api/options-data.html#emits */
   const emit = defineEmits(['success', 'register']);
-  const [registerForm, { resetFields, setFieldsValue, validate, clearValidate, updateSchema }] = useForm({
+  const [registerForm, { resetFields, setFieldsValue, validate, clearValidate, updateSchema, setProps }] = useForm({
     labelWidth: 100,
     schemas: formSchema,
     showActionButtonGroup: false,
@@ -44,9 +44,15 @@
       case 'add':
         props.title = '新增监听器';
         break;
+      case 'view':
+        props.title = '查看监听器';
+        await setFieldsValue(await getListener(id));
+        await setProps({ disabled: true });
+        break;
       case 'edit':
         props.title = '编辑监听器';
         await setFieldsValue(await getListener(id));
+        await setProps({ disabled: false });
         break;
     }
     // 尾部:设置处理后的最终配置数据
diff --git a/src/views/workflow/extension/listener/index.vue b/src/views/workflow/extension/listener/index.vue
index 6e4f1d6..214d144 100644
--- a/src/views/workflow/extension/listener/index.vue
+++ b/src/views/workflow/extension/listener/index.vue
@@ -26,7 +26,7 @@
             :actions="[
               {
                 label: '查看',
-                icon: 'fa6-regular:pen-to-square',
+                icon: 'fa6-solid:eye',
                 onClick: handleView.bind(null, record)
               },
               {
diff --git a/src/views/workflow/extension/listener/listener.data.ts b/src/views/workflow/extension/listener/listener.data.ts
index a7c46d4..bb3057b 100644
--- a/src/views/workflow/extension/listener/listener.data.ts
+++ b/src/views/workflow/extension/listener/listener.data.ts
@@ -106,7 +106,6 @@ export const formSchema: FormSchema[] = [
       options: []
     }
   },
-
   {
     field: 'valueType',
     label: '值类型',
diff --git a/src/views/workflow/extension/workflowCopy/index.vue b/src/views/workflow/extension/workflowCopy/index.vue
index 2d45fa3..2c0f02f 100644
--- a/src/views/workflow/extension/workflowCopy/index.vue
+++ b/src/views/workflow/extension/workflowCopy/index.vue
@@ -17,11 +17,11 @@
             :actions="[
               {
                 label: '查阅审批',
-                icon: 'fa6-solid:bars-progress',
+                icon: 'fa6-solid:eye',
                 onClick: handleViewAudit.bind(null, record)
               }, {
                 label: '删除',
-                icon: 'fa-solid:toggle-on',
+                icon: 'fa6-solid:trash',
                 onClick: handleDel.bind(null, record)
               }]"
           />