vue2-client 1.18.66 → 1.18.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.18.66",
+  "version": "1.18.68",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

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

@@ -29,7 +29,9 @@ const wrapperClassObject = computed(() => {
     'label-text-justify',
     'simple-inline',
     'label-justify',
-    'charge-form'
+    'charge-form',
+    'mini-form',
+    'content-right'
   ]
   for (const key of booleanStyleKeys) {
     const val = a[key]
@@ -77,6 +79,27 @@ defineExpose({
   :deep(.ant-form-item) {
     margin-bottom: 4px;
   }
+  &.h-form-mini-form {
+    :deep(.ant-form-inline) {
+      .ant-row-flex {
+        .ant-col {
+          flex: auto !important;
+          max-width: 250px !important;
+        }
+      }
+    }
+    :deep(.ant-form-item){
+      margin-right: 0px !important;
+    }
+  }
+
+  &.h-form-content-right {
+    :deep(.ant-form-inline) {
+      .ant-row-flex {
+        justify-content: right;
+      }
+    }
+  }
 
   // query-conditions 样式
   &.h-form-query-conditions {

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

@@ -131,8 +131,8 @@ defineExpose({
     display: none;
   }
   :deep(.ant-tabs-nav-wrap) {
-    margin-top: 18px !important;
-    margin-bottom: 0 !important;
+    margin-top: 18px;
+    margin-bottom: 0;
   }
   :deep(.ant-tabs-nav) {
     // 去除导航容器默认左右内边距，避免收缩时左侧多出一截
@@ -235,12 +235,23 @@ defineExpose({
     :deep(.ant-tabs-bar) { border-bottom: 2px solid transparent; }
 
     :deep(.ant-tabs-ink-bar) {
-      display: block;
-      background-color: #0057FE;
-      bottom: 8px;
-      height: 2px;
-      /* 宽度交给 antd 自身计算，避免固定值影响自适应 */
-      margin-left: 0;
+      display: block !important;
+      background-color: #0057FE !important;
+      bottom: 3px !important;
+      height: 2px !important;
+      /* 让 antd 自身计算宽度，与页签宽度匹配 */
+      margin-left: 0 !important;
+    }
+
+    :deep(.ant-tabs-nav-wrap) {
+      margin-top: 0;
+      padding-left: 0 !important; // 消除整个Tab的左间距
+      padding-right: 0 !important; // 消除整个Tab的右间距
+    }
+
+    :deep(.ant-tabs-nav-container) {
+      padding-left: 0 !important; // 确保容器也没有左右间距
+      padding-right: 0 !important;
     }
 
     :deep(.ant-tabs-nav) {
@@ -255,7 +266,7 @@ defineExpose({
         /* 自适应宽度，允许通过变量覆盖最小宽度 */
         min-width: var(--tab-min-width, 96px);
         width: auto;
-        padding: 0 12px;
+        padding: 0 12px 6px;
         font-size: 16px;
         line-height: 10px;
         font-family: "Source Han Sans";
@@ -269,6 +280,7 @@ defineExpose({
         color: #0057FE;
         font-weight: 600;
         width: auto;
+        padding: 0 12px 6px;
         line-height: 10px;
         height: 40px;
         text-align: center;
@@ -292,8 +304,8 @@ defineExpose({
         left: 0 !important;
         top: 50% !important;
         transform: translateY(-50%) !important;
-        width: 8px !important;
-        height: 8px !important;
+        width: 12px !important;
+        height: 12px !important;
         background: #0057FE !important;
         border-radius: 50% !important;
         display: block !important;

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>

package/src/base-client/components/his/HChart/demo.vue

@@ -1,88 +1,88 @@
-<template>
-  <div class="h-chart-test-container">
-    <h2>HChart 组件测试案例</h2>
-
-    <section class="test-section">
-      <h3>测试1: 通过 queryParamsName 查询配置（从后端获取配置和数据）</h3>
-      <div class="chart-wrapper">
-        <HChart
-          ref="chart1"
-          query-params-name="accountsReceivableChart"
-          :fixed-query-form="{ condition: '1=1', dateRange: '2024-01' }"
-          service-name="af-his"
-          @init="handleChartInit"
-          @dataLoaded="handleDataLoaded"
-          @error="handleError"
-        />
-      </div>
-      <div class="test-actions">
-        <a-button @click="refreshChart1">刷新图表</a-button>
-        <a-button @click="reloadChart1">重新加载（更新查询条件）</a-button>
-      </div>
-    </section>
-
-    <section class="test-section">
-      <h3>测试日志</h3>
-      <div class="log-container">
-        <div v-for="(log, index) in logs" :key="index" class="log-item">
-          <span class="log-time">{{ log.time }}</span>
-          <span class="log-type" :class="log.type">{{ log.type }}</span>
-          <span class="log-message">{{ log.message }}</span>
-        </div>
-      </div>
-      <a-button @click="clearLogs">清空日志</a-button>
-    </section>
-  </div>
-</template>
-
-<script setup>
-import { ref } from 'vue'
-import { message } from 'ant-design-vue'
-import HChart from './HChart.vue'
-
-const chart1 = ref(null)
-
-const logs = ref([])
-
-const addLog = (type, messageText) => {
-  logs.value.unshift({
-    time: new Date().toLocaleTimeString(),
-    type,
-    message: typeof messageText === 'object' ? JSON.stringify(messageText, null, 2) : messageText
-  })
-  if (logs.value.length > 50) logs.value.pop()
-}
-
-const clearLogs = () => {
-  logs.value = []
-}
-
-const handleChartInit = (config) => {
-  addLog('init', `图表初始化: ${config?.title || '未知'}`)
-  message.success(`图表初始化成功: ${config?.title || '未知'}`)
-}
-
-const handleDataLoaded = (data) => {
-  addLog('dataLoaded', `数据加载完成，共 ${data?.length || 0} 条`)
-  console.log('数据加载完成:', data)
-}
-
-const handleError = (error) => {
-  addLog('error', `错误: ${error?.message || String(error)}`)
-  message.error(`图表加载错误: ${error?.message || String(error)}`)
-}
-
-const refreshChart1 = () => {
-  if (!chart1.value) return
-  chart1.value.refresh()
-  addLog('action', '刷新图表')
-  message.info('正在刷新图表...')
-}
-
-const reloadChart1 = () => {
-  if (!chart1.value) return
-  chart1.value.reload({ condition: '1=1', dateRange: '2024-02' })
-  addLog('action', '重新加载图表，更新查询条件')
-  message.info('正在重新加载图表...')
-}
-</script>
+<template>
+  <div class="h-chart-test-container">
+    <h2>HChart 组件测试案例</h2>
+
+    <section class="test-section">
+      <h3>测试1: 通过 queryParamsName 查询配置（从后端获取配置和数据）</h3>
+      <div class="chart-wrapper">
+        <HChart
+          ref="chart1"
+          query-params-name="accountsReceivableChart"
+          :fixed-query-form="{ condition: '1=1', dateRange: '2024-01' }"
+          service-name="af-his"
+          @init="handleChartInit"
+          @dataLoaded="handleDataLoaded"
+          @error="handleError"
+        />
+      </div>
+      <div class="test-actions">
+        <a-button @click="refreshChart1">刷新图表</a-button>
+        <a-button @click="reloadChart1">重新加载（更新查询条件）</a-button>
+      </div>
+    </section>
+
+    <section class="test-section">
+      <h3>测试日志</h3>
+      <div class="log-container">
+        <div v-for="(log, index) in logs" :key="index" class="log-item">
+          <span class="log-time">{{ log.time }}</span>
+          <span class="log-type" :class="log.type">{{ log.type }}</span>
+          <span class="log-message">{{ log.message }}</span>
+        </div>
+      </div>
+      <a-button @click="clearLogs">清空日志</a-button>
+    </section>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { message } from 'ant-design-vue'
+import HChart from './HChart.vue'
+
+const chart1 = ref(null)
+
+const logs = ref([])
+
+const addLog = (type, messageText) => {
+  logs.value.unshift({
+    time: new Date().toLocaleTimeString(),
+    type,
+    message: typeof messageText === 'object' ? JSON.stringify(messageText, null, 2) : messageText
+  })
+  if (logs.value.length > 50) logs.value.pop()
+}
+
+const clearLogs = () => {
+  logs.value = []
+}
+
+const handleChartInit = (config) => {
+  addLog('init', `图表初始化: ${config?.title || '未知'}`)
+  message.success(`图表初始化成功: ${config?.title || '未知'}`)
+}
+
+const handleDataLoaded = (data) => {
+  addLog('dataLoaded', `数据加载完成，共 ${data?.length || 0} 条`)
+  console.log('数据加载完成:', data)
+}
+
+const handleError = (error) => {
+  addLog('error', `错误: ${error?.message || String(error)}`)
+  message.error(`图表加载错误: ${error?.message || String(error)}`)
+}
+
+const refreshChart1 = () => {
+  if (!chart1.value) return
+  chart1.value.refresh()
+  addLog('action', '刷新图表')
+  message.info('正在刷新图表...')
+}
+
+const reloadChart1 = () => {
+  if (!chart1.value) return
+  chart1.value.reload({ condition: '1=1', dateRange: '2024-02' })
+  addLog('action', '重新加载图表，更新查询条件')
+  message.info('正在重新加载图表...')
+}
+</script>