vue2-client 1.19.81 → 1.19.83

package/package.json

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

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

@@ -623,6 +623,11 @@ export default {
       Object.assign(this.fixedQueryForm, prefixedData)
     },
 
+    // 固定条件（key 已包含表别名，不再处理）
+    setFixedQueryFormWithAlias (data) {
+      Object.assign(this.fixedQueryForm, data)
+    },
+
     importExcelOk (data) {
       this.$emit('importExcelOk', data)
     },

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

@@ -3,7 +3,15 @@
     <x-form-table
       title="示例表单"
       :queryParamsName="queryParamsName"
-      serviceName="af-linepatrol"
+      :fixedAddForm="fixedAddForm"
+      :externalSelectedRowKeys="selectedKeys"
+      @action="action"
+      @selectRow="selectRow"
+      @columnClick="columnClick"
+      @ceshi="ceshi"
+      @rowDblClick="rowDblClick"
+      :defaultPageSize="5"
+      serviceName="af-revenue"
       ref="xFormTable"
     ></x-form-table>
   </a-card>
@@ -20,7 +28,7 @@ export default {
   data() {
     return {
       // 查询配置文件名
-      queryParamsName: 't_subhighpressure_pipelineCRUD',
+      queryParamsName: 'address_management',
       // 查询配置左侧tree
       xTreeConfigName: 'addressType',
       // 新增表单固定值

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

@@ -16,6 +16,7 @@
     <!-- 表格区域 -->
     <div class="table-container" :class="{ 'table-report-mode': isReportMode }" :style="{ height: tableHeight }">
       <a-table
+        :loading="loading"
         :columns="processedColumns"
         :dataSource="tableData"
         :pagination="false"
@@ -54,16 +55,15 @@ export default {
       scrollY: undefined,
       rowStyleConfig: {},
       isReportMode: false,
-      // 标题数据 - 添加 show 字段
+      // 标题数据
       titleData: {
-        // 默认不显示
         show: false,
         text: '',
         value: null,
         line: false
       },
-      // 从配置中读取的数据模式
-      dataMode: 'normal'
+      dataMode: 'normal',
+      loading: false // 新增加载状态
     }
   },
   watch: {
@@ -75,7 +75,6 @@ export default {
     }
   },
   computed: {
-    // 是否显示标题 - 必须明确配置 show: true 才显示
     showTitle () {
       return this.titleData.show === true && (this.titleData.text || this.titleData.value !== null)
     },
@@ -272,67 +271,89 @@ export default {
       }
     },
 
+    // 修改 init 为返回 Promise，并添加 loading 控制
     init (config, parameterData) {
-      getConfigByName(config, 'af-his', res => {
-        this.tableHeight = res.tableHeight || '400px'
-        this.columns = res.columns || []
-
-        this.rowStyleConfig = res.rowStyle || {}
-
-        // 从配置中读取数据模式
-        this.dataMode = res.dataMode || 'normal'
-
-        // 从 $attrs 判断是否启用报表模式
-        this.isReportMode = this.$attrs['report-mode'] === true ||
-          this.$attrs['report-mode'] === '' ||
-          this.$attrs['report-mode'] === 'true'
-
-        // 读取标题配置，默认不显示
-        const titleConfig = res.titleConfig || {}
-        this.titleData = {
-          // 默认 false
-          show: titleConfig.show || false,
-          text: titleConfig.text || '',
-          line: titleConfig.line || false,
-          value: null
-        }
+      return new Promise((resolve, reject) => {
+        this.loading = true // 开始加载
+
+        getConfigByName(config, 'af-his', res => {
+          // 配置获取成功
+          this.tableHeight = res.tableHeight || '400px'
+          this.columns = res.columns || []
+          this.rowStyleConfig = res.rowStyle || {}
+          this.dataMode = res.dataMode || 'normal'
+
+          // 报表模式判断
+          this.isReportMode = this.$attrs['report-mode'] === true ||
+            this.$attrs['report-mode'] === '' ||
+            this.$attrs['report-mode'] === 'true'
+
+          // 标题配置
+          const titleConfig = res.titleConfig || {}
+          this.titleData = {
+            show: titleConfig.show || false,
+            text: titleConfig.text || '',
+            line: titleConfig.line || false,
+            value: null
+          }
 
-        runLogic(res.logicName, parameterData, 'af-his').then(result => {
-          // 根据配置中的dataMode处理返回的数据
-          if (this.dataMode === 'title' && result && typeof result === 'object') {
-            if (result.title) {
-              // 如果接口返回了title，则显示标题（即使配置中show: false）
-              this.titleData.show = true
-              this.titleData = {
-                ...this.titleData,
-                ...result.title,
-                value: result.title.value !== undefined ? result.title.value : result.title.count
+          // 执行逻辑获取数据
+          runLogic(res.logicName, parameterData, 'af-his')
+            .then(result => {
+              // 根据 dataMode 处理返回数据
+              if (this.dataMode === 'title' && result && typeof result === 'object') {
+                if (result.title) {
+                  this.titleData.show = true
+                  this.titleData = {
+                    ...this.titleData,
+                    ...result.title,
+                    value: result.title.value !== undefined ? result.title.value : result.title.count
+                  }
+                }
+                this.tableData = result.data || []
+              } else {
+                this.tableData = Array.isArray(result) ? result : []
               }
-            }
 
-            this.tableData = result.data || []
-          } else {
-            // 普通模式：返回的是数组
-            this.tableData = Array.isArray(result) ? result : []
-          }
+              // 标题数据补全
+              if (this.titleData.show) {
+                if (this.titleData.value === null || this.titleData.value === undefined) {
+                  this.titleData.value = this.tableData.length
+                }
+              }
 
-          // 只有在显示标题的情况下才设置value
-          if (this.titleData.show) {
-            if (this.titleData.value === null || this.titleData.value === undefined) {
-              this.titleData.value = this.tableData.length
-            }
-          }
+              // 添加 key
+              this.tableData = this.tableData.map((item, index) => ({
+                ...item,
+                key: item[this.rowKey] || `row_${index}`
+              }))
 
-          this.tableData = this.tableData.map((item, index) => ({
-            ...item,
-            key: item[this.rowKey] || `row_${index}`
-          }))
+              this.$nextTick(() => {
+                this.scrollY = this.tableHeight
+              })
 
-          this.$nextTick(() => {
-            this.scrollY = this.tableHeight
-          })
+              resolve(result) // 成功 resolve
+            })
+            .catch(error => {
+              console.error('数据加载失败', error)
+              reject(error) // 失败 reject
+            })
+            .finally(() => {
+              this.loading = false // 无论成功或失败，最终关闭 loading
+            })
+        }, error => {
+          // getConfigByName 错误回调
+          console.error('配置获取失败', error)
+          this.loading = false
+          reject(error)
         })
       })
+    },
+
+    // 刷新表格方法，返回 Promise 以便外部可 await
+    refreshTable (parameterData) {
+      const params = parameterData !== undefined ? parameterData : this.parameter
+      return this.init(this.queryParamsName, params)
     }
   }
 }

package/src/router/async/router.map.js

@@ -95,7 +95,7 @@ routerResource.XReportView = () => import('@vue2-client/pages/XReportView')
 
 routerResource.XReportGrid = () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo')
 
-routerResource.XTab = () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
+routerResource.XTab = () => import('@vue2-client/base-client/components/common/AfMap/demo.vue')
 routerResource.addressManage = () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
 // 大屏界面, 放行登录
 routerResource.bigDashboard = () => import('@vue2-client/pages/dashboard/index.vue')