chore: Microapp Value Transfer

src/views/workflow/task/TaskForm.vue

@@ -139,7 +139,7 @@
       </a-card>
     </ALayoutContent>
     <footer class="workflow-form__footer" :style="getWrapFormFooterStyle">
-      <a-button size="large" type="primary" @click="test">审批</a-button>
+      <a-button size="large" type="primary" @click="commit">审批</a-button>
       <a-button size="large" type="primary" danger>驳回</a-button>
     </footer>
     <UserPicker :title="state.userPickerProps.title"
@@ -182,6 +182,7 @@
   import UserPicker from './popups/UserPicker/index.vue';
   import { ApiSelect } from '/@/components/Form';
   import { listUser } from '/@/api/platform/system/controller/user';
+  import { ActivityCommentInfo } from '/@/api/platform/workflow/entity/activityCommentInfo';
 
   /** 类型规范统一声明定义区域 */
   interface WindowState {
@@ -225,15 +226,12 @@
     // 是否指定代理人
     isAssign: boolean;
     // 审批表单信息
-    auditForm: {
+    auditForm: ActivityCommentInfo & {
-      message: string;
-      mesCode: string;
-      mesName: string;
       // 抄送用户ID
       userIds: string[];
       // 任务代理人ID
       assignee: string;
-    },
+    };
     rulesRef: Recordable;
     userPickerProps: {
       title: string;
@@ -281,6 +279,7 @@
       message: '',
       mesCode: '',
       mesName: '',
+      mesLevel: '',
       userIds: [],
       assignee: ''
     },
@@ -366,19 +365,16 @@
   }
 
   /** 流程抄送 */
-  function cc(data: Recordable) {
+  async function cc(data: Recordable) {
     if (state.isCC && state.auditForm.userIds) {
-      //this.$refs['auditForm'].validate((valid) => {
+      await auditForm.value.validate();
-        //if (valid) {
+      await saveWorkflowCopy(state.auditForm.userIds.join(','), {
-          saveWorkflowCopy(state.auditForm.userIds.join(','), {
+        processDefId: state.processDefId,
-            processDefId: state.processDefId,
+        processInsId: data.processInsId,
-            processInsId: data.processInsId,
+        processDefName: '',
-            processDefName: '',
+        processInsName: state.formTitle,
-            processInsName: state.formTitle,
+        taskName: ''
-            taskName: ''
+      });
-          });
-        //}
-      //});
     }
   }
 
@@ -396,7 +392,7 @@
     if (state.formType === '2') {
       formPreview.value.startProcessDefinition(async (businessTable: string, businessId: string) => {
         const processInsId = await startProcessDefinition({
-          processDefKey: this.processDefKey,
+          processDefKey: state.processDefKey,
           businessTable: businessTable,
           businessId: businessId,
           ...vars
@@ -407,7 +403,7 @@
       });
     // 动态表单
     } else {
-      formPreview.value.startFormProcessDefinition({ processDefId: this.processDefId, ...vars }, (processInsId: string) => {
+      formPreview.value.startFormProcessDefinition({ processDefId: state.processDefId, ...vars }, (processInsId: string) => {
         close();
         push({ path: '/workflow/task/index' });
         cc({ processInsId });
@@ -483,7 +479,7 @@
       title: '警告',
       content: '确定终止流程吗?',
       onOk: async () => {
-        await stopProcessInstance(this.processInsId, this.auditForm.message);
+        await stopProcessInstance(state.processInsId, state.auditForm.message);
         await close();
         await push({path: '/workflow/task/index'});
         cc({processInsId: state.processInsId});
@@ -498,7 +494,7 @@
 
   /** 驳回到任意节点 */
   function rollBack() {
-    openRollBackTask(true,{ taskId: this.taskId });
+    openRollBackTask(true,{ taskId: state.taskId });
   }
 
   /** 加签 */
@@ -524,12 +520,12 @@
     if (state.formType === '2') {
       formPreview.value.auditTask(async () => {
          await auditTask({
-          taskId: this.taskId,
+          taskId: state.taskId,
-          taskDefKey: this.taskDefKey,
+          taskDefKey: state.taskDefKey,
-          processInsId: this.processInsId,
+          processInsId: state.processInsId,
-          processDefId: this.processDefId,
+          processDefId: state.processDefId,
-          activityCommentInfo: this.auditForm,
+          activityCommentInfo: state.auditForm,
-          assignee: this.auditForm.assignee,
+          assignee: state.auditForm.assignee,
           vars,
         });
         await close();
@@ -539,11 +535,12 @@
     // 动态表单审批
     } else {
       formPreview.value.auditFormTask({
-        taskId: this.taskId,
+        formType: '',
-        processInsId: this.processInsId,
+        taskId: state.taskId,
-        activityCommentInfo: this.auditForm,
+        processInsId: state.processInsId,
-        assignee: this.auditForm.assignee,
+        activityCommentInfo: state.auditForm,
-        vars,
+        assignee: state.auditForm.assignee,
+        vars
       }, () => {
         close();
         push({ path: '/workflow/task/index' });
@@ -555,9 +552,9 @@
   /** 处理回退到任意节点 */
   async function handleRollBackTask(backTaskDefKey: string) {
     await rejectTask({
-      currentTaskId: this.taskId,
+      currentTaskId: state.taskId,
       rollBackTaskDefKey: backTaskDefKey,
-      comment: this.auditForm
+      comment: state.auditForm
     });
     await close();
     await push({ path: '/workflow/task/index' });
@@ -566,7 +563,7 @@
 
   /** 处理转派任务 */
   async function handleTransferTask(userList: KiccUser[]) {
-    await transferTask( this.taskId, userList[0].id);
+    await transferTask( state.taskId, userList[0].id);
     await close();
     await push({ path: '/workflow/task/index' });
     cc({ processInsId: state.processInsId });
@@ -574,7 +571,7 @@
 
   /** 处理任务委派 */
   async function handleDelegateTask(userList: KiccUser[]) {
-    await delegateTask(this.taskId, userList[0].id);
+    await delegateTask(state.taskId, userList[0].id);
     await close();
     await push({ path: '/workflow/task/index' });
     cc({ processInsId: state.processInsId });
@@ -658,10 +655,6 @@
     }
   }
 
-  function test() {
-    auditForm.value.validate();
-  }
-
 </script>
 <style lang="less" scoped>
   @prefix-cls: ~'@{namespace}-task-form';

src/views/workflow/task/WorkflowPreviewForm.vue

@@ -43,6 +43,9 @@
     options: {},
     disabled: false,
     readonly: false,
+    value: state.formData,
+    handleValueChange: (formData: Recordable) =>
+        formDesignProps.value = state.formData = formData
   };
   const microAppStore = useMicroAppStore();
   const { createMessage } = useMessage();
@@ -56,6 +59,18 @@
         const data = await getFormDefinitionJson(formJsonId);
         if (!data.json) throw Error('当前数据没有json结构体');
         formDesignProps.options = eval('(' + data.json + ')');
+        const disableIds: string[] = [], showIds: string[] = [];
+        props.taskFormData.forEach((item) => {
+          if (item.value !== undefined) {
+            state.formData[item.id] = item.value;
+          }
+          if (item.readable === true) {
+            showIds.push(item.id);
+          }
+          if (item.writable === false) {
+            disableIds.push(item.id);
+          }
+        });
         state.formDesignApp?.unmount();
         state.formDesignApp = loadMicroApp(Object.assign({} , apps.find(item => item.name == 'form-design'), {
           container: '#formPreview',
@@ -67,19 +82,6 @@
           }
         }), { sandbox: { experimentalStyleIsolation: true }});
         state.formDesignApp.mountPromise.then(() => {
-          const disableIds:string[] = [];
-          const showIds:string[] = [];
-          props.taskFormData.forEach((item) => {
-            if (item.value !== undefined) {
-              state.formData[item.id] = item.value;
-            }
-            if (item.readable === true) {
-              showIds.push(item.id);
-            }
-            if (item.writable === false) {
-              disableIds.push(item.id);
-            }
-          });
           const formPreviewApp: Recordable = microAppStore.getFormDesignApp(FORM_DESIGN_APP_COMPONENTS.PREVIEW),
                 formRef: Recordable = formPreviewApp.getRef().$refs['form-preview'];
           formRef.setShowIds(showIds);