uiw 5.0.0-bate-8 → 5.0.0-bate-10

package/dist/uiw.js

@@ -16906,24 +16906,35 @@ class NodeTreeData {
     var parentKey = this.childToParent.get(key) || '';
     var childList = this.parentToChild.get(parentKey) || [];
     var summary = {};
+    var summaryCount = {};
     var lg = childList.length;
     for (var index = 0; index < lg; index++) {
       var childKey = childList[index];
       if (expandedKeys.includes(childKey)) {
         (function () {
-          summary[childKey] = 1;
+          summary[childKey] = {
+            count: 1,
+            level: index
+          };
           var count = _this.childTreeCount.get(childKey || '') || 0;
           Object.entries(summary).forEach(_ref => {
             var [k, value] = _ref;
             /**计算合并行个数*/
-            summary[k] = value + count;
+            summary[k] = {
+              count: value.count + count,
+              level: value.level
+            };
+            summaryCount[value.level] = value.count + count;
           });
         })();
       } else {
         break;
       }
     }
-    return summary;
+    return {
+      summary,
+      summaryCount
+    };
   }
 }
 var getRowSpan = (rowSpan, leve, index) => {
@@ -17109,11 +17120,13 @@ function TableTr(props) {
     header,
     isAutoExpanded = true,
     treeData,
-    isAutoMergeRowSpan
+    isAutoMergeRowSpan,
+    expandIndex,
+    setExpandIndex
   } = props;
   var [isOpacity, setIsOpacity] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false);
   var [childrenIndex, setChildrenIndex] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0);
-  var [expandIndex, setExpandIndex] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)([]);
+  // const [expandIndex, setExpandIndex] = useState<Array<T[keyof T] | number>>([]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(() => {
     setIsOpacity(!!(data != null && data.find(it => it[childrenColumnName])));
     setChildrenIndex((keys == null ? void 0 : keys.findIndex(it => it.key === 'uiw-expanded')) === -1 ? 0 : 1);
@@ -17151,22 +17164,30 @@ function TableTr(props) {
   return /*#__PURE__*/(0,jsx_runtime.jsx)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
     children: data.map((trData, rowNum) => {
       var key = rowKey ? trData[rowKey] : rowNum;
-      var summary = treeData == null ? void 0 : treeData.getSum(key, expandIndex);
+      var summary = treeData == null ? void 0 : treeData.getSum(key, expandIndex || []);
       return /*#__PURE__*/(0,jsx_runtime.jsxs)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
         children: [/*#__PURE__*/(0,jsx_runtime.jsx)("tr", {
           children: keys.map((keyName, colNum) => {
+            var isHasChildren = Array.isArray(trData[childrenColumnName]);
             var itemShow = {};
             if (isAutoMergeRowSpan && summary) {
-              itemShow = getRowSpan(summary[key], hierarchy, colNum);
-              if (!itemShow.show) {
-                return /*#__PURE__*/(0,jsx_runtime.jsx)(external_root_React_commonjs2_react_commonjs_react_amd_react_.Fragment, {});
+              var newLaval = Reflect.get(keyName, 'level');
+              var summaryCount = summary.summaryCount[newLaval];
+              if (hierarchy === newLaval && isHasChildren) {
+                itemShow.rowSpan = summaryCount;
+              } else if (hierarchy && Reflect.has(keyName, 'level') && hierarchy > newLaval) {
+                return /*#__PURE__*/(0,jsx_runtime.jsx)(external_root_React_commonjs2_react_commonjs_react_amd_react_.Fragment, {}, colNum);
               }
             }
             var objs = {
               children: trData[keyName.key]
             };
             if (render[keyName.key]) {
-              var child = render[keyName.key](trData[keyName.key], keyName.key, trData, rowNum, colNum, itemShow.rowSpan);
+              var child = render[keyName.key](trData[keyName.key], keyName.key, trData, rowNum, colNum, {
+                level: hierarchy,
+                rowSpan: itemShow.rowSpan,
+                summary
+              });
               if ( /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().isValidElement(child)) {
                 objs.children = child;
               } else {
@@ -17183,7 +17204,6 @@ function TableTr(props) {
             } else if (itemShow.rowSpan && isAutoMergeRowSpan) {
               objs.rowSpan = itemShow.rowSpan;
             }
-            var isHasChildren = Array.isArray(trData[childrenColumnName]);
             var isExpanded = false;
             if ((isOpacity || hierarchy || isHasChildren) && colNum === childrenIndex && isAutoExpanded) {
               isExpanded = true;
@@ -17464,7 +17484,7 @@ function esm_Table(props) {
     render,
     ellipsis
   } = getLevelItems(self.selfColumns);
-  var treeData = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(() => isAutoMergeRowSpan && new NodeTreeData(data, rowKey, (expandable == null ? void 0 : expandable.childrenColumnName) || 'children') || undefined, [data, rowKey, expandable == null ? void 0 : expandable.childrenColumnName, isAutoMergeRowSpan]);
+  var treeData = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(() => new NodeTreeData(data, rowKey, (expandable == null ? void 0 : expandable.childrenColumnName) || 'children'), [data, rowKey, expandable == null ? void 0 : expandable.childrenColumnName, isAutoMergeRowSpan]);
   return /*#__PURE__*/(0,jsx_runtime.jsxs)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
     children: [/*#__PURE__*/(0,jsx_runtime.jsx)(TableStyleWrap, extends_extends({
       className: cls
@@ -17501,7 +17521,9 @@ function esm_Table(props) {
             childrenColumnName: (expandable == null ? void 0 : expandable.childrenColumnName) || 'children',
             isAutoExpanded: expandable == null ? void 0 : expandable.isAutoExpanded,
             treeData: treeData,
-            isAutoMergeRowSpan: isAutoMergeRowSpan
+            isAutoMergeRowSpan: isAutoMergeRowSpan,
+            expandIndex: expandIndex,
+            setExpandIndex: setExpandIndex
           })
         }), data && data.length === 0 && empty && /*#__PURE__*/(0,jsx_runtime.jsx)("tbody", {
           children: /*#__PURE__*/(0,jsx_runtime.jsx)("tr", {