vue2-client 1.16.52 → 1.16.54

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>

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 },