vue2-client 1.16.40 → 1.16.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.16.40",
+  "version": "1.16.43",
   "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/HButtons/HButtons.vue

@@ -85,8 +85,9 @@ defineExpose({
       }
     }
   }
-  // +号样式
-  &.h-buttons-table-height-button23 {
+  // +号样式（共享基础样式）
+  &.h-buttons-table-height-button23,
+  &.h-buttons-table-height-button23-no-transform {
     :deep(.ant-btn-group) {
       display: inline-flex;
       align-items: center;
@@ -104,11 +105,15 @@ defineExpose({
         margin-left: 10px;
         width: 30px;
         height: 30px;
-        /* 自适应上移：按按钮自身高度百分比位移 */
-        transform: translateY(-100%);
       }
     }
   }
+  // 仅在有分页的场景上移
+  &.h-buttons-table-height-button23 {
+    :deep(.ant-btn-group) {
+      .ant-btn { transform: translateY(-100%); }
+    }
+  }
   // 居中+悬停高亮的新样式
   &.h-buttons-plus-center {
     :deep(.ant-btn-group) {

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 = {}

package/src/base-client/components/his/XCharge/testConfig.js

@@ -1,149 +1,149 @@
-// 测试配置 - 用于演示混合支付功能
-export const testChargeConfig = {
-  "amountFields": [
-    {
-      "field": 'f_amount',
-      "disabled": false,
-      "label": '费用总额'
-    },
-    {
-      "field": 'f_insurance_amount',
-      "disabled": true,
-      "label": '医保支付'
-    },
-    {
-      "field": 'f_self_amount',
-      "disabled": true,
-      "label": '自费金额'
-    },
-    {
-      "field": 'out_of_pocket_amount',
-      "disabled": true,
-      "label": '自付金额'
-    },
-    {
-      "field": 'biscount_amount',
-      "disabled": true,
-      "label": '折扣金额'
-    },
-    {
-      "field": 'billing_amount',
-      "disabled": true,
-      "label": '记账金额'
-    }
-  ],
-  "paymentMethods": [
-    {
-      "key": '医保卡',
-      "label": '医保卡'
-    },
-    {
-      "key": '微信/支付宝',
-      "label": '微信/支付宝'
-    },
-    {
-      "key": '银行卡',
-      "label": '银行卡'
-    },
-    {
-      "key": '现金',
-      "label": '现金'
-    }
-  ],
-  "bottomFields": [
-    {
-      "field": 'f_balance',
-      "label": '账户余额',
-      "disabled": false
-    },
-    {
-      "field": 'received',
-      "label": '实收',
-      "disabled": false
-    },
-    {
-      "field": 'change',
-      "label": '找零',
-      "disabled": false
-    }
-  ],
-  "actionButtons": [
-    {
-      "key": 'charge',
-      "label": '收费',
-      "icon": 'check'
-    },
-    {
-      "key": 'refund',
-      "label": '退费',
-      "icon": 'undo'
-    },
-    {
-      "key": 'print',
-      "label": '打印',
-      "icon": 'printer'
-    }
-  ],
-  "enableMixedPayment": true, // 启用混合支付
-  // 可配置事件名，参考 fronImport 风格
-  "eventNames": {
-    "method": 'method',
-    "methods": 'methods',
-    "totalPaymentAmount": 'totalPaymentAmount',
-    "action": 'action'
-  },
-  "dataSourceConfig": 'testChargeLogic'
-}
-
-// 单选模式测试配置
-export const testSingleChargeConfig = {
-  "amountFields": [
-    {
-      "field": 'f_amount',
-      "disabled": false,
-      "label": '费用总额'
-    },
-    {
-      "field": 'f_insurance_amount',
-      "disabled": true,
-      "label": '医保支付'
-    }
-  ],
-  "paymentMethods": [
-    {
-      "key": '医保卡',
-      "label": '医保卡'
-    },
-    {
-      "key": '现金',
-      "label": '现金'
-    }
-  ],
-  "bottomFields": [
-    {
-      "field": 'received',
-      "label": '实收',
-      "disabled": false
-    },
-    {
-      "field": 'change',
-      "label": '找零',
-      "disabled": false
-    }
-  ],
-  "actionButtons": [
-    {
-      "key": 'charge',
-      "label": '收费',
-      "icon": 'check'
-    }
-  ],
-  "enableMixedPayment": false, // 禁用混合支付（单选模式）
-  "eventNames": {
-    "method": 'method',
-    "methods": 'methods',
-    "totalPaymentAmount": 'totalPaymentAmount',
-    "action": 'action'
-  },
-  "dataSourceConfig": 'testChargeLogic'
-}
+// 测试配置 - 用于演示混合支付功能
+export const testChargeConfig = {
+  "amountFields": [
+    {
+      "field": 'f_amount',
+      "disabled": false,
+      "label": '费用总额'
+    },
+    {
+      "field": 'f_insurance_amount',
+      "disabled": true,
+      "label": '医保支付'
+    },
+    {
+      "field": 'f_self_amount',
+      "disabled": true,
+      "label": '自费金额'
+    },
+    {
+      "field": 'out_of_pocket_amount',
+      "disabled": true,
+      "label": '自付金额'
+    },
+    {
+      "field": 'biscount_amount',
+      "disabled": true,
+      "label": '折扣金额'
+    },
+    {
+      "field": 'billing_amount',
+      "disabled": true,
+      "label": '记账金额'
+    }
+  ],
+  "paymentMethods": [
+    {
+      "key": '医保卡',
+      "label": '医保卡'
+    },
+    {
+      "key": '微信/支付宝',
+      "label": '微信/支付宝'
+    },
+    {
+      "key": '银行卡',
+      "label": '银行卡'
+    },
+    {
+      "key": '现金',
+      "label": '现金'
+    }
+  ],
+  "bottomFields": [
+    {
+      "field": 'f_balance',
+      "label": '账户余额',
+      "disabled": false
+    },
+    {
+      "field": 'received',
+      "label": '实收',
+      "disabled": false
+    },
+    {
+      "field": 'change',
+      "label": '找零',
+      "disabled": false
+    }
+  ],
+  "actionButtons": [
+    {
+      "key": 'charge',
+      "label": '收费',
+      "icon": 'check'
+    },
+    {
+      "key": 'refund',
+      "label": '退费',
+      "icon": 'undo'
+    },
+    {
+      "key": 'print',
+      "label": '打印',
+      "icon": 'printer'
+    }
+  ],
+  "enableMixedPayment": true, // 启用混合支付
+  // 可配置事件名，参考 fronImport 风格
+  "eventNames": {
+    "method": 'method',
+    "methods": 'methods',
+    "totalPaymentAmount": 'totalPaymentAmount',
+    "action": 'action'
+  },
+  "dataSourceConfig": 'testChargeLogic'
+}
+
+// 单选模式测试配置
+export const testSingleChargeConfig = {
+  "amountFields": [
+    {
+      "field": 'f_amount',
+      "disabled": false,
+      "label": '费用总额'
+    },
+    {
+      "field": 'f_insurance_amount',
+      "disabled": true,
+      "label": '医保支付'
+    }
+  ],
+  "paymentMethods": [
+    {
+      "key": '医保卡',
+      "label": '医保卡'
+    },
+    {
+      "key": '现金',
+      "label": '现金'
+    }
+  ],
+  "bottomFields": [
+    {
+      "field": 'received',
+      "label": '实收',
+      "disabled": false
+    },
+    {
+      "field": 'change',
+      "label": '找零',
+      "disabled": false
+    }
+  ],
+  "actionButtons": [
+    {
+      "key": 'charge',
+      "label": '收费',
+      "icon": 'check'
+    }
+  ],
+  "enableMixedPayment": false, // 禁用混合支付（单选模式）
+  "eventNames": {
+    "method": 'method',
+    "methods": 'methods',
+    "totalPaymentAmount": 'totalPaymentAmount',
+    "action": 'action'
+  },
+  "dataSourceConfig": 'testChargeLogic'
+}

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

@@ -153,7 +153,7 @@ export default {
       const classes = {}
 
       const booleanStyleKeys = [
-        'description'
+        'description', 'no-padding'
       ]
       booleanStyleKeys.forEach(key => {
         const val = attrs[key]
@@ -476,4 +476,7 @@ export default {
     }
   }
 }
+.xhdesc-no-padding {
+  padding: 0px;
+}
 </style>

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="x-radio-container">
+  <div class="x-radio-container" :class="wrapperClassObject()">
     <a-radio-group v-model="innerValue" @change="onChange" class="x-radio-group">
       <div v-for="item in data" :key="item.value" class="x-radio-item-container">
         <a-radio :value="item.value" class="x-radio-item">
@@ -87,12 +87,25 @@ export default {
     onChange (e) {
       this.innerValue = e.target.value
       this.$emit('change', e.target.value)
-    }
+    },
+    wrapperClassObject () {
+      const attrs = this.$attrs || {}
+      const classes = {}
+      const booleanStyleKeys = [
+        'item-0padding'
+      ]
+      booleanStyleKeys.forEach(key => {
+        const val = attrs[key]
+        const truthy = val === true || val === '' || val === 'true'
+        if (truthy) classes[`x-radio-${key}`] = true
+      })
+      return classes
+    },
   }
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
 .x-radio-container {
   display: flex;
   flex-direction: column;
@@ -122,4 +135,16 @@ export default {
   transition: all 0.3s;
   max-width: 100%;
 }
+.x-radio-description {
+  padding: 4px 4px 4px 4px;
+}
+
+.x-radio-item-0padding {
+  &.x-radio-container,
+  .x-radio-container {
+    :deep(.x-radio-item-container) {
+      padding: 0px;
+    }
+  }
+}
 </style>

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

@@ -4,6 +4,7 @@
       v-model="selectedValue"
       :placeholder="placeholder"
       class="x-select"
+      :class="wrapperClassObject()"
       :allowClear="true"
       :showSearch="true"
       :filter-option="filterOption"
@@ -56,7 +57,20 @@ export default {
     },
     filterOption (input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-    }
+    },
+    wrapperClassObject () {
+      const attrs = this.$attrs || {}
+      const classes = {}
+      const booleanStyleKeys = [
+        'x-select4'
+      ]
+      booleanStyleKeys.forEach(key => {
+        const val = attrs[key]
+        const truthy = val === true || val === '' || val === 'true'
+        if (truthy) classes[`x-select-${key}`] = true
+      })
+      return classes
+    },
   },
   watch: {
     selectedValue (val) {
@@ -65,8 +79,13 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
 .x-select {
   min-width: 150px;
 }
+
+.x-select-x-select4 {
+  width: 100%;
+  min-width: auto;
+}
 </style>

package/src/services/api/common.js

@@ -83,7 +83,6 @@ export function getConfig (content, configName, serviceName = process.env.VUE_AP
     apiPre = '/devApi/'
   }
   const getConfigUrl = apiPre + serviceName + '/' + commonApi.getConfig
-  console.log('getConfigUrl', getConfigUrl)
   indexedDB.getByWeb(configName, getConfigUrl, { configName: configName }, callback)
 }