vue2-client 1.16.59 → 1.16.60

package/package.json

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

@@ -21,7 +21,7 @@ const wrapperClassObject = computed(() => {
 
   // 通用布尔样式开关（以存在/空字符串/'true' 为真）
   const booleanStyleKeys = [
-    'max-width200'
+    'max-width200', 'width173'
   ]
   for (const key of booleanStyleKeys) {
     const val = a[key]
@@ -176,9 +176,6 @@ defineExpose({
       .ant-btn {
         border: 1px solid #CDCDCD;
         color: #5D5C5C;
-        width: auto;
-        min-width: 124px;
-        max-width: 140px;
         white-space: nowrap;
         overflow: hidden;
         margin-right: 0px;
@@ -196,9 +193,6 @@ defineExpose({
     :deep(.ant-btn-group) {
       justify-content: flex-start;
       gap: 12px;
-      .ant-btn {
-        flex: 1 1 auto;
-      }
     }
   }
   // button-center样式 - 按钮居中排列
@@ -206,9 +200,6 @@ defineExpose({
     :deep(.ant-btn-group) {
       justify-content: center;
       gap: 12px;
-      .ant-btn {
-        flex: 1 1 auto;
-      }
     }
   }
   // button-right样式 - 按钮从右到左排列
@@ -216,18 +207,12 @@ defineExpose({
     :deep(.ant-btn-group) {
       justify-content: flex-end;
       gap: 12px;
-      .ant-btn {
-        flex: 1 1 auto;
-      }
     }
   }
   // button-space-between样式 - 按钮两端对齐（两个按钮时分布在两端）
   &.h-buttons-button-space-between {
     :deep(.ant-btn-group) {
       justify-content: space-between;
-      .ant-btn {
-        flex: 1 1 auto;
-      }
     }
   }
 
@@ -375,6 +360,10 @@ defineExpose({
       align-items: center;
     }
   }
-
+  &.h-buttons-width173 {
+    :deep(.ant-btn) {
+        width: 173px !important;
+    }
+  }
 }
 </style>

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

@@ -4,10 +4,12 @@ import { ref, onMounted, getCurrentInstance, watch } from 'vue'
 import { getConfigByNameAsync } from '@vue2-client/services/api/common'
 
 // 与 HTab 保持一致的样式开关
-defineProps({
+const props = defineProps({
   hasTopMargin: { type: Boolean, default: true },
   // 隐藏左侧索引栏（样式控制）
-  leftHide: { type: Boolean, default: false }
+  leftHide: { type: Boolean, default: false },
+  // 标题蓝色圆圈样式
+  showDot: { type: Boolean, default: false }
 })
 
 // 内部 XFormGroup 实例引用
@@ -70,14 +72,16 @@ watch(() => [vm?.proxy?.$attrs?.queryParamsName, vm?.proxy?.$attrs?.serviceName,
   <div
     class="h-form-group-wrapper"
     :class="{
-      'h-form-group-has-top-margin': hasTopMargin,
-      'left-hide': leftHide
+      'h-form-group-has-top-margin': props.hasTopMargin,
+      'left-hide': props.leftHide,
+      'show-dot': props.showDot
     }"
   >
     <x-form-group
       ref="xFormGroupRef"
       v-bind="$attrs"
       v-on="$listeners"
+      :showDot="props.showDot"
     >
       <template v-for="(_, name) in $slots" #[name]="slotData">
         <slot :name="name" v-bind="slotData" />
@@ -89,6 +93,7 @@ watch(() => [vm?.proxy?.$attrs?.queryParamsName, vm?.proxy?.$attrs?.serviceName,
 
 <style scoped lang="less">
 .h-form-group-wrapper {
+  padding: 6px;
   // XFormGroup 自身容器
   :deep(.XFormGroupClass) {
     height: 100%;
@@ -116,5 +121,18 @@ watch(() => [vm?.proxy?.$attrs?.queryParamsName, vm?.proxy?.$attrs?.serviceName,
       }
     }
   }
+  &.show-dot {
+    :deep(.x-title) {
+      font-size: 16px;
+      .title-content {
+        gap: 6px;
+        .title-dot {
+          height: 12px;
+          width: 12px;
+        }
+      }
+
+    }
+  }
 }
 </style>

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

@@ -24,7 +24,7 @@ const wrapperClassObject = computed(() => {
 
   // 通用布尔样式开关（以存在/空字符串/'true' 为真）
   const booleanStyleKeys = [
-    'hasTopMargin', 'useStyle7', 'useCycle', 'useStyle8', 'ant-tabs-bar-left0'
+    'hasTopMargin', 'useStyle7', 'useCycle', 'useStyle8'
   ]
   for (const key of booleanStyleKeys) {
     const val = a[key]
@@ -175,7 +175,7 @@ defineExpose({
 
   :deep(.ant-tabs-bar) {
     border-bottom: 2px solid #0057FE;
-    margin: 20px 10px 0 10px;
+    margin: 20px 0px 0 0px;
   }
 
   // 滚动状态下的容器左右内边距清零，避免左侧多出一截
@@ -229,7 +229,7 @@ defineExpose({
     :deep(.ant-tabs-ink-bar) {
       display: block;
       background-color: #0057FE;
-      bottom: 8px;
+      bottom: 1px;
       height: 2px;
       /* 宽度交给 antd 自身计算，避免固定值影响自适应 */
       margin-left: 0;
@@ -247,7 +247,7 @@ defineExpose({
         /* 自适应宽度，允许通过变量覆盖最小宽度 */
         min-width: var(--tab-min-width, 96px);
         width: auto;
-        padding: 0 12px;
+        padding: 0 12px 10px 12px;
         font-size: 16px;
         line-height: 10px;
         font-family: "Source Han Sans";
@@ -277,15 +277,16 @@ defineExpose({
         align-items: center !important; // 确保内容垂直居中
         line-height: normal !important; // 重置line-height避免冲突
         vertical-align: top !important; // 确保垂直对齐
+        justify-content: flex-start !important; // 确保内容左对齐
       }
       :deep(.ant-tabs-tab::before) {
         content: "" !important;
         position: absolute !important;
-        left: 0 !important;
-        top: 50% !important;
+        left: 3px !important;
+        top: calc(50% - 4px) !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;
@@ -405,12 +406,5 @@ defineExpose({
       line-height: 0px !important;
     }
   }
-  // 侧边栏tab页签移除左侧空白区域
-  &.t-tab-ant-tabs-bar-left0 {
-    :deep(.ant-tabs-bar) {
-      border-bottom: 2px solid #0057FE;
-      margin: 20px 0px 0 0px;
-    }
-  }
 }
 </style>

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

@@ -18,7 +18,8 @@
           <div class="group-item" :ref="`group-${index}`" :key="index" v-for="(item, index) in groups">
             <a-row :style="{ marginTop: index === 0 ? '' : '8px' }" v-if="formShow[`show${item.groupName}`] || formShow[`show${item.slotName}`]">
               <a-col :span="5">
-                <span class="xFormGroupTitle">{{ item.describe }}</span>
+                <x-title v-if="showDot === true || showDot === 'true'" :title="item.describe" :dot="true" />
+                <span v-else class="xFormGroupTitle">{{ item.describe }}</span>
               </a-col>
             </a-row>
             <div v-show="formShow[`show${item.slotName}`]">
@@ -41,11 +42,19 @@
 
 <script>
 import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import XTitle from '@vue2-client/base-client/components/his/XTitle/XTitle.vue'
 
 export default {
   name: 'XFormGroup',
   components: {
-    XAddNativeForm
+    XAddNativeForm,
+    XTitle
+  },
+  props: {
+    showDot: {
+      type: Boolean,
+      default: false
+    }
   },
   data () {
     return {

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

@@ -2,8 +2,14 @@
   <a-card :bordered="false">
     <x-form-table
       title="示例表单"
-      queryParamsName="ceshiCRUD"
-      serviceName="af-linepatrol"
+      :queryParamsName="queryParamsName"
+      :fixedAddForm="fixedAddForm"
+      :x-tree-config-name="xTreeConfigName"
+      :externalSelectedRowKeys="selectedKeys"
+      @action="action"
+      @selectRow="selectRow"
+      @columnClick="columnClick"
+      serviceName="af-revenue"
       ref="xFormTable">
     </x-form-table>
   </a-card>
@@ -11,6 +17,7 @@
 
 <script>
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
+import { microDispatch } from '@vue2-client/utils/microAppUtils'
 
 export default {
   name: 'Demo',
@@ -20,9 +27,9 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'ceshiCRUD',
+      queryParamsName: 'address_management',
       // 查询配置左侧tree
-      xTreeConfigName: '',
+      xTreeConfigName: 'addressType',
       // 新增表单固定值
       fixedAddForm: {},
       // 是否显示详情抽屉
@@ -38,6 +45,41 @@ export default {
     }
   },
   methods: {
+    test () {
+      this.$refs.xFormTable.setTableData([])
+    },
+    defaultF () {
+      this.$refs.xFormTable.setTableSize('default')
+    },
+    middleF () {
+      this.$refs.xFormTable.setTableSize('middle')
+    },
+    smallF () {
+      this.$refs.xFormTable.setTableSize('small')
+    },
+    columnClick (key, value, record) {
+      microDispatch({
+        type: 'v3route',
+        path: '/bingliguanli/dianzibingliluru',
+        props: { selected: arguments[0].his_f_admission_id }
+      })
+    },
+    action (record, id, actionType) {
+      this.detailVisible = true
+      console.log('触发了详情操作', record, id, actionType)
+    },
+    onClose () {
+      this.detailVisible = false
+      // 关闭详情之后重新查询表单
+      this.$refs.xFormTable.refreshTable(true)
+    },
+    selectRow (selectedRowKeys, selectedRows) {
+      this.selected = {
+        keys: selectedRowKeys,
+        rows: selectedRows
+      }
+      console.log('selectedDemo', this.selected)
+    },
   },
   computed: {},
 }

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/XReport/print.js

@@ -1,186 +1,186 @@
-// print.js
-
-export function printElement (elementToPrint) {
-  // 创建一个新的浏览器窗口
-  const printWindow = window.open('', '_blank', 'height=1024,width=768')
-  // 设置新窗口的文档内容
-  printWindow.document.write(`
-    <html>
-      <head>
-        <title>Print</title>
-        <style>
-          @page {
-            size: auto;
-            margin: 0mm;
-          }
-          html, body {
-            margin: 0;
-            padding: 0;
-            width: 100%;
-            height: 100%;
-          }
-          #print-container {
-            display: none
-          }
-          .img{
-            width: 95%;
-            height: 180px;
-            object-fit: cover;
-          }
-          .reportMain {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            padding: 15px;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-              margin-bottom: 1%;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-              text-align: center;
-            }
-          }
-          .reportMainForDisplay {
-            text-align: center;
-            margin: 10% auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            padding: 15px;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-around;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .reportMainNoPadding {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .tools{
-            position: fixed;
-            right: 2%;
-            text-align: right;
-            width: 60%;
-            cursor: pointer;
-            .toolsItem{
-              width: 15%;
-              margin-right: 3%;
-              display: inline-block;
-            }
-          }
-        </style>
-      </head>
-      <body>
-        <!-- 将需要打印的元素内容复制到新窗口中 -->
-        ${elementToPrint.innerHTML}
-      </body>
-    </html>
-  `)
-  // 延迟执行打印，以确保新窗口的内容已加载完成
-  printWindow.document.close() // 关闭文档流，确保内容完全加载
-  setTimeout(() => {
-    printWindow.print() // 调用打印方法
-    printWindow.close()
-  }, 500) // 延迟500毫秒后执行打印
-}
+// print.js
+
+export function printElement (elementToPrint) {
+  // 创建一个新的浏览器窗口
+  const printWindow = window.open('', '_blank', 'height=1024,width=768')
+  // 设置新窗口的文档内容
+  printWindow.document.write(`
+    <html>
+      <head>
+        <title>Print</title>
+        <style>
+          @page {
+            size: auto;
+            margin: 0mm;
+          }
+          html, body {
+            margin: 0;
+            padding: 0;
+            width: 100%;
+            height: 100%;
+          }
+          #print-container {
+            display: none
+          }
+          .img{
+            width: 95%;
+            height: 180px;
+            object-fit: cover;
+          }
+          .reportMain {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            padding: 15px;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+              margin-bottom: 1%;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+              text-align: center;
+            }
+          }
+          .reportMainForDisplay {
+            text-align: center;
+            margin: 10% auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            padding: 15px;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-around;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .reportMainNoPadding {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .tools{
+            position: fixed;
+            right: 2%;
+            text-align: right;
+            width: 60%;
+            cursor: pointer;
+            .toolsItem{
+              width: 15%;
+              margin-right: 3%;
+              display: inline-block;
+            }
+          }
+        </style>
+      </head>
+      <body>
+        <!-- 将需要打印的元素内容复制到新窗口中 -->
+        ${elementToPrint.innerHTML}
+      </body>
+    </html>
+  `)
+  // 延迟执行打印，以确保新窗口的内容已加载完成
+  printWindow.document.close() // 关闭文档流，确保内容完全加载
+  setTimeout(() => {
+    printWindow.print() // 调用打印方法
+    printWindow.close()
+  }, 500) // 延迟500毫秒后执行打印
+}

package/src/base-client/components/his/XSidebar/XSidebar.vue

@@ -127,6 +127,7 @@ export default {
     },
     // 更新card-body的padding
     updateCardBodyPadding () {
+      if (this.widthMode) { return }
       this.$nextTick(() => {
         const cardBody = this.$el.querySelector('.ant-card-body')
         if (cardBody) {
@@ -176,7 +177,6 @@ export default {
     updateLayout (isOpen) {
       this.$nextTick(() => {
         try {
-          // 获取所有同级a-col（仅筛选出 .ant-col-12）
           const otherCols = this.getSiblingCols()
           if (otherCols.length > 0) {
             let currentCol = this.$el.parentNode
@@ -184,7 +184,6 @@ export default {
               currentCol = currentCol.parentNode
             }
             if (currentCol) {
-              // 触发XTab组件重新计算宽度
               const triggerResize = () => {
                 this.$nextTick(() => {
                   const tabComponent = this.$el.querySelector('.ant-tabs')
@@ -196,40 +195,34 @@ export default {
               }
 
               if (isOpen) {
-                // 展开：仅当显式允许时才改变布局；否则恢复默认宽度
                 if (this.affectLayout) {
                   if (this.widthMode === 'px') {
-                    // px模式：使用固定像素宽度
                     const drawerWidth = this.expandedWidth || 584
-                    currentCol.style.cssText = `
-                    flex: 0 0 ${drawerWidth}px !important;
-                    max-width: ${drawerWidth}px !important;
-                    transition: all 0.3s;`
+                    // 使用 style 对象逐个设置属性，保留其他样式
+                    currentCol.style.flex = `0 0 ${drawerWidth}px`
+                    currentCol.style.maxWidth = `${drawerWidth}px`
+                    currentCol.style.transition = 'all 0.3s'
                     if (otherCols.length === 1) {
                       const mainCol = otherCols[0]
-                      mainCol.style.cssText = `
-                      flex: 1 1 auto !important;
-                      max-width: calc(${this.totalWidth} - ${drawerWidth}px) !important;
-                      transition: all 0.3s;`
+                      mainCol.style.flex = '1 1 auto'
+                      mainCol.style.maxWidth = `calc(${this.totalWidth} - ${drawerWidth}px)`
+                      mainCol.style.transition = 'all 0.3s'
                     }
                   } else {
-                    // percent模式：使用百分比宽度（原有逻辑）
                     const drawerWidth = (this.expandedWidthPercent || 33.3)
-                    currentCol.style.cssText = `
-                    flex: 0 0 ${drawerWidth}% !important;
-                    max-width: ${drawerWidth}% !important;
-                    transition: all 0.3s;`
+                    currentCol.style.flex = `0 0 ${drawerWidth}%`
+                    currentCol.style.maxWidth = `${drawerWidth}%`
+                    currentCol.style.transition = 'all 0.3s'
                     if (otherCols.length === 1) {
                       const mainCol = otherCols[0]
                       const mainWidth = Math.max(0, Math.min(this.totalWidth, 100) - drawerWidth)
-                      mainCol.style.cssText = `
-                      flex: 0 0 ${mainWidth}% !important;
-                      max-width: ${mainWidth}% !important;
-                      transition: all 0.3s;`
+                      mainCol.style.flex = `0 0 ${mainWidth}%`
+                      mainCol.style.maxWidth = `${mainWidth}%`
+                      mainCol.style.transition = 'all 0.3s'
                     }
                   }
                 } else {
-                  // 恢复默认（移除我们加的内联样式）
+                  // 恢复默认：只移除我们设置的属性
                   currentCol.style.removeProperty('flex')
                   currentCol.style.removeProperty('max-width')
                   if (otherCols.length === 1) {
@@ -240,17 +233,15 @@ export default {
                 }
                 triggerResize()
               } else {
-                // 收缩：为了消除空白，始终把侧栏压到 26px，并让相邻主列占满剩余
-                currentCol.style.cssText = `
-                flex: 0 0 26px !important;
-                max-width: 26px !important;
-                transition: all 0.3s;`
+                // 收缩状态
+                currentCol.style.flex = '0 0 26px'
+                currentCol.style.maxWidth = '26px'
+                currentCol.style.transition = 'all 0.3s'
                 if (otherCols.length === 1) {
                   const mainCol = otherCols[0]
-                  mainCol.style.cssText = `
-                  flex: 1 1 auto !important;
-                  max-width: calc(100% - 26px) !important;
-                  transition: all 0.3s;`
+                  mainCol.style.flex = '1 1 auto'
+                  mainCol.style.maxWidth = 'calc(100% - 26px)'
+                  mainCol.style.transition = 'all 0.3s'
                 }
                 triggerResize()
               }

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

@@ -60,12 +60,14 @@ 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/XFormTable/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'),
   // component: () => import('@vue2-client/base-client/components/common/XForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/his/XCharge/XChargeDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XImportExcelButton/XFrontImportExcelDemo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),

package/src/utils/map-utils.js

@@ -1,47 +1,47 @@
-import AMapLoader from '@amap/amap-jsapi-loader'
-let Amap
-async function GetGDMap (secretKey, key) {
-  if (!Amap) {
-    window._AMapSecurityConfig = {
-      securityJsCode: secretKey
-    }
-    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
-    AMapLoader.reset()
-    Amap = await AMapLoader.load({
-      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
-      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
-        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
-        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-      AMapUI: {
-        version: '1.1', // AMapUI 缺省 1.1
-        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
-      }
-    })
-  }
-  return Amap
-}
-
-async function getGDMap (address) {
-  new (await GetGDMap()).Geocoder({
-    radius: 500 // 范围，默认：500
-  }).getLocation(address, function (status, result) {
-    if (status === 'complete' && result.geocodes.length) {
-      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
-    } else {
-      // eslint-disable-next-line prefer-promise-reject-errors
-      throw new Error('根据经纬度查询地址失败')
-    }
-  })
-}
-
-async function GetLocation (address) {
-  return new Promise((resolve, reject) => {
-    try {
-      resolve(getGDMap(address))
-    } catch (e) {
-      reject(e)
-    }
-  })
-}
-export { GetGDMap, GetLocation }
+import AMapLoader from '@amap/amap-jsapi-loader'
+let Amap
+async function GetGDMap (secretKey, key) {
+  if (!Amap) {
+    window._AMapSecurityConfig = {
+      securityJsCode: secretKey
+    }
+    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
+    AMapLoader.reset()
+    Amap = await AMapLoader.load({
+      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
+      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
+        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
+        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+      AMapUI: {
+        version: '1.1', // AMapUI 缺省 1.1
+        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
+      }
+    })
+  }
+  return Amap
+}
+
+async function getGDMap (address) {
+  new (await GetGDMap()).Geocoder({
+    radius: 500 // 范围，默认：500
+  }).getLocation(address, function (status, result) {
+    if (status === 'complete' && result.geocodes.length) {
+      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
+    } else {
+      // eslint-disable-next-line prefer-promise-reject-errors
+      throw new Error('根据经纬度查询地址失败')
+    }
+  })
+}
+
+async function GetLocation (address) {
+  return new Promise((resolve, reject) => {
+    try {
+      resolve(getGDMap(address))
+    } catch (e) {
+      reject(e)
+    }
+  })
+}
+export { GetGDMap, GetLocation }

package/vue.config.js

@@ -42,12 +42,6 @@ module.exports = {
         ws: false,
         changeOrigin: true
       },
-      '/socket/af-system': {
-        target: 'http://127.0.0.1:9002',
-        ws: true,
-        changeOrigin: true,
-        pathRewrite: { '^/socket/af-system': '/concept-websocket' },
-      },
       '/revenue-web/api/af-revenue': {
         pathRewrite: { '^/revenue-web/': '/' },
         target: v3Server,
@@ -89,10 +83,6 @@ module.exports = {
         target: revenue,
         changeOrigin: true
       },
-      '/api/af-linepatrol': {
-        target: revenue,
-        changeOrigin: true
-      },
       '/api/af-gaslink': {
         // pathRewrite: { '^/api/af-gaslink/': '/' },
         // target: 'http://127.0.0.1:9036',