vue2-client 1.16.68 → 1.16.70

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

@@ -152,7 +152,7 @@ defineExpose({
     .ant-tabs-tab {
       background-color: transparent;
       border-radius: 6px 6px 0 0;
-      color: #313131;
+      color: #5D5C5C;
       font-weight: bold;
       width: 134px;
       font-size: 18px;
@@ -175,7 +175,7 @@ defineExpose({
 
   :deep(.ant-tabs-bar) {
     border-bottom: 2px solid #0057FE;
-    margin: 20px 0px 0 0px;
+    margin: 20px 10px 0 10px;
   }
 
   // 滚动状态下的容器左右内边距清零，避免左侧多出一截
@@ -229,7 +229,7 @@ defineExpose({
     :deep(.ant-tabs-ink-bar) {
       display: block;
       background-color: #0057FE;
-      bottom: 1px;
+      bottom: 8px;
       height: 2px;
       /* 宽度交给 antd 自身计算，避免固定值影响自适应 */
       margin-left: 0;
@@ -247,7 +247,7 @@ defineExpose({
         /* 自适应宽度，允许通过变量覆盖最小宽度 */
         min-width: var(--tab-min-width, 96px);
         width: auto;
-        padding: 0 12px 10px 12px;
+        padding: 0 12px;
         font-size: 16px;
         line-height: 10px;
         font-family: "Source Han Sans";
@@ -277,16 +277,15 @@ 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: 3px !important;
-        top: calc(50% - 4px) !important;
+        left: 0 !important;
+        top: 50% !important;
         transform: translateY(-50%) !important;
-        width: 12px !important;
-        height: 12px !important;
+        width: 8px !important;
+        height: 8px !important;
         background: #0057FE !important;
         border-radius: 50% !important;
         display: block !important;
@@ -319,21 +318,18 @@ defineExpose({
       margin-right: 0 !important; // 移除重叠修复
       flex-shrink: 1 !important; // 允许收缩
       height: auto !important; // 高度自适应
-      // Important: if the tabPosition is 'top', the default margin-bottom of ant-tabs-bar is 16px, need to remove it to make border connect well
       margin-bottom: 0px !important;
     }
 
-    // Ensure tab content takes remaining space
     :deep(.ant-tabs-content) {
       flex: none !important; // 移除 flex: 1，允许内容区域自然流淌
     }
 
-    // Apply flex properties directly to the div containing tabs within ant-tabs-nav
     :deep(.ant-tabs-nav) {
       .ant-tabs-nav-container,
       .ant-tabs-nav-wrap,
       .ant-tabs-nav-scroll,
-      & > div:first-child { // Target the direct div child of ant-tabs-nav
+      & > div:first-child {
         display: flex !important;
         flex-direction: row !important;
         flex-wrap: nowrap !important; // 确保不换行
@@ -341,9 +337,6 @@ defineExpose({
         height: auto !important;
       }
 
-      // These properties are applied to ant-tabs-nav itself, not its direct div child.
-      // Since the flex properties are moved to the inner div, ant-tabs-nav can be left as default or adjusted if needed.
-      // For now, removing the redundant flex properties from ant-tabs-nav.
       height: auto !important; // 高度自适应内容
       width: 100% !important; // 确保容器占据全部宽度
 
@@ -358,7 +351,7 @@ defineExpose({
         &:last-child {
           border-right: 1px solid #d9d9d9; // 最后一个选项卡有右边框
         }
-        border-radius: 0;
+        border-radius: 0; // 默认无圆角，避免中间相邻处出现圆角
         background-color: #f5f5f5;
         color: #333333;
         font-weight: 500;
@@ -370,10 +363,20 @@ defineExpose({
         align-items: center;
         padding: 0;
       }
+      // 首项：仅左侧圆角
+      .ant-tabs-tab:first-child {
+        border-top-left-radius: 10px;
+        border-bottom-left-radius: 10px;
+      }
+      // 末项：仅右侧圆角
+      .ant-tabs-tab:last-child {
+        border-top-right-radius: 10px;
+        border-bottom-right-radius: 10px;
+      }
       .ant-tabs-tab-active {
         border-bottom: 1px solid transparent; // 激活时隐藏底部边框，与 ant-tabs-bar 的边框衔接
-        background-color: #ffffff;
-        color: #0057FE;
+        background-color: #0057FE;
+        color: #ffffff;
         font-weight: 600;
       }
     }
@@ -403,7 +406,7 @@ defineExpose({
       padding-top: 2px;
     }
     :deep(.ant-tabs-extra-content){
-      line-height: 0px !important;
+        line-height: 0px !important;
     }
   }
 }

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

@@ -1,61 +1,61 @@
-<template>
-  <div class="h-tab-demo">
-    <!--    &lt;!&ndash; XTab &ndash;&gt;-->
-    <!--    <a-card title="XTab">-->
-    <!--      <h-tab-->
-    <!--        configName="openPrescriptionTab"-->
-    <!--        serverName="af-his"-->
-    <!--      />-->
-    <!--    </a-card>-->
-
-    <!-- HFormTable -->
-    <a-card title="HFormTable" style="margin-top: 20px;">
-      <h-form-table
-        queryParamsName="outpatientAdviceAllCRUD"
-        serviceName="af-his"
-      />
-    </a-card>
-
-    <!-- HForm -->
-    <a-card title="HAddNativeForm" style="margin-top: 20px;">
-      <h-add-native-form
-        queryParamsName="TCMAdviceFormConfig"
-        serviceName="af-his"
-      />
-    </a-card>
-<!--    <a-card title="HFormGroup" style="margin-top: 20px;">-->
-<!--      <h-form-group-->
-<!--        queryParamsName="surgeryApplicationFormGroup"-->
-<!--        serviceName="af-his"-->
-<!--        :left-hide="true"-->
-<!--      />-->
-<!--    </a-card>-->
-    <!--    &lt;!&ndash; HButtons &ndash;&gt;-->
-    <!--    <a-card title="HButtons" style="margin-top: 20px;">-->
-    <!--      <h-buttons-->
-    <!--        queryParamsName="outpatientAdviceGroup"-->
-    <!--        serviceName="af-his"-->
-    <!--      />-->
-    <!--    </a-card>-->
-  </div>
-</template>
-
-<script setup>
-// import HTab from './HTab/HTab.vue'
-import HFormTable from './HFormTable/HFormTable.vue'
-// import HButtons from './HButtons/HButtons.vue'
-import HAddNativeForm from '@vue2-client/base-client/components/common/HIS/HAddNativeForm/HAddNativeForm.vue'
- // import HFormGroup from './HFormGroup/HFormGroup.vue'
-</script>
-
-<style scoped lang="less">
-.h-tab-demo {
-  padding: 20px;
-
-  h4 {
-    color: #333;
-    margin-bottom: 10px;
-    font-size: 14px;
-  }
-}
-</style>
+<template>
+  <div class="h-tab-demo">
+    <!--    &lt;!&ndash; XTab &ndash;&gt;-->
+    <!--    <a-card title="XTab">-->
+    <!--      <h-tab-->
+    <!--        configName="openPrescriptionTab"-->
+    <!--        serverName="af-his"-->
+    <!--      />-->
+    <!--    </a-card>-->
+
+    <!-- HFormTable -->
+    <a-card title="HFormTable" style="margin-top: 20px;">
+      <h-form-table
+        queryParamsName="outpatientAdviceAllCRUD"
+        serviceName="af-his"
+      />
+    </a-card>
+
+    <!-- HForm -->
+    <a-card title="HAddNativeForm" style="margin-top: 20px;">
+      <h-add-native-form
+        queryParamsName="TCMAdviceFormConfig"
+        serviceName="af-his"
+      />
+    </a-card>
+<!--    <a-card title="HFormGroup" style="margin-top: 20px;">-->
+<!--      <h-form-group-->
+<!--        queryParamsName="surgeryApplicationFormGroup"-->
+<!--        serviceName="af-his"-->
+<!--        :left-hide="true"-->
+<!--      />-->
+<!--    </a-card>-->
+    <!--    &lt;!&ndash; HButtons &ndash;&gt;-->
+    <!--    <a-card title="HButtons" style="margin-top: 20px;">-->
+    <!--      <h-buttons-->
+    <!--        queryParamsName="outpatientAdviceGroup"-->
+    <!--        serviceName="af-his"-->
+    <!--      />-->
+    <!--    </a-card>-->
+  </div>
+</template>
+
+<script setup>
+// import HTab from './HTab/HTab.vue'
+import HFormTable from './HFormTable/HFormTable.vue'
+// import HButtons from './HButtons/HButtons.vue'
+import HAddNativeForm from '@vue2-client/base-client/components/common/HIS/HAddNativeForm/HAddNativeForm.vue'
+ // import HFormGroup from './HFormGroup/HFormGroup.vue'
+</script>
+
+<style scoped lang="less">
+.h-tab-demo {
+  padding: 20px;
+
+  h4 {
+    color: #333;
+    margin-bottom: 10px;
+    font-size: 14px;
+  }
+}
+</style>