@kdcloudjs/table 1.2.2-canary.12 → 1.2.2-canary.12-hotfix.1

package/es/table/base/header.js

@@ -72,12 +72,13 @@ function calculateLeveledAndFlat(inputNested, rowCount) {
     leveled.push([]);
   }
   var flat = [];
-  dfs(inputNested, 0);
+  dfs(inputNested, 0, false);
   return {
     flat: flat,
     leveled: leveled
   };
-  function dfs(input, depth) {
+  function dfs(input, depth, suppressLeveled) {
+    var _a;
     var leafCount = 0;
     for (var i = 0; i < input.length; i++) {
       var indexedCol = input[i];
@@ -91,12 +92,15 @@ function calculateLeveledAndFlat(inputNested, rowCount) {
           colSpan: 1,
           isLeaf: true
         };
-        leveled[depth].push(wrapped);
+        if (!suppressLeveled) {
+          leveled[depth].push(wrapped);
+        }
         flat.push(wrapped);
       } else {
-        var dfsRes = dfs(indexedCol.children, depth + 1);
+        var mergeHeader = Boolean((_a = indexedCol.col) === null || _a === void 0 ? void 0 : _a.isHeaderMerge);
+        var dfsRes = dfs(indexedCol.children, depth + 1, suppressLeveled || mergeHeader);
         leafCount += dfsRes.leafCount;
-        if (dfsRes.leafCount > 0) {
+        if (dfsRes.leafCount > 0 && !suppressLeveled) {
           leveled[depth].push({
             type: 'normal',
             width: indexedCol.col.width,
@@ -243,9 +247,9 @@ export default function TableHeader(_ref2) {
         var cell = /*#__PURE__*/React.createElement("th", _extends({
           key: colIndex
         }, headerCellProps, {
-          className: cx(Classes.tableHeaderCell, headerCellProps.className, (_cx = {}, _defineProperty(_cx, Classes.first, colIndex === 0), _defineProperty(_cx, Classes.last, colIndex + colSpan === fullFlatCount), _defineProperty(_cx, Classes.lockLeft, colIndex < leftFlatCount || theaderPosition === 'left'), _defineProperty(_cx, Classes.lockRight, colIndex >= fullFlatCount - rightFlatCount || theaderPosition === 'right'), _defineProperty(_cx, Classes.leaf, wrapped.isLeaf), _cx)),
+          className: cx(Classes.tableHeaderCell, headerCellProps.className, (_cx = {}, _defineProperty(_cx, Classes.first, colIndex === 0), _defineProperty(_cx, Classes.last, colIndex + colSpan === fullFlatCount), _defineProperty(_cx, Classes.lockLeft, colIndex < leftFlatCount || theaderPosition === 'left'), _defineProperty(_cx, Classes.lockRight, colIndex >= fullFlatCount - rightFlatCount || theaderPosition === 'right'), _defineProperty(_cx, Classes.leaf, wrapped.isLeaf || col.isHeaderMerge), _cx)),
           colSpan: colSpan,
-          rowSpan: isLeaf ? rowCount - level : undefined,
+          rowSpan: isLeaf || col.isHeaderMerge ? rowCount - level : undefined,
           style: _extends(_extends({
             textAlign: col.align,
             verticalAlign: (_b = col.verticalAlign) !== null && _b !== void 0 ? _b : 'middle'

package/es/table/interfaces.d.ts

@@ -29,6 +29,8 @@ export interface ArtColumnStaticPart {
     };
     /** 表头设置操作项到自定义操作区 */
     renderHeader?: (title: ReactNode, opr: ReactNode) => ReactNode;
+    /** 在分组情况下是否需要合并表头 默认不合并 */
+    isHeaderMerge?: boolean;
 }
 export interface Features {
     /** 是否开启排序功能 */

package/es/table/transforms/sort.d.ts

@@ -39,5 +39,6 @@ export declare function useSortTransform({ defaultSorts, ...others }?: Omit<Sort
     defaultSorts?: SortItem[];
 }): import("../interfaces").Transform<{
     columns: ArtColumn[];
+    /** 调用 makeSortTransform(...) 时的参数 */
     dataSource: any[];
 }>;

package/es/table/utils/getTreeDepth.js

@@ -12,12 +12,15 @@ export default function getTreeDepth(nodes) {
   dfs(nodes, 0);
   return maxDepth;
   function dfs(columns, depth) {
+    var _a;
     var _iterator = _createForOfIteratorHelper(columns),
       _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var column = _step.value;
-        if (isLeafNode(column)) {
+        var isHeaderMerge = ((_a = column) === null || _a === void 0 ? void 0 : _a.isHeaderMerge) === true;
+        // 当列配置了 isHeaderMerge 时，将其视作“可视叶子”，不再深入子层计算深度
+        if (isLeafNode(column) || isHeaderMerge) {
           maxDepth = Math.max(maxDepth, depth);
         } else {
           dfs(column.children, depth + 1);

package/lib/table/base/header.js

@@ -79,12 +79,13 @@ function calculateLeveledAndFlat(inputNested, rowCount) {
     leveled.push([]);
   }
   var flat = [];
-  dfs(inputNested, 0);
+  dfs(inputNested, 0, false);
   return {
     flat: flat,
     leveled: leveled
   };
-  function dfs(input, depth) {
+  function dfs(input, depth, suppressLeveled) {
+    var _a;
     var leafCount = 0;
     for (var i = 0; i < input.length; i++) {
       var indexedCol = input[i];
@@ -98,12 +99,15 @@ function calculateLeveledAndFlat(inputNested, rowCount) {
           colSpan: 1,
           isLeaf: true
         };
-        leveled[depth].push(wrapped);
+        if (!suppressLeveled) {
+          leveled[depth].push(wrapped);
+        }
         flat.push(wrapped);
       } else {
-        var dfsRes = dfs(indexedCol.children, depth + 1);
+        var mergeHeader = Boolean((_a = indexedCol.col) === null || _a === void 0 ? void 0 : _a.isHeaderMerge);
+        var dfsRes = dfs(indexedCol.children, depth + 1, suppressLeveled || mergeHeader);
         leafCount += dfsRes.leafCount;
-        if (dfsRes.leafCount > 0) {
+        if (dfsRes.leafCount > 0 && !suppressLeveled) {
           leveled[depth].push({
             type: 'normal',
             width: indexedCol.col.width,
@@ -250,9 +254,9 @@ function TableHeader(_ref2) {
         var cell = /*#__PURE__*/_react.default.createElement("th", (0, _extends2.default)({
           key: colIndex
         }, headerCellProps, {
-          className: (0, _classnames.default)(_styles.Classes.tableHeaderCell, headerCellProps.className, (_cx = {}, (0, _defineProperty2.default)(_cx, _styles.Classes.first, colIndex === 0), (0, _defineProperty2.default)(_cx, _styles.Classes.last, colIndex + colSpan === fullFlatCount), (0, _defineProperty2.default)(_cx, _styles.Classes.lockLeft, colIndex < leftFlatCount || theaderPosition === 'left'), (0, _defineProperty2.default)(_cx, _styles.Classes.lockRight, colIndex >= fullFlatCount - rightFlatCount || theaderPosition === 'right'), (0, _defineProperty2.default)(_cx, _styles.Classes.leaf, wrapped.isLeaf), _cx)),
+          className: (0, _classnames.default)(_styles.Classes.tableHeaderCell, headerCellProps.className, (_cx = {}, (0, _defineProperty2.default)(_cx, _styles.Classes.first, colIndex === 0), (0, _defineProperty2.default)(_cx, _styles.Classes.last, colIndex + colSpan === fullFlatCount), (0, _defineProperty2.default)(_cx, _styles.Classes.lockLeft, colIndex < leftFlatCount || theaderPosition === 'left'), (0, _defineProperty2.default)(_cx, _styles.Classes.lockRight, colIndex >= fullFlatCount - rightFlatCount || theaderPosition === 'right'), (0, _defineProperty2.default)(_cx, _styles.Classes.leaf, wrapped.isLeaf || col.isHeaderMerge), _cx)),
           colSpan: colSpan,
-          rowSpan: isLeaf ? rowCount - level : undefined,
+          rowSpan: isLeaf || col.isHeaderMerge ? rowCount - level : undefined,
           style: (0, _extends2.default)((0, _extends2.default)({
             textAlign: col.align,
             verticalAlign: (_b = col.verticalAlign) !== null && _b !== void 0 ? _b : 'middle'

package/lib/table/interfaces.d.ts

@@ -29,6 +29,8 @@ export interface ArtColumnStaticPart {
     };
     /** 表头设置操作项到自定义操作区 */
     renderHeader?: (title: ReactNode, opr: ReactNode) => ReactNode;
+    /** 在分组情况下是否需要合并表头 默认不合并 */
+    isHeaderMerge?: boolean;
 }
 export interface Features {
     /** 是否开启排序功能 */

package/lib/table/transforms/sort.d.ts

@@ -39,5 +39,6 @@ export declare function useSortTransform({ defaultSorts, ...others }?: Omit<Sort
     defaultSorts?: SortItem[];
 }): import("../interfaces").Transform<{
     columns: ArtColumn[];
+    /** 调用 makeSortTransform(...) 时的参数 */
     dataSource: any[];
 }>;

package/lib/table/utils/getTreeDepth.js

@@ -19,12 +19,15 @@ function getTreeDepth(nodes) {
   dfs(nodes, 0);
   return maxDepth;
   function dfs(columns, depth) {
+    var _a;
     var _iterator = _createForOfIteratorHelper(columns),
       _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var column = _step.value;
-        if ((0, _isLeafNode.default)(column)) {
+        var isHeaderMerge = ((_a = column) === null || _a === void 0 ? void 0 : _a.isHeaderMerge) === true;
+        // 当列配置了 isHeaderMerge 时，将其视作“可视叶子”，不再深入子层计算深度
+        if ((0, _isLeafNode.default)(column) || isHeaderMerge) {
           maxDepth = Math.max(maxDepth, depth);
         } else {
           dfs(column.children, depth + 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/table",
-  "version": "1.2.2-canary.12",
+  "version": "1.2.2-canary.12-hotfix.1",
   "description": "金蝶 react table 组件",
   "title": "table",
   "keywords": [
@@ -57,7 +57,8 @@
     "pub": "npm run test:all && npm run build && cross-env PUB_ENV=pub np --no-cleanup --no-tests",
     "pub:canary": "npm run build && cross-env PUB_ENV=pub np --no-cleanup --anyBranch --no-tests --tag=canary",
     "new": "node scripts/create-component.js",
-    "kd-ui": "npm install @kingdee-ui/kui --registry http://npm.kingdee.com/"
+    "kd-ui": "npm install @kingdee-ui/kui --registry http://npm.kingdee.com/",
+    "pub:canary-hotfix": "npm run build && cross-env PUB_ENV=pub np --no-cleanup --anyBranch --no-tests --tag=canaryHotFix"
   },
   "browserslist": [
     "last 2 versions",