From ca97409adfb2e9b6ddbeb5a6c11fd33e829be960 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=A6=8D?= <1455167345@qq.com>
Date: Wed, 10 Jul 2024 17:12:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E8=8E=B7=E5=8F=96=E8=A1=A8=E5=8D=95=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/workflow/task/index.vue        |   2 +-
 src/views/demo/workflow/task/process/look.vue | 141 +++++++++---------
 2 files changed, 74 insertions(+), 69 deletions(-)

diff --git a/src/views/demo/workflow/task/index.vue b/src/views/demo/workflow/task/index.vue
index f4763577..511971f1 100644
--- a/src/views/demo/workflow/task/index.vue
+++ b/src/views/demo/workflow/task/index.vue
@@ -8,7 +8,7 @@
     >
       <template v-for="item in settingList" :key="item.key">
         <TabPane :tab="item.name">
-          <div :style="'display: flex; height:' + data.height">
+          <div :style="' height:' + data.height">
             <component :is="tabs[item.component]" />
           </div>
         </TabPane>
diff --git a/src/views/demo/workflow/task/process/look.vue b/src/views/demo/workflow/task/process/look.vue
index 715da411..01bc326f 100644
--- a/src/views/demo/workflow/task/process/look.vue
+++ b/src/views/demo/workflow/task/process/look.vue
@@ -17,12 +17,12 @@
         ref="MapboxComponent"
       />
     </div>
-    
+
     <div :class="mapConfig?.isShowMap ? 'form-container' : ''">
       <a-layout>
         <a-layout>
           <a-layout-content>
-            <a-tabs v-model:activeKey="activeName"  @change="changeActive" type="card" >
+            <a-tabs v-model:activeKey="activeName" @change="changeActive" type="card">
               <a-tab-pane
                 key="form"
                 :tab="
@@ -33,7 +33,11 @@
                 v-if="formVisble"
               >
                 <div>
-                  <ImagePreview  v-if="isShowImagePreview" :globalImagePreviewUrl="globalImagePreviewUrl" @closeImagePreview="closeImagePreview"></ImagePreview>
+                  <ImagePreview
+                    v-if="isShowImagePreview"
+                    :globalImagePreviewUrl="globalImagePreviewUrl"
+                    @closeImagePreview="closeImagePreview"
+                  ></ImagePreview>
                   <FormViewer
                     ref="formBoxRef"
                     :formConfig="formConfig"
@@ -47,7 +51,6 @@
                     v-if="formVisble"
                   />
                 </div>
-                
               </a-tab-pane>
               <a-tab-pane key="flow" tab="流程模板" force-render>
                 <div class="process-design" :style="'display: flex; height:' + designerData.height">
@@ -110,7 +113,6 @@
       </a-layout>
     </div>
 
-
     <!-- 节点记录信息 -->
     <div class="info-box" v-if="designerData.nodeLogs.length > 0">
       <a-drawer v-model:open="infoOpen" class="custom-class" title="记录信息" placement="right">
@@ -138,7 +140,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, reactive, onBeforeMount, defineAsyncComponent,watch } from 'vue';
+  import { ref, reactive, onBeforeMount, defineAsyncComponent, watch } from 'vue';
   import { FormViewer } from '@/components/FormViewer';
   import { ProcessViewer } from '@/components/ProcessViewer';
   import { PageWrapper } from '@/components/Page';
@@ -149,7 +151,7 @@
   import { auditInfo } from './page';
   import { getGeom } from '@/api/sys/layerManagement';
   import { storeToRefs } from 'pinia';
-  import ImagePreview from "@/components/Upload/src/components/image_preview.vue";
+  import ImagePreview from '@/components/Upload/src/components/image_preview.vue';
   import { userFormFileStore } from '@/store/modules/formFileUrl';
   import { useMessage } from '@/hooks/web/useMessage';
   const { createMessage } = useMessage();
@@ -259,9 +261,14 @@
     if (data.process.isFinished == 1) {
       data.flowViewer.finishedTaskSet.forEach((finishElement) => {
         wfData.forEach((element) => {
-          if (finishElement == element.id && element.type == 'bpmn:Task') {
+          if (element.type == 'bpmn:StartEvent') {
             currentNode = element;
           }
+          if (finishElement == element.id && element.type == 'bpmn:Task') {
+            if (!element.isInherit) {
+              currentNode = element;
+            }
+          }
         });
       });
       mapConfig.value = currentNode.mapConfig;
@@ -431,34 +438,34 @@
   //   tabStore.closeTabByKey('/dashboard/task_look_preview/detail?processId=' + processId, router);
   // }
   // 解析组件获取图斑组件
-  const chooseLayer = ref<string>("")
-  const geomfield = ref<string>("");
+  const chooseLayer = ref<string>('');
+  const geomfield = ref<string>('');
 
   function findValue(obj, targetKey) {
-      for (var key in obj) {
-          if (typeof obj[key] === 'object') {
-              // 如果当前值是对象，则递归调用findValue
-              var result = findValue(obj[key], targetKey);
-              if (result !== undefined && result == 'MapGeom') {
-                  return result;
-              }
-          } else if (key === targetKey && obj[key] == 'MapGeom') {
-              // 如果当前键等于目标键，则返回对应的值
-              chooseLayer.value = obj['mapSetData'].chooseLayer;
-              geomfield.value = obj['field']
-              return obj[key];
-          }
+    for (var key in obj) {
+      if (typeof obj[key] === 'object') {
+        // 如果当前值是对象，则递归调用findValue
+        var result = findValue(obj[key], targetKey);
+        if (result !== undefined && result == 'MapGeom') {
+          return result;
+        }
+      } else if (key === targetKey && obj[key] == 'MapGeom') {
+        // 如果当前键等于目标键，则返回对应的值
+        chooseLayer.value = obj['mapSetData'].chooseLayer;
+        geomfield.value = obj['field'];
+        return obj[key];
       }
+    }
   }
 
-  function getFormSuccess(formData){
-    if(mapConfig.value.isShowMap){
+  function getFormSuccess(formData) {
+    if (mapConfig.value.isShowMap) {
       handlerShowGeomtrys(designerData.formCurrentNode, formData);
     }
   }
 
-  async function handlerShowGeomtrys(currentNode,formData) {
-    findValue(currentNode.authFields,"component");
+  async function handlerShowGeomtrys(currentNode, formData) {
+    findValue(currentNode.authFields, 'component');
     let layer: string = chooseLayer.value;
     if (!layer) {
       createMessage.error('图斑未绑定图层服务！');
@@ -467,57 +474,55 @@
     let geomfiledValue = geomfield.value;
     let gids = '';
     try {
-        geomfiledValue = geomfiledValue.toLowerCase();
-        gids = formData[geomfiledValue];
-        // 根据ids获取图斑
-        if (gids) {
-          try {
-            let getGeomPrams = {
-              TableName: layer,
-              FieldName: 'gid',
-              FieldValue: gids,
-              page: 1,
-              limit: 999,
-              key: null,
-            };
-            getGeom(getGeomPrams).then((res) => {
-              let geoms = [];
-              if (res) {
-                if (res.items?.length > 0) {
-                  res.items.forEach((item, index) => {
-                    let geom = {
-                      key: item.gid,
-                      mapgeom: item.geometry,
-                    };
-                    geoms.push(geom);
-                  });
-                }
-                // MapboxComponent.value.handlerDraw(status,mapgemoList.value, false);
-                MapboxComponent.value.handlerDraw('Details', geoms, false);
-              } else {
-                createMessage.error('当前数据没有图斑！');
+      geomfiledValue = geomfiledValue.toLowerCase();
+      gids = formData[geomfiledValue];
+      // 根据ids获取图斑
+      if (gids) {
+        try {
+          let getGeomPrams = {
+            TableName: layer,
+            FieldName: 'gid',
+            FieldValue: gids,
+            page: 1,
+            limit: 999,
+            key: null,
+          };
+          getGeom(getGeomPrams).then((res) => {
+            let geoms = [];
+            if (res) {
+              if (res.items?.length > 0) {
+                res.items.forEach((item, index) => {
+                  let geom = {
+                    key: item.gid,
+                    mapgeom: item.geometry,
+                  };
+                  geoms.push(geom);
+                });
               }
-            });
-          } catch (e) {
-            createMessage.error('当前数据没有图斑！');
-          }
-        } else {
+              // MapboxComponent.value.handlerDraw(status,mapgemoList.value, false);
+              MapboxComponent.value.handlerDraw('Details', geoms, false);
+            } else {
+              createMessage.error('当前数据没有图斑！');
+            }
+          });
+        } catch (e) {
           createMessage.error('当前数据没有图斑！');
         }
+      } else {
+        createMessage.error('当前数据没有图斑！');
+      }
     } catch {
       createMessage.error('获取图斑数据失败！');
     }
   }
-  function onMapboxLoad() {
+  function onMapboxLoad() {}
 
-  }
-
-    // 图片预览
+  // 图片预览
   const isShowImagePreview = ref<Boolean>(false);
-  const closeImagePreview = ()=>{
+  const closeImagePreview = () => {
     isShowImagePreview.value = false;
-  }
-  const globalImagePreviewUrl=ref<String>();
+  };
+  const globalImagePreviewUrl = ref<String>();
   const formFileStore = userFormFileStore();
   const formFileState = storeToRefs(formFileStore);
   watch(formFileState.url, (newValue, oldValue) => {