@kdcloudjs/table 1.2.1-canary.6 → 1.2.1-canary.7-hotfix.1

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

@@ -1,46 +1,31 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.tips = tips;
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/taggedTemplateLiteral"));
-
 var _react = _interopRequireDefault(require("react"));
-
 var _styledComponents = _interopRequireDefault(require("styled-components"));
-
 var _commonViews = require("../../common-views");
-
 var _internals = require("../../internals");
-
 var _utils = require("../../utils");
-
 var _templateObject;
-
 var HeaderCellWithTips = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  align-items: center;\n\n  .tip-icon-wrapper {\n    margin-left: 2px;\n  }\n\n  .tip-icon {\n    display: flex;\n    fill: currentColor;\n  }\n"])));
-
 function tips() {
   return function tipsSteap(pipeline) {
     var Balloon = pipeline.ctx.components.Balloon;
     var Tooltip = pipeline.ctx.components.Tooltip;
-
     if (Balloon == null && Tooltip == null) {
       throw new Error('使用 tips 之前需要通过 pipeline context 设置 components.Balloon / components.Tooltip');
     }
-
     return pipeline.mapColumns((0, _utils.makeRecursiveMapper)(function (col) {
       var _a;
-
       if (!((_a = col.features) === null || _a === void 0 ? void 0 : _a.tips)) {
         return col;
       }
-
       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, {

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

@@ -1,128 +1,93 @@
 "use strict";
 
 var _sliceInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
-
 var _Array$from = require("@babel/runtime-corejs3/core-js-stable/array/from");
-
 var _Symbol2 = require("@babel/runtime-corejs3/core-js-stable/symbol");
-
 var _getIteratorMethod = require("@babel/runtime-corejs3/core-js/get-iterator-method");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.treeMetaSymbol = void 0;
 exports.treeMode = treeMode;
-
 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"));
-
 var _symbol = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/symbol"));
-
 var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
-
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
-
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
-
 var _findIndex = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find-index"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 var _react = _interopRequireDefault(require("react"));
-
 var _commonViews = require("../../common-views");
-
 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 _context2; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context2 = Object.prototype.toString.call(o)).call(_context2, 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); }
-
 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 treeMetaSymbol = (0, _symbol.default)('treeMetaSymbol');
 exports.treeMetaSymbol = treeMetaSymbol;
-
 function treeMode() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function treeModeStep(pipeline) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-
     var stateKey = '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;
-
       (_a = opts.onChangeOpenKeys) === null || _a === void 0 ? void 0 : _a.call(opts, nextKeys, key, action);
       pipeline.setStateAtKey(stateKey, nextKeys, {
         key: key,
         action: action
       });
     };
-
     var toggle = function toggle(rowKey) {
       var expanded = openKeySet.has(rowKey);
-
       if (expanded) {
         onChangeOpenKeys((0, _filter.default)(openKeys).call(openKeys, function (key) {
           return key !== rowKey;
         }), rowKey, 'collapse');
       } else {
         var _context;
-
         onChangeOpenKeys((0, _concat.default)(_context = []).call(_context, (0, _toConsumableArray2.default)(openKeys), [rowKey]), rowKey, 'expand');
       }
     };
-
     var isLeafNode = (_d = opts.isLeafNode) !== null && _d !== void 0 ? _d : _utils.isLeafNode;
     var clickArea = (_e = opts.clickArea) !== null && _e !== void 0 ? _e : 'cell';
     var treeMetaKey = (_f = opts.treeMetaKey) !== null && _f !== void 0 ? _f : treeMetaSymbol;
-    var stopClickEventPropagation = Boolean(opts.stopClickEventPropagation); // indents
-
+    var stopClickEventPropagation = Boolean(opts.stopClickEventPropagation);
+    // indents
     var iconWidth = ctx.indents.iconWidth;
     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;
     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;
         }
-
         var _iterator = _createForOfIteratorHelper(nodes),
-            _step;
-
+          _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var node = _step.value;
-
             var rowKey = _internals.internals.safeGetRowKey(primaryKey, node, -1);
-
             var expanded = openKeySet.has(rowKey);
             var isLeaf = isLeafNode(node, {
               depth: depth,
@@ -136,7 +101,6 @@ function treeMode() {
               rowKey: rowKey
             };
             result.push((0, _extends3.default)((0, _defineProperty2.default)({}, treeMetaKey, treeMeta), node));
-
             if (!isLeaf && expanded) {
               dfs(node.children, depth + 1);
             }
@@ -147,38 +111,31 @@ function treeMode() {
           _iterator.f();
         }
       }
-
       pipeline.setFeatureOptions('lastTreeMode', result);
       return result;
     }
-
     function processColumns(columns) {
       if (columns.length === 0) {
         return columns;
       }
-
       var expandColIndex = (0, _findIndex.default)(columns).call(columns, function (_ref) {
         var code = _ref.code;
         return code && opts.expandColCode === code;
       });
       expandColIndex = expandColIndex === -1 ? 0 : expandColIndex;
       var expandCol = columns[expandColIndex];
-
       var render = function render(value, record, recordIndex) {
         var content = _internals.internals.safeRender(expandCol, record, recordIndex);
-
         if (record[treeMetaKey] == null) {
           // 没有 treeMeta 信息的话，就返回原先的渲染结果
           return content;
         }
-
         var _record$treeMetaKey = record[treeMetaKey],
-            rowKey = _record$treeMetaKey.rowKey,
-            depth = _record$treeMetaKey.depth,
-            isLeaf = _record$treeMetaKey.isLeaf,
-            expanded = _record$treeMetaKey.expanded;
+          rowKey = _record$treeMetaKey.rowKey,
+          depth = _record$treeMetaKey.depth,
+          isLeaf = _record$treeMetaKey.isLeaf,
+          expanded = _record$treeMetaKey.expanded;
         var indent = iconIndent + depth * indentSize;
-
         if (isLeaf) {
           return /*#__PURE__*/_react.default.createElement(_commonViews.InlineFlexCell, {
             className: (0, _classnames.default)('expansion-cell', _styles.Classes.leaf)
@@ -188,15 +145,12 @@ function treeMode() {
             }
           }, content));
         }
-
         var onClick = function onClick(e) {
           if (stopClickEventPropagation) {
             e.stopPropagation();
           }
-
           toggle(rowKey);
         };
-
         var expandCls = expanded ? _styles.Classes.expanded : _styles.Classes.collapsed;
         return /*#__PURE__*/_react.default.createElement(_commonViews.ExpansionCell, {
           className: (0, _classnames.default)('expansion-cell', expandCls),
@@ -223,29 +177,23 @@ function treeMode() {
           onClick: clickArea === 'icon' ? onClick : undefined
         }), content);
       };
-
       var getCellProps = function getCellProps(value, record, rowIndex) {
         var prevProps = _internals.internals.safeGetCellProps(expandCol, record, rowIndex);
-
         if (record[treeMetaKey] == null) {
           // 没有 treeMeta 信息的话，就返回原先的 cellProps
           return prevProps;
         }
-
         var _record$treeMetaKey2 = record[treeMetaKey],
-            isLeaf = _record$treeMetaKey2.isLeaf,
-            rowKey = _record$treeMetaKey2.rowKey;
-
+          isLeaf = _record$treeMetaKey2.isLeaf,
+          rowKey = _record$treeMetaKey2.rowKey;
         if (isLeaf) {
           return prevProps;
         }
-
         return (0, _utils.mergeCellProps)(prevProps, {
           onClick: function onClick(e) {
             if (stopClickEventPropagation) {
               e.stopPropagation();
             }
-
             toggle(rowKey);
           },
           style: {
@@ -253,7 +201,6 @@ function treeMode() {
           }
         });
       };
-
       columns[expandColIndex] = (0, _extends3.default)((0, _extends3.default)({}, expandCol), {
         title: /*#__PURE__*/_react.default.createElement("span", {
           style: {

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

@@ -1,56 +1,38 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.treeSelect = treeSelect;
-
 var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-
 var _react = _interopRequireDefault(require("react"));
-
 var _others = require("../../utils/others");
-
 var _StrictTreeDataHelper = _interopRequireDefault(require("../../utils/tree-data-helpers/StrictTreeDataHelper"));
-
 var _TreeDataHelper = _interopRequireDefault(require("../../utils/tree-data-helpers/TreeDataHelper"));
-
 var STATE_KEY = 'treeSelect';
-
 function treeSelect(opts) {
   return function treeSelectStep(pipeline) {
     var _ref, _context;
-
     var _a, _b, _c, _d, _e, _f, _g, _h;
-
     var Checkbox = pipeline.ctx.components.Checkbox;
-
     if (Checkbox == null) {
       throw new Error('使用 treeSelect 之前需要通过 pipeline context 设置 components.Checkbox');
     }
-
     var primaryKey = pipeline.ensurePrimaryKey('treeSelect');
-
     if (typeof primaryKey !== 'string') {
       throw new Error('treeSelect 仅支持字符串作为 primaryKey');
     }
-
     var clickArea = (_a = opts.clickArea) !== null && _a !== void 0 ? _a : 'checkbox';
     var isDisabled = (_b = opts.isDisabled) !== null && _b !== void 0 ? _b : (0, _others.always)(false);
     var isDetached = (_c = opts.idDetached) !== null && _c !== void 0 ? _c : (0, _others.always)(false);
     var value = (_f = (_e = (_d = opts.value) !== null && _d !== void 0 ? _d : pipeline.getStateAtKey(STATE_KEY)) !== null && _e !== void 0 ? _e : opts.defaultValue) !== null && _f !== void 0 ? _f : [];
     var tree = opts.rootKey != null ? [(_ref = {}, (0, _defineProperty2.default)(_ref, primaryKey, opts.rootKey), (0, _defineProperty2.default)(_ref, "children", opts.tree), _ref)] : opts.tree;
-
     var getNodeValue = function getNodeValue(node) {
       return node[primaryKey];
     };
-
     var treeDataHelper = opts.checkStrictly ? new _StrictTreeDataHelper.default({
       value: value,
       getNodeValue: getNodeValue,
@@ -62,15 +44,12 @@ function treeSelect(opts) {
       tree: tree,
       checkedStrategy: (_g = opts.checkedStrategy) !== null && _g !== void 0 ? _g : 'parent'
     });
-
     var onToggleKey = function onToggleKey(key) {
       var _a;
-
       var nextValue = treeDataHelper.getValueAfterToggle(key);
       pipeline.setStateAtKey(STATE_KEY, nextValue);
       (_a = opts.onChange) === null || _a === void 0 ? void 0 : _a.call(opts, nextValue);
     };
-
     var makeCheckbox = function makeCheckbox(key, root, row) {
       return /*#__PURE__*/_react.default.createElement(Checkbox, {
         checked: treeDataHelper.isChecked(key),
@@ -81,7 +60,6 @@ function treeSelect(opts) {
         } : undefined
       });
     };
-
     var checkboxColumn = (0, _extends2.default)((0, _extends2.default)({
       name: '',
       width: 50,
@@ -93,13 +71,10 @@ function treeSelect(opts) {
       },
       getCellProps: function getCellProps(value, row) {
         var rowKey = row[primaryKey];
-
         if (clickArea !== 'cell') {
           return;
         }
-
         var disabled = isDisabled(row);
-
         if (disabled) {
           return {
             style: {
@@ -107,7 +82,6 @@ function treeSelect(opts) {
             }
           };
         }
-
         return {
           style: {
             cursor: 'pointer'
@@ -116,7 +90,6 @@ function treeSelect(opts) {
             if (opts.stopClickEventPropagation) {
               e.stopPropagation();
             }
-
             onToggleKey(rowKey);
           }
         };
@@ -124,19 +97,15 @@ function treeSelect(opts) {
     });
     var nextColumns = (0, _slice.default)(_context = pipeline.getColumns()).call(_context);
     var checkboxPlacement = (_h = opts.checkboxPlacement) !== null && _h !== void 0 ? _h : 'start';
-
     if (checkboxPlacement === 'start') {
       nextColumns.unshift(checkboxColumn);
     } else {
       nextColumns.push(checkboxColumn);
     }
-
     pipeline.columns(nextColumns);
-
     if (clickArea === 'row') {
       pipeline.appendRowPropsGetter(function (row) {
         var disabled = isDisabled(row);
-
         if (!disabled) {
           return {
             style: {
@@ -146,14 +115,12 @@ function treeSelect(opts) {
               if (opts.stopClickEventPropagation) {
                 e.stopPropagation();
               }
-
               onToggleKey(row[primaryKey]);
             }
           };
         }
       });
     }
-
     if (opts.highlightRowWhenSelected) {
       pipeline.appendRowPropsGetter(function (row) {
         if (treeDataHelper.isChecked(row[primaryKey])) {
@@ -163,7 +130,6 @@ function treeSelect(opts) {
         }
       });
     }
-
     return pipeline;
   };
 }

package/lib/table/pipeline/index.js

@@ -1,11 +1,8 @@
 "use strict";
 
 var _typeof = require("@babel/runtime-corejs3/helpers/typeof");
-
 var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
-
 var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -22,13 +19,8 @@ Object.defineProperty(exports, "useTablePipeline", {
     return _pipeline.useTablePipeline;
   }
 });
-
 var features = _interopRequireWildcard(require("./features"));
-
 exports.features = features;
-
 var _pipeline = require("./pipeline");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }