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

package/dist/@kdcloudjs/table.css

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.2.2-canary.11
+ *   @kdcloudjs/table v1.2.2-canary.12
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.

package/dist/@kdcloudjs/table.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.2.2-canary.11
+ *   @kdcloudjs/table v1.2.2-canary.12
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -1505,12 +1505,12 @@ 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 leafCount = 0;
     for (var i = 0; i < input.length; i++) {
       var indexedCol = input[i];
@@ -1524,12 +1524,16 @@ 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 _indexedCol$col;
+        var mergeHeader = Boolean((_indexedCol$col = indexedCol.col) === null || _indexedCol$col === void 0 ? void 0 : _indexedCol$col.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,
@@ -1674,9 +1678,9 @@ function TableHeader(_ref2) {
         var cell = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_24___default.a.createElement("th", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_15___default()({
           key: colIndex
         }, headerCellProps, {
-          className: classnames__WEBPACK_IMPORTED_MODULE_23___default()(_styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].tableHeaderCell, headerCellProps.className, (_cx = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_16___default()(_cx, _styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].first, colIndex === 0), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_16___default()(_cx, _styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].last, colIndex + colSpan === fullFlatCount), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_16___default()(_cx, _styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].lockLeft, colIndex < leftFlatCount || theaderPosition === 'left'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_16___default()(_cx, _styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].lockRight, colIndex >= fullFlatCount - rightFlatCount || theaderPosition === 'right'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_16___default()(_cx, _styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].leaf, wrapped.isLeaf), _cx)),
+          className: classnames__WEBPACK_IMPORTED_MODULE_23___default()(_styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].tableHeaderCell, headerCellProps.className, (_cx = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_16___default()(_cx, _styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].first, colIndex === 0), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_16___default()(_cx, _styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].last, colIndex + colSpan === fullFlatCount), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_16___default()(_cx, _styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].lockLeft, colIndex < leftFlatCount || theaderPosition === 'left'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_16___default()(_cx, _styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].lockRight, colIndex >= fullFlatCount - rightFlatCount || theaderPosition === 'right'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_16___default()(_cx, _styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].leaf, wrapped.isLeaf || col.isHeaderMerge), _cx)),
           colSpan: colSpan,
-          rowSpan: isLeaf ? rowCount - level : undefined,
+          rowSpan: isLeaf || col.isHeaderMerge ? rowCount - level : undefined,
           style: _objectSpread(_objectSpread({
             textAlign: col.align,
             verticalAlign: (_col$verticalAlign = col.verticalAlign) !== null && _col$verticalAlign !== void 0 ? _col$verticalAlign : 'middle'
@@ -14216,7 +14220,9 @@ function getTreeDepth(nodes) {
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var column = _step.value;
-        if (Object(_isLeafNode__WEBPACK_IMPORTED_MODULE_11__["default"])(column)) {
+        var isHeaderMerge = (column === null || column === void 0 ? void 0 : column.isHeaderMerge) === true;
+        // 当列配置了 isHeaderMerge 时，将其视作“可视叶子”，不再深入子层计算深度
+        if (Object(_isLeafNode__WEBPACK_IMPORTED_MODULE_11__["default"])(column) || isHeaderMerge) {
           maxDepth = Math.max(maxDepth, depth);
         } else {
           dfs(column.children, depth + 1);