vue2-client 1.20.19 → 1.20.21

package/src/base-client/components/common/XForm/index.md

@@ -1,178 +1,178 @@
-# XForm
-
-动态表单控件，根据JSON配置生成一个完整的动态表单
-
-
-## 何时使用
-
-当需要一个动态生成的表单时
-
-
-引用方式：
-
-```javascript
-import XForm from '@vue2-client/base-client/components/XForm/XForm'
-
-export default {
-    components: {
-      XForm
-    }
-}
-```
-
-
-
-## 代码演示
-
-```html
-<x-form
-  :json-data="json"
-  :isExports="true"
-  @onSubmit="onSubmit">
-</x-form>
-```
-
-## API
-
-| 参数        | 说明                       | 类型      | 默认值  |
-|-----------|--------------------------|---------|------|
-| jsonData  | JSON配置，根据[工具>查询配置生成]功能生成 | Object  | {}   |
-| isExports | 是否显示导出按钮                 | Boolean | true |
-| getDataParams | 调用logic获取数据源的追加参数 | Object | - |
-| @onSubmit | 表单的提交事件                  | event   | -    |
-
-## 例子1
-----
-（基础使用）
-
-```vue
-<template>
-  <x-form
-    v-if="loaded"
-    :json-data="formItemJson"
-    :isExports="false"
-    @onSubmit="onSubmit">
-  </x-form>
-</template>
-
-<script>
-  import XForm from '@vue2-client/base-client/components/XForm/XForm'
-
-  export default {
-    components: {
-      XForm
-    },
-    data () {
-      return {
-        // 加载查询参数JSON配置文件是否完成
-        loaded: false,
-        // 从查询参数JSON配置中得到的生成表单的JSON
-        formItemJson: undefined,
-        // 表单
-        form: {}
-      }
-    },
-    created () {
-      this.getQueryJson()
-    },
-    methods: {
-      // 加载查询参数JSON配置文件
-      getQueryJson () {
-        this.formItemJson = [
-          {
-            "name":"燃气公司",
-            "keyName":"orgList",
-            "model":"orgName",
-            "placeholder":"请选择",
-            "type":"select"
-          },
-          {
-            "name":"用户地址",
-            "model":"f_address",
-            "type":"input"
-          },
-          {
-            "name":"指令类型",
-            "keyName":"指令类型",
-            "model":"f_instruct_type",
-            "placeholder":"请选择",
-            "type":"select"
-          },
-          {
-            "name":"指令说明",
-            "model":"f_instruct_title",
-            "placeholder":"请输入指令说明",
-            "type":"input"
-          },
-          {
-            "name":"指令状态",
-            "keyName":"指令状态",
-            "model":"f_instruct_state",
-            "placeholder":"请选择",
-            "type":"select"
-          },
-          {
-            "name":"响应结果",
-            "model":"f_receive_state",
-            "placeholder":"请输入响应结果",
-            "type":"input"
-          },
-          {
-            "name":"生成时间",
-            "model":"f_instruct_date",
-            "type":"rangePicker"
-          },
-          {
-            "name":"操作人",
-            "model":"f_inputtor",
-            "placeholder":"请输入操作人员",
-            "type":"input"
-          }
-        ]
-        this.loaded = true
-      },
-      // 表单提交方法
-      onSubmit (res) {
-        // 如果通过校验
-        if (res.valid) {
-          // 表单赋值
-          this.form = res.form
-        } else {
-          return false
-        }
-      }
-    }
-  }
-</script>
-```
-
-注意事项
-----
-
-> 本组件已经实现了自适应布局，在不同分辨率下的设备均可得到基本理想的展示效果
->
-> 以上示例查询参数配置为后台生成后的结果，此处为了方便调试，所以直接写在了代码中，实际使用请通过发起请求获取查询参数配置，如下：
-```vue
-<script>
-  import { commonApi } from '@vue2-client/base-client/api/common'
-  import Vue from 'vue'
-
-  export default {
-    data () {
-      return {
-        // 查询配置文件名
-        queryParamsName: 'instructQueryParams'
-      }
-    },
-    methods: {
-      getConfig () {
-        Vue.resetpost(commonApi.getConfig, {str: this.queryParamsName}).then((res) => {
-          this.formItemJson = res.formJson
-          this.columnItemJson = res.columnJson
-          this.loaded = true
-        })
-      }
-    }
-  }
-</script>
-```
+# XForm
+
+动态表单控件，根据JSON配置生成一个完整的动态表单
+
+
+## 何时使用
+
+当需要一个动态生成的表单时
+
+
+引用方式：
+
+```javascript
+import XForm from '@vue2-client/base-client/components/XForm/XForm'
+
+export default {
+    components: {
+      XForm
+    }
+}
+```
+
+
+
+## 代码演示
+
+```html
+<x-form
+  :json-data="json"
+  :isExports="true"
+  @onSubmit="onSubmit">
+</x-form>
+```
+
+## API
+
+| 参数        | 说明                       | 类型      | 默认值  |
+|-----------|--------------------------|---------|------|
+| jsonData  | JSON配置，根据[工具>查询配置生成]功能生成 | Object  | {}   |
+| isExports | 是否显示导出按钮                 | Boolean | true |
+| getDataParams | 调用logic获取数据源的追加参数 | Object | - |
+| @onSubmit | 表单的提交事件                  | event   | -    |
+
+## 例子1
+----
+（基础使用）
+
+```vue
+<template>
+  <x-form
+    v-if="loaded"
+    :json-data="formItemJson"
+    :isExports="false"
+    @onSubmit="onSubmit">
+  </x-form>
+</template>
+
+<script>
+  import XForm from '@vue2-client/base-client/components/XForm/XForm'
+
+  export default {
+    components: {
+      XForm
+    },
+    data () {
+      return {
+        // 加载查询参数JSON配置文件是否完成
+        loaded: false,
+        // 从查询参数JSON配置中得到的生成表单的JSON
+        formItemJson: undefined,
+        // 表单
+        form: {}
+      }
+    },
+    created () {
+      this.getQueryJson()
+    },
+    methods: {
+      // 加载查询参数JSON配置文件
+      getQueryJson () {
+        this.formItemJson = [
+          {
+            "name":"燃气公司",
+            "keyName":"orgList",
+            "model":"orgName",
+            "placeholder":"请选择",
+            "type":"select"
+          },
+          {
+            "name":"用户地址",
+            "model":"f_address",
+            "type":"input"
+          },
+          {
+            "name":"指令类型",
+            "keyName":"指令类型",
+            "model":"f_instruct_type",
+            "placeholder":"请选择",
+            "type":"select"
+          },
+          {
+            "name":"指令说明",
+            "model":"f_instruct_title",
+            "placeholder":"请输入指令说明",
+            "type":"input"
+          },
+          {
+            "name":"指令状态",
+            "keyName":"指令状态",
+            "model":"f_instruct_state",
+            "placeholder":"请选择",
+            "type":"select"
+          },
+          {
+            "name":"响应结果",
+            "model":"f_receive_state",
+            "placeholder":"请输入响应结果",
+            "type":"input"
+          },
+          {
+            "name":"生成时间",
+            "model":"f_instruct_date",
+            "type":"rangePicker"
+          },
+          {
+            "name":"操作人",
+            "model":"f_inputtor",
+            "placeholder":"请输入操作人员",
+            "type":"input"
+          }
+        ]
+        this.loaded = true
+      },
+      // 表单提交方法
+      onSubmit (res) {
+        // 如果通过校验
+        if (res.valid) {
+          // 表单赋值
+          this.form = res.form
+        } else {
+          return false
+        }
+      }
+    }
+  }
+</script>
+```
+
+注意事项
+----
+
+> 本组件已经实现了自适应布局，在不同分辨率下的设备均可得到基本理想的展示效果
+>
+> 以上示例查询参数配置为后台生成后的结果，此处为了方便调试，所以直接写在了代码中，实际使用请通过发起请求获取查询参数配置，如下：
+```vue
+<script>
+  import { commonApi } from '@vue2-client/base-client/api/common'
+  import Vue from 'vue'
+
+  export default {
+    data () {
+      return {
+        // 查询配置文件名
+        queryParamsName: 'instructQueryParams'
+      }
+    },
+    methods: {
+      getConfig () {
+        Vue.resetpost(commonApi.getConfig, {str: this.queryParamsName}).then((res) => {
+          this.formItemJson = res.formJson
+          this.columnItemJson = res.columnJson
+          this.loaded = true
+        })
+      }
+    }
+  }
+</script>
+```

package/src/base-client/components/common/XFormTable/XFormTable.vue

@@ -561,6 +561,14 @@ export default {
       handler () {
         this.initConfig()
       }
+    },
+    extraData: {
+      handler (newVal) {
+        if (this.$refs.xTable) {
+          this.$refs.xTable.updateExtraData(newVal)
+        }
+      },
+      deep: true
     }
   },
   methods: {

package/src/base-client/components/common/XFormTable/demo.vue

@@ -2,32 +2,51 @@
   <a-card :bordered="false">
     <x-form-table
       title="示例表单"
-      :queryParamsName="queryParamsName"
+      queryParamsName="scanCodeAndNFCRUD"
       :fixedAddForm="fixedAddForm"
       :externalSelectedRowKeys="selectedKeys"
+      :defaultPageSize="100"
+      :pageSizeArray="['100','200']"
       @action="action"
       @selectRow="selectRow"
       @columnClick="columnClick"
       @ceshi="ceshi"
-      @rowDblClick="rowDblClick"
-      :defaultPageSize="5"
-      serviceName="af-revenue"
+      @startService="startService"
+      serviceName="af-safecheck"
       ref="xFormTable"
       :reserveSpaceForButtons="true"
-      @addFormSubmit="addFormSubmit"
-    ></x-form-table>
+    >
+    </x-form-table>
+    <a-modal
+      v-model="formModalVisible"
+      title="工单回访"
+      :zIndex="1002"
+      width="50vw"
+      :destroy-on-close="true"
+      @cancel="formModalVisible = false"
+      @ok="ok"
+    >
+      <x-add-native-form
+        ref="xForm"
+      />
+    </a-modal>
+    <button @click="backDealData">提交</button>
   </a-card>
 </template>
 
 <script>
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
 import { microDispatch } from '@vue2-client/utils/microAppUtils'
+import {getConfigByNameAsync, runLogic} from '@vue2-client/services/api/common'
+
 export default {
   name: 'Demo',
   components: {
-    XFormTable
+    XFormTable,
+    XAddNativeForm,
   },
-  data() {
+  data () {
     return {
       // 查询配置文件名
       queryParamsName: 'ceshiCRUD',
@@ -43,26 +62,32 @@ export default {
       selectedKeys: [],
       selected: {
         keys: [],
-        rows: []
-      }
+        rows: [],
+      },
+      formModalVisible: false,
     }
   },
-
   methods: {
-    handleCustomQuery() {
-      this.$refs.xFormTable.queryTable({
-        uf_f_alias: 'XianFeng',
-        uf_f_card_id: '10500030'
+    backDealData () {
+      this.$refs.xFormTable.$refs.xForm.backDealData().then(data => {
+        console.log('backDealData', data)
+        console.log('selected', this.$refs.xFormTable.$refs.xForm?.form)
       })
     },
-    rowDblClick(record) {
-      console.log('rowDblClick', record)
-    },
     // input框 行編輯參數傳遞
-    ceshi(...args) {
+    ceshi (...args) {
       // attr, value, currentRecord, currentIndex, nextRecord, nextIndex
-      const [attr, value, currentRecord, currentIndex, nextRecord, nextIndex] = args
-      console.log('ceshi', attr, value, currentRecord, currentIndex, nextRecord, nextIndex)
+      const [attr, value, currentRecord, currentIndex, nextRecord, nextIndex] =
+        args
+      console.log(
+        'ceshi',
+        attr,
+        value,
+        currentRecord,
+        currentIndex,
+        nextRecord,
+        nextIndex
+      )
       // 示例：当按下 Enter 键且有下一行时，跳转到下一行的同一列
       // 可以在这里执行业务逻辑（例如：保存数据）
       console.log('当前行:', currentIndex, '下一行:', nextIndex)
@@ -73,44 +98,61 @@ export default {
       // 跳转到下一行的同一列
       this.$refs.xFormTable.$refs.xTable.focusInput(nextIndex, attr.model)
     },
-    test() {
+    test () {
       this.$refs.xFormTable.setTableData([])
     },
-    defaultF() {
+    defaultF () {
       this.$refs.xFormTable.setTableSize('default')
     },
-    middleF() {
+    middleF () {
       this.$refs.xFormTable.setTableSize('middle')
     },
-    smallF() {
+    smallF () {
       this.$refs.xFormTable.setTableSize('small')
     },
-    columnClick(key, value, record) {
+    columnClick (key, value, record) {
       microDispatch({
         type: 'v3route',
         path: '/bingliguanli/dianzibingliluru',
-        props: { selected: arguments[0].his_f_admission_id }
+        props: { selected: arguments[0].his_f_admission_id },
       })
     },
-    action(record, id, actionType) {
-      this.detailVisible = true
-      console.log('触发了详情操作', record, id, actionType)
+    startService (record, id, actionType) {
+      getConfigByNameAsync('测试Form', 'af-safecheck').then(config => {
+        this.formModalVisible = true
+        this.$nextTick(
+          () => {
+            this.formModalVisible = true
+            this.$refs.xForm.init({
+              formItems: config.formJson,
+              title: '工单回访',
+              businessType: '新增',
+              ...config,
+              modifyModelData: { data: { id: 1 } },
+            })
+          })
+      })
+      // this.detailVisible = true
+      // console.log('触发了详情操作', record, id, actionType)
+    },
+    async ok () {
+      const res = await this.$refs.xForm.asyncSubmit()
+      await runLogic('ceshwewei', res.realForm)
     },
-    onClose() {
+    onClose () {
       this.detailVisible = false
       // 关闭详情之后重新查询表单
       this.$refs.xFormTable.refreshTable(true)
     },
-    selectRow(selectedRowKeys, selectedRows) {
+    selectRow (selectedRowKeys, selectedRows) {
       this.selected = {
         keys: selectedRowKeys,
-        rows: selectedRows
+        rows: selectedRows,
       }
+      console.log('selectedDemo', this.selected)
     },
-    addFormSubmit(params, callback){
-      callback()
-    }
-  }
+  },
+  computed: {},
 }
 </script>
 

package/src/base-client/components/common/XInspectionDetailDrawer/components/CheckItems.vue

@@ -79,9 +79,9 @@
                         >
                           <!-- 有 fileId 时通过 img 展示加载中/错误/图片 -->
                           <template v-if="photo.fileId">
-                            <a-spin v-if="getThumbState(photo.fileId) === 'loading'" size="small" />
-                            <a-icon v-else-if="getThumbState(photo.fileId) === 'error'" type="picture" class="thumb-error-icon" />
-                            <img v-else :src="thumbUrlMap[photo.fileId]" :alt="photo.title || '照片'" />
+                            <a-spin v-if="getThumbState(photo) === 'loading'" size="small" />
+                            <a-icon v-else-if="getThumbState(photo) === 'error'" type="picture" class="thumb-error-icon" />
+                            <img v-else :src="thumbUrlMap[thumbCacheKey(photo)]" :alt="photo.title || '照片'" />
                           </template>
                           <!-- 直接有 url 时展示 -->
                           <img v-else-if="photo.url" :src="photo.url" :alt="photo.title || '照片'" />
@@ -162,7 +162,8 @@ export default {
       if (!this.currentPhoto) return ''
       if (this.currentPhoto.url) return this.currentPhoto.url
       if (this.currentPhoto.fileId) {
-        return this.thumbUrlMap[this.currentPhoto.fileId] || ''
+        const key = this.thumbCacheKey(this.currentPhoto)
+        return this.thumbUrlMap[key] || ''
       }
       return ''
     },
@@ -184,37 +185,61 @@ export default {
      */
     preloadThumbnails () {
       if (!this.checkItems || !this.injectedServiceName) return
+      this.thumbUrlMap = {}
+      this.thumbStateMap = {}
       this.checkItems.forEach(category => {
         if (!category.items) return
         category.items.forEach(item => {
           if (!item.photos) return
           item.photos.forEach(photo => {
-            if (photo.fileId && !this.thumbStateMap[photo.fileId]) {
-              this.loadThumb(photo.fileId)
-            }
+            if (photo.fileId) this.loadThumb(photo)
           })
         })
       })
     },
 
-    async loadThumb (fileId) {
-      this.$set(this.thumbStateMap, fileId, 'loading')
+    /**
+     * 缩略图缓存必须用字符串键。若用对象作 fileId，JS 会统一变成 "[object Object]"，导致所有缩略图共用一张图。
+     * 优先使用业务侧已生成的 photo.id，其次从 fileId 上解析 id。
+     */
+    thumbCacheKey (photo) {
+      if (!photo) return ''
+      if (photo.id != null && photo.id !== '') return String(photo.id)
+      const raw = photo.fileId
+      if (raw == null || raw === '') return ''
+      if (typeof raw !== 'object') return String(raw)
+      const id = raw.id ?? raw.f_id
+      if (id != null && typeof id !== 'object') return String(id)
+      return JSON.stringify(raw)
+    },
+
+    async loadThumb (photo) {
+      const key = this.thumbCacheKey(photo)
+      if (!key || !photo.fileId) return
+      if (this.thumbStateMap[key] === 'loading' || this.thumbStateMap[key] === 'done') return
+      this.$set(this.thumbStateMap, key, 'loading')
       try {
         const svc = createFileImageService({ serviceName: this.injectedServiceName })
-        const url = await svc.getImageUrl(fileId)
-        this.$set(this.thumbUrlMap, fileId, url)
-        this.$set(this.thumbStateMap, fileId, 'done')
-      } catch {
-        this.$set(this.thumbStateMap, fileId, 'error')
+        const url = await svc.getImageUrl(photo.fileId)
+        if (this.thumbStateMap[key] === 'loading') {
+          this.$set(this.thumbUrlMap, key, url)
+          this.$set(this.thumbStateMap, key, 'done')
+        }
+      } catch (e) {
+        console.warn(`[CheckItems] 加载缩略图失败 key=${key}:`, e.message)
+        if (this.thumbStateMap[key] === 'loading') {
+          this.$set(this.thumbStateMap, key, 'error')
+        }
       }
     },
 
-    getThumbState (fileId) {
-      return this.thumbStateMap[fileId] || 'loading'
+    getThumbState (photo) {
+      const key = this.thumbCacheKey(photo)
+      return this.thumbStateMap[key] || 'loading'
     },
 
     getPhotoKey (photo, index) {
-      return photo.fileId || photo.id || index
+      return this.thumbCacheKey(photo) || photo.id || index
     },
 
     /**