vue2-client 1.16.51 → 1.16.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.16.51",
+  "version": "1.16.54",
   "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

@@ -1,371 +1,380 @@
-<script setup lang="ts">
-import XButtons from '@vue2-client/base-client/components/common/XButtons/XButtons.vue'
-import { ref, computed, useAttrs } from 'vue'
-
-defineProps({
-  // HButtons特有的属性
-  buttonStyle: {
-    type: String,
-    default: 'button24'
-  }
-})
-
-// 内部 XButtons 实例引用
-const xButtonsRef = ref()
-
-// 兼容多种样式配置
-const attrs = useAttrs()
-const wrapperClassObject = computed(() => {
-  const a = attrs
-  const classes = {}
-
-  // 通用布尔样式开关（以存在/空字符串/'true' 为真）
-  const booleanStyleKeys = [
-    'max-width200'
-  ]
-  for (const key of booleanStyleKeys) {
-    const val = a[key]
-    const truthy = val === true || val === '' || val === 'true'
-    if (truthy) classes[`h-buttons-${key}`] = true
-  }
-  return classes
-})
-
-// 暴露方法：获取内部 XButtons 实例
-defineExpose({
-  getXButtonsInstance: function () { return xButtonsRef.value }
-})
-</script>
-
-<template>
-  <div
-    class="h-buttons-wrapper"
-    :class="[
-      `h-buttons-${buttonStyle}`,
-      wrapperClassObject
-    ]"
-  >
-    <x-buttons
-      ref="xButtonsRef"
-      v-bind="$attrs"
-      v-on="$listeners"
-    >
-      <template v-for="(_, name) in $slots" v-slot:[name]="slotData">
-        <slot :name="name" v-bind="slotData" />
-      </template>
-    </x-buttons>
-  </div>
-</template>
-
-<style scoped lang="less">
-.h-buttons-wrapper {
-  // 基础样式
-  :deep(.ant-btn-group) {
-    .ant-btn {
-      border-radius: 6px;
-      background-color: #FFFFFF;
-      border: 1px solid #9499A0;
-      color: #313131;
-      font-weight: normal;
-      letter-spacing: 0em;
-      width: 110px;
-      font-size: 16px;
-      font-family: "Source Han Sans";
-      line-height: normal;
-      margin-right: 25px;
-      height: 32px;
-    }
-  }
-  // button24样式
-  &.h-buttons-button24 {
-    :deep(.ant-btn-group) {
-      .ant-btn {
-        border: 1px solid #CDCDCD;
-        color: #5D5C5C;
-        // top: -100px;
-        width: fit-content;
-        min-width: 110px;
-      }
-    }
-  }
-  // button23样式
-  &.h-buttons-button23 {
-    :deep(.ant-btn-group) {
-      .ant-btn {
-        border: none;
-        padding: 0 !important;
-        color: #FFFFFF;
-        border-radius: 50%;
-        background-color: #1890FF;
-        margin-left: 10px;
-        top: -88px;
-        width: 30px;
-        height: 30px;
-      }
-    }
-  }
-  // +号样式（共享基础样式）
-  &.h-buttons-table-height-button23,
-  &.h-buttons-table-height-button23-no-transform {
-    :deep(.ant-btn-group) {
-      display: inline-flex;
-      align-items: center;
-      height: 100%;
-
-      .ant-btn {
-        display: inline-flex;
-        align-items: center;
-        justify-content: center;
-        border: none;
-        padding: 0 !important;
-        color: #FFFFFF;
-        border-radius: 50%;
-        background-color: #1890FF;
-        margin-left: 10px;
-        width: 30px;
-        height: 30px;
-      }
-    }
-  }
-  // 仅在有分页的场景上移
-  &.h-buttons-table-height-button23 {
-    :deep(.ant-btn-group) {
-      .ant-btn { transform: translateY(-100%); }
-    }
-  }
-  // 居中+悬停高亮的新样式
-  &.h-buttons-plus-center {
-    :deep(.ant-btn-group) {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 16px;
-
-      .ant-btn {
-        display: inline-flex;
-        align-items: center;
-        justify-content: center;
-        border: 1px solid #CDCDCD;
-        color: #5D5C5C;
-        min-width: 110px;
-        transition: background-color 0.2s ease, border-color 0.2s ease, color 0.2s ease;
-
-        &:hover {
-          background-color: #0057FE;
-          border-color: #0057FE;
-          color: #FFFFFF;
-        }
-        /* 支持通过 data-type 改变悬停颜色 */
-        &[data-type='success']:hover {
-          background-color: #34C76E;
-          border-color: #34C76E;
-          color: #FFFFFF;
-        }
-      }
-    }
-  }
-  // 按钮布局样式公共部分
-  &.h-buttons-button-left,
-  &.h-buttons-button-center,
-  &.h-buttons-button-right,
-  &.h-buttons-button-space-between {
-    :deep(.ant-btn-group) {
-      width: 100%;
-      display: flex;
-      flex-wrap: nowrap;
-      .ant-btn {
-        border: 1px solid #CDCDCD;
-        color: #5D5C5C;
-        width: auto;
-        min-width: 124px;
-        max-width: 170px;
-        white-space: nowrap;
-        overflow: hidden;
-        margin-right: 0px;
-        text-overflow: ellipsis;
-      }
-    }
-  }
-  &.h-buttons-max-width200 {
-    :deep(.ant-btn) {
-        max-width: 200px !important;
-    }
-  }
-  // button-left样式 - 按钮从左到右排列
-  &.h-buttons-button-left {
-    :deep(.ant-btn-group) {
-      justify-content: flex-start;
-      gap: 12px;
-      .ant-btn {
-        flex: 1 1 auto;
-      }
-    }
-  }
-  // button-center样式 - 按钮居中排列
-  &.h-buttons-button-center {
-    :deep(.ant-btn-group) {
-      justify-content: center;
-      gap: 12px;
-      .ant-btn {
-        flex: 1 1 auto;
-      }
-    }
-  }
-  // button-right样式 - 按钮从右到左排列
-  &.h-buttons-button-right {
-    :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;
-      }
-    }
-  }
-
-   // button-icon-tiles样式 - 左侧彩色图标块 + 右侧文字
-  &.h-buttons-button-icon-tiles {
-    :deep(.ant-btn-group) {
-      width: 100%;
-      display: flex;
-      flex-wrap: wrap; // 允许自动换行
-      justify-content: flex-start; // 左对齐
-      gap: 0; // 取消统一间距
-
-      .ant-btn {
-        position: relative;
-        display: inline-flex;
-        align-items: center;
-        gap: 10px; // 控制图标与文字间距
-        border: 1px solid #E6E8EB;
-        font-size: 14px;
-        height: 44px;
-        padding: 0 10px 0 10px;
-        border-radius: 8px;
-        min-width: 116px;
-        box-shadow: 0 2px 0 rgba(0,0,0,0.02);
-        margin-right: 12px; // 用margin控制横向间距，末尾一排自然换行
-      }
-
-      .ant-btn .anticon {
-        width: 26px;
-        height: 26px;
-        display: inline-flex;
-        align-items: center;
-        justify-content: center;
-        border-radius: 6px;
-        color: #fff;
-        font-size: 14px;
-        flex: 0 0 26px; // 固定正方形，防止随文本挤压变形
-        box-sizing: border-box;
-      }
-
-      /* 默认蓝色，支持通过 data-type 改变色块（success/warning/error/default）*/
-      .ant-btn .anticon { background: #3FA7FF; }
-      .ant-btn[data-type='success'] .anticon { background: #34C76E; }
-      .ant-btn[data-type='warning'] .anticon { background: #FFA940; }
-      .ant-btn[data-type='error'] .anticon { background: #FF7875; }
-      .ant-btn[disabled] .anticon { background: #BFBFBF; }
-
-      /* 图标与文字间距在有图标时更自然 */
-      .ant-btn > .anticon + span { margin-left: 10px; }
-    }
-  }
-  // 水印图标与按钮容器布局调整
-  &.h-buttons-button-watermark-icon {
-    :deep(.watermark-icon) {  transform: translate(-50%, -54%) !important; }
-    :deep(.x-button) { display: flex !important; }
-    :deep(.ant-btn-group) {
-      margin: 0 auto;
-      display: block;
-    }
-  }
-  &.h-buttons-0padding-button {
-    padding: 0px 4px;
-  }
-  // button25样式 用于会诊申请侧边栏按钮样式
-  &.h-buttons-button25 {
-    :deep(.x-buttons) {
-      .ant-btn-group {
-        width: 173px;
-        justify-content: space-between;
-
-        .ant-btn {
-          width: 173px;
-        }
-      }
-    }
-  }
-  // 居中样式 用于门诊收费左侧按钮样式（三个按钮居中样式）
-  &.h-buttons-out-button {
-    :deep(.x-buttons) {
-      margin-top: 0vw;
-      display: flex;
-      justify-content: center;
-      .ant-btn-group {
-        display: flex;
-        flex-wrap: nowrap;
-        gap: 12px;
-        .ant-btn {
-          box-sizing: border-box;
-          margin-right: 0px;
-          width: auto;
-          min-width: 130px;
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-      }
-    }
-  }
-  // button15样式 - 垂直排列的深色按钮组
-  &.h-buttons-button15 {
-    :deep(.x-buttons) {
-      margin-top: -22px;
-      .ant-btn-group {
-        flex-direction: column; /* 按钮垂直排列 */
-        display: flex; /* 启用flex布局 */
-        gap: 6px; /* 按钮间距 */
-        .ant-btn {
-          border: none; /* 移除边框 */
-          color: #FFFFFF; /* 字体颜色 */
-          background-color: #5D5C5C; /* 背景色 */
-          box-sizing: border-box; /* 盒模型 */
-          left: 12px; /* 左偏移 */
-          width: 280px; /* 宽度 */
-        }
-      }
-    }
-  }
-  // button2样式
-  &.h-buttons-button2 {
-    :deep(.x-buttons) {
-      margin: -20px 6px -20px 6px;
-      .ant-btn-group {
-        width: 100%;
-        justify-content: space-between;
-        display: flex; /* 确保flex布局 */
-        flex-wrap: nowrap; /* 防止换行 */
-        .ant-btn {
-          border-radius: 6px; /* 边框圆角 */
-          border: none; /* 移除边框 */
-          flex: 0 0 46%; /* flex-grow: 0, flex-shrink: 0, flex-basis: 46% */
-          min-width: 0; /* 覆盖可能的默认最小宽度 */
-          font-size: 16px; /* 字体大小 */
-          height: 32px; /* 高度 */
-          color: #FFFFFF; /* 字体颜色 */
-          background-color: #1890FF; /* 背景颜色 */
-        }
-      }
-    }
-  }
-}
-</style>
+<script setup lang="ts">
+import XButtons from '@vue2-client/base-client/components/common/XButtons/XButtons.vue'
+import { ref, computed, useAttrs } from 'vue'
+
+defineProps({
+  // HButtons特有的属性
+  buttonStyle: {
+    type: String,
+    default: 'button24'
+  }
+})
+
+// 内部 XButtons 实例引用
+const xButtonsRef = ref()
+
+// 兼容多种样式配置
+const attrs = useAttrs()
+const wrapperClassObject = computed(() => {
+  const a = attrs
+  const classes = {}
+
+  // 通用布尔样式开关（以存在/空字符串/'true' 为真）
+  const booleanStyleKeys = [
+    'max-width200'
+  ]
+  for (const key of booleanStyleKeys) {
+    const val = a[key]
+    const truthy = val === true || val === '' || val === 'true'
+    if (truthy) classes[`h-buttons-${key}`] = true
+  }
+  return classes
+})
+
+// 暴露方法：获取内部 XButtons 实例
+defineExpose({
+  getXButtonsInstance: function () { return xButtonsRef.value }
+})
+</script>
+
+<template>
+  <div
+    class="h-buttons-wrapper"
+    :class="[
+      `h-buttons-${buttonStyle}`,
+      wrapperClassObject
+    ]"
+  >
+    <x-buttons
+      ref="xButtonsRef"
+      v-bind="$attrs"
+      v-on="$listeners"
+    >
+      <template v-for="(_, name) in $slots" v-slot:[name]="slotData">
+        <slot :name="name" v-bind="slotData" />
+      </template>
+    </x-buttons>
+  </div>
+</template>
+
+<style scoped lang="less">
+.h-buttons-wrapper {
+  // 基础样式
+  :deep(.ant-btn-group) {
+    .ant-btn {
+      border-radius: 6px;
+      background-color: #FFFFFF;
+      border: 1px solid #9499A0;
+      color: #313131;
+      font-weight: normal;
+      letter-spacing: 0em;
+      width: 110px;
+      font-size: 16px;
+      font-family: "Source Han Sans";
+      line-height: normal;
+      margin-right: 25px;
+      height: 32px;
+    }
+  }
+  // button24样式
+  &.h-buttons-button24 {
+    :deep(.ant-btn-group) {
+      .ant-btn {
+        border: 1px solid #CDCDCD;
+        color: #5D5C5C;
+        // top: -100px;
+        width: fit-content;
+        min-width: 110px;
+      }
+    }
+  }
+  // button23样式
+  &.h-buttons-button23 {
+    :deep(.ant-btn-group) {
+      .ant-btn {
+        border: none;
+        padding: 0 !important;
+        color: #FFFFFF;
+        border-radius: 50%;
+        background-color: #1890FF;
+        margin-left: 10px;
+        top: -88px;
+        width: 30px;
+        height: 30px;
+      }
+    }
+  }
+  // +号样式（共享基础样式）
+  &.h-buttons-table-height-button23,
+  &.h-buttons-table-height-button23-no-transform {
+    :deep(.ant-btn-group) {
+      display: inline-flex;
+      align-items: center;
+      height: 100%;
+
+      .ant-btn {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        border: none;
+        padding: 0 !important;
+        color: #FFFFFF;
+        border-radius: 50%;
+        background-color: #1890FF;
+        margin-left: 10px;
+        width: 30px;
+        height: 30px;
+      }
+    }
+  }
+  // 仅在有分页的场景上移
+  &.h-buttons-table-height-button23 {
+    :deep(.ant-btn-group) {
+      .ant-btn { transform: translateY(-100%); }
+    }
+  }
+  // 居中+悬停高亮的新样式
+  &.h-buttons-plus-center {
+    :deep(.ant-btn-group) {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 16px;
+
+      .ant-btn {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        border: 1px solid #CDCDCD;
+        color: #5D5C5C;
+        min-width: 110px;
+        transition: background-color 0.2s ease, border-color 0.2s ease, color 0.2s ease;
+
+        &:hover {
+          background-color: #0057FE;
+          border-color: #0057FE;
+          color: #FFFFFF;
+        }
+        /* 支持通过 data-type 改变悬停颜色 */
+        &[data-type='success']:hover {
+          background-color: #34C76E;
+          border-color: #34C76E;
+          color: #FFFFFF;
+        }
+      }
+    }
+  }
+  // 按钮布局样式公共部分
+  &.h-buttons-button-left,
+  &.h-buttons-button-center,
+  &.h-buttons-button-right,
+  &.h-buttons-button-space-between {
+    :deep(.ant-btn-group) {
+      width: 100%;
+      display: flex;
+      flex-wrap: nowrap;
+      .ant-btn {
+        border: 1px solid #CDCDCD;
+        color: #5D5C5C;
+        width: auto;
+        min-width: 124px;
+        max-width: 140px;
+        white-space: nowrap;
+        overflow: hidden;
+        margin-right: 0px;
+        text-overflow: ellipsis;
+      }
+    }
+  }
+  &.h-buttons-max-width200 {
+    :deep(.ant-btn) {
+        max-width: 200px !important;
+    }
+  }
+  // button-left样式 - 按钮从左到右排列
+  &.h-buttons-button-left {
+    :deep(.ant-btn-group) {
+      justify-content: flex-start;
+      gap: 12px;
+      .ant-btn {
+        flex: 1 1 auto;
+      }
+    }
+  }
+  // button-center样式 - 按钮居中排列
+  &.h-buttons-button-center {
+    :deep(.ant-btn-group) {
+      justify-content: center;
+      gap: 12px;
+      .ant-btn {
+        flex: 1 1 auto;
+      }
+    }
+  }
+  // button-right样式 - 按钮从右到左排列
+  &.h-buttons-button-right {
+    :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;
+      }
+    }
+  }
+
+   // button-icon-tiles样式 - 左侧彩色图标块 + 右侧文字
+  &.h-buttons-button-icon-tiles {
+    :deep(.ant-btn-group) {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap; // 允许自动换行
+      justify-content: flex-start; // 左对齐
+      gap: 0; // 取消统一间距
+
+      .ant-btn {
+        position: relative;
+        display: inline-flex;
+        align-items: center;
+        gap: 10px; // 控制图标与文字间距
+        border: 1px solid #E6E8EB;
+        font-size: 14px;
+        height: 44px;
+        padding: 0 10px 0 10px;
+        border-radius: 8px;
+        min-width: 116px;
+        box-shadow: 0 2px 0 rgba(0,0,0,0.02);
+        margin-right: 12px; // 用margin控制横向间距，末尾一排自然换行
+      }
+
+      .ant-btn .anticon {
+        width: 26px;
+        height: 26px;
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 6px;
+        color: #fff;
+        font-size: 14px;
+        flex: 0 0 26px; // 固定正方形，防止随文本挤压变形
+        box-sizing: border-box;
+      }
+
+      /* 默认蓝色，支持通过 data-type 改变色块（success/warning/error/default）*/
+      .ant-btn .anticon { background: #3FA7FF; }
+      .ant-btn[data-type='success'] .anticon { background: #34C76E; }
+      .ant-btn[data-type='warning'] .anticon { background: #FFA940; }
+      .ant-btn[data-type='error'] .anticon { background: #FF7875; }
+      .ant-btn[disabled] .anticon { background: #BFBFBF; }
+
+      /* 图标与文字间距在有图标时更自然 */
+      .ant-btn > .anticon + span { margin-left: 10px; }
+    }
+  }
+  // 水印图标与按钮容器布局调整
+  &.h-buttons-button-watermark-icon {
+    :deep(.watermark-icon) {  transform: translate(-50%, -54%) !important; }
+    :deep(.x-button) { display: flex !important; }
+    :deep(.ant-btn-group) {
+      margin: 0 auto;
+      display: block;
+    }
+  }
+  &.h-buttons-0padding-button {
+    padding: 0px 4px;
+  }
+  // button25样式 用于会诊申请侧边栏按钮样式
+  &.h-buttons-button25 {
+    :deep(.x-buttons) {
+      .ant-btn-group {
+        width: 173px;
+        justify-content: space-between;
+
+        .ant-btn {
+          width: 173px;
+        }
+      }
+    }
+  }
+  // 居中样式 用于门诊收费左侧按钮样式（三个按钮居中样式）
+  &.h-buttons-out-button {
+    :deep(.x-buttons) {
+      margin-top: 0vw;
+      display: flex;
+      justify-content: center;
+      .ant-btn-group {
+        display: flex;
+        flex-wrap: nowrap;
+        gap: 12px;
+        .ant-btn {
+          box-sizing: border-box;
+          margin-right: 0px;
+          width: auto;
+          min-width: 130px;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+      }
+    }
+  }
+  // button15样式 - 垂直排列的深色按钮组
+  &.h-buttons-button15 {
+    :deep(.x-buttons) {
+      margin-top: -22px;
+      .ant-btn-group {
+        flex-direction: column; /* 按钮垂直排列 */
+        display: flex; /* 启用flex布局 */
+        gap: 6px; /* 按钮间距 */
+        .ant-btn {
+          border: none; /* 移除边框 */
+          color: #FFFFFF; /* 字体颜色 */
+          background-color: #5D5C5C; /* 背景色 */
+          box-sizing: border-box; /* 盒模型 */
+          left: 12px; /* 左偏移 */
+          width: 280px; /* 宽度 */
+        }
+      }
+    }
+  }
+  // button2样式
+  &.h-buttons-button2 {
+    :deep(.x-buttons) {
+      margin: -20px 6px -20px 6px;
+      .ant-btn-group {
+        width: 100%;
+        justify-content: space-between;
+        display: flex; /* 确保flex布局 */
+        flex-wrap: nowrap; /* 防止换行 */
+        .ant-btn {
+          border-radius: 6px; /* 边框圆角 */
+          border: none; /* 移除边框 */
+          flex: 0 0 46%; /* flex-grow: 0, flex-shrink: 0, flex-basis: 46% */
+          min-width: 0; /* 覆盖可能的默认最小宽度 */
+          font-size: 16px; /* 字体大小 */
+          height: 32px; /* 高度 */
+          color: #FFFFFF; /* 字体颜色 */
+          background-color: #1890FF; /* 背景颜色 */
+        }
+      }
+    }
+  }
+  // 与表单项内联使用时的垂直居中对齐样式
+  &.h-buttons-form-inline {
+    :deep(.ant-btn-group){
+      height: 45px;
+      display: flex;
+      align-items: center;
+    }
+  }
+
+}
+</style>

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

@@ -1,10 +1,17 @@
 <script setup lang="ts">
 import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { ref, computed, useAttrs } from 'vue'
+import { ref, computed, useAttrs, defineProps } from 'vue'
 
 const xAddNativeFormRef = ref()
 
 const attrs = useAttrs()
+const props = defineProps({
+  // 是否启用 horizontal 模式的自定义配置
+  enableHorizontalCustom: {
+    type: Boolean,
+    default: false
+  }
+})
 const wrapperClassObject = computed(() => {
   const a = attrs
   const classes = {}
@@ -14,7 +21,9 @@ const wrapperClassObject = computed(() => {
     'query-conditions',
     'padding-50',
     'label-text-horizontal',
-    'label-text-justify'
+    'item-control-width90',
+    'label-text-justify',
+    'item-control-width700',
   ]
   for (const key of booleanStyleKeys) {
     const val = a[key]
@@ -44,6 +53,7 @@ defineExpose({
     <x-add-native-form
       ref="xAddNativeFormRef"
       v-bind="$attrs"
+      :enable-horizontal-custom="props.enableHorizontalCustom"
       v-on="$listeners"
     >
       <template v-for="(_, name) in $slots" #[name]="slotData">
@@ -150,5 +160,18 @@ defineExpose({
       }
     }
   }
+
+  /**表单项90%宽度 */
+  &.h-form-item-control-width90 {
+    :deep(.ant-form-item-control){
+      width: 90%;
+    }
+  }
+  /**表单项700宽度 */
+  &.h-form-item-control-width700{
+    :deep(.ant-form-item-control-wrapper){
+      width: 700px;
+    }
+  }
 }
 </style>

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

@@ -1,32 +1,80 @@
-<script setup lang="ts">
+<script setup>
 import XTab from '@vue2-client/base-client/components/common/XTab/XTab.vue'
-import { ref } from 'vue'
-
-defineProps({
-  // HTab特有的属性
-  hasTopMargin: {
-    type: Boolean,
-    default: true
-  },
-  // 是否启用 style7 样式（细下划线、自适应）
-  useStyle7: {
-    type: Boolean,
-    default: false
-  },
-  // 是否叠加圆点样式（仅在 useStyle7 为 true 时生效）
-  useCycle: {
-    type: Boolean,
-    default: false
-  },
-  useStyle8: {
-    type: Boolean,
-    default: false
+import { ref, computed, useAttrs, useSlots, watch, onMounted } from 'vue'
+import { getConfigByName } from '@vue2-client/services/api/common'
+
+const props = defineProps({
+  // 标签栏右侧附加区域的配置名（可选）。提供时将自动加载配置并渲染到 tabBar 右侧。
+  tabBarExtraConfig: {
+    type: String,
+    default: undefined
+  }
+})
+
+// 兼容多种样式配置
+const attrs = useAttrs()
+const wrapperClassObject = computed(() => {
+  const a = attrs
+  const classes = {}
+
+  // 通用布尔样式开关（以存在/空字符串/'true' 为真）
+  const booleanStyleKeys = [
+    'hasTopMargin', 'useStyle7', 'useCycle', 'useStyle8'
+  ]
+  for (const key of booleanStyleKeys) {
+    const val = a[key]
+    const truthy = val === true || val === '' || val === 'true'
+    if (truthy) classes[`h-tab-${key}`] = true
   }
+  return classes
 })
 
 // 创建对XTab组件的引用
 const xTabRef = ref()
 
+// 获取插槽（避免模板中直接使用 $slots 触发类型检查错误）
+const slots = useSlots()
+const slotNames = computed(() => {
+  try {
+    return Object.keys(slots || {})
+  } catch (e) {
+    return []
+  }
+})
+
+// 右侧附加区域的动态配置
+const extraConfig = ref(null)
+const extraItems = computed(() => {
+  const cfg = extraConfig.value
+  return cfg && cfg.value ? cfg.value : []
+})
+
+// 本地异步组件映射（未全局注册时生效）
+const localMap = {
+  'x-input': () => import('@vue2-client/base-client/components/common/XInput/XInput.vue'),
+  'x-select': () => import('@vue2-client/base-client/components/his/XSelect/XSelect.vue'),
+  'x-radio': () => import('@vue2-client/base-client/components/his/XRadio/XRadio.vue'),
+  'x-buttons': () => import('@vue2-client/base-client/components/common/XButtons/XButtons.vue'),
+  'h-buttons': () => import('@vue2-client/base-client/components/common/HIS/HButtons/HButtons.vue')
+}
+
+// 从 attrs 中读取 serverName 与 env（保持向后兼容）
+const serverName = computed(() => (attrs && attrs.serverName))
+const env = computed(() => (attrs && attrs.env) || 'prod')
+
+const loadExtraConfig = (configName) => {
+  if (!configName) {
+    extraConfig.value = null
+    return
+  }
+  getConfigByName(configName, serverName.value, (res) => {
+    extraConfig.value = res
+  }, env.value === 'dev')
+}
+
+onMounted(() => loadExtraConfig(props.tabBarExtraConfig))
+watch(() => props.tabBarExtraConfig, loadExtraConfig)
+
 // 暴露方法给父组件使用
 defineExpose({
   // 为了兼容性，保留getXTabInstance方法
@@ -37,16 +85,32 @@ defineExpose({
 <template>
   <div
     class="h-tab-wrapper"
-    :class="{ 'h-tab-has-top-margin': hasTopMargin,
-              'h-tab-style7': useStyle7,
-              'h-tab-cycle': useStyle7 && useCycle,
-              'h-tab-style8': useStyle8}">
+    :class="[wrapperClassObject, extraItems.length > 1 ? 'h-tab-extra-wrapper-multiple' : '']">
     <x-tab
       ref="xTabRef"
       v-bind="$attrs"
       v-on="$listeners"
     >
-      <template v-for="(_, name) in $slots" #[name]="slotData">
+      <template v-if="extraItems.length" #tabBarExtraContent>
+        <!-- 父级可接管渲染；未提供则按配置兜底渲染 -->
+        <slot name="tabBarExtraContent" :config="extraConfig" :items="extraItems">
+          <div class="h-tab-extra-wrapper">
+            <component
+              v-for="(item, idx) in extraItems"
+              :is="localMap[item.slotType] || item.slotType"
+              :key="idx"
+              :ref="item.slotRef || `extra_${idx}`"
+              :serviceName="item.serviceName || serverName"
+              :serverName="item.serviceName || serverName"
+              :queryParamsName="item.slotConfig"
+              :env="env"
+              v-on="$listeners"
+              v-bind="item.attrs"
+            />
+          </div>
+        </slot>
+      </template>
+      <template v-for="name in slotNames" #[name]="slotData">
         <slot :name="name" v-bind="slotData" />
       </template>
     </x-tab>
@@ -109,7 +173,7 @@ defineExpose({
   }
 
   // 带顶部边距的样式
-  &.h-tab-has-top-margin {
+  &.h-tab-hasTopMargin {
     :deep(.ant-tabs-nav) {
       margin-top: 6px;
     }
@@ -128,7 +192,7 @@ defineExpose({
   }
 
   // 通用样式7：细下划线、透明背景、可配置宽度
-  &.h-tab-style7 {
+  &.h-tab-useStyle7 {
     :deep(.ant-tabs-tab-next),
     :deep(.ant-tabs-tab-prev-icon-target),
     :deep(.ant-tabs-tab-next-icon) { display: none; }
@@ -177,7 +241,7 @@ defineExpose({
     }
 
     // 可选：标签左侧圆点
-    &.h-tab-cycle {
+    &.h-tab-useCycle {
       :deep(.ant-tabs-tab) {
         position: relative;
         padding-left: 18px !important;
@@ -209,7 +273,7 @@ defineExpose({
     }
   }
   // 用户词条使用样式
-  &.h-tab-style8 {
+  &.h-tab-useStyle8 {
     :deep(.ant-tabs-tab-next),
     :deep(.ant-tabs-tab-prev-icon-target),
     :deep(.ant-tabs-tab-next-icon) { display: none; }
@@ -289,5 +353,30 @@ defineExpose({
       display: none; // 隐藏下划线
     }
   }
+  &.h-tab-extra-wrapper-multiple {
+    :deep(.h-tab-extra-wrapper){
+      display: flex;
+      justify-content: end;
+      gap: 8px;
+    }
+    :deep(.x-radio-group){
+      height: 32px;
+    }
+    :deep(.x-radio-item){
+      height: 32px;
+      display: flex;
+      align-items: center;
+      margin-bottom: 0px;
+    }
+    :deep(.ant-tabs-tab){
+      height: 34px;
+    }
+    :deep(.ant-tabs-nav-container){
+      padding-top: 2px;
+    }
+    :deep(.ant-tabs-extra-content){
+        line-height: 0px !important;
+    }
+  }
 }
 </style>

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

@@ -186,7 +186,13 @@ export default {
       default: null
     }
   },
-  props: {},
+  props: {
+    // 是否启用 horizontal 模式的自定义配置
+    enableHorizontalCustom: {
+      type: Boolean,
+      default: false
+    }
+  },
   data () {
     return {
       DEFAULT_GROUP_NAME,
@@ -324,6 +330,17 @@ export default {
     },
     formItemLayoutGen () {
       if (this.layout === 'horizontal') {
+        // 如果启用了自定义配置，从 formItemLayout 读取（支持 0 值）
+        if (this.enableHorizontalCustom && this.formItemLayout) {
+          return {
+            labelCol: {
+              span: (this.formItemLayout.labelCol ?? 4),
+              offset: (this.formItemLayout.offset ?? 2)
+            },
+            wrapperCol: { span: (this.formItemLayout.wrapperCol ?? 14) },
+          }
+        }
+        // 默认配置
         return {
           labelCol: { span: 4, offset: 2 },
           wrapperCol: { span: 14 },

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

@@ -84,7 +84,7 @@
             </template>
           </template>
         </div>
-        <a-card v-else class="flexItem" :bordered="false">
+        <a-card v-else class="flexItem" :bordered="false" :body-style="{ padding: 0 }">
           <!-- 插槽渲染 -->
           <template v-if="Array.isArray(cell)">
             <!-- 处理 cell 是数组的情况 -->
@@ -580,7 +580,7 @@ export default {
         })
 
         // 处理子节点样式
-        this.parseNestedStyles(classConfig, childStyles)
+       // this.parseNestedStyles(classConfig, childStyles)
       })
       return {
         rootStyles,

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

@@ -7,6 +7,9 @@
       :hideAdd="true"
       :tabBarStyle="{ display: showTabBar ? 'block' : 'none' }"
     >
+      <template #tabBarExtraContent v-if="$slots.tabBarExtraContent || tabBarExtraContent">
+        <slot name="tabBarExtraContent"></slot>
+      </template>
       <slot name="extraBeforeTabs"></slot>
       <a-tab-pane
         :forceRender="true"
@@ -67,6 +70,7 @@ export default {
       activeKey: 0,
       // 配置
       config: undefined,
+      tabBarExtraContent: undefined,
       attr: {},
       showTabBar: true // 默认显示页签
     }

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

@@ -13,6 +13,7 @@
     :scroll="{ x: tableContext.scrollXWidth, y: tableContext.scrollYHeight }"
     :showPagination="tableContext.showPagination"
     :hidePagination="tableContext.simpleMode"
+    :customPagination="tableContext.customPagination"
     :showSelected="!tableContext.simpleMode"
     :pageSize="tableContext.simpleMode ? 1000 : undefined"
     :pageMaxSize="tableContext.pageMaxSize"

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

@@ -4,7 +4,10 @@
       v-if="config.type === 'title'"
       class="x-title"
       :class="{ 'with-underline': config.line === 'line' }">
-      <span>{{ config.label }}</span>
+      <div class="title-content">
+        <div class="title-dot"></div>
+        <span>{{ config.label }}</span>
+      </div>
       <div
         v-if="config.line === 'line'"
         class="underline"
@@ -55,7 +58,7 @@ const attrs = useAttrs()
 const wrapperClassObject = computed(() => {
   const classes = {}
   const booleanStyleKeys = [
-  'center', 'littlefont'
+  'center', 'littlefont', 'dot', 'nodot'
   ]
   booleanStyleKeys.forEach(key => {
     const val = attrs[key]
@@ -151,4 +154,45 @@ onMounted(() => {
     }
   }
 }
+
+// dot 和 nodot 样式的公共部分
+.x-title-dot,
+.x-title-nodot {
+  &.x-title-container,
+  .x-title-container {
+    :deep(.title-content) {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+    }
+
+    :deep(.title-dot) {
+      width: 14px;
+      height: 14px;
+      flex-shrink: 0;
+    }
+  }
+}
+
+// dot 样式特有部分
+.x-title-dot {
+  &.x-title-container,
+  .x-title-container {
+    :deep(.title-dot) {
+      border-radius: 50%;
+      background-color: #3362DA;
+    }
+  }
+}
+
+// nodot 样式特有部分
+.x-title-nodot {
+  &.x-title-container,
+  .x-title-container {
+    :deep(.title-dot) {
+      /* 透明圆点，保持占位但不显示 */
+      background-color: transparent;
+    }
+  }
+}
 </style>