vue2-client 1.19.59 → 1.19.61

package/package.json

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

package/src/base-client/components/his/XHDescriptions/XHDescriptions.vue

@@ -106,7 +106,14 @@
                   <div v-if="item.showAvatar" class="gender-icon">
                     <img :src="maleIcon" alt="male" class="gender-img" />
                   </div>
-                  <span class="label-text">{{ item.label }}<span v-if="getItemColon(item)" class="colon">:</span></span>
+                  <span class="label-text">
+                    <template v-if="item.type === 'list'">
+                      <span class="list-label-text">{{ item.label }}</span>
+                    </template>
+                    <template v-else>
+                      {{ item.label }}<span v-if="item.type !== 'list' && getItemColon(item)" class="colon">:</span>
+                    </template>
+                  </span>
                 </div>
               </template>
               <a-tooltip
@@ -172,7 +179,14 @@
                   <div v-if="item.showAvatar" class="gender-icon">
                     <img :src="maleIcon" alt="male" class="gender-img" />
                   </div>
-                  <span class="label-text">{{ item.label }}</span>
+                  <span class="label-text">
+                    <template v-if="item.type === 'list'">
+                      <span class="list-label-text">{{ item.label }}</span>
+                    </template>
+                    <template v-else>
+                      {{ item.label }}
+                    </template>
+                  </span>
                 </div>
               </template>
               <div
@@ -458,6 +472,7 @@ export default {
     return {
       hiddenConfig: '-1^',
       data: null,
+      rawData: null,
       config: null,
       showAllItems: false,
       maleIcon: require('@vue2-client/assets/svg/male.svg')
@@ -606,20 +621,62 @@ export default {
   methods: {
     async getData (data, parameterData) {
       this.data = null
+      this.config = null
       this.showAllItems = false
       getConfigByName(data, 'af-his', res => {
         this.config = res
         const hiddenConfig = (this.config && this.config.hiddenConfig) || (0 === 1)
         const parameter = { ...res.parameter, ...this.parameter, ...parameterData }
         runLogic(res.logicName, parameter, 'af-his').then(result => {
-          if (hiddenConfig) {
-            for (const key in result) {
-              if (Object.prototype.hasOwnProperty.call(result, key) && result[key] === this.hiddenConfig) {
-                delete result[key]
+          // 如果配置启用 parseList（或 expandList），将 type=list 的父项展开为父项 + 子项（子项来自 result 中对应的数组）
+          const expandFlag = Boolean(res.expandList || res.parseList)
+          // 不用展开则直接将结果赋值给augmented
+          if(!expandFlag){
+            if (hiddenConfig) {
+              for (const key in result) {
+                if (Object.prototype.hasOwnProperty.call(result, key) && result[key] === this.hiddenConfig) {
+                  delete result[key]
+                }
               }
             }
+            this.data = result
+          }
+          const augmented = {}
+          if (expandFlag && Array.isArray(res.items)) {
+            // 在 expandFlag && Array.isArray(res.items) 的分支内
+            const expandedItems = []
+            // 用快照遍历，避免遍历被修改过的 res.items
+            const originalItems = Array.isArray(res.items) ? res.items.slice() : []
+            originalItems.forEach(parentItem => {
+              if (!parentItem) return
+              if (parentItem.type === 'list') {
+                expandedItems.push(parentItem)
+                const arr = result ? result[parentItem.field] : null
+                if (Array.isArray(arr)) {
+                  augmented[parentItem.field] = ''
+                  arr.forEach((sub, idx) => {
+                    const childItem = {
+                      field: sub.field || `${parentItem.field}_${idx + 1}`,
+                      label: sub.label ?? '',
+                      colon: sub.colon ? sub.colon : parentItem.colon,
+                      style: parentItem.style ? { ...parentItem.style } : undefined,
+                      showAvatar: parentItem.showAvatar,
+                      unit: parentItem.unit,
+                    }
+                    if (sub && sub.value !== undefined) augmented[childItem.field] = sub.value
+                    expandedItems.push(childItem)
+                  })
+                }
+              } else {
+                // 普通项直接加入
+                expandedItems.push(parentItem)
+              }
+            })
+            // 不要改原 res，创建新 config
+            this.rawData = result
+            this.config = { ...res, items: expandedItems }
+            this.data = augmented
           }
-          this.data = result
         })
       })
     },
@@ -797,6 +854,10 @@ export default {
   text-decoration: none !important;
 }
 
+.list-label-text{
+  font-weight: bold;
+}
+
 .content-wrapper {
   display: inline-flex;
   align-items: center;

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

@@ -80,9 +80,12 @@
                 slot="extraBeforeTabs"
                 key="workFlowTab"
                 tab="表单"
-              >
-                <work-flow-preview v-if="historyFormCompletedDataPreview" :form-completed-data-preview="historyFormCompletedDataPreview" :showTitle="false"/>
-                <a-divider/>
+                >
+                 <work-flow-step-files-preview
+                   v-if="historyFormCompletedDataPreview"
+                   :preview="historyFormCompletedDataPreview"
+                 />
+                 <a-divider/>
                 <x-add-native-form
                   ref="xAddForm"
                   @x-form-item-emit-func="formItemEmitFunc"
@@ -90,8 +93,11 @@
               </a-tab-pane>
             </x-tab>
             <div v-else>
-              <work-flow-preview v-if="historyFormCompletedDataPreview" :form-completed-data-preview="historyFormCompletedDataPreview" :showTitle="false"/>
-              <a-divider/>
+               <work-flow-step-files-preview
+                 v-if="historyFormCompletedDataPreview"
+                 :preview="historyFormCompletedDataPreview"
+               />
+               <a-divider/>
               <x-add-native-form
                 ref="xAddForm"
                 @x-form-item-emit-func="formItemEmitFunc"
@@ -287,6 +293,7 @@ import { getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common
 import LogicRunner from '@vue2-client/logic/LogicRunner'
 import XTab from '@vue2-client/base-client/components/common/XTab/XTab.vue'
 import WorkFlowPreview from '@vue2-client/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowPreview'
+import WorkFlowStepFilesPreview from '@vue2-client/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowStepFilesPreview.vue'
 import WorkflowPersonSelector from '@vue2-client/pages/WorkflowDetail/WorkflowPageDetail/components/WorkflowPersonSelector.vue'
 
 export default {
@@ -308,6 +315,7 @@ export default {
     FileItem,
     ImageItem,
     WorkFlowPreview,
+    WorkFlowStepFilesPreview,
     WorkflowPersonSelector
   },
   computed: {
@@ -962,73 +970,82 @@ export default {
       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()
+          // 预处理
+          const stepIdByName = new Map(this.stepsForChild.map(step => [step.name, step.id]))
+          const stepFormJsonByStepId = new Map(
+            this.stepsDefine.map(step => [step.id, step?.properties?.form?.formJson])
+          )
 
+          const stepIdSet = new Set()
           for (const historyFormConfig of historyFormDataConfig) {
-            const stepConfig = this.stepsDefine.find(item => item.name === historyFormConfig.stepName)
-            if (!stepConfig) {
-              continue
-            }
+            const targetStepId = stepIdByName.get(historyFormConfig.stepName)
+            if (targetStepId == null) continue
+            stepIdSet.add(targetStepId)
+          }
 
-            const stepId = stepConfig.id
-            const stepFormJson = stepConfig?.properties?.form?.formJson
-            if (!stepFormJson) {
-              continue
-            }
+          const stepIdS = Array.from(stepIdSet)
+          if (stepIdS.length > 0) {
+            const allStepData = await postByServiceName('/logic/geWorkFlowCompletedStepDataBySteps', {
+              workflowId: this.workflowId,
+              stepIdS
+            })
 
-            const formItem = stepFormJson.find(item => item.name === historyFormConfig.formLabel)
-            const model = formItem?.model
+            // 组装历史表单数据（data 部分）和按步骤分组的附件
+            const historyFormData = []
+            const stepAttachmentsMap = new Map()
 
-            if (!model) {
-              continue
-            }
+            for (const historyFormConfig of historyFormDataConfig) {
+              const targetStepId = stepIdByName.get(historyFormConfig.stepName)
+              if (targetStepId == null) continue
 
-            // 收集配置项和需要查询的 stepId
-            configItems.push({
-              stepId,
-              model,
-              displayLabel: historyFormConfig.displayLabel
-            })
-            stepIdSet.add(stepId)
-          }
+              const stepFormJson = stepFormJsonByStepId.get(targetStepId)
+              if (!stepFormJson) continue
 
-          // 批量查询：每个 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, {})
-            }
-          })
+              const stepDataRaw = allStepData?.[targetStepId] || allStepData?.[String(targetStepId)]
+              if (!stepDataRaw) continue
 
-          // 等待所有查询完成
-          await Promise.all(queryPromises)
+              const isAttachment = historyFormConfig.displayLabel === '附件' && historyFormConfig.formLabel === '附件'
 
-          // 组装历史表单数据
-          const historyFormData = configItems.map(configItem => {
-            const cachedFormData = formDataCache.get(configItem.stepId)
-            return {
-              label: configItem.displayLabel,
-              value: cachedFormData?.[configItem.model]
+              if (isAttachment) {
+                // 仅在配置了附件时才收集对应步骤的附件
+                if (!stepAttachmentsMap.has(targetStepId)) {
+                  stepAttachmentsMap.set(targetStepId, {
+                    stepId: targetStepId,
+                    stepName: historyFormConfig.stepName,
+                    data: [],
+                    images: [],
+                    files: []
+                  })
+                }
+                const attachment = stepAttachmentsMap.get(targetStepId)
+                attachment.images = Array.isArray(stepDataRaw.images) ? stepDataRaw.images : []
+                attachment.files = Array.isArray(stepDataRaw.files) ? stepDataRaw.files : []
+              } else {
+                const formItem = stepFormJson.find(item => item.name === historyFormConfig.formLabel)
+                const model = formItem?.model
+                if (!model) continue
+                // 普通字段：从 data 中取值，并按 displayLabel 组织
+                const value = stepDataRaw.data ? stepDataRaw.data[model] : undefined
+                if (value === undefined || value === null) continue
+                historyFormData.push({
+                  label: historyFormConfig.displayLabel,
+                  value
+                })
+              }
             }
-          })
 
-          this.historyFormCompletedDataPreview = {
-            data: historyFormData,
-            images: [],
-            files: [],
-            note: ''
+            // 聚合所有步骤的附件到统一的 images/files，同时保留按步骤分组的数据
+            const stepAttachments = Array.from(stepAttachmentsMap.values())
+
+            this.historyFormCompletedDataPreview = {
+              data: historyFormData,
+              stepAttachments,
+            }
           }
         }
         this.stepDefine = properties.form.formJson

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

@@ -0,0 +1,165 @@
+<template>
+  <div class="workflow-step-preview">
+    <!-- data：不分步骤，直接展示（有就展示，没有就不展示） -->
+    <a-descriptions
+      v-if="previewData && previewData.length"
+      :column="{ xxl: 4, xl: 3, lg: 3, md: 3, sm: 2, xs: 1 }"
+      bordered
+      size="small"
+      class="descriptionPreviewItem"
+    >
+      <p slot="title" class="descriptionTitle">
+        填写历史
+      </p>
+      <a-descriptions-item
+        v-for="(item, idx) in previewData"
+        :key="item.label || idx"
+        v-if="item.label !== '附件上传' && item.label !== '__expressionRs'"
+      >
+        <span slot="label" class="label">{{ item.label }}</span>
+        <span v-if="(item.type ?? 'default') === 'image'">
+          <div class="value">
+            <image-item :images="item.value" :width="70" :padding="0"/>
+          </div>
+        </span>
+        <span v-else>
+          <div class="value">{{ item.value }}</div>
+        </span>
+      </a-descriptions-item>
+    </a-descriptions>
+
+    <!-- 附件：按步骤分组展示（有就展示，没有就不展示） -->
+    <a-card
+      v-for="step in normalizedAttachmentSteps"
+      :key="step.stepId"
+      size="small"
+      class="step-card"
+      :bordered="false"
+    >
+      <template slot="title">
+        <span class="step-title">{{ step.stepName }}</span>
+      </template>
+
+      <div v-if="Array.isArray(step.images) && step.images.length" class="attachment-block">
+        <image-item :images="step.images" :width="70" :padding="0"/>
+      </div>
+
+      <div v-if="Array.isArray(step.files) && step.files.length" class="attachment-block">
+        <file-item :files="step.files" />
+      </div>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import { FileItem, ImageItem } from '@vue2-client/components/FileImageItem'
+
+export default {
+  name: 'WorkFlowStepFilesPreview',
+  components: {
+    FileItem,
+    ImageItem
+  },
+  props: {
+    preview: {
+      type: Object,
+      default: null
+    },
+    stepAttachments: {
+      type: Array,
+      default: () => []
+    },
+  },
+  computed: {
+    previewData () {
+      const data = this.preview?.data
+      return Array.isArray(data) ? data : null
+    },
+    normalizedAttachmentSteps () {
+      const steps = (this.preview && Array.isArray(this.preview.stepAttachments))
+        ? this.preview.stepAttachments
+        : this.stepAttachments
+
+      return (steps || [])
+        .filter(step => step && step.stepId != null)
+        .map(step => ({
+          stepId: step.stepId,
+          stepName: step.stepName || `步骤 ${step.stepId}`,
+          images: Array.isArray(step.images) ? step.images : [],
+          files: Array.isArray(step.files) ? step.files : []
+        }))
+        .filter(step => step.images.length || step.files.length)
+    }
+  },
+}
+</script>
+
+<style lang="less" scoped>
+.workflow-step-preview {
+  padding: 4px 0;
+}
+
+.step-card {
+  margin-bottom: 14px;
+  border-radius: 10px;
+  border: 1px solid #f0f0f0;
+  box-shadow: 0 4px 10px -6px rgba(0, 0, 0, 0.05);
+
+  :deep(.ant-card-body) {
+    padding: 12px 16px 10px;
+  }
+}
+
+.step-title {
+  font-weight: 600;
+  color: rgba(0, 0, 0, 0.85);
+}
+
+.label {
+  color: rgba(0, 0, 0, 0.85);
+}
+
+.value {
+  white-space: pre-wrap;
+  word-break: break-word;
+  color: rgba(0, 0, 0, 0.65);
+}
+
+.attachment-block {
+  padding: 8px 0;
+
+  & + & {
+    margin-top: 8px;
+  }
+
+  :deep(.file-item),
+  :deep(.image-item) {
+    margin: 0;
+  }
+}
+
+.descriptionPreviewItem {
+  margin-bottom: 22px;
+  border-radius: 10px;
+  overflow: hidden;
+}
+
+.descriptionTitle {
+  position: relative;
+  padding-left: 12px;
+
+  &::before {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 50%;
+    transform: translateY(-50%);
+    width: 4px;
+    height: 16px;
+    background-color: #1890ff;
+    border-radius: 2px;
+  }
+}
+</style>
+
+