vue2-client 1.16.36 → 1.16.38

package/package.json

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

@@ -214,7 +214,8 @@ defineExpose({
         border: 1px solid #CDCDCD;
         color: #5D5C5C;
         width: auto;
-        flex: 0 0 auto;
+        flex: 1 1 auto;
+        max-width: 180px;
         min-width: 124px;
         white-space: nowrap;
         overflow: hidden;

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

@@ -51,7 +51,7 @@ defineExpose({
       v-bind="$attrs"
       v-on="$listeners"
     >
-      <template v-for="(_, name) in $slots" v-slot:[name]="slotData">
+      <template v-for="(_, name) in $slots" #[name]="slotData">
         <slot :name="name" v-bind="slotData" />
       </template>
     </x-add-native-form>

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

@@ -0,0 +1,120 @@
+<script setup lang="ts">
+import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup/XFormGroup.vue'
+import { ref, onMounted, getCurrentInstance, watch } from 'vue'
+import { getConfigByNameAsync } from '@vue2-client/services/api/common'
+
+// 与 HTab 保持一致的样式开关
+defineProps({
+  hasTopMargin: { type: Boolean, default: true },
+  // 隐藏左侧索引栏（样式控制）
+  leftHide: { type: Boolean, default: false }
+})
+
+// 内部 XFormGroup 实例引用
+const xFormGroupRef = ref()
+
+// 暴露方法：对齐 XFormGroup 的外部可用方法
+defineExpose({
+  getXFormGroupInstance: () => xFormGroupRef.value,
+  init: (params) => xFormGroupRef.value && xFormGroupRef.value.init && xFormGroupRef.value.init(params),
+  asyncSubmit: () => xFormGroupRef.value && xFormGroupRef.value.asyncSubmit && xFormGroupRef.value.asyncSubmit(),
+  getNativeFormRef: (group) => xFormGroupRef.value && xFormGroupRef.value.getNativeFormRef && xFormGroupRef.value.getNativeFormRef(group),
+  getNativeForm: (group) => xFormGroupRef.value && xFormGroupRef.value.getNativeForm && xFormGroupRef.value.getNativeForm(group)
+})
+
+// 自动初始化：当外部传入 queryParamsName 时，自动加载配置并调用 XFormGroup.init
+const vm = getCurrentInstance()
+const autoInit = async () => {
+  try {
+    const a = vm?.proxy?.$attrs || {}
+    const queryParamsName = a.queryParamsName
+    if (!queryParamsName) return
+    const serviceName = a.serviceName || process.env.VUE_APP_SYSTEM_NAME
+    const env = a.env || 'prod'
+    const showLeftTab = a.showLeftTab || false
+    const businessType = a.businessType || '新增'
+    const modifyModelData = a.modifyModelData || {}
+
+    const isDev = env === 'dev'
+    const res = await getConfigByNameAsync(queryParamsName, serviceName, isDev)
+
+    const payload = {
+      ...res,
+      serviceName,
+      env,
+      showLeftTab,
+      businessType,
+      modifyModelData
+    }
+    if (xFormGroupRef.value && typeof xFormGroupRef.value.init === 'function') {
+      xFormGroupRef.value.init(payload)
+    } else {
+      // do nothing
+    }
+  } catch (e) {
+    // swallow
+  }
+}
+
+onMounted(() => {
+  autoInit()
+})
+
+// 当关键 attrs 变更时，重新初始化
+watch(() => [vm?.proxy?.$attrs?.queryParamsName, vm?.proxy?.$attrs?.serviceName, vm?.proxy?.$attrs?.env], () => {
+  autoInit()
+})
+</script>
+
+<template>
+  <div
+    class="h-form-group-wrapper"
+    :class="{
+      'h-form-group-has-top-margin': hasTopMargin,
+      'left-hide': leftHide
+    }"
+  >
+    <x-form-group
+      ref="xFormGroupRef"
+      v-bind="$attrs"
+      v-on="$listeners"
+    >
+      <template v-for="(_, name) in $slots" #[name]="slotData">
+        <slot :name="name" v-bind="slotData" />
+      </template>
+    </x-form-group>
+  </div>
+
+</template>
+
+<style scoped lang="less">
+.h-form-group-wrapper {
+  // XFormGroup 自身容器
+  :deep(.XFormGroupClass) {
+    height: 100%;
+
+    .heigth100 { height: 100%; }
+    :deep(.ant-spin-container) { height: 100%; }
+
+    // 默认分组标题样式，参考 XFormGroup
+    .xFormGroupTitle {
+      font-size: 15px;
+      font-weight: bold;
+      color: @primary-color;
+    }
+
+    .formGroupContext {
+      height: 100%;
+      overflow-y: auto;
+    }
+  }
+  // 隐藏左侧（索引栏）
+  &.left-hide {
+    :deep(.ant-spin-container) {
+      .ant-row {
+        .ant-col-3 { display: none; }
+      }
+    }
+  }
+}
+</style>

package/src/base-client/components/common/HIS/HFormGroup/index.js

@@ -0,0 +1,3 @@
+import HFormGroup from './HFormGroup.vue'
+
+export default HFormGroup

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

@@ -23,7 +23,13 @@
         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-->
@@ -39,6 +45,7 @@
 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">

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

@@ -36,6 +36,7 @@
                 'x-tab',
                 'h-tab',
                 'x-form-group',
+                'h-form-group',
                 'x-report',
                 'x-buttons',
                 'h-buttons',
@@ -112,6 +113,7 @@
                 'x-tab',
                 'h-tab',
                 'x-form-group',
+                'h-form-group',
                 'x-report',
                 'x-buttons',
                 'h-buttons',
@@ -181,6 +183,7 @@ export default {
     XAddNativeForm: () => import('@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'),
     HAddNativeForm: () => import('@vue2-client/base-client/components/common/HIS/HAddNativeForm/HAddNativeForm.vue'),
     XFormGroup: () => import('@vue2-client/base-client/components/common/XFormGroup/XFormGroup.vue'),
+    HFormGroup: () => import('@vue2-client/base-client/components/common/HIS/HFormGroup/HFormGroup.vue'),
     XTreePro: () => import('@vue2-client/base-client/components/common/XTree/XTreePro.vue'),
     XHisEditor: () => import('@vue2-client/base-client/components/his/XHisEditor/XHisEditor.vue'),
     XTab: () => import('@vue2-client/base-client/components/common/XTab/XTab.vue'),

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

@@ -865,6 +865,10 @@ export default {
         if (item.slotType === 'action') {
           item.fixed = 'right'
           item.width = 70
+        } else if (item.slotType === 'index') {
+          item.fixed = 'left'
+        } else if (item.slotType === 'fixed') {
+          item.fixed = item.fixedType
         }
         // 设置表格宽度
         if (item.width) {

package/src/pages/userInfoDetailManage/ExceptionRecordQuery/index.vue

@@ -10,14 +10,14 @@ export default {
       default: () => undefined
     }
   },
-  mounted() {
+  mounted () {
     this.$refs.xFormTable.refresh(true)
   },
-  data() {
+  data () {
     return {
       // 查询配置名称
       queryParamsName: 'ExceptionRecordQueryCRUD',
-      fixedQueryForm: {ex_f_userfiles_id: this.currUserInfo.f_userfiles_id},
+      fixedQueryForm: { ex_f_userfiles_id: this.currUserInfo.f_userfiles_id },
       // 新增表单固定值
       fixedAddForm: {},
       // 是否显示详情抽屉

package/src/router/async/router.map.js

@@ -60,7 +60,7 @@ path: 'example',
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+  component: () => import('@vue2-client/base-client/components/common/HIS/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),