@kdcloudjs/table 1.2.1-canary.7 → 1.2.2-canary.10

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

@@ -152,7 +152,7 @@ function rowGrouping() {
         });
       };
       return (0, _concat.default)(_context3 = [(0, _extends3.default)((0, _extends3.default)({}, firstCol), {
-        title: ( /*#__PURE__*/_react.default.createElement("div", {
+        title: (/*#__PURE__*/_react.default.createElement("div", {
           style: {
             display: 'inline-block',
             marginLeft: textOffset

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

@@ -77,7 +77,7 @@ function DefaultSortHeaderCell(_ref2) {
     className: (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _styles.Classes.tableSortIcon, true), "active", sortOrder === 'desc' || sortOrder === 'asc')),
     size: 16,
     order: sortOrder
-  }), sortOptions.mode === 'multiple' && sortIndex !== -1 && ( /*#__PURE__*/_react.default.createElement("div", {
+  }), sortOptions.mode === 'multiple' && sortIndex !== -1 && (/*#__PURE__*/_react.default.createElement("div", {
     style: {
       userSelect: 'none',
       marginLeft: 2,

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

@@ -28,7 +28,7 @@ function tips() {
       }
       var justifyContent = col.align === 'right' ? 'flex-end' : col.align === 'center' ? 'center' : 'flex-start';
       return (0, _extends2.default)((0, _extends2.default)({}, col), {
-        title: ( /*#__PURE__*/_react.default.createElement(HeaderCellWithTips, {
+        title: (/*#__PURE__*/_react.default.createElement(HeaderCellWithTips, {
           style: {
             justifyContent: justifyContent
           }

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

@@ -1,6 +1,7 @@
 import React from 'react';
 import { TablePipeline } from '../pipeline';
 export declare const treeMetaSymbol: unique symbol;
+export declare const treeModeOptionsKey = "treeModeOptions";
 interface ExpandIconProps extends React.DOMAttributes<Element> {
     expanded: boolean;
     style: React.CSSProperties;

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

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.treeMetaSymbol = void 0;
 exports.treeMode = treeMode;
+exports.treeModeOptionsKey = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 var _extends3 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
@@ -25,9 +26,10 @@ var _internals = require("../../internals");
 var _utils = require("../../utils");
 var _styles = require("../../base/styles");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof _Symbol2 && _getIteratorMethod(r) || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, 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 o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray(r, a) { if (r) { var _context2; if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = _sliceInstanceProperty(_context2 = {}.toString.call(r)).call(_context2, 8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? _Array$from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _unsupportedIterableToArray(r, a) { if (r) { var _context3; if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = _sliceInstanceProperty(_context3 = {}.toString.call(r)).call(_context3, 8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? _Array$from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var treeMetaSymbol = exports.treeMetaSymbol = (0, _symbol.default)('treeMetaSymbol');
+var treeModeOptionsKey = exports.treeModeOptionsKey = 'treeModeOptions';
 function treeMode() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function treeModeStep(pipeline) {
@@ -36,6 +38,7 @@ function treeMode() {
     var ctx = pipeline.ctx;
     var primaryKey = pipeline.ensurePrimaryKey('treeMode');
     var openKeys = (_c = (_b = (_a = opts.openKeys) !== null && _a !== void 0 ? _a : pipeline.getStateAtKey(stateKey)) !== null && _b !== void 0 ? _b : opts.defaultOpenKeys) !== null && _c !== void 0 ? _c : [];
+    var curSort = pipeline.getStateAtKey('sort');
     var openKeySet = new _set.default(openKeys);
     var onChangeOpenKeys = function onChangeOpenKeys(nextKeys, key, action) {
       var _a;
@@ -65,16 +68,37 @@ function treeMode() {
     var iconIndent = (_g = opts.iconIndent) !== null && _g !== void 0 ? _g : ctx.indents.iconIndent;
     var iconGap = (_h = opts.iconGap) !== null && _h !== void 0 ? _h : ctx.indents.iconGap;
     var indentSize = (_j = opts.indentSize) !== null && _j !== void 0 ? _j : ctx.indents.indentSize;
+    pipeline.setFeatureOptions(treeModeOptionsKey, {
+      iconWidth: iconWidth,
+      iconIndent: iconIndent,
+      iconGap: iconGap,
+      indentSize: indentSize,
+      treeMetaKey: treeMetaKey,
+      isExpanded: function isExpanded(rowKey) {
+        return openKeySet.has(rowKey);
+      },
+      onExpand: function onExpand(rowKey) {
+        var _context2;
+        onChangeOpenKeys((0, _concat.default)(_context2 = []).call(_context2, (0, _toConsumableArray2.default)(openKeys), [rowKey]), rowKey, 'expand');
+      },
+      onCollapse: function onCollapse(rowKey) {
+        onChangeOpenKeys((0, _filter.default)(openKeys).call(openKeys, function (key) {
+          return key !== rowKey;
+        }), rowKey, 'collapse');
+      }
+    });
     var Icon = opts.icon;
     return pipeline.mapDataSource(processDataSource).mapColumns(processColumns);
     function processDataSource(input) {
-      if (pipeline.isSameInputDataSource() && openKeys === pipeline.getFeatureOptions('lastOpenKeys')) {
+      if (pipeline.isSameInputDataSource() && openKeys === pipeline.getFeatureOptions('lastOpenKeys') && curSort === pipeline.getFeatureOptions('lastSort')) {
         return pipeline.getFeatureOptions('lastTreeMode');
       }
-      pipeline.setFeatureOptions('lastOpenKeys', pipeline.getStateAtKey(stateKey));
+      pipeline.setFeatureOptions('lastOpenKeys', openKeys);
+      pipeline.setFeatureOptions('lastSort', curSort);
       var result = [];
       dfs(input, 0);
       function dfs(nodes, depth) {
+        var parentNode = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
         if (nodes == null) {
           return;
         }
@@ -84,6 +108,7 @@ function treeMode() {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var node = _step.value;
             var rowKey = _internals.internals.safeGetRowKey(primaryKey, node, -1);
+            var parentRowKey = parentNode ? _internals.internals.safeGetRowKey(primaryKey, parentNode, -1) : null;
             var expanded = openKeySet.has(rowKey);
             var isLeaf = isLeafNode(node, {
               depth: depth,
@@ -94,11 +119,12 @@ function treeMode() {
               depth: depth,
               isLeaf: isLeaf,
               expanded: expanded,
-              rowKey: rowKey
+              rowKey: rowKey,
+              parentRowKey: parentRowKey
             };
             result.push((0, _extends3.default)((0, _defineProperty2.default)({}, treeMetaKey, treeMeta), node));
             if (!isLeaf && expanded) {
-              dfs(node.children, depth + 1);
+              dfs(node.children, depth + 1, node);
             }
           }
         } catch (err) {
@@ -175,15 +201,19 @@ function treeMode() {
       };
       var getCellProps = function getCellProps(value, record, rowIndex) {
         var prevProps = _internals.internals.safeGetCellProps(expandCol, record, rowIndex);
-        if (record[treeMetaKey] == null) {
+        if (record[treeMetaKey] == null || clickArea !== 'cell') {
           // 没有 treeMeta 信息的话，就返回原先的 cellProps
-          return prevProps;
+          return (0, _utils.mergeCellProps)(prevProps, {
+            className: _styles.Classes.tableExtendCell
+          });
         }
         var _record$treeMetaKey2 = record[treeMetaKey],
           isLeaf = _record$treeMetaKey2.isLeaf,
           rowKey = _record$treeMetaKey2.rowKey;
         if (isLeaf) {
-          return prevProps;
+          return (0, _utils.mergeCellProps)(prevProps, {
+            className: _styles.Classes.tableExtendCell
+          });
         }
         return (0, _utils.mergeCellProps)(prevProps, {
           onClick: function onClick(e) {
@@ -194,18 +224,19 @@ function treeMode() {
           },
           style: {
             cursor: 'pointer'
-          }
+          },
+          className: _styles.Classes.tableExtendCell
         });
       };
       columns[expandColIndex] = (0, _extends3.default)((0, _extends3.default)({}, expandCol), {
-        title: ( /*#__PURE__*/_react.default.createElement("span", {
+        title: (/*#__PURE__*/_react.default.createElement("span", {
           style: {
             marginLeft: iconIndent + iconWidth + iconGap,
             display: 'flex'
           }
         }, _internals.internals.safeRenderHeader(expandCol))),
         render: render,
-        getCellProps: clickArea === 'cell' ? getCellProps : expandCol.getCellProps
+        getCellProps: getCellProps
       });
       return (0, _toConsumableArray2.default)(columns);
     }

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

@@ -90,6 +90,9 @@ export declare class TablePipeline {
     setFeatureOptions(optionKey: string, value: any): void;
     /** 获取 BaseTable 的 props，结果中包含 dataSource/columns/primaryKey/getRowProps 四个字段 */
     getProps(this: TablePipeline): TableProps;
+    getFeatureApi(featureName: string): any;
+    addFeatureApi(featureName: string): any;
+    getLastPipeline(): any;
 }
 export declare function useTablePipeline(ctx?: Partial<TablePipelineCtx>): TablePipeline;
 export {};

package/lib/table/pipeline/pipeline.js

@@ -16,6 +16,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpe
 var _react = require("react");
 var _utils = require("../utils");
 var _autoFill = require("./features/autoFill");
+var _utils2 = require("./features/featureApi/utils");
 /**
  * 表格数据处理流水线。TablePipeline 提供了表格数据处理过程中的一些上下方与工具方法，包括……
  *
@@ -132,6 +133,7 @@ var TablePipeline = exports.TablePipeline = /*#__PURE__*/function () {
       this._isSameInputDataSource = _input.dataSource === this.ref.current._lastInputDataSource;
       this._dataSource = _input.dataSource;
       this.ref.current._lastInputDataSource = _input.dataSource;
+      this.ref.current.lastPipeline = this;
       this._columns = (0, _map.default)(_context = _input.columns).call(_context, function (col) {
         return (0, _extends3.default)((0, _extends3.default)({}, col), {
           key: _this.guid()
@@ -262,6 +264,25 @@ var TablePipeline = exports.TablePipeline = /*#__PURE__*/function () {
       };
       return result;
     }
+  }, {
+    key: "getFeatureApi",
+    value: function getFeatureApi(featureName) {
+      var _a;
+      return (_a = this.ref.current.featureApi) === null || _a === void 0 ? void 0 : _a[featureName];
+    }
+  }, {
+    key: "addFeatureApi",
+    value: function addFeatureApi(featureName) {
+      if (!this.getFeatureApi(featureName)) {
+        this.ref.current.featureApi[featureName] = (0, _utils2.createFeatureApi)(featureName, this);
+      }
+      return this.ref.current.featureApi[featureName];
+    }
+  }, {
+    key: "getLastPipeline",
+    value: function getLastPipeline() {
+      return this.ref.current.lastPipeline;
+    }
   }]);
 }();
 TablePipeline.defaultIndents = {
@@ -276,7 +297,8 @@ function useTablePipeline(ctx) {
     state = _useState2[0],
     setState = _useState2[1];
   var ref = (0, _react.useRef)({
-    featureOptions: {}
+    featureOptions: {},
+    featureApi: {}
   });
   return new TablePipeline({
     state: state,

package/lib/table/style/index.less

@@ -1 +1 @@
-
+

package/lib/table/transforms/columnResize.js

@@ -85,7 +85,7 @@ function makeColumnResizeTransform(_ref) {
     var prevTitle = _internals.internals.safeRenderHeader(col);
     return (0, _extends2.default)((0, _extends2.default)({}, col), {
       width: sizes[range.start],
-      title: ( /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, prevTitle, /*#__PURE__*/_react.default.createElement(ResizeHandle, {
+      title: (/*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, prevTitle, /*#__PURE__*/_react.default.createElement(ResizeHandle, {
         className: "resize-handle",
         onMouseDown: function onMouseDown(e) {
           return startResize(range.start, e);

package/lib/table/transforms/sort.js

@@ -89,7 +89,7 @@ function DefaultSortHeaderCell(_ref2) {
     },
     size: 16,
     order: sortOrder
-  }), sortOptions.mode === 'multiple' && sortIndex != -1 && ( /*#__PURE__*/_react.default.createElement("div", {
+  }), sortOptions.mode === 'multiple' && sortIndex != -1 && (/*#__PURE__*/_react.default.createElement("div", {
     style: {
       userSelect: 'none',
       marginLeft: 2,

package/lib/table/transforms/tips.js

@@ -27,7 +27,7 @@ function makeTipsTransform(_ref) {
     }
     var justifyContent = col.align === 'right' ? 'flex-end' : col.align === 'center' ? 'center' : 'flex-start';
     return (0, _extends2.default)((0, _extends2.default)({}, col), {
-      title: ( /*#__PURE__*/_react.default.createElement(HeaderCellWithTips, {
+      title: (/*#__PURE__*/_react.default.createElement(HeaderCellWithTips, {
         style: {
           justifyContent: justifyContent
         }

package/lib/table/transforms/treeMode.js

@@ -197,7 +197,7 @@ function makeTreeModeTransform(_ref) {
         });
       };
       return (0, _concat.default)(_context2 = [(0, _extends3.default)((0, _extends3.default)({}, firstCol), {
-        title: ( /*#__PURE__*/_react.default.createElement("span", {
+        title: (/*#__PURE__*/_react.default.createElement("span", {
           style: {
             marginLeft: iconIndent + ICON_WIDTH + iconGap
           }