vue2-client 1.17.42 → 1.17.45

package/package.json

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

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

@@ -62,7 +62,8 @@
                 'x-charge',
                 'x-questionnaire',
                 'x-import-excel-button',
-                'x-chart'
+                'x-chart',
+                'h-chart'
               ].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
@@ -139,7 +140,8 @@
                 'x-charge',
                 'x-questionnaire',
                 'x-import-excel-button',
-                'x-chart'
+                'x-chart',
+                'h-chart'
               ].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
@@ -213,7 +215,8 @@ export default {
     XCharge: () => import('@vue2-client/base-client/components/his/XCharge/XCharge.vue'),
     XQuestionnaire: () => import('@vue2-client/base-client/components/his/XQuestionnaire/XQuestionnaire.vue'),
     XImportExcelButton: () => import('@vue2-client/base-client/components/his/XImportExcelButton/XImportExcelButton.vue'),
-    XChart: () => import('@vue2-client/base-client/components/his/XChart/XChart.vue')
+    XChart: () => import('@vue2-client/base-client/components/his/XChart/XChart.vue'),
+    HChart: () => import('@vue2-client/base-client/components/his/HChart/HChart.vue')
   },
   props: {
     // 每一行的配置

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

@@ -333,12 +333,34 @@ export default {
       return this.tableContext.expandedGrid ? this.$refs.expandableTable : this.$refs.simpleTable
     },
     realTableColumns () {
-      return this.tableContext.tableColumns.filter(item => item.slotType !== 'action' || !this.disableAction).map((item) => {
-        if (['ellipsis', 'badge', 'towDecimal', 'date', 'dateTime', 'fourDecimal', 'int'].includes(item.slotType)) {
-          item.ellipsis = true
+      // 1. 先过滤列并设置 ellipsis 属性
+      const filteredColumns = this.tableContext.tableColumns
+        .filter(item => item.slotType !== 'action' || !this.disableAction)
+        .map((item) => {
+          // 设置 ellipsis 属性
+          if (['ellipsis', 'badge', 'towDecimal', 'date', 'dateTime', 'fourDecimal', 'int'].includes(item.slotType)) {
+            item.ellipsis = true
+          }
+          return item
+        })
+
+      // 2. 分组：左固定、普通、右固定
+      const leftFixedColumns = []
+      const normalColumns = []
+      const rightFixedColumns = []
+
+      filteredColumns.forEach(col => {
+        if (col.fixed === 'left') {
+          leftFixedColumns.push(col)
+        } else if (col.fixed === 'right') {
+          rightFixedColumns.push(col)
+        } else {
+          normalColumns.push(col)
         }
-        return item
       })
+
+      // 3. 按顺序合并：左固定 + 普通 + 右固定
+      return [...leftFixedColumns, ...normalColumns, ...rightFixedColumns]
     },
     components () {
       return {
@@ -653,6 +675,10 @@ export default {
   vertical-align: middle !important;
   border-bottom: 1px solid #f0f0f0;
 }
+/* 分页组件不换行 */
+:deep(.ant-pagination > li) {
+  white-space: nowrap;
+}
 </style>
 <style>
 /* vue-draggable-resizable 拖动手柄样式 */

package/src/theme/global.less

@@ -147,8 +147,10 @@ ol {
   display: none;
 }
 
-// STable 表格行样式
-.ant-table-tbody {
+// STable 表格行样式 - 同时应用于主表格和固定列
+.ant-table-tbody,
+.ant-table-fixed-left .ant-table-tbody,
+.ant-table-fixed-right .ant-table-tbody {
   // 统一为所有行添加平滑过渡效果
   tr {
     transition: background-color 0.2s cubic-bezier(0.4, 0, 0.2, 1);
@@ -162,8 +164,8 @@ ol {
   .row-style-success {
     background-color: rgba(82, 196, 26, 0.1) !important;
 
-    // 使用 CSS :hover 处理鼠标悬浮（即使快速移动也能正确显示）
-    &:hover,
+    // 使用 Ant Design 自动添加的 .ant-table-row-hover 类名
+    &.ant-table-row-hover,
     &.row-clicked {
       background-color: rgba(82, 196, 26, 0.2) !important;
     }
@@ -193,7 +195,7 @@ ol {
   .row-style-warn {
     background-color: rgba(250, 173, 20, 0.1) !important;
 
-    &:hover,
+    &.ant-table-row-hover,
     &.row-clicked {
       background-color: rgba(250, 173, 20, 0.2) !important;
     }
@@ -223,7 +225,7 @@ ol {
   .row-style-danger {
     background-color: rgba(245, 34, 47, 0.1) !important;
 
-    &:hover,
+    &.ant-table-row-hover,
     &.row-clicked {
       background-color: rgba(245, 34, 47, 0.2) !important;
     }
@@ -252,7 +254,7 @@ ol {
   .row-style-magic {
     background-color: rgba(114, 46, 209, 0.1) !important;
 
-    &:hover,
+    &.ant-table-row-hover,
     &.row-clicked {
       background-color: rgba(114, 46, 209, 0.2) !important;
     }
@@ -279,9 +281,9 @@ ol {
 
   // 默认信息样式
   .row-style-info {
-    &:hover,
+    &.ant-table-row-hover,
     &.row-clicked {
-      // 使用主题色的 20% 透明度
+      // 使用主题色的 10% 透明度
       background-color: fade(@primary-color, 10%) !important;
     }