@kdcloudjs/table 1.0.2 → 1.1.0

package/lib/table/pipeline/features/columnDrag.js

@@ -7,37 +7,49 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.columnDrag = columnDrag;
 
+var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 
-var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
 
 var _utils = require("../../utils");
 
 var _autoFill = require("./autoFill");
 
 var stateKey = 'columnDrag';
+var SCROLL_SIZE = 30;
 
-function sortColumns(cloumns, sort) {
-  var res = new Array(cloumns.length);
+function sortColumns(columns, sort) {
+  var res = new Array(columns.length);
+  var lastColumns = (0, _toConsumableArray2.default)(columns);
 
-  while (cloumns.length) {
-    var cloumn = cloumns.pop();
+  while (columns.length) {
+    var cloumn = columns.pop();
     res[sort[cloumn.code]] = cloumn;
   }
 
+  if ((0, _filter.default)(res).call(res, Boolean).length !== lastColumns.length) {
+    return lastColumns;
+  }
+
   return res;
 }
 
+function stopClickPropagation(e) {
+  e.stopPropagation();
+}
+
 function columnDrag() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function (pipeline) {
     var _pipeline$getStateAtK = pipeline.getStateAtKey(stateKey, {}),
-        cloumnsSortData = _pipeline$getStateAtK.cloumnsSortData,
         cloumnsTranslateData = _pipeline$getStateAtK.cloumnsTranslateData;
 
-    var columns = pipeline.getColumns(); // if (cloumnsSortData) {
+    var columns = pipeline.getColumns();
+    var tableBody = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.tableBody; // if (cloumnsSortData) {
     //   columns = sortColumns(columns, cloumnsSortData)
     // }
 
@@ -79,28 +91,55 @@ function columnDrag() {
             var columns = pipeline.getColumns();
 
             var _pipeline$getStateAtK2 = pipeline.getStateAtKey(stateKey, {}),
-                cloumnsSortData = _pipeline$getStateAtK2.cloumnsSortData,
                 cloumnsTranslateData = _pipeline$getStateAtK2.cloumnsTranslateData;
 
-            if (cloumnsSortData) {
-              columns = sortColumns(columns, cloumnsSortData);
-            } else {
-              cloumnsSortData = {};
-              columns.forEach(function (item, index) {
-                cloumnsSortData[item.code] = index;
-              });
-            }
-
+            var cloumnsSortData = {};
+            columns.forEach(function (item, index) {
+              cloumnsSortData[item.code] = index;
+            });
             var currentTarget = e.currentTarget;
             var rect = e.currentTarget.parentElement.getClientRects()[0];
             var startX = rect.left;
             var moveData = [];
             var allColumns = (0, _utils.collectNodes)(columns);
+            var tableBodyClientRect = tableBody.getBoundingClientRect();
+            var startScrollLeft = pipeline.ref.current.domHelper.virtual.scrollLeft;
+
+            var updateScrollPosition = function updateScrollPosition(client) {
+              var clientX = client.clientX;
+              var left = tableBodyClientRect.left,
+                  width = tableBodyClientRect.width;
+
+              if (clientX + SCROLL_SIZE >= left + width) {
+                pipeline.ref.current.domHelper.virtual.scrollLeft += SCROLL_SIZE;
+              }
+
+              if (clientX - SCROLL_SIZE <= left) {
+                pipeline.ref.current.domHelper.virtual.scrollLeft -= SCROLL_SIZE;
+              }
+            };
+
+            var stopClickPropagationFlag = false;
 
             function handleMouseMove(e) {
-              if (e.clientX - startX < 20) {
+              var client = {
+                clientX: e.clientX,
+                clientY: e.clientY
+              };
+              var scrollDistance = pipeline.ref.current.domHelper.virtual.scrollLeft - startScrollLeft;
+              var leftPosition = startX - scrollDistance; // 表头最左边起点
+
+              updateScrollPosition(client);
+
+              if (e.clientX - leftPosition < 20) {
                 return;
               } else {
+                // 阻止列头点击事件，防止拖动后触发列头过滤事件
+                if (stopClickPropagationFlag === false) {
+                  stopClickPropagationFlag = true;
+                  currentTarget.addEventListener('click', stopClickPropagation);
+                }
+
                 e.stopPropagation();
               }
 
@@ -137,7 +176,7 @@ function columnDrag() {
               var replaceIndex = 0;
               var totalWitdth = getColumnWidth(columns[replaceIndex]);
 
-              while (totalWitdth < e.clientX - startX && replaceIndex < columns.length - 1) {
+              while (totalWitdth < e.clientX - leftPosition && replaceIndex < columns.length - 1) {
                 replaceIndex++;
                 totalWitdth += getColumnWidth(columns[replaceIndex]);
               } // 需要取最新startIndex, 不能直接用makeRecursiveMapper提供的startIndex（因为map时还没添加选择列、充满列等后面use添加的列）
@@ -210,7 +249,6 @@ function columnDrag() {
 
               window.requestAnimationFrame(function () {
                 pipeline.setStateAtKey(stateKey, {
-                  cloumnsSortData: cloumnsSortData,
                   cloumnsTranslateData: cloumnsTranslateData
                 });
                 moveData = [startIndex, replaceIndex];
@@ -222,6 +260,11 @@ function columnDrag() {
               document.body.removeEventListener('mousemove', handleMouseMove);
               document.body.removeEventListener('mouseup', handleMouseUp);
               window.requestAnimationFrame(function () {
+                // 取消阻止列头点击事件
+                currentTarget.removeEventListener('click', stopClickPropagation);
+                stopClickPropagationFlag = false;
+                currentTarget = null;
+
                 var _moveData = moveData,
                     _moveData2 = (0, _slicedToArray2.default)(_moveData, 2),
                     startIndex = _moveData2[0],
@@ -290,14 +333,12 @@ function columnDrag() {
                 }
 
                 pipeline.setStateAtKey(stateKey, {
-                  cloumnsSortData: cloumnsSortData,
                   cloumnsTranslateData: null
                 });
               });
               document.body.style.userSelect = '';
               currentTarget.style.opacity = '';
               currentTarget.style.cursor = '';
-              currentTarget = null;
             }
 
             document.body.addEventListener('mousemove', handleMouseMove);

package/lib/table/pipeline/features/contextMenu.js

@@ -123,20 +123,25 @@ function contextMenu() {
     };
 
     var showContextMenu = function showContextMenu(e) {
-      var dataSource = pipeline.getDataSource();
-      var cellEle = getCellEleForEvent(e);
+      var path = (0, _utils.getEventPath)(e);
+      var cellEle = getCellEleInEventPath(path);
       var code;
       var rowIndex;
+      var isInFooter;
 
       if (cellEle) {
-        code = cellEle.getAttribute('data-code'), rowIndex = cellEle.getAttribute('data-rowindex');
+        code = cellEle.getAttribute('data-code');
+        rowIndex = cellEle.getAttribute('data-rowindex');
+        isInFooter = isElementInsideTheFooter(cellEle);
       } else {
-        var rowEle = getRowEleForEvent(e, dataSource);
+        var rowEle = getRowEleInEventPath(path);
         rowIndex = rowEle === null || rowEle === void 0 ? void 0 : rowEle.getAttribute('data-rowindex');
+        isInFooter = isElementInsideTheFooter(rowEle);
       }
 
+      var dataSource = isInFooter ? pipeline.getFooterDataSource() || [] : pipeline.getDataSource();
       var record = dataSource[rowIndex];
-      var column = code !== undefined && (0, _others.findByTree)(pipeline.getColumns(), function (item, index) {
+      var column = code !== undefined && (0, _others.findByTree)(pipeline.getColumns(), function (item) {
         return item.code === code;
       });
 
@@ -312,18 +317,6 @@ function isEventFromCurrentPopup(event, ele) {
 
   return false;
 }
-
-function getCellEleInEventPath(path) {
-  return (0, _utils.getTargetEleInEventPath)(path, function (ele) {
-    return ele && ele.getAttribute('data-role') === 'table-cell';
-  });
-}
-
-function getRowEleInEventPath(path) {
-  return (0, _utils.getTargetEleInEventPath)(path, function (ele) {
-    return ele && ele.getAttribute('data-role') === 'table-row';
-  });
-}
 /** 是否点击是外部 end */
 
 /** 计算位置 start */
@@ -400,15 +393,37 @@ function keepWithinBounds(popupParent, ePopup, x, y) {
 /** 获得点击的元素 start */
 
 
-function getCellEleForEvent(event) {
-  return getCellEleInEventPath((0, _utils.getEventPath)(event));
+function getCellEleInEventPath(path) {
+  return (0, _utils.getTargetEleInEventPath)(path, function (ele) {
+    return ele && ele.getAttribute('data-role') === 'table-cell';
+  });
 }
 
-function getRowEleForEvent(event, dataSource) {
-  return getRowEleInEventPath((0, _utils.getEventPath)(event));
+function getRowEleInEventPath(path) {
+  return (0, _utils.getTargetEleInEventPath)(path, function (ele) {
+    return ele && ele.getAttribute('data-role') === 'table-row';
+  });
 }
 /** 获得点击的元素 end */
-// 禁止弹出右键菜单
+
+
+function isElementInsideTheFooter(ele) {
+  var pointer = ele;
+
+  while (pointer) {
+    if (pointer.tagName === 'TFOOT') {
+      return true;
+    }
+
+    if (pointer.tagName === 'TABLE' || pointer.tagName === 'TBODY') {
+      return false;
+    }
+
+    pointer = pointer.parentElement;
+  }
+
+  return false;
+} // 禁止弹出右键菜单
 
 
 function suppressShowContextMenu(e) {

package/lib/table/pipeline/features/multiSelect.js

@@ -26,8 +26,6 @@ var _utils = require("../../utils");
 function multiSelect() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function multiSelectStep(pipeline) {
-    var _context;
-
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
 
     var stateKey = 'multiSelect';
@@ -72,95 +70,103 @@ function multiSelect() {
         allKeys.push(rowKey);
       }
     });
-    var set = new _set.default(value);
-    var isAllChecked = allKeys.length > 0 && allKeys.every(function (key) {
-      return set.has(key);
-    });
-    var isAnyChecked = allKeys.some(function (key) {
-      return set.has(key);
-    });
+    var set = new _set.default(value); // todo: 暂使用hidden隐藏选择列 后续增加配置
+
+    var hiddenSelectColumn = opts.checkboxColumn && opts.checkboxColumn.hidden === true;
+
+    if (!hiddenSelectColumn) {
+      var _context;
 
-    var defaultCheckboxColumnTitle = /*#__PURE__*/_react.default.createElement(Checkbox, {
-      checked: isAllChecked,
-      indeterminate: !isAllChecked && isAnyChecked,
-      onChange: function onChange(_) {
-        if (isAllChecked) {
-          _onChange(_others.arrayUtils.diff(value, allKeys), '', allKeys, 'uncheck-all');
-        } else {
-          _onChange(_others.arrayUtils.merge(value, allKeys), '', allKeys, 'check-all');
+      var isAllChecked = allKeys.length > 0 && allKeys.every(function (key) {
+        return set.has(key);
+      });
+      var isAnyChecked = allKeys.some(function (key) {
+        return set.has(key);
+      });
+
+      var defaultCheckboxColumnTitle = /*#__PURE__*/_react.default.createElement(Checkbox, {
+        checked: isAllChecked,
+        indeterminate: !isAllChecked && isAnyChecked,
+        onChange: function onChange(_) {
+          if (isAllChecked) {
+            _onChange(_others.arrayUtils.diff(value, allKeys), '', allKeys, 'uncheck-all');
+          } else {
+            _onChange(_others.arrayUtils.merge(value, allKeys), '', allKeys, 'check-all');
+          }
         }
-      }
-    });
+      });
 
-    var checkboxColumn = (0, _extends2.default)((0, _extends2.default)({
-      name: '是否选中',
-      title: defaultCheckboxColumnTitle,
-      width: 50,
-      align: 'center'
-    }, opts.checkboxColumn), {
-      getCellProps: function getCellProps(value, row, rowIndex) {
-        var _a, _b;
-
-        var rowKey = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
-
-        var checkboxCellProps = {};
-        var preCellProps = (_b = (_a = opts.checkboxColumn) === null || _a === void 0 ? void 0 : _a.getCellProps) === null || _b === void 0 ? void 0 : _b.call(_a, value, row, rowIndex);
-
-        if (fullKeySet.has(rowKey) && clickArea === 'cell') {
-          var prevChecked = set.has(rowKey);
-          var disabled = isDisabled(row, rowIndex);
-          checkboxCellProps = {
-            style: {
-              cursor: disabled ? 'not-allowed' : 'pointer'
-            },
-            onClick: disabled ? undefined : function (e) {
-              if (opts.stopClickEventPropagation) {
-                e.stopPropagation();
+      var checkboxColumn = (0, _extends2.default)((0, _extends2.default)({
+        name: '是否选中',
+        title: defaultCheckboxColumnTitle,
+        width: 50,
+        align: 'center'
+      }, opts.checkboxColumn), {
+        getCellProps: function getCellProps(value, row, rowIndex) {
+          var _a, _b;
+
+          var rowKey = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
+
+          var checkboxCellProps = {};
+          var preCellProps = (_b = (_a = opts.checkboxColumn) === null || _a === void 0 ? void 0 : _a.getCellProps) === null || _b === void 0 ? void 0 : _b.call(_a, value, row, rowIndex);
+
+          if (fullKeySet.has(rowKey) && clickArea === 'cell') {
+            var prevChecked = set.has(rowKey);
+            var disabled = isDisabled(row, rowIndex);
+            checkboxCellProps = {
+              style: {
+                cursor: disabled ? 'not-allowed' : 'pointer'
+              },
+              onClick: disabled ? undefined : function (e) {
+                if (opts.stopClickEventPropagation) {
+                  e.stopPropagation();
+                }
+
+                onCheckboxChange(prevChecked, rowKey, e.shiftKey);
               }
+            };
+          }
 
-              onCheckboxChange(prevChecked, rowKey, e.shiftKey);
-            }
-          };
-        }
+          return (0, _utils.mergeCellProps)(preCellProps, checkboxCellProps);
+        },
+        render: function render(_, row, rowIndex) {
+          var key = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
 
-        return (0, _utils.mergeCellProps)(preCellProps, checkboxCellProps);
-      },
-      render: function render(_, row, rowIndex) {
-        var key = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
+          var checked = set.has(key);
+          return /*#__PURE__*/_react.default.createElement(Checkbox, {
+            checked: checked,
+            disabled: isDisabled(row, rowIndex),
+            onChange: clickArea === 'checkbox' ? function (arg1, arg2) {
+              var _a; // 这里要同时兼容 antd 和 fusion 的用法
+              // fusion: arg2?.nativeEvent
+              // antd: arg1.nativeEvent
 
-        var checked = set.has(key);
-        return /*#__PURE__*/_react.default.createElement(Checkbox, {
-          checked: checked,
-          disabled: isDisabled(row, rowIndex),
-          onChange: clickArea === 'checkbox' ? function (arg1, arg2) {
-            var _a; // 这里要同时兼容 antd 和 fusion 的用法
-            // fusion: arg2?.nativeEvent
-            // antd: arg1.nativeEvent
 
+              var nativeEvent = (_a = arg2 === null || arg2 === void 0 ? void 0 : arg2.nativeEvent) !== null && _a !== void 0 ? _a : arg1.nativeEvent;
 
-            var nativeEvent = (_a = arg2 === null || arg2 === void 0 ? void 0 : arg2.nativeEvent) !== null && _a !== void 0 ? _a : arg1.nativeEvent;
+              if (nativeEvent) {
+                if (opts.stopClickEventPropagation) {
+                  nativeEvent.stopPropagation();
+                }
 
-            if (nativeEvent) {
-              if (opts.stopClickEventPropagation) {
-                nativeEvent.stopPropagation();
+                onCheckboxChange(checked, key, nativeEvent.shiftKey);
               }
+            } : undefined
+          });
+        }
+      });
+      var nextColumns = (0, _slice.default)(_context = pipeline.getColumns()).call(_context);
+      var checkboxPlacement = (_l = opts.checkboxPlacement) !== null && _l !== void 0 ? _l : 'start';
 
-              onCheckboxChange(checked, key, nativeEvent.shiftKey);
-            }
-          } : undefined
-        });
+      if (checkboxPlacement === 'start') {
+        nextColumns.unshift(checkboxColumn);
+      } else {
+        nextColumns.push(checkboxColumn);
       }
-    });
-    var nextColumns = (0, _slice.default)(_context = pipeline.getColumns()).call(_context);
-    var checkboxPlacement = (_l = opts.checkboxPlacement) !== null && _l !== void 0 ? _l : 'start';
 
-    if (checkboxPlacement === 'start') {
-      nextColumns.unshift(checkboxColumn);
-    } else {
-      nextColumns.push(checkboxColumn);
+      pipeline.columns(nextColumns);
     }
 
-    pipeline.columns(nextColumns);
     pipeline.appendRowPropsGetter(function (row, rowIndex) {
       var rowKey = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
 

package/lib/table/pipeline/features/rowDetail.js

@@ -47,6 +47,8 @@ var _console = _interopRequireDefault(require("../../utils/console"));
 
 var _renderTemplates = _interopRequireDefault(require("../../base/renderTemplates"));
 
+var _base = require("../../base");
+
 var rowDetailSymbol = (0, _symbol.default)('row-detail');
 
 var fallbackRenderDetail = function fallbackRenderDetail() {
@@ -187,7 +189,7 @@ function rowDetail() {
           toggle(rowKey);
         };
 
-        var expandCls = expanded ? 'expanded' : 'collapsed';
+        var expandCls = expanded ? _base.Classes.expanded : _base.Classes.collapsed;
         var ExpandIcon = opts.expandIcon;
         return /*#__PURE__*/_react.default.createElement(_commonViews.ExpansionCell, {
           className: (0, _classnames.default)('expansion-cell', expandCls),

package/lib/table/pipeline/features/rowGrouping.js

@@ -41,6 +41,8 @@ var _utils = require("../../utils");
 
 var _others = require("../../utils/others");
 
+var _base = require("../../base");
+
 var groupingMetaSymbol = (0, _symbol.default)('row-grouping-meta');
 
 function attachGroupingMeta(row) {
@@ -149,7 +151,7 @@ function rowGrouping() {
         }
 
         var expanded = openKeySet.has(row[primaryKey]);
-        var expandCls = expanded ? 'expanded' : 'collapsed';
+        var expandCls = expanded ? _base.Classes.expanded : _base.Classes.collapsed;
         return /*#__PURE__*/_react.default.createElement(_commonViews.ExpansionCell, {
           className: (0, _classnames.default)('expansion-cell', expandCls)
         }, /*#__PURE__*/_react.default.createElement(_commonViews.icons.CaretRight, {

package/lib/table/pipeline/features/treeMode.js

@@ -44,6 +44,8 @@ var _internals = require("../../internals");
 
 var _utils = require("../../utils");
 
+var _styles = require("../../base/styles");
+
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol2 !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray(o, minLen) { var _context3; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty2(_context3 = Object.prototype.toString.call(o)).call(_context3, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -177,7 +179,7 @@ function treeMode() {
 
         if (isLeaf) {
           return /*#__PURE__*/_react.default.createElement(_commonViews.InlineFlexCell, {
-            className: "expansion-cell leaf"
+            className: (0, _classnames.default)('expansion-cell', _styles.Classes.leaf)
           }, /*#__PURE__*/_react.default.createElement("span", {
             style: {
               marginLeft: indent + iconWidth + iconGap
@@ -193,7 +195,7 @@ function treeMode() {
           toggle(rowKey);
         };
 
-        var expandCls = expanded ? 'expanded' : 'collapsed';
+        var expandCls = expanded ? _styles.Classes.expanded : _styles.Classes.collapsed;
         return /*#__PURE__*/_react.default.createElement(_commonViews.ExpansionCell, {
           className: (0, _classnames.default)('expansion-cell', expandCls),
           style: {

package/lib/table/pipeline/pipeline.d.ts

@@ -36,6 +36,7 @@ export declare class TablePipeline {
     private _tableProps;
     private _dataSource;
     private _columns;
+    private _footerDataSource;
     static defaultIndents: TablePipelineIndentsConfig;
     readonly ctx: TablePipelineCtx;
     private readonly state;
@@ -51,6 +52,7 @@ export declare class TablePipeline {
     addTableProps(props: React.HTMLAttributes<HTMLTableElement>): void;
     getDataSource(name?: string): any[];
     getColumns(name?: string): any[];
+    getFooterDataSource(): any[];
     getStateAtKey<T = any>(stateKey: string, defaultValue?: T): T;
     /** 将 stateKey 对应的状态设置为 partialState  */
     setStateAtKey(stateKey: string, partialState: any, extraInfo?: any): void;
@@ -67,6 +69,8 @@ export declare class TablePipeline {
     columns(cols: ArtColumn[]): this;
     /** 设置主键 */
     primaryKey(key: PrimaryKey): this;
+    /** 设置页脚数据 */
+    footerDataSource(rows: any[]): this;
     /** 保存快照 */
     snapshot(name: string): this;
     /** @deprecated

package/lib/table/pipeline/pipeline.js

@@ -101,6 +101,11 @@ var TablePipeline = /*#__PURE__*/function () {
         return this._snapshots[name].columns;
       }
     }
+  }, {
+    key: "getFooterDataSource",
+    value: function getFooterDataSource() {
+      return this._footerDataSource;
+    }
   }, {
     key: "getStateAtKey",
     value: function getStateAtKey(stateKey, defaultValue) {
@@ -173,6 +178,14 @@ var TablePipeline = /*#__PURE__*/function () {
       this.ctx.primaryKey = key;
       return this;
     }
+    /** 设置页脚数据 */
+
+  }, {
+    key: "footerDataSource",
+    value: function footerDataSource(rows) {
+      this._footerDataSource = rows;
+      return this;
+    }
     /** 保存快照 */
 
   }, {
@@ -253,6 +266,10 @@ var TablePipeline = /*#__PURE__*/function () {
         result.primaryKey = this.ctx.primaryKey;
       }
 
+      if (this._footerDataSource) {
+        result.footerDataSource = this._footerDataSource;
+      }
+
       if (this._rowPropsGetters.length > 0) {
         result.getRowProps = function (row, rowIndex) {
           return _this2._rowPropsGetters.reduce(function (res, get) {

package/lib/table/pivot/pivot-utils/convert-utils.js

@@ -33,12 +33,16 @@ var _rxjs = require("rxjs");
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _commonViews = require("../../common-views");
 
 var _utils = require("../../utils");
 
 var _simpleEncode = _interopRequireDefault(require("./simpleEncode"));
 
+var _styles = require("../../base/styles");
+
 var _templateObject;
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -47,7 +51,7 @@ function _unsupportedIterableToArray(o, minLen) { var _context3; if (!o) return;
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-var ExpandSpan = _styledComponents.default.span(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: inline-flex;\n  align-items: center;\n  padding: 2px 8px 2px 0;\n  cursor: pointer;\n\n  .icon {\n    fill: #999;\n    margin-right: 4px;\n\n    &.expanded {\n      transform-origin: center center;\n      transform: rotate(90deg);\n    }\n  }\n"])));
+var ExpandSpan = _styledComponents.default.span(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: inline-flex;\n  align-items: center;\n  padding: 2px 8px 2px 0;\n  cursor: pointer;\n\n  .icon {\n    fill: #999;\n    margin-right: 4px;\n\n    &.", " {\n      transform-origin: center center;\n      transform: rotate(90deg);\n    }\n  }\n"])), _styles.Classes.expanded);
 
 function convertDrillTreeToCrossTree(drillTree) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
@@ -140,7 +144,7 @@ function convertDrillTreeToCrossTree(drillTree) {
                 }), node, 'collapse');
               }
             }, /*#__PURE__*/_react.default.createElement(_commonViews.icons.CaretRight, {
-              className: "icon expanded"
+              className: (0, _classnames.default)('icon', _styles.Classes.expanded)
             }), node.value);
             crossTreeNode.children = dfs(node.children, depth + 1);
           } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/table",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "金蝶 react table 组件",
   "title": "table",
   "keywords": [

package/es/table/pipeline/features/__test__/multiSelect.test.d.ts

@@ -1 +0,0 @@
-export {};