vue2-client 1.16.39 → 1.16.40

package/package.json

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

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/his/XHDescriptions/XHDescriptions.vue

@@ -22,11 +22,10 @@
           <template v-if="data">
             <!-- 显示前N个标签 -->
             <a-descriptions-item
-              v-for="(item) in visibleItems"
+              v-for="(item) in visibleItemsFiltered"
               :key="item.field"
               :colon="item.colon !== false"
-              :class="{ 'with-divider': item.isLine }"
-              v-if="data[item.field] !== null && data[item.field] !== undefined && (!showAllItems || showAllItems && !hiddenItems.some(i => i.field === item.field))">
+              :class="{ 'with-divider': item.isLine }">
               <template #label>
                 <div :class="['label-wrapper', { 'with-avatar': item.showAvatar }]">
                   <a-avatar
@@ -46,10 +45,9 @@
             <!-- 展开后显示剩余标签 -->
             <template v-if="showAllItems">
               <a-descriptions-item
-                v-for="item in hiddenItems"
+                v-for="item in hiddenItemsFiltered"
                 :key="item.field"
-                :colon="item.colon !== false"
-                v-if="data[item.field] !== null && data[item.field] !== undefined">
+                :colon="item.colon !== false">
                 <template #label>
                   <div :class="['label-wrapper', { 'with-avatar': item.showAvatar }]">
                     <a-avatar
@@ -76,10 +74,9 @@
           <template v-if="data">
             <!-- 显示可见的标签 -->
             <div
-              v-for="(item) in visibleItems"
+              v-for="(item) in visibleItemsFiltered"
               :key="item.field"
               :class="['description-item', { 'with-divider': item.isLine }]"
-              v-if="data[item.field] !== null && data[item.field] !== undefined"
             >
               <div :class="['label-wrapper', { 'with-avatar': item.showAvatar }]">
                 <a-avatar
@@ -98,10 +95,9 @@
             <!-- 展开后显示的内容 -->
             <template v-if="showAllItems">
               <div
-                v-for="item in hiddenItems"
+                v-for="item in hiddenItemsFiltered"
                 :key="item.field"
                 class="description-item"
-                v-if="data[item.field] !== null && data[item.field] !== undefined"
               >
                 <div :class="['label-wrapper', { 'with-avatar': item.showAvatar }]">
                   <a-avatar
@@ -157,9 +153,6 @@ export default {
       const classes = {}
 
       const booleanStyleKeys = [
-        'query-conditions',
-        'padding-50',
-        'label-text-horizontal',
         'description'
       ]
       booleanStyleKeys.forEach(key => {
@@ -201,6 +194,21 @@ export default {
       if (!(this.config && this.config.items)) return []
       if (!(this.config && this.config.detailsConfig)) return []
       return this.config.items.slice(this.detailsAfterIndex)
+    },
+    // 过滤后可直接渲染的可见项
+    visibleItemsFiltered () {
+      const list = this.visibleItems || []
+      if (!this.data) return []
+      const res = list.filter(item => this.data[item.field] !== null && this.data[item.field] !== undefined)
+      if (!this.showAllItems) return res
+      const hiddenFields = new Set((this.hiddenItems || []).map(i => i.field))
+      return res.filter(item => !hiddenFields.has(item.field))
+    },
+    // 过滤后可直接渲染的隐藏项（仅展开时使用）
+    hiddenItemsFiltered () {
+      const list = this.hiddenItems || []
+      if (!this.data) return []
+      return list.filter(item => this.data[item.field] !== null && this.data[item.field] !== undefined)
     }
   },
   created () {
@@ -250,7 +258,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
 .patient-info-descriptions {
   background: #fff;
   padding: 12px;