vue2-client 1.15.138 → 1.15.141

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

@@ -1,46 +1,54 @@
-<template>
-  <div class="h-tab-demo">
-    <!-- XTab -->
-    <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>
-
-    <!-- HButtons -->
-    <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'
-
-</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>
+
+<!--    &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 '@/base-client/components/common/HIS/HAddNativeForm/HAddNativeForm.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/XFormTable/XFormTable.vue

@@ -70,6 +70,7 @@
             :serviceName="serviceName"
             :pageMaxSize="realQueryConfig.queryPagesSize"
             :externalSelectedRowKeys="externalSelectedRowKeys"
+            :customPagination="customPagination"
             @add="add"
             @move="move"
             @edit="edit"
@@ -402,6 +403,11 @@ export default {
       default: () => {
         return {}
       }
+    },
+    // 是否使用自定义分页样式
+    customPagination: {
+      type: Boolean,
+      default: false
     }
   },
   watch: {