vue2-client 1.18.27 → 1.18.29

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/common/XTable/XTable.vue

@@ -519,6 +519,11 @@ export default {
         return {}
       }
     },
+    // 行编辑模式自动数据切换自动保存
+    autoSave:{
+      type: Boolean,
+      default: false
+    },
     // 数据只有一页时是否展示分页，true：展示，auto：隐藏
     showPagination: {
       type: Boolean,
@@ -687,12 +692,12 @@ export default {
               })
             })
           },
-          onCancel () {
+          onCancel() {
           }
         })
       }
     },
-    importExcelOk (data) {
+    importExcelOk(data) {
       this.refresh(true)
       this.$emit('importExcelOk', data)
     },
@@ -701,7 +706,7 @@ export default {
      * @param row 选中行集合
      * @param attr 表单项属性
      */
-    async rowChoose (row, attr, callback, record) {
+    async rowChoose(row, attr, callback, record) {
       // 如果配置了自定义函数
       if (attr.dataChangeFunc) {
         await executeStrFunction(attr.dataChangeFunc, [record, this.setForm, {
@@ -716,7 +721,7 @@ export default {
         callback()
       }
     },
-    setForm (record, obj) {
+    setForm(record, obj) {
       Object.assign(record, obj)
       this.$forceUpdate()
     },
@@ -725,7 +730,7 @@ export default {
      * @param {Number} rowIndex 行索引
      * @param {String} fieldName 字段名
      */
-    focusInput (rowIndex, fieldName) {
+    focusInput(rowIndex, fieldName) {
       this.$nextTick(() => {
         // 构造 ID：{rowIndex}-{fieldName}input
         const inputId = `${rowIndex}-${fieldName}input`
@@ -760,16 +765,16 @@ export default {
      * 处理表单项事件，向外抛出事件供开发者处理
      * @param {Object} context 增强的上下文数据
      */
-    handleFormItemEvent (context) {
-      const { func, attr, value, currentRecord, currentIndex, nextRecord, nextIndex } = context
+    handleFormItemEvent(context) {
+      const {func, attr, value, currentRecord, currentIndex, nextRecord, nextIndex} = context
 
       // 向外抛出事件，参数顺序：func, attr, value, currentRecord, currentIndex, nextRecord, nextIndex
       this.$emit('x-form-item-emit-func', func, attr, value, currentRecord, currentIndex, nextRecord, nextIndex)
     },
-    handleResize () {
+    handleResize() {
       this.setScrollYHeight({})
     },
-    isInAModal () {
+    isInAModal() {
       let parent = this.$parent
       while (parent) {
         // 检查组件名称，这里假设a-modal组件的名称为AModal，根据实际情况可能需要调整
@@ -782,7 +787,7 @@ export default {
     },
     executeStrFunction,
     // 切换看板模式和表格模式
-    changeViewMode () {
+    changeViewMode() {
       this.isTableMode = !this.isTableMode
       // 看板切换回表格模式 刷新列表
       this.refresh(true)
@@ -790,7 +795,7 @@ export default {
     /**
      * 初始化表格参数
      */
-    init (params) {
+    init(params) {
       const {
         // 查询参数对象, 用于没有对应查询配置文件名时
         queryParams,
@@ -964,7 +969,7 @@ export default {
       }
     },
     // 操作面板按钮渲染
-    buttonRendering (button) {
+    buttonRendering(button) {
       if (!this.buttonPermissions) {
         return true
       }
@@ -983,7 +988,7 @@ export default {
       }
     },
     // 防止查询多次点击处理
-    loadTableData (requestParameters) {
+    loadTableData(requestParameters) {
       if (this.queryPromise) {
         return this.queryPromise
       }
@@ -996,11 +1001,11 @@ export default {
      * 加载表格数据
      * @param requestParameters 请求参数
      */
-    async loadTableDataGen (requestParameters) {
+    async loadTableDataGen(requestParameters) {
       let result
       if (this.localEditMode) {
         if (!this.isLocalDataSourceLoadedExternally && requestParameters?.conditionParams && Object.keys(requestParameters?.conditionParams).length > 0) {
-          const result = await query(Object.assign(requestParameters, { userId: this.currUser?.id }),
+          const result = await query(Object.assign(requestParameters, {userId: this.currUser?.id}),
             this.serviceName, this.env === 'dev')
           if (result.data) {
             let no = 0
@@ -1018,7 +1023,7 @@ export default {
           })
         })
       } else {
-        result = query(Object.assign(requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev')
+        result = query(Object.assign(requestParameters, {userId: this.currUser?.id}), this.serviceName, this.env === 'dev')
         result.then(res => {
           this.totalCount = res.totalCount || 0
 
@@ -1077,11 +1082,11 @@ export default {
      * @param func 事件默认 action
      * @param index 行下标
      */
-    action (record, actionType, func = 'action', index) {
+    action(record, actionType, func = 'action', index) {
       this.$emit('action', record, record[this.getPrimaryKeyName()], actionType, func, index)
     },
     // 看板点击事件
-    handleCardEmit (data, eventName) {
+    handleCardEmit(data, eventName) {
       this.action(data, undefined, eventName)
     },
     /**
@@ -1091,7 +1096,7 @@ export default {
      * @param selectedRows 被选择的列集合
      * @param nativeEvent 原生事件
      */
-    onSelect (record, selected, selectedRows, nativeEvent) {
+    onSelect(record, selected, selectedRows, nativeEvent) {
       console.log('onSelect', record, selected, selectedRows)
       if (this.selectRowMode === 'listView') {
         const primaryKeyName = this.primaryKey || this.rowKey
@@ -1110,7 +1115,7 @@ export default {
      * @param selectedRows 被选择的列集合
      * @param changeRows 改变的行集合
      */
-    onSelectAll (selected, selectedRows, changeRows) {
+    onSelectAll(selected, selectedRows, changeRows) {
       console.log('onSelectAll', selected, selectedRows, changeRows)
       if (this.selectRowMode === 'listView') {
         if (!selected) {
@@ -1127,7 +1132,7 @@ export default {
      * @param currentPageSelectedKeys 被选择的列Key集合
      * @param currentPageSelectedRows 被选择的列集合
      */
-    onSelectChange (currentPageSelectedKeys, currentPageSelectedRows) {
+    onSelectChange(currentPageSelectedKeys, currentPageSelectedRows) {
       if (this.selectRowMode === 'listView' && !this.clearSelectRowAfterQuery) {
         const primaryKeyName = this.primaryKey || this.rowKey
         if (primaryKeyName) {
@@ -1187,13 +1192,13 @@ export default {
     /**
      * 清除表格选中项
      */
-    clearRowKeys () {
+    clearRowKeys() {
       this.$refs.table.clearSelected()
     },
     /**
      * 为表格附加查询条件
      */
-    setQueryForm (form = {}) {
+    setQueryForm(form = {}) {
       this.form = form
       if (this.createdQuery) {
         this.refresh(true)
@@ -1204,7 +1209,7 @@ export default {
     /**
      * 主动传递条件查询表格
      */
-    async queryTable (conditionParams) {
+    async queryTable(conditionParams) {
       // 备份一下 form 这个函数传递的 condition 仅临时用一下
       // 如果要实质修改 form 需要在 x-form 中赋值
       const _from = JSON.parse(JSON.stringify(this.form))
@@ -1217,12 +1222,12 @@ export default {
      * 表格重新加载方法
      * 如果参数为 true, 则强制刷新到第一页
      */
-    refresh (bool) {
+    refresh(bool) {
       this.$nextTick(() => {
         this.$refs.table.refresh(bool)
       })
     },
-    setScrollYHeight ({ extraHeight = this.extraHeight, id = this.uniqueId, type = '' }) {
+    setScrollYHeight({extraHeight = this.extraHeight, id = this.uniqueId, type = ''}) {
       this.$nextTick(() => {
         debounce(() => {
           const curDocument = window?.rawDocument || document
@@ -1278,17 +1283,17 @@ export default {
     /**
      * 获取主键列名称
      */
-    getPrimaryKeyName () {
+    getPrimaryKeyName() {
       if (this.primaryKey) {
         return this.primaryKey
       }
       const indexColumn = this.tableColumns.find(i => i?.slotType === 'index')
       return indexColumn ? indexColumn.dataIndex : this.tableColumns[0].dataIndex
     },
-    handleExport (type) {
+    handleExport(type) {
       this.$refs.exportExcel.handleExport(type, this.title)
     },
-    handlePrint (type) {
+    handlePrint(type) {
       const printData = {
         title: this.title,
         form: this.form,
@@ -1298,7 +1303,7 @@ export default {
       }
       this.$refs.exportExcel.handlePrint(type, printData)
     },
-    validateTableAndSyncData (currRow, defaultAppendRowData) {
+    validateTableAndSyncData(currRow, defaultAppendRowData) {
       let isLastRow = false
       if (this.localEditModeDataSource.length === 0) {
         isLastRow = true
@@ -1310,7 +1315,7 @@ export default {
       }
     },
     // 新增业务
-    add () {
+    add() {
       if (this.eventState?.customAdd) {
         this.custom('customAdd', {})
         return
@@ -1322,19 +1327,19 @@ export default {
       }
     },
     // 添加业务
-    move () {
+    move() {
       this.$emit('move')
     },
     // 通用事件业务
-    custom (func) {
+    custom(func) {
       this.$emit('customEvent', func)
     },
     // 编辑业务
-    edit (id) {
+    edit(id) {
       this.editLoading = true
       this.getEditData(id).then(modifyModelData => {
         if (this.eventState?.customEdit) {
-          this.custom('customEdit', { id, modifyModelData })
+          this.custom('customEdit', {id, modifyModelData})
           return
         }
         this.$emit('edit', modifyModelData)
@@ -1342,7 +1347,7 @@ export default {
       })
     },
     // 行选择业务
-    choose () {
+    choose() {
       if (this.isChoose) {
         // 如果配置了自定义函数
         this.$emit('rowChoose', this.selectedRows)
@@ -1351,11 +1356,11 @@ export default {
       }
     },
     // 自定义按钮点击
-    editButtonStateDataClick (index) {
+    editButtonStateDataClick(index) {
       this.$emit('editButtonStateDataClick', this.editButtonStateData[index].functionName, this.selectedRows)
     },
     // 获取被编辑的数据
-    getEditData (id) {
+    getEditData(id) {
       if (!id) {
         this.selectId = this.selectedRowKeys[0]
       } else {
@@ -1387,11 +1392,11 @@ export default {
       requestParameters.conditionParams[primaryKeyName] = this.selectId
       requestParameters.f_businessid = this.selectId
       return queryWithResource(requestParameters, this.serviceName, this.env === 'dev').then(res => {
-        return { data: res.data[0], primaryKeyData: primaryKeyData, images: res.images, files: res.files }
+        return {data: res.data[0], primaryKeyData: primaryKeyData, images: res.images, files: res.files}
       })
     },
     // 删除业务
-    deleteItem () {
+    deleteItem() {
       if (this.viewMode) {
         this.$message.info('预览模式禁止删除')
         return
@@ -1436,24 +1441,24 @@ export default {
             }
           })
         },
-        onCancel () {
+        onCancel() {
         }
       })
     },
     // 导入业务
-    importData () {
+    importData() {
       this.$refs.importExcel.importExcelHandleOpen()
     },
-    afterVisibleChange (val) {
+    afterVisibleChange(val) {
       if (val) {
         this.retrieveSummaryData()
       }
     },
-    async retrieveSummaryData () {
+    async retrieveSummaryData() {
       const promises = []
 
       if (this.requestParameters.querySummary) {
-        const querySummaryPromise = querySummary(Object.assign(this.requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev')
+        const querySummaryPromise = querySummary(Object.assign(this.requestParameters, {userId: this.currUser?.id}), this.serviceName, this.env === 'dev')
           .then(res => {
             if (this.compatible === 'V3') {
               res = res.data
@@ -1475,7 +1480,7 @@ export default {
 
       if (this.showCustomSummary) {
         this.customSummaryArray.forEach(item => {
-          const runLogicPromise = runLogic(item.source, Object.assign(this.requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev')
+          const runLogicPromise = runLogic(item.source, Object.assign(this.requestParameters, {userId: this.currUser?.id}), this.serviceName, this.env === 'dev')
             .then(res => {
               this.summaryData.forEach(summary => {
                 if (item.key === summary.key) {
@@ -1501,7 +1506,7 @@ export default {
       await Promise.all(promises)
       return this.summaryData
     },
-    sortSummaryData () {
+    sortSummaryData() {
       const result = this.summaryData
       // 过滤出 result 中实际存在的 title，并按照 fieldsArray 的顺序排序
       this.summaryData = [...result].sort((a, b) => {
@@ -1510,7 +1515,7 @@ export default {
         return indexA - indexB
       })
     },
-    showDrawer () {
+    showDrawer() {
       if (this.summaryUpdate) {
         this.summaryData.forEach(item => {
           item.loading = true
@@ -1522,15 +1527,15 @@ export default {
         this.$message.warning('请查询后再来查看')
       }
     },
-    onClose () {
+    onClose() {
       this.summaryDrawerVisible = false
     },
     // 获取表格内所有数据
-    getTableData () {
+    getTableData() {
       return this.$refs.table.localDataSource
     },
     // 设置表格内数据
-    setTableData (data) {
+    setTableData(data) {
       if (this.localEditMode) {
         // 本地编辑模式下，需要修改 localEditModeDataSource
         this.localEditModeDataSource = data.map((item, index) => ({
@@ -1550,24 +1555,24 @@ export default {
       }
     },
     // 获取所有本地数据
-    getLocalData () {
+    getLocalData() {
       return this.localEditModeDataSource
     },
     // 获取指定rowKey的value的本地数据
-    getDataByRowKeyValue (rowKeyValue) {
+    getDataByRowKeyValue(rowKeyValue) {
       return this.getLocalData().find(item => {
         return item[this.rowKey] === rowKeyValue
       })
     },
     // 修改本地数据
-    modifyLocalData (rowKeyValue, data) {
+    modifyLocalData(rowKeyValue, data) {
       const modifyItem = this.getDataByRowKeyValue(rowKeyValue)
       if (modifyItem) {
         Object.assign(modifyItem, data)
       }
     },
     // 追加本地数据
-    appendLocalData (item) {
+    appendLocalData(item) {
       if (this.localEditModeDataSource.length === 0) {
         item['序号'] = 1
       } else {
@@ -1575,20 +1580,23 @@ export default {
       }
       this.localEditModeDataSource.push(item)
     },
-    handleRowClick (record) {
+    handleRowClick(record) {
       this.$emit('rowClick', record)
     },
-    handleRowDblClick (record) {
+    handleRowDblClick(record) {
       this.$emit('rowDblClick', record)
     },
-    beforeDataChange (record) {
+    beforeDataChange(record) {
+      if (this.isEditMode && this.autoSave) {
+        this.editRowSave()
+      }
       this.$emit('beforeDataChange', record)
     },
-    onExpand (expanded, record) {
+    onExpand(expanded, record) {
       this.$emit('expand', expanded, record)
     },
     // 添加新方法处理表格选中状态
-    updateTableSelection (selectedKeys) {
+    updateTableSelection(selectedKeys) {
       console.log('selectedKeys', selectedKeys)
       if (!this.$refs.table) {
         return
@@ -1612,7 +1620,7 @@ export default {
     },
 
     // 实际执行更新选中状态的方法
-    doUpdateTableSelection (selectedKeys) {
+    doUpdateTableSelection(selectedKeys) {
       const primaryKeyName = this.primaryKey || this.rowKey
 
       // 更新内部选中状态
@@ -1695,7 +1703,8 @@ export default {
     margin: 0;
   }
 }
-.hiddenFunctionalArea{
+
+.hiddenFunctionalArea {
   display: none;
 }
 </style>

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>