vue2-client 1.16.39 → 1.16.41

package/package.json

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

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

@@ -85,7 +85,7 @@
 import { GetGDMap } from '@vue2-client/utils/map-utils'
 import { debounce } from 'ant-design-vue/lib/vc-table/src/utils'
 import { mapState } from 'vuex'
-import { runLogic } from '@vue2-client/services/api/common'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 import IcMapIcon from '@vue2-client/base-client/components/common/AddressSearchCombobox/IcMapIcon.vue'
 
 export default {
@@ -117,12 +117,14 @@ export default {
       // 生成地址串中省市区街道信息禁止修改
       readOnlyDivisions: false,
       // cur 位置
-      curPosition: null,
+      curPosition: {},
+      gaode_key: '',
+      gaode_secret_key: '',
       searchFlag: false,
     }
   },
   computed: {
-    ...mapState('setting', ['isMobile', 'gaode_key', 'gaode_secret_key'])
+    ...mapState('setting', ['isMobile'])
   },
   props: {
     attr: {
@@ -175,6 +177,15 @@ export default {
   mounted () {
   },
   methods: {
+    getGaoDeKey () {
+      return new Promise((resolve) => {
+        getConfigByName('gaoDeKeyConfig', 'af-system', (config) => {
+          this.gaode_secret_key = config.gaode_secret_key
+          this.gaode_key = config.gaode_key
+          resolve()
+        })
+      })
+    },
     change (value) {
       if (this.readOnlyDivisions && !this.divisionsChange) {
         // 如果省市区街道信息禁止修改
@@ -435,7 +446,10 @@ export default {
   watch: {
     'visible' (val) {
       if (val) {
-        this.$nextTick(() => {
+        this.$nextTick(async () => {
+          if (!this.gaode_key) {
+            await this.getGaoDeKey()
+          }
           GetGDMap(this.gaode_secret_key, this.gaode_key).then(aMap => {
             this.initMap(aMap)
             this.mapAutocomplete = new (aMap).AutoComplete({

package/src/base-client/components/common/HIS/HFormTable/HFormTable.vue

@@ -1,25 +1,42 @@
-<script setup lang="ts">
+<script setup>
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
-import { ref, computed } from 'vue'
+import { ref, computed, useAttrs } from 'vue'
 
 const props = defineProps({
   // HFormTable特有的属性
   tableStyle: {
     type: String,
     default: 'formtable-col1'
-  },
-  // 顶部
-  topStyle: {
-    type: String,
-    default: ''
-  },
-  // 分页
-  paginationStyle: {
-    type: String,
-    default: ''
   }
 })
 
+// 兼容多种样式配置
+const attrs = useAttrs()
+const wrapperClassObject = computed(() => {
+  const a = attrs
+  const classes = {}
+
+  // 通用布尔样式开关（以存在/空字符串/'true' 为真）
+  const booleanStyleKeys = [
+    'button-row-0margin',
+    'top-hidden'
+  ]
+  for (const key of booleanStyleKeys) {
+    const val = a[key]
+    const truthy = val === true || val === '' || val === 'true'
+    if (truthy) classes[`h-form-table-${key}`] = true
+  }
+
+  // 兼容通过 attrs 透传的分页样式：将值映射为当前样式中存在的类名
+  const paginationAttr = a && a.paginationStyle
+  if (paginationAttr && ['pagination-center', 'custom-pagination'].includes(paginationAttr)) {
+    classes[`h-form-table-${paginationAttr}`] = true
+  }
+  return classes
+})
+
+// 通过暴露的实例访问 $slots，避免直接依赖 Composition API 的 useSlots
+// 在模板中使用 `$slots` 遍历以保持与 Vue2 兼容
 // 创建对XFormTable组件的引用
 const xFormTableRef = ref()
 
@@ -29,8 +46,12 @@ defineExpose({
   getXFormTableInstance: () => xFormTableRef.value
 })
 
-// 计算是否使用自定义分页
-const isCustomPagination = computed(() => props.tableStyle === 'custom-pagination' || props.paginationStyle === 'custom-pagination')
+// 计算是否使用自定义分页（兼容 attrs 透传与 tableStyle 配置）
+const isCustomPagination = computed(() => {
+  const a = attrs
+  const paginationAttr = (a && a.paginationStyle) || ''
+  return props.tableStyle === 'custom-pagination' || paginationAttr === 'custom-pagination'
+})
 </script>
 
 <template>
@@ -38,10 +59,7 @@ const isCustomPagination = computed(() => props.tableStyle === 'custom-paginatio
     class="h-form-table-wrapper"
     :class="[
       `h-form-table-${tableStyle}`,
-      {
-        [`h-form-table-${topStyle}`]: ['top-hidden'].includes(topStyle),
-        [`h-form-table-${paginationStyle}`]: ['pagination-center','custom-pagination'].includes(paginationStyle)
-      }
+      wrapperClassObject
     ]"
   >
     <x-form-table
@@ -215,5 +233,12 @@ const isCustomPagination = computed(() => props.tableStyle === 'custom-paginatio
       }
     }
   }
+
+  // 按钮行0margin
+  &.h-form-table-button-row-0margin {
+    :deep(.ant-row) {
+      margin: 0px;
+    }
+  }
 }
 </style>

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

@@ -1,174 +1,174 @@
-<template>
-  <div class="row">
-    <div class="content">
-      <a-skeleton :loading="loading" :paragraph="{ rows: 4 }" />
-      <div v-show="!loading">
-        <template v-if="!loadError">
-          <a-descriptions v-if="realData" :column="isMobile ? 1 : column" size="small" :title="title">
-            <a-descriptions-item
-              v-for="(value, key) in realData"
-              :key="key"
-              :label="key">
-              {{ formatText(value) }}
-            </a-descriptions-item>
-          </a-descriptions>
-        </template>
-        <template v-else>
-          <a-empty>
-            <span slot="description"> 页面配置不存在，请联系系统管理员 </span>
-          </a-empty>
-        </template>
-      </div>
-    </div>
-    <div class="extra" v-if="extraShow">
-      <slot name="addonAfter"/>
-    </div>
-  </div>
-</template>
-<script>
-
-import { mapState } from 'vuex'
-import { getRealKeyData } from '@vue2-client/utils/formatter'
-import { getConfigByName } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XDescriptions',
-  components: {
-  },
-  props: {
-    // 标题
-    title: {
-      type: String,
-      required: true
-    },
-    // 内容
-    content: {
-      type: Object,
-      required: true
-    },
-    // 模型名
-    model: {
-      type: String,
-      required: false,
-      default: ''
-    },
-    // 配置名称
-    configName: {
-      type: String,
-      required: true
-    },
-    // 配置所属命名空间
-    serviceName: {
-      type: String,
-      default: undefined
-    },
-    env: {
-      type: String,
-      default: 'prod'
-    },
-    // 每列显示数量
-    column: {
-      type: Number,
-      default: 2
-    },
-    // 每列显示数量
-    getRealData: {
-      type: Boolean,
-      default: false
-    },
-    // 是否展示插槽
-    extraShow: {
-      type: Boolean,
-      default: true
-    }
-  },
-  created () {
-    this.initConfig()
-  },
-  data () {
-    return {
-      // 加载状态
-      loading: false,
-      loadError: false,
-      realData: undefined
-    }
-  },
-  computed: {
-    ...mapState('setting', { isMobile: 'isMobile' })
-  },
-  methods: {
-    initConfig () {
-      this.loading = true
-      this.loadError = false
-      if (this.configName) {
-        this.getConfig()
-      } else {
-        this.loading = false
-        this.loadError = true
-      }
-    },
-    getConfig () {
-      getConfigByName(this.configName, this.serviceName, (res) => {
-        const mapIndex = {}
-        const result = {}
-        if (res.formJson) {
-          res.formJson.filter(item => {
-            const model = item.model
-            return model.indexOf(this.model) > 0
-          })[0].groupItems.forEach(item => {
-            mapIndex[item.model.substring(item.model.indexOf('_') + 1)] = item.name
-          })
-          for (const key of Object.keys(this.content)) {
-            const name = mapIndex[key]
-            if (name) {
-              result[name] = this.content[key]
-            } else {
-              result[key] = this.content[key]
-            }
-          }
-        } else if (res.column) {
-          // [{label:'标签1',filed:'字段1'}]
-          let content = {}
-          if (this.getRealData) {
-            content = getRealKeyData(this.content)
-          } else {
-            content = this.content
-          }
-          if (typeof content === 'string') {
-            content = JSON.parse(content)
-          }
-          res.column.forEach(item => {
-            result[item.label] = content[item.filed]
-          })
-        }
-        this.realData = result
-        this.loading = false
-      }, this.env === 'dev')
-    },
-    // 文字格式化
-    formatText (value) {
-      return value ?? '--'
-    }
-  }
-}
-</script>
-<style>
-.row {
-  display: flex;
-
-  .content {
-    -webkit-box-flex: 1;
-    flex: auto;
-    -ms-flex: auto;
-  }
-
-  .extra {
-    flex: 0 1 auto;
-    -webkit-box-flex: 0;
-    -ms-flex: 0 1 auto;
-    min-width: 242px;
-    margin-left: 88px;
-    text-align: right;
-  }
-}
-</style>
+<template>
+  <div class="row">
+    <div class="content">
+      <a-skeleton :loading="loading" :paragraph="{ rows: 4 }" />
+      <div v-show="!loading">
+        <template v-if="!loadError">
+          <a-descriptions v-if="realData" :column="isMobile ? 1 : column" size="small" :title="title">
+            <a-descriptions-item
+              v-for="(value, key) in realData"
+              :key="key"
+              :label="key">
+              {{ formatText(value) }}
+            </a-descriptions-item>
+          </a-descriptions>
+        </template>
+        <template v-else>
+          <a-empty>
+            <span slot="description"> 页面配置不存在，请联系系统管理员 </span>
+          </a-empty>
+        </template>
+      </div>
+    </div>
+    <div class="extra" v-if="extraShow">
+      <slot name="addonAfter"/>
+    </div>
+  </div>
+</template>
+<script>
+
+import { mapState } from 'vuex'
+import { getRealKeyData } from '@vue2-client/utils/formatter'
+import { getConfigByName } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XDescriptions',
+  components: {
+  },
+  props: {
+    // 标题
+    title: {
+      type: String,
+      required: true
+    },
+    // 内容
+    content: {
+      type: Object,
+      required: true
+    },
+    // 模型名
+    model: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    // 配置名称
+    configName: {
+      type: String,
+      required: true
+    },
+    // 配置所属命名空间
+    serviceName: {
+      type: String,
+      default: undefined
+    },
+    env: {
+      type: String,
+      default: 'prod'
+    },
+    // 每列显示数量
+    column: {
+      type: Number,
+      default: 2
+    },
+    // 每列显示数量
+    getRealData: {
+      type: Boolean,
+      default: false
+    },
+    // 是否展示插槽
+    extraShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  created () {
+    this.initConfig()
+  },
+  data () {
+    return {
+      // 加载状态
+      loading: false,
+      loadError: false,
+      realData: undefined
+    }
+  },
+  computed: {
+    ...mapState('setting', { isMobile: 'isMobile' })
+  },
+  methods: {
+    initConfig () {
+      this.loading = true
+      this.loadError = false
+      if (this.configName) {
+        this.getConfig()
+      } else {
+        this.loading = false
+        this.loadError = true
+      }
+    },
+    getConfig () {
+      getConfigByName(this.configName, this.serviceName, (res) => {
+        const mapIndex = {}
+        const result = {}
+        if (res.formJson) {
+          res.formJson.filter(item => {
+            const model = item.model
+            return model.indexOf(this.model) > 0
+          })[0].groupItems.forEach(item => {
+            mapIndex[item.model.substring(item.model.indexOf('_') + 1)] = item.name
+          })
+          for (const key of Object.keys(this.content)) {
+            const name = mapIndex[key]
+            if (name) {
+              result[name] = this.content[key]
+            } else {
+              result[key] = this.content[key]
+            }
+          }
+        } else if (res.column) {
+          // [{label:'标签1',filed:'字段1'}]
+          let content = {}
+          if (this.getRealData) {
+            content = getRealKeyData(this.content)
+          } else {
+            content = this.content
+          }
+          if (typeof content === 'string') {
+            content = JSON.parse(content)
+          }
+          res.column.forEach(item => {
+            result[item.label] = content[item.filed]
+          })
+        }
+        this.realData = result
+        this.loading = false
+      }, this.env === 'dev')
+    },
+    // 文字格式化
+    formatText (value) {
+      return value ?? '--'
+    }
+  }
+}
+</script>
+<style>
+.row {
+  display: flex;
+
+  .content {
+    -webkit-box-flex: 1;
+    flex: auto;
+    -ms-flex: auto;
+  }
+
+  .extra {
+    flex: 0 1 auto;
+    -webkit-box-flex: 0;
+    -ms-flex: 0 1 auto;
+    min-width: 242px;
+    margin-left: 88px;
+    text-align: right;
+  }
+}
+</style>

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

@@ -328,11 +328,8 @@ export default {
               value = config.data[cell.dataIndex]
             }
 
-            // 检查值是否为空（允许 0 和 false）
-            const isEmptyString = typeof value === 'string' && value.trim() === ''
-            const isEmptyArray = Array.isArray(value) && value.length === 0
-            const isNullish = value === null || value === undefined
-            if (isNullish || isEmptyString || isEmptyArray) {
+            // 检查值是否为空
+            if (!value || (typeof value === 'string' && value.trim() === '')) {
               const message = cell.requiredMessage || this.getDefaultRequiredMessage(cell.type)
               errors.push({
                 dataIndex: cell.dataIndex,
@@ -822,18 +819,12 @@ export default {
       this.getConfigAndJoin(this.config, lock)
 
       // 用定时器循环查看锁状态
-      // 先清理可能存在的旧轮询，避免重复打印与重复初始化
-      if (this.timer) {
-        clearInterval(this.timer)
-        this.timer = undefined
-      }
       this.timer = setInterval(() => {
         if (!lock.status) {
           clearInterval(this.timer)
-          this.timer = undefined
           console.log('拼接完成', this.config)
           // 将初始化好的配置拷贝一份留存
-          this.originalConfig = JSON.parse(JSON.stringify(this.config))
+          this.originalConfig = Object.assign({}, this.config)
           if (!this.dontFormat) {
             // 扫描配置文件中有没有rowSpan，进行格式化调整
             this.formatConfigRow(this.config)
@@ -873,8 +864,8 @@ export default {
       if (this.configData === undefined) {
         console.error('未找到数据！')
       } else {
-        this.originalConfig = JSON.parse(JSON.stringify(this.config))
-        this.originalConfig.data = Object.assign({}, this.originalConfig.data, JSON.parse(JSON.stringify(this.configData)))
+        this.originalConfig = Object.assign({}, this.config)
+        this.originalConfig.data = Object.assign(this.originalConfig.data, JSON.parse(JSON.stringify(this.configData)))
         this.type = 'display'
         // this.onlyDisplay = true
         this.showSkeleton = false
@@ -888,12 +879,12 @@ export default {
         this.config = res
         if (this.config.designMode === 'json') {
           if (this.configData !== undefined) {
-            this.config.data = Object.assign({}, this.config.data, JSON.parse(JSON.stringify(this.configData)))
+            this.config.data = Object.assign({}, this.config.data, this.configData)
           }
           this.jsonConfigInit()
         } else {
           if (this.configData !== undefined) {
-            this.config.data = Object.assign({}, this.config.data, JSON.parse(JSON.stringify(this.configData)))
+            this.config.data = Object.assign(this.config.data, this.configData)
           }
           if (this.config.data.images === undefined) {
             this.config.data.images = {}
@@ -926,14 +917,14 @@ export default {
       if (this.localConfig.designMode === 'json') {
         this.config = this.localConfig
         if (this.configData !== undefined) {
-          this.config.data = Object.assign({}, this.config.data, JSON.parse(JSON.stringify(this.configData)))
+          this.config.data = Object.assign(this.config.data, this.configData)
         }
         this.jsonConfigInit()
       } else {
         // 如果配置是普通渲染器
         this.config = this.localConfig
         if (this.configData !== undefined) {
-          this.config.data = Object.assign({}, this.config.data, JSON.parse(JSON.stringify(this.configData)))
+          this.config.data = Object.assign(this.config.data, this.configData)
         }
         if (this.config.data.images === undefined) {
           this.config.data.images = {}