vue2-client 1.19.57 → 1.19.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.19.57",
+  "version": "1.19.59",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue

@@ -81,18 +81,23 @@
                 key="workFlowTab"
                 tab="表单"
               >
+                <work-flow-preview v-if="historyFormCompletedDataPreview" :form-completed-data-preview="historyFormCompletedDataPreview" :showTitle="false"/>
+                <a-divider/>
                 <x-add-native-form
                   ref="xAddForm"
                   @x-form-item-emit-func="formItemEmitFunc"
                   @onSubmit="submitForm"/>
               </a-tab-pane>
             </x-tab>
-            <x-add-native-form
-              v-else
-              ref="xAddForm"
-              @x-form-item-emit-func="formItemEmitFunc"
-              @onSubmit="submitForm"/>
-            <a-divider/>
+            <div v-else>
+              <work-flow-preview v-if="historyFormCompletedDataPreview" :form-completed-data-preview="historyFormCompletedDataPreview" :showTitle="false"/>
+              <a-divider/>
+              <x-add-native-form
+                ref="xAddForm"
+                @x-form-item-emit-func="formItemEmitFunc"
+                @onSubmit="submitForm"/>
+              <a-divider/>
+            </div>
 
             <!-- 分支节点状态提示 -->
             <a-alert
@@ -486,6 +491,7 @@ export default {
       formCompletedData: {},
       // 用于展示提交的数据
       formCompletedDataPreview: null,
+      historyFormCompletedDataPreview: null,
       // 切换至目标流程时，目标流程定义
       targetStepDefine: [],
       // 控制历史记录加载
@@ -953,8 +959,78 @@ export default {
     // 获取当前步骤定义内容，构建组件
     async buildComp (stepId) {
       const properties = this.stepsDefine.find(item => item.id === stepId).properties
+      this.historyFormCompletedDataPreview = null
       // 表单的渲染
       if (properties.form && properties.form.formJson) {
+        if (properties.otherProperty && properties.otherProperty.historyFormData) {
+          const historyFormDataConfig = properties.otherProperty.historyFormData
+
+          // 收集所有需要查询的步骤和字段映射关系
+          const configItems = []
+          const stepIdSet = new Set()
+
+          for (const historyFormConfig of historyFormDataConfig) {
+            const stepConfig = this.stepsDefine.find(item => item.name === historyFormConfig.stepName)
+            if (!stepConfig) {
+              continue
+            }
+
+            const stepId = stepConfig.id
+            const stepFormJson = stepConfig?.properties?.form?.formJson
+            if (!stepFormJson) {
+              continue
+            }
+
+            const formItem = stepFormJson.find(item => item.name === historyFormConfig.formLabel)
+            const model = formItem?.model
+
+            if (!model) {
+              continue
+            }
+
+            // 收集配置项和需要查询的 stepId
+            configItems.push({
+              stepId,
+              model,
+              displayLabel: historyFormConfig.displayLabel
+            })
+            stepIdSet.add(stepId)
+          }
+
+          // 批量查询：每个 stepId 只查询一次，并行执行
+          const formDataCache = new Map()
+          const queryPromises = Array.from(stepIdSet).map(async stepId => {
+            try {
+              const formData = await postByServiceName(
+                workFlowViewApi.getWorkFlowCompletedStepData,
+                { workflowId: this.workflowId, stepId }
+              )
+              formDataCache.set(stepId, formData.data || {})
+            } catch (error) {
+              console.error(`查询步骤 ${stepId} 的数据失败:`, error)
+              formDataCache.set(stepId, {})
+            }
+          })
+
+          // 等待所有查询完成
+          await Promise.all(queryPromises)
+
+          // 组装历史表单数据
+          const historyFormData = configItems.map(configItem => {
+            const cachedFormData = formDataCache.get(configItem.stepId)
+            return {
+              label: configItem.displayLabel,
+              value: cachedFormData?.[configItem.model]
+            }
+          })
+
+          this.historyFormCompletedDataPreview = {
+            data: historyFormData,
+            images: [],
+            files: [],
+            note: ''
+          }
+        }
         this.stepDefine = properties.form.formJson
         this.showForm = true
         this.$nextTick(() => {

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowPreview.vue

@@ -7,7 +7,7 @@
         bordered
         class="descriptionPreviewItem"
       >
-        <p slot="title" class="descriptionTitle">
+        <p slot="title" class="descriptionTitle" v-if="showTitle">
           填写历史
         </p>
         <template v-if="legacyMode">
@@ -97,7 +97,11 @@ export default {
     legacyMode: {
       type: Boolean,
       default: false
-    }
+    },
+    showTitle: {
+      type: Boolean,
+      default: true
+    },
   },
   computed: {
     noData () {