vue2-client 1.16.37 → 1.16.39

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

@@ -1,120 +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>
+<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

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

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/XReport/XReport.vue

@@ -328,8 +328,11 @@ export default {
               value = config.data[cell.dataIndex]
             }
 
-            // 检查值是否为空
-            if (!value || (typeof value === 'string' && value.trim() === '')) {
+            // 检查值是否为空（允许 0 和 false）
+            const isEmptyString = typeof value === 'string' && value.trim() === ''
+            const isEmptyArray = Array.isArray(value) && value.length === 0
+            const isNullish = value === null || value === undefined
+            if (isNullish || isEmptyString || isEmptyArray) {
               const message = cell.requiredMessage || this.getDefaultRequiredMessage(cell.type)
               errors.push({
                 dataIndex: cell.dataIndex,
@@ -819,12 +822,18 @@ export default {
       this.getConfigAndJoin(this.config, lock)
 
       // 用定时器循环查看锁状态
+      // 先清理可能存在的旧轮询，避免重复打印与重复初始化
+      if (this.timer) {
+        clearInterval(this.timer)
+        this.timer = undefined
+      }
       this.timer = setInterval(() => {
         if (!lock.status) {
           clearInterval(this.timer)
+          this.timer = undefined
           console.log('拼接完成', this.config)
           // 将初始化好的配置拷贝一份留存
-          this.originalConfig = Object.assign({}, this.config)
+          this.originalConfig = JSON.parse(JSON.stringify(this.config))
           if (!this.dontFormat) {
             // 扫描配置文件中有没有rowSpan，进行格式化调整
             this.formatConfigRow(this.config)
@@ -864,8 +873,8 @@ export default {
       if (this.configData === undefined) {
         console.error('未找到数据！')
       } else {
-        this.originalConfig = Object.assign({}, this.config)
-        this.originalConfig.data = Object.assign(this.originalConfig.data, JSON.parse(JSON.stringify(this.configData)))
+        this.originalConfig = JSON.parse(JSON.stringify(this.config))
+        this.originalConfig.data = Object.assign({}, this.originalConfig.data, JSON.parse(JSON.stringify(this.configData)))
         this.type = 'display'
         // this.onlyDisplay = true
         this.showSkeleton = false
@@ -879,12 +888,12 @@ export default {
         this.config = res
         if (this.config.designMode === 'json') {
           if (this.configData !== undefined) {
-            this.config.data = Object.assign({}, this.config.data, this.configData)
+            this.config.data = Object.assign({}, this.config.data, JSON.parse(JSON.stringify(this.configData)))
           }
           this.jsonConfigInit()
         } else {
           if (this.configData !== undefined) {
-            this.config.data = Object.assign(this.config.data, this.configData)
+            this.config.data = Object.assign({}, this.config.data, JSON.parse(JSON.stringify(this.configData)))
           }
           if (this.config.data.images === undefined) {
             this.config.data.images = {}
@@ -917,14 +926,14 @@ export default {
       if (this.localConfig.designMode === 'json') {
         this.config = this.localConfig
         if (this.configData !== undefined) {
-          this.config.data = Object.assign(this.config.data, this.configData)
+          this.config.data = Object.assign({}, this.config.data, JSON.parse(JSON.stringify(this.configData)))
         }
         this.jsonConfigInit()
       } else {
         // 如果配置是普通渲染器
         this.config = this.localConfig
         if (this.configData !== undefined) {
-          this.config.data = Object.assign(this.config.data, this.configData)
+          this.config.data = Object.assign({}, this.config.data, JSON.parse(JSON.stringify(this.configData)))
         }
         if (this.config.data.images === undefined) {
           this.config.data.images = {}

package/src/base-client/components/common/XReport/XReportHospitalizationDemo.vue

@@ -0,0 +1,45 @@
+<template>
+  <div id="xreport-hosp-demo">
+    <a-space style="margin-bottom: 12px;">
+      <a-button type="primary" @click="doInit">手动初始化</a-button>
+    </a-space>
+    <XReport
+      ref="reportRef"
+      :edit-mode="true"
+      :show-save-button="true"
+      :show-img-in-cell="false"
+      :use-oss-for-img="false"
+      server-name="af-his"
+      @updateImg="onUpdateImg"/>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import XReport from '@vue2-client/base-client/components/common/XReport'
+
+const reportRef = ref(null)
+
+const payload = {
+  arr: [
+    { BQ: '病房区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
+    { BQ: '感染科', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
+    { BQ: '骨科病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
+    { BQ: '呼吸科病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
+    { BQ: '急症科病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 },
+    { BQ: '内科二病区', RY: 0, CY: 0, CW: 0, SW: 0, SS: 0, ZC: 0, ZR: 0, ZY: 0 }
+  ]
+}
+
+const doInit = async () => {
+  if (!reportRef.value || !reportRef.value.init) return
+  await reportRef.value.init({
+    configName: 'hospitalizationStatsReport',
+    configData: payload
+  })
+}
+
+const onUpdateImg = data => {
+  console.warn('updateImg:', data)
+}
+</script>