vue2-client 1.16.57 → 1.16.60

package/package.json

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

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

@@ -21,7 +21,7 @@ const wrapperClassObject = computed(() => {
 
   // 通用布尔样式开关（以存在/空字符串/'true' 为真）
   const booleanStyleKeys = [
-    'max-width200'
+    'max-width200', 'width173'
   ]
   for (const key of booleanStyleKeys) {
     const val = a[key]
@@ -176,9 +176,6 @@ defineExpose({
       .ant-btn {
         border: 1px solid #CDCDCD;
         color: #5D5C5C;
-        width: auto;
-        min-width: 124px;
-        max-width: 140px;
         white-space: nowrap;
         overflow: hidden;
         margin-right: 0px;
@@ -196,9 +193,6 @@ defineExpose({
     :deep(.ant-btn-group) {
       justify-content: flex-start;
       gap: 12px;
-      .ant-btn {
-        flex: 1 1 auto;
-      }
     }
   }
   // button-center样式 - 按钮居中排列
@@ -206,9 +200,6 @@ defineExpose({
     :deep(.ant-btn-group) {
       justify-content: center;
       gap: 12px;
-      .ant-btn {
-        flex: 1 1 auto;
-      }
     }
   }
   // button-right样式 - 按钮从右到左排列
@@ -216,18 +207,12 @@ defineExpose({
     :deep(.ant-btn-group) {
       justify-content: flex-end;
       gap: 12px;
-      .ant-btn {
-        flex: 1 1 auto;
-      }
     }
   }
   // button-space-between样式 - 按钮两端对齐（两个按钮时分布在两端）
   &.h-buttons-button-space-between {
     :deep(.ant-btn-group) {
       justify-content: space-between;
-      .ant-btn {
-        flex: 1 1 auto;
-      }
     }
   }
 
@@ -375,6 +360,10 @@ defineExpose({
       align-items: center;
     }
   }
-
+  &.h-buttons-width173 {
+    :deep(.ant-btn) {
+        width: 173px !important;
+    }
+  }
 }
 </style>

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

@@ -4,10 +4,12 @@ import { ref, onMounted, getCurrentInstance, watch } from 'vue'
 import { getConfigByNameAsync } from '@vue2-client/services/api/common'
 
 // 与 HTab 保持一致的样式开关
-defineProps({
+const props = defineProps({
   hasTopMargin: { type: Boolean, default: true },
   // 隐藏左侧索引栏（样式控制）
-  leftHide: { type: Boolean, default: false }
+  leftHide: { type: Boolean, default: false },
+  // 标题蓝色圆圈样式
+  showDot: { type: Boolean, default: false }
 })
 
 // 内部 XFormGroup 实例引用
@@ -70,14 +72,16 @@ watch(() => [vm?.proxy?.$attrs?.queryParamsName, vm?.proxy?.$attrs?.serviceName,
   <div
     class="h-form-group-wrapper"
     :class="{
-      'h-form-group-has-top-margin': hasTopMargin,
-      'left-hide': leftHide
+      'h-form-group-has-top-margin': props.hasTopMargin,
+      'left-hide': props.leftHide,
+      'show-dot': props.showDot
     }"
   >
     <x-form-group
       ref="xFormGroupRef"
       v-bind="$attrs"
       v-on="$listeners"
+      :showDot="props.showDot"
     >
       <template v-for="(_, name) in $slots" #[name]="slotData">
         <slot :name="name" v-bind="slotData" />
@@ -89,6 +93,7 @@ watch(() => [vm?.proxy?.$attrs?.queryParamsName, vm?.proxy?.$attrs?.serviceName,
 
 <style scoped lang="less">
 .h-form-group-wrapper {
+  padding: 6px;
   // XFormGroup 自身容器
   :deep(.XFormGroupClass) {
     height: 100%;
@@ -116,5 +121,18 @@ watch(() => [vm?.proxy?.$attrs?.queryParamsName, vm?.proxy?.$attrs?.serviceName,
       }
     }
   }
+  &.show-dot {
+    :deep(.x-title) {
+      font-size: 16px;
+      .title-content {
+        gap: 6px;
+        .title-dot {
+          height: 12px;
+          width: 12px;
+        }
+      }
+
+    }
+  }
 }
 </style>

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

@@ -24,7 +24,7 @@ const wrapperClassObject = computed(() => {
 
   // 通用布尔样式开关（以存在/空字符串/'true' 为真）
   const booleanStyleKeys = [
-    'hasTopMargin', 'useStyle7', 'useCycle', 'useStyle8', 'ant-tabs-bar-left0'
+    'hasTopMargin', 'useStyle7', 'useCycle', 'useStyle8'
   ]
   for (const key of booleanStyleKeys) {
     const val = a[key]
@@ -175,7 +175,7 @@ defineExpose({
 
   :deep(.ant-tabs-bar) {
     border-bottom: 2px solid #0057FE;
-    margin: 20px 10px 0 10px;
+    margin: 20px 0px 0 0px;
   }
 
   // 滚动状态下的容器左右内边距清零，避免左侧多出一截
@@ -229,7 +229,7 @@ defineExpose({
     :deep(.ant-tabs-ink-bar) {
       display: block;
       background-color: #0057FE;
-      bottom: 8px;
+      bottom: 1px;
       height: 2px;
       /* 宽度交给 antd 自身计算，避免固定值影响自适应 */
       margin-left: 0;
@@ -247,7 +247,7 @@ defineExpose({
         /* 自适应宽度，允许通过变量覆盖最小宽度 */
         min-width: var(--tab-min-width, 96px);
         width: auto;
-        padding: 0 12px;
+        padding: 0 12px 10px 12px;
         font-size: 16px;
         line-height: 10px;
         font-family: "Source Han Sans";
@@ -277,15 +277,16 @@ defineExpose({
         align-items: center !important; // 确保内容垂直居中
         line-height: normal !important; // 重置line-height避免冲突
         vertical-align: top !important; // 确保垂直对齐
+        justify-content: flex-start !important; // 确保内容左对齐
       }
       :deep(.ant-tabs-tab::before) {
         content: "" !important;
         position: absolute !important;
-        left: 0 !important;
-        top: 50% !important;
+        left: 3px !important;
+        top: calc(50% - 4px) !important;
         transform: translateY(-50%) !important;
-        width: 8px !important;
-        height: 8px !important;
+        width: 12px !important;
+        height: 12px !important;
         background: #0057FE !important;
         border-radius: 50% !important;
         display: block !important;
@@ -405,12 +406,5 @@ defineExpose({
       line-height: 0px !important;
     }
   }
-  // 侧边栏tab页签移除左侧空白区域
-  &.t-tab-ant-tabs-bar-left0 {
-    :deep(.ant-tabs-bar) {
-      border-bottom: 2px solid #0057FE;
-      margin: 20px 0px 0 4px;
-    }
-  }
 }
 </style>

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

@@ -18,7 +18,8 @@
           <div class="group-item" :ref="`group-${index}`" :key="index" v-for="(item, index) in groups">
             <a-row :style="{ marginTop: index === 0 ? '' : '8px' }" v-if="formShow[`show${item.groupName}`] || formShow[`show${item.slotName}`]">
               <a-col :span="5">
-                <span class="xFormGroupTitle">{{ item.describe }}</span>
+                <x-title v-if="showDot === true || showDot === 'true'" :title="item.describe" :dot="true" />
+                <span v-else class="xFormGroupTitle">{{ item.describe }}</span>
               </a-col>
             </a-row>
             <div v-show="formShow[`show${item.slotName}`]">
@@ -41,11 +42,19 @@
 
 <script>
 import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import XTitle from '@vue2-client/base-client/components/his/XTitle/XTitle.vue'
 
 export default {
   name: 'XFormGroup',
   components: {
-    XAddNativeForm
+    XAddNativeForm,
+    XTitle
+  },
+  props: {
+    showDot: {
+      type: Boolean,
+      default: false
+    }
   },
   data () {
     return {

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -645,7 +645,17 @@ export default {
       // 应用根节点样式
       if (Object.keys(rootStyles).length > 0) {
         Object.entries(rootStyles).forEach(([property, value]) => {
-          component.$el.style.setProperty(property, value, 'important')
+          // 兼容 Ant Row gutter 在列上写入的行内 padding-left/right，
+          // 这里同时写入四个方向的长属性，确保覆盖。
+          if (property === 'padding') {
+            component.$el.style.setProperty('padding', value, 'important')
+            component.$el.style.setProperty('padding-left', value, 'important')
+            component.$el.style.setProperty('padding-right', value, 'important')
+            component.$el.style.setProperty('padding-top', value, 'important')
+            component.$el.style.setProperty('padding-bottom', value, 'important')
+          } else {
+            component.$el.style.setProperty(property, value, 'important')
+          }
         })
       }
 
@@ -683,8 +693,25 @@ export default {
         const hasNewNodes = mutations.some(mutation =>
           mutation.type === 'childList' && mutation.addedNodes.length > 0
         )
+        const styleChanged = mutations.some(mutation =>
+          mutation.type === 'attributes' && mutation.attributeName === 'style'
+        )
 
-        if (hasNewNodes) {
+        if (hasNewNodes || styleChanged) {
+          // 重新应用根样式（处理 gutter 改写列 padding 的情况）
+          if (Object.keys(rootStyles).length > 0) {
+            Object.entries(rootStyles).forEach(([property, value]) => {
+              if (property === 'padding') {
+                component.$el.style.setProperty('padding', value, 'important')
+                component.$el.style.setProperty('padding-left', value, 'important')
+                component.$el.style.setProperty('padding-right', value, 'important')
+                component.$el.style.setProperty('padding-top', value, 'important')
+                component.$el.style.setProperty('padding-bottom', value, 'important')
+              } else {
+                component.$el.style.setProperty(property, value, 'important')
+              }
+            })
+          }
           applyStyles()
         }
       })
@@ -693,7 +720,8 @@ export default {
       observer.observe(component.$el, {
         childList: true,
         subtree: true,
-        attributes: false
+        attributes: true,
+        attributeFilter: ['style']
       })
 
       // 3秒后停止观察

package/src/base-client/components/common/XTable/ExportExcel.vue

@@ -17,6 +17,7 @@ export default {
       tipMsg: '正在获取汇总数据。。。',
       exportType: false,
       type: 'export',
+      modalTitle: '',
       selectedExportColumns: [],
       exportSelectedRows: false,
       allColumnsSelected: false,
@@ -29,12 +30,14 @@ export default {
   methods: {
     // 导出选中或本页数据
     handleExport (type, title) {
+      this.modalTitle = '选择导出列'
       this.exportFileName = title || '查询导出'
       this.type = 'export'
       this.handle(type)
     },
-    // 导出选中或本页数据
+    // 打印选中或本页数据
     handlePrint (type, printData) {
+      this.modalTitle = '选择打印数据列'
       this.type = 'print'
       this.printData = printData
       this.handle(type)
@@ -224,7 +227,7 @@ export default {
 
 <template>
   <a-modal
-    title="选择导出列"
+    :title="modalTitle"
     width="35vw"
     :z-index="1001"
     :confirmLoading="confirmLoading"

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

@@ -127,6 +127,7 @@ export default {
     },
     // 更新card-body的padding
     updateCardBodyPadding () {
+      if (this.widthMode) { return }
       this.$nextTick(() => {
         const cardBody = this.$el.querySelector('.ant-card-body')
         if (cardBody) {
@@ -176,7 +177,6 @@ export default {
     updateLayout (isOpen) {
       this.$nextTick(() => {
         try {
-          // 获取所有同级a-col（仅筛选出 .ant-col-12）
           const otherCols = this.getSiblingCols()
           if (otherCols.length > 0) {
             let currentCol = this.$el.parentNode
@@ -184,7 +184,6 @@ export default {
               currentCol = currentCol.parentNode
             }
             if (currentCol) {
-              // 触发XTab组件重新计算宽度
               const triggerResize = () => {
                 this.$nextTick(() => {
                   const tabComponent = this.$el.querySelector('.ant-tabs')
@@ -196,40 +195,34 @@ export default {
               }
 
               if (isOpen) {
-                // 展开：仅当显式允许时才改变布局；否则恢复默认宽度
                 if (this.affectLayout) {
                   if (this.widthMode === 'px') {
-                    // px模式：使用固定像素宽度
                     const drawerWidth = this.expandedWidth || 584
-                    currentCol.style.cssText = `
-                    flex: 0 0 ${drawerWidth}px !important;
-                    max-width: ${drawerWidth}px !important;
-                    transition: all 0.3s;`
+                    // 使用 style 对象逐个设置属性，保留其他样式
+                    currentCol.style.flex = `0 0 ${drawerWidth}px`
+                    currentCol.style.maxWidth = `${drawerWidth}px`
+                    currentCol.style.transition = 'all 0.3s'
                     if (otherCols.length === 1) {
                       const mainCol = otherCols[0]
-                      mainCol.style.cssText = `
-                      flex: 1 1 auto !important;
-                      max-width: calc(${this.totalWidth} - ${drawerWidth}px) !important;
-                      transition: all 0.3s;`
+                      mainCol.style.flex = '1 1 auto'
+                      mainCol.style.maxWidth = `calc(${this.totalWidth} - ${drawerWidth}px)`
+                      mainCol.style.transition = 'all 0.3s'
                     }
                   } else {
-                    // percent模式：使用百分比宽度（原有逻辑）
                     const drawerWidth = (this.expandedWidthPercent || 33.3)
-                    currentCol.style.cssText = `
-                    flex: 0 0 ${drawerWidth}% !important;
-                    max-width: ${drawerWidth}% !important;
-                    transition: all 0.3s;`
+                    currentCol.style.flex = `0 0 ${drawerWidth}%`
+                    currentCol.style.maxWidth = `${drawerWidth}%`
+                    currentCol.style.transition = 'all 0.3s'
                     if (otherCols.length === 1) {
                       const mainCol = otherCols[0]
                       const mainWidth = Math.max(0, Math.min(this.totalWidth, 100) - drawerWidth)
-                      mainCol.style.cssText = `
-                      flex: 0 0 ${mainWidth}% !important;
-                      max-width: ${mainWidth}% !important;
-                      transition: all 0.3s;`
+                      mainCol.style.flex = `0 0 ${mainWidth}%`
+                      mainCol.style.maxWidth = `${mainWidth}%`
+                      mainCol.style.transition = 'all 0.3s'
                     }
                   }
                 } else {
-                  // 恢复默认（移除我们加的内联样式）
+                  // 恢复默认：只移除我们设置的属性
                   currentCol.style.removeProperty('flex')
                   currentCol.style.removeProperty('max-width')
                   if (otherCols.length === 1) {
@@ -240,17 +233,15 @@ export default {
                 }
                 triggerResize()
               } else {
-                // 收缩：为了消除空白，始终把侧栏压到 26px，并让相邻主列占满剩余
-                currentCol.style.cssText = `
-                flex: 0 0 26px !important;
-                max-width: 26px !important;
-                transition: all 0.3s;`
+                // 收缩状态
+                currentCol.style.flex = '0 0 26px'
+                currentCol.style.maxWidth = '26px'
+                currentCol.style.transition = 'all 0.3s'
                 if (otherCols.length === 1) {
                   const mainCol = otherCols[0]
-                  mainCol.style.cssText = `
-                  flex: 1 1 auto !important;
-                  max-width: calc(100% - 26px) !important;
-                  transition: all 0.3s;`
+                  mainCol.style.flex = '1 1 auto'
+                  mainCol.style.maxWidth = 'calc(100% - 26px)'
+                  mainCol.style.transition = 'all 0.3s'
                 }
                 triggerResize()
               }

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

@@ -65,7 +65,6 @@ path: 'example',
   // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XReport/XReportHospitalizationDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XCharge/XChargeDemo.vue'),