vxe-table 3.15.6 → 3.15.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.15.6",
+  "version": "3.15.8",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、拖拽排序，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "vxe-pc-ui": "^3.5.26"
+    "vxe-pc-ui": "^3.5.29"
   },
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.25.7",

package/packages/table/render/index.ts

@@ -360,7 +360,18 @@ function defaultEditRender (h: CreateElement, renderOpts: VxeGlobalRendererHandl
   ]
 }
 
-function radioAndCheckboxEditRender (h: CreateElement, renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: VxeGlobalRendererHandles.RenderEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
+function checkboxEditRender (h: CreateElement, renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: VxeGlobalRendererHandles.RenderEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
+  const { row, column } = params
+  const cellValue = getCellValue(row, column)
+  return [
+    h(getDefaultComponent(renderOpts), {
+      props: getCellEditProps(renderOpts, params, cellValue),
+      on: getEditOns(renderOpts, params)
+    })
+  ]
+}
+
+function radioAndCheckboxGroupEditRender (h: CreateElement, renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: VxeGlobalRendererHandles.RenderEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
   const { options } = renderOpts
   const { row, column } = params
   const cellValue = getCellValue(row, column)
@@ -957,10 +968,13 @@ renderer.mixin({
     }
   },
   VxeRadioGroup: {
-    renderTableDefault: radioAndCheckboxEditRender
+    renderTableDefault: radioAndCheckboxGroupEditRender
+  },
+  VxeCheckbox: {
+    renderTableDefault: checkboxEditRender
   },
   VxeCheckboxGroup: {
-    renderTableDefault: radioAndCheckboxEditRender
+    renderTableDefault: radioAndCheckboxGroupEditRender
   },
   VxeSwitch: {
     tableAutoFocus: 'button',

package/packages/table/src/methods.ts

@@ -2720,8 +2720,14 @@ function loadTableData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods,
   scrollXStore.endIndex = 1
   reactData.isRowLoading = true
   reactData.scrollVMLoading = false
+  internalData.treeExpandedMaps = {}
+  reactData.treeExpandedFlag++
+  internalData.rowExpandedMaps = {}
+  reactData.rowExpandedFlag++
   internalData.insertRowMaps = {}
+  reactData.insertRowFlag++
   internalData.removeRowMaps = {}
+  reactData.removeRowFlag++
   const sYLoad = updateScrollYStatus($xeTable, fullData)
   reactData.isDragColMove = false
   reactData.isDragRowMove = false

package/packages/ui/index.ts

@@ -220,8 +220,8 @@ VxeUI.setConfig({
       oSize: 2
     },
     scrollbarConfig: {
-      // width: 0,
-      // height: 0
+      width: 14,
+      height: 14
     }
   },
   // export: {

package/styles/components/table.scss

@@ -990,12 +990,6 @@
     position: relative;
     line-height: var(--vxe-ui-table-row-line-height);
     text-align: left;
-    &.col--current {
-      background-color: var(--vxe-ui-table-column-current-background-color);
-      // .vxe-cell--tree-btn {
-      //   background-color: var(--vxe-ui-table-column-current-background-color);
-      // }
-    }
     &.col--center {
       text-align: center;
       & > .vxe-cell {
@@ -1009,17 +1003,6 @@
       }
     }
   }
-  // &.is--tree-line {
-  //   .vxe-header--column,
-  //   .vxe-body--column,
-  //   .vxe-footer--column {
-  //     &.col--current {
-  //       .vxe-cell--tree-btn {
-  //         background-color: var(--vxe-ui-table-column-current-background-color);
-  //       }
-  //     }
-  //   }
-  // }
   .vxe-header--column,
   .vxe-footer--column {
     &.col--ellipsis {
@@ -1043,6 +1026,36 @@
         background-color: var(--vxe-ui-table-row-striped-background-color);
       }
     }
+  }
+
+  // 列高亮
+  .vxe-header--column,
+  .vxe-body--column,
+  .vxe-footer--column {
+    position: relative;
+    line-height: var(--vxe-ui-table-row-line-height);
+    text-align: left;
+    &.col--current {
+      background-color: var(--vxe-ui-table-column-current-background-color);
+      // .vxe-cell--tree-btn {
+      //   background-color: var(--vxe-ui-table-column-current-background-color);
+      // }
+    }
+  }
+  // &.is--tree-line {
+  //   .vxe-header--column,
+  //   .vxe-body--column,
+  //   .vxe-footer--column {
+  //     &.col--current {
+  //       .vxe-cell--tree-btn {
+  //         background-color: var(--vxe-ui-table-column-current-background-color);
+  //       }
+  //     }
+  //   }
+  // }
+
+  // 行高亮
+  .vxe-body--row {
     &.row--radio {
       & > .vxe-body--column {
         background-color: var(--vxe-ui-table-row-radio-checked-background-color);