vue2-client 1.16.94 → 1.16.97

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

@@ -12,7 +12,7 @@ const props = defineProps({
     default: false
   }
 })
- // 启动时间选择框弹出到body
+// 启动时间选择框弹出到body
 const enablePopupToBody = computed(() => {
   const a = attrs
   return a.enablePopupToBody === 'true' || a.enablePopupToBody === true
@@ -27,6 +27,7 @@ const wrapperClassObject = computed(() => {
     'padding-50',
     'label-text-horizontal',
     'label-text-justify',
+    'label-justify',
     'charge-form'
   ]
   for (const key of booleanStyleKeys) {
@@ -34,6 +35,7 @@ const wrapperClassObject = computed(() => {
     const truthy = val === true || val === '' || val === 'true'
     if (truthy) classes[`h-form-${key}`] = true
   }
+
   return classes
 })
 
@@ -81,7 +83,6 @@ defineExpose({
     :deep(.ant-card-body) {
       padding: 0px;
     }
-
     // ant-row-flex 样式
     :deep(.ant-row-flex) {
       // x-form-col-wrapper 样式
@@ -102,7 +103,6 @@ defineExpose({
           }
         }
       }
-
       // ant-col-24 样式
       .ant-col-24 {
         padding: 0px 4px !important;
@@ -127,7 +127,6 @@ defineExpose({
       font-size: 16px;
       font-weight: normal;
       letter-spacing: 0em;
-      font-variation-settings: "opsz" auto;
       font-feature-settings: "kern" on;
     };
 
@@ -241,6 +240,7 @@ defineExpose({
               .ant-select-selection-placeholder {
                 .placeholder-base();
                 line-height: 30px;
+                color: #313131;
               }
             }
           }
@@ -357,5 +357,45 @@ defineExpose({
       }
     }
   }
+
+  // label-justify 样式 - 两端对齐，应用指定字体样式
+  &.h-form-label-justify {
+    padding-left: 8px;
+
+    :deep(.ant-form-item-label) {
+      padding-left: 0;
+      padding-right: 8px;
+      // 限制label容器的宽度，强制两端对齐
+      width: 80px !important;
+      min-width: 80px;
+      max-width: 80px;
+      label {
+        position: relative;
+        display: block;
+        width: 100%;
+        white-space: nowrap;
+        margin: 0;
+        text-indent: 0;
+        text-align: justify;
+        text-align-last: justify;
+        text-justify: inter-ideograph;
+        box-sizing: border-box;
+        padding-right: 12px; // 给绝对定位的冒号留出空间
+
+        // 应用指定的字体样式
+        height: 39px;
+        opacity: 1;
+        font-family: 'Source Han Sans', sans-serif;
+        font-size: 16px;
+        font-weight: normal;
+        line-height: 39px;
+        color: #313131;
+      }
+      // 去掉冒号
+      label::after {
+        content: '';
+      }
+    }
+  }
 }
 </style>

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

@@ -22,7 +22,8 @@ const wrapperClassObject = computed(() => {
     'top-hidden',
     'dialog-style',
     'button-style',
-    'header-center'
+    'header-center',
+    'expanded-grid-white'
   ]
   for (const key of booleanStyleKeys) {
     const val = a[key]
@@ -396,7 +397,6 @@ const isHiddenFunctionalArea = computed(() => {
       line-height: normal;
     }
   }
-
   // 表格内容全部居中样式
   &.h-form-table-header-center {
     :deep(.ant-table-thead > tr > th),
@@ -404,5 +404,11 @@ const isHiddenFunctionalArea = computed(() => {
       text-align: center !important;
     }
   }
+  // 行展开白色背景
+  &.h-form-table-expanded-grid-white {
+    :deep(.ant-table-expanded-row){
+      background-color: white;
+    }
+  }
 }
 </style>

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>