releases 4.10.6

x-extends · Jan 21, 2025 · 259fee5 · 259fee5
1 parent ab994d4
commit 259fee5
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.10.6-beta.27",
+  "version": "4.10.6-beta.30",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、拖拽排序，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

diff --git a/packages/table/src/body.ts b/packages/table/src/body.ts
@@ -114,7 +114,8 @@ export default defineComponent({
       const rowOpts = computeRowOpts.value
       const rowDragOpts = computeRowDragOpts.value
       const defaultRowHeight = computeDefaultRowHeight.value
-      const currCellHeight = cellOpts.height || rowOpts.height || defaultRowHeight
+      const customCellHeight = cellOpts.height || rowOpts.height
+      const currCellHeight = customCellHeight || defaultRowHeight
       const { disabledMethod: dragDisabledMethod, isCrossDrag, isPeerDrag } = rowDragOpts
       const columnOpts = computeColumnOpts.value
       const mouseOpts = computeMouseOpts.value
@@ -141,6 +142,7 @@ export default defineComponent({
       const showTitle = cellOverflow === 'title'
       const showTooltip = cellOverflow === true || cellOverflow === 'tooltip'
       const hasEllipsis = isAllOverflow || showTitle || showTooltip || showEllipsis
+      const isCsHeight = !!customCellHeight
       const isRsHeight = resizeHeight > 0
       let isDirty
       const tdOns: any = {}
@@ -289,7 +291,7 @@ export default defineComponent({
       }
 
       const tcStyle: Record<string, string> = {}
-      if (scrollYLoad || hasEllipsis || isRsHeight) {
+      if (scrollYLoad || hasEllipsis || isCsHeight || isRsHeight) {
         tcStyle.height = `${cellHeight}px`
       } else {
         tcStyle.minHeight = `${cellHeight}px`
@@ -394,6 +396,7 @@ export default defineComponent({
             'col--tree-node': treeNode,
             'col--edit': isEdit,
             'col--ellipsis': hasEllipsis,
+            'col--cs-height': isCsHeight,
             'col--rs-height': isRsHeight,
             'col--to-row': showAreaRowStatus,
             'col--auto-height': isVNAutoHeight,

diff --git a/packages/table/src/table.ts b/packages/table/src/table.ts
@@ -8005,7 +8005,11 @@ export default defineComponent({
                       // 根到根
                     }
 
-                    const fullList = XEUtils.toTreeArray(internalData.afterTreeFullData, { children: childrenField })
+                    const fullList = XEUtils.toTreeArray(internalData.afterTreeFullData, {
+                      key: rowField,
+                      parentKey: parentField,
+                      children: mapChildrenField
+                    })
 
                     // 移出
                     const otfIndex = $xeTable.findRowIndexOf(fullList, dragRow)
@@ -8025,10 +8029,10 @@ export default defineComponent({
                     dragRow[parentField] = isDragToChildFlag ? prevDragRow[rowField] : prevDragRow[parentField]
 
                     internalData.tableFullTreeData = XEUtils.toArrayTree(fullList, {
-                      key: treeOpts.rowField,
-                      parentKey: treeOpts.parentField,
+                      key: rowField,
+                      parentKey: parentField,
                       children: childrenField,
-                      mapChildren: treeOpts.mapChildrenField
+                      mapChildren: mapChildrenField
                     })
                   }
                 }

diff --git a/packages/ui/index.ts b/packages/ui/index.ts
@@ -81,8 +81,10 @@ VxeUI.setConfig({
       padding: true
     },
     headerCellConfig: {
+      height: 'unset'
     },
     footerCellConfig: {
+      height: 'unset'
     },
     // menuConfig: {
     //   visibleMethod () {}

diff --git a/styles/components/table.scss b/styles/components/table.scss
@@ -1542,6 +1542,8 @@
         }
       }
     }
+    &.col--cs-height,
+    &.col--rs-height,
     &.col--auto-height {
       overflow: hidden;
       & > .vxe-cell {