From 55da358336433ce971f007e9ae1e5fa8188ccea8 Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Sun, 3 Nov 2024 23:12:13 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=91=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=98=AF=20Simple=20=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=20Simple=20=E6=B5=81=E7=A8=8B=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../create/ProcessDefinitionDetail.vue        | 17 +++-
 .../detail/ProcessInstanceSimpleViewer.vue    | 91 ++++++++-----------
 2 files changed, 52 insertions(+), 56 deletions(-)

diff --git a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
index df3705ac..203ec25b 100644
--- a/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
+++ b/src/views/bpm/processInstance/create/ProcessDefinitionDetail.vue
@@ -71,8 +71,17 @@
           <!-- 流程图 -->
           <el-tab-pane label="流程图" name="diagram">
             <div class="form-scroll-area">
-              <!-- 流程图预览 -->
-              <ProcessInstanceBpmnViewer :bpmn-xml="bpmnXML" />
+              <!-- BPMN 流程图预览 -->
+              <ProcessInstanceBpmnViewer 
+                :bpmn-xml="bpmnXML" 
+                v-if="BpmModelType.BPMN === selectProcessDefinition.modelType" 
+              />
+
+              <!-- Simple 流程图预览 -->
+              <ProcessInstanceSimpleViewer 
+                :simple-json="simpleJson" 
+                v-if="BpmModelType.SIMPLE === selectProcessDefinition.modelType" 
+              />
             </div>
           </el-tab-pane>
         </el-tabs>
@@ -98,7 +107,9 @@
 </template>
 <script lang="ts" setup>
 import { decodeFields, setConfAndFields2 } from '@/utils/formCreate'
+import { BpmModelType } from '@/utils/constants'
 import ProcessInstanceBpmnViewer from '../detail/ProcessInstanceBpmnViewer.vue'
+import ProcessInstanceSimpleViewer from '../detail/ProcessInstanceSimpleViewer.vue'
 import ProcessInstanceTimeline from '../detail/ProcessInstanceTimeline.vue'
 import type { ApiAttrs } from '@form-create/element-ui/types/config'
 import { useTagsViewStore } from '@/store/modules/tagsView'
@@ -127,6 +138,7 @@ const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据
 const startUserSelectAssigneesFormRules = ref({}) // 发起人选择审批人的表单 Rules
 const userList = ref<any[]>([]) // 用户列表
 const bpmnXML: any = ref(null) // BPMN 数据
+const simpleJson = ref<string|undefined>() // Simple 设计器数据 json 格式
 /** 当前的Tab */
 const activeTab = ref('form')
 const emit = defineEmits(['cancel'])
@@ -162,6 +174,7 @@ const initProcessInfo = async (row: any, formVariables?: any) => {
     const processDefinitionDetail = await DefinitionApi.getProcessDefinition(row.id)
     if (processDefinitionDetail) {
       bpmnXML.value = processDefinitionDetail.bpmnXml
+      simpleJson.value = processDefinitionDetail.simpleModel
       startUserSelectTasks.value = processDefinitionDetail.startUserSelectTasks
 
       // 设置指定审批人
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue b/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue
index 6fcad0ca..22c21d69 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue
@@ -1,6 +1,10 @@
 <template>
   <div v-loading="loading" class="mb-20px">
-      <SimpleProcessViewer :flow-node="simpleModel" :tasks="tasks" :process-instance="processInstance"/>
+    <SimpleProcessViewer
+      :flow-node="simpleModel"
+      :tasks="tasks"
+      :process-instance="processInstance"
+    />
   </div>
 </template>
 <script lang="ts" setup>
@@ -12,72 +16,51 @@ defineOptions({ name: 'BpmProcessInstanceSimpleViewer' })
 
 const props = defineProps({
   loading: propTypes.bool.def(false), // 是否加载中
-  modelView: propTypes.object
+  modelView: propTypes.object,
+  simpleJson: propTypes.string // Simple 模型结构数据 (json 格式)
 })
 const simpleModel = ref()
 // 用户任务
 const tasks = ref([])
 // 流程实例
 const processInstance = ref()
-// /** 只有 loading 完成时，才去加载流程列表 */
-// watch(
-//   () => props.loading,
-//   async (value) => {
-//     if (value && props.id) {
-//       const modelView = await ProcessInstanceApi.getProcessInstanceBpmnModelView(props.id)
-//       if (modelView) {
-//         tasks.value = modelView.tasks
-//         processInstance.value = modelView.processInstance
-//         // 已经拒绝的活动节点编号集合，只包括 UserTask
-//         const rejectedTaskActivityIds: string[] = modelView.rejectedTaskActivityIds
-//         // 进行中的活动节点编号集合， 只包括 UserTask
-//         const unfinishedTaskActivityIds: string[] = modelView.unfinishedTaskActivityIds
-//         // 已经完成的活动节点编号集合， 包括 UserTask、Gateway 等
-//         const finishedActivityIds: string[] = modelView.finishedTaskActivityIds
-//         // 已经完成的连线节点编号集合，只包括 SequenceFlow
-//         const finishedSequenceFlowActivityIds: string[] = modelView.finishedSequenceFlowActivityIds
-//         setSimpleModelNodeTaskStatus(
-//           modelView.simpleModel,
-//           modelView.processInstance.status,
-//           rejectedTaskActivityIds,
-//           unfinishedTaskActivityIds,
-//           finishedActivityIds,
-//           finishedSequenceFlowActivityIds
-//         )
-//         simpleModel.value = modelView.simpleModel
-//       }
-//     }
-//   }
-// )
+
+/** 监控模型视图 包括任务列表、进行中的活动节点编号等 */
 watch(
   () => props.modelView,
   async (newModelView) => {
     if (newModelView) {
-      if (newModelView) {
-        tasks.value = newModelView.tasks
-        processInstance.value = newModelView.processInstance
-        // 已经拒绝的活动节点编号集合，只包括 UserTask
-        const rejectedTaskActivityIds: string[] = newModelView.rejectedTaskActivityIds
-        // 进行中的活动节点编号集合， 只包括 UserTask
-        const unfinishedTaskActivityIds: string[] = newModelView.unfinishedTaskActivityIds
-        // 已经完成的活动节点编号集合， 包括 UserTask、Gateway 等
-        const finishedActivityIds: string[] = newModelView.finishedTaskActivityIds
-        // 已经完成的连线节点编号集合，只包括 SequenceFlow
-        const finishedSequenceFlowActivityIds: string[] = newModelView.finishedSequenceFlowActivityIds
-        setSimpleModelNodeTaskStatus(
-          newModelView.simpleModel,
-          newModelView.processInstance.status,
-          rejectedTaskActivityIds,
-          unfinishedTaskActivityIds,
-          finishedActivityIds,
-          finishedSequenceFlowActivityIds
-        )
-        simpleModel.value = newModelView.simpleModel
-      }
+      tasks.value = newModelView.tasks
+      processInstance.value = newModelView.processInstance
+      // 已经拒绝的活动节点编号集合，只包括 UserTask
+      const rejectedTaskActivityIds: string[] = newModelView.rejectedTaskActivityIds
+      // 进行中的活动节点编号集合， 只包括 UserTask
+      const unfinishedTaskActivityIds: string[] = newModelView.unfinishedTaskActivityIds
+      // 已经完成的活动节点编号集合， 包括 UserTask、Gateway 等
+      const finishedActivityIds: string[] = newModelView.finishedTaskActivityIds
+      // 已经完成的连线节点编号集合，只包括 SequenceFlow
+      const finishedSequenceFlowActivityIds: string[] = newModelView.finishedSequenceFlowActivityIds
+      setSimpleModelNodeTaskStatus(
+        newModelView.simpleModel,
+        newModelView.processInstance.status,
+        rejectedTaskActivityIds,
+        unfinishedTaskActivityIds,
+        finishedActivityIds,
+        finishedSequenceFlowActivityIds
+      )
+      simpleModel.value = newModelView.simpleModel
+    }
+  }
+)
+/** 监控模型结构数据 */
+watch(
+  () => props.simpleJson,
+  async (value) => {
+    if (value) {
+      simpleModel.value = JSON.parse(value)
     }
   }
 )
-
 const setSimpleModelNodeTaskStatus = (
   simpleModel: SimpleFlowNode | undefined,
   processStatus: number,