@kdcloudjs/table 1.1.3-canary.5 → 1.1.3-canary.7

package/es/table/base/helpers/getRichVisibleRectsStream.js

@@ -12,7 +12,7 @@ import * as op from 'rxjs/operators';
 import { shallowEqual } from '../utils';
 
 function isWindow(arg) {
-  return arg.toString() === '[object Window]';
+  return arg.toString() === '[object Window]' || arg.toString() === '[object global]';
 }
 
 function isBody(arg) {

package/es/table/pipeline/features/columnFilter.d.ts

@@ -12,7 +12,7 @@ export interface FilterFeatureOptions {
     keepDataSource?: boolean;
     /** 过滤模式。单列过滤 single，多列过滤 multiple，默认为多选 */
     mode?: 'single' | 'multiple';
-    /**过滤图标 */
+    /** 过滤图标 */
     filterIcon?: ReactNode;
     /** 是否对触发弹出过滤面板 的 click 事件调用 event.stopPropagation() */
     stopClickEventPropagation?: boolean;

package/es/table/pipeline/features/columnFilter.js

@@ -39,7 +39,7 @@ export function filter() {
       return _mapInstanceProperty(columns).call(columns, dfs);
 
       function dfs(col) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
 
         var result = _extends({}, col);
 
@@ -81,12 +81,13 @@ export function filter() {
           };
 
           var filterPanel = (_d = col.features) === null || _d === void 0 ? void 0 : _d.filterPanel;
-          result.title = _concatInstanceProperty(_context = []).call(_context, _toConsumableArray(_concatInstanceProperty(_context2 = []).call(_context2, (_e = result.title) !== null && _e !== void 0 ? _e : [internals.safeRenderHeader(_extends(_extends({}, col), {
+          var colFilterIcon = (_f = (_e = col.features) === null || _e === void 0 ? void 0 : _e.filterIcon) !== null && _f !== void 0 ? _f : filterIcon;
+          result.title = _concatInstanceProperty(_context = []).call(_context, _toConsumableArray(_concatInstanceProperty(_context2 = []).call(_context2, (_g = result.title) !== null && _g !== void 0 ? _g : [internals.safeRenderHeader(_extends(_extends({}, col), {
             title: null
           }))])), [/*#__PURE__*/React.createElement(Filter, {
             key: "filter",
             FilterPanelContent: filterPanel,
-            filterIcon: filterIcon,
+            filterIcon: colFilterIcon,
             filterModel: inputFiltersMap.get(col.code),
             setFilterModel: handleFilterChanged,
             setFilter: setFilter,
@@ -134,8 +135,8 @@ export function filter() {
         return [item.key, _extends({}, item)];
       }));
 
-      function isMatchedFilterCondition(record, rowIndex) {
-        return !filtersKeys.some(function (key) {
+      function isMatchedFilterCondition(record) {
+        return filtersKeys.every(function (key) {
           var _a, _b;
 
           var filterItem = inputFiltersMap.get(key);
@@ -149,24 +150,43 @@ export function filter() {
           } else {
             console.warn("\u5217[".concat(key, "]\u672A\u914D\u7F6E\u7B5B\u9009\u51FD\u6570\uFF0C\u8BF7\u8BBE\u7F6E column.features.filterable \u6765\u4F5C\u4E3A\u8BE5\u5217\u7684\u7B5B\u9009\u51FD\u6570, \u76EE\u524D\u4F7F\u7528\u9ED8\u8BA4\u5305\u542B\u7B5B\u9009\u51FD\u6570"));
             comparisonFn = _filterInstanceProperty(defaultFilterOptionsMap.get('contain'));
-          } // 不符合过滤条件,退出循环
+          }
 
-
-          return !comparisonFn(_filterInstanceProperty(filterItem), filterItem)(internals.safeGetValue(columnsMap.get(key), record, rowIndex), record);
+          return comparisonFn(_filterInstanceProperty(filterItem), filterItem)(internals.safeGetValue(columnsMap.get(key), record, -1), record);
         });
       }
 
-      return dataSource.reduce(function (pre, record, rowIndex) {
-        if (isMatchedFilterCondition(record, rowIndex)) {
-          return _concatInstanceProperty(pre).call(pre, [record]);
-        }
-
-        return pre;
-      }, []);
+      return layeredFilter(dataSource, isMatchedFilterCondition);
     }
 
     pipeline.dataSource(processDataSource(dataSource));
     pipeline.columns(processColumns(columns));
     return pipeline;
   };
+}
+
+function layeredFilter(array, matchFn) {
+  return dfs(array);
+
+  function dfs(rows) {
+    var _context6;
+
+    var parentMatched = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    return _filterInstanceProperty(_context6 = _mapInstanceProperty(rows).call(rows, function (row) {
+      var currentMatched = matchFn(row);
+
+      if (isLeafNode(row)) {
+        return (parentMatched || currentMatched) && _extends({}, row);
+      }
+
+      var children = row.children;
+
+      var rowAfterFilterChildren = _extends(_extends({}, row), {
+        children: dfs(children, parentMatched || currentMatched)
+      });
+
+      var matchedByChildren = !isLeafNode(rowAfterFilterChildren);
+      return (parentMatched || currentMatched || matchedByChildren) && rowAfterFilterChildren;
+    })).call(_context6, Boolean);
+  }
 }

package/es/table/pipeline/features/filter/Filter.js

@@ -136,7 +136,7 @@ function Filter(_ref2) {
     fill: "currentColor",
     "aria-hidden": "true"
   }, /*#__PURE__*/React.createElement("path", {
-    d: "M349 838c0 17.7 14.2 32 31.8 32h262.4c17.6 0 31.8-14.3\r\n              31.8-32V642H349v196zm531.1-684H143.9c-24.5 0-39.8 26.7-27.5\r\n              48l221.3 376h348.8l221.3-376c12.1-21.3-3.2-48-27.7-48z"
+    d: "M349 838c0 17.7 14.2 32 31.8 32h262.4c17.6 0 31.8-14.3\n              31.8-32V642H349v196zm531.1-684H143.9c-24.5 0-39.8 26.7-27.5\n              48l221.3 376h348.8l221.3-376c12.1-21.3-3.2-48-27.7-48z"
   }))), showPanel && /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement(Panel, {
     ele: iconRef.current,
     filterIcon: filterIcon,

package/es/table/pipeline/features/filter/FilterPanel.js

@@ -72,7 +72,7 @@ function FilterPanel(_ref) {
     fill: "currentColor",
     "aria-hidden": "true"
   }, /*#__PURE__*/React.createElement("path", {
-    d: "M349 838c0 17.7 14.2 32 31.8 32h262.4c17.6 0 31.8-14.3\r\n              31.8-32V642H349v196zm531.1-684H143.9c-24.5 0-39.8 26.7-27.5\r\n              48l221.3 376h348.8l221.3-376c12.1-21.3-3.2-48-27.7-48z"
+    d: "M349 838c0 17.7 14.2 32 31.8 32h262.4c17.6 0 31.8-14.3\n              31.8-32V642H349v196zm531.1-684H143.9c-24.5 0-39.8 26.7-27.5\n              48l221.3 376h348.8l221.3-376c12.1-21.3-3.2-48-27.7-48z"
   })))), /*#__PURE__*/React.createElement("div", {
     className: "popup-body"
   }, children));

package/es/table/pipeline/features/filter/util.js

@@ -12,7 +12,7 @@ var DEFAULT_FILTER_OPTIONS = [{
         data = data + '';
       }
 
-      return _includesInstanceProperty(data).call(data, value);
+      return _includesInstanceProperty(data).call(data, value[0]);
     };
   }
 }, {
@@ -28,7 +28,7 @@ var DEFAULT_FILTER_OPTIONS = [{
         data = data + '';
       }
 
-      return !_includesInstanceProperty(data).call(data, value);
+      return !_includesInstanceProperty(data).call(data, value[0]);
     };
   }
 }, {
@@ -36,7 +36,7 @@ var DEFAULT_FILTER_OPTIONS = [{
   key: 'equal',
   filter: function filter(value) {
     return function (data) {
-      return value !== data;
+      return value[0] === data;
     };
   }
 }, {
@@ -44,7 +44,7 @@ var DEFAULT_FILTER_OPTIONS = [{
   key: 'notEqual',
   filter: function filter(value) {
     return function (data) {
-      return value !== data;
+      return value[0] !== data;
     };
   }
 }, {

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

@@ -5,7 +5,7 @@ import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instan
 import React from 'react';
 import { internals } from '../../internals';
 import { always, arrayUtils } from '../../utils/others';
-import { mergeCellProps } from '../../utils';
+import { collectNodes, mergeCellProps } from '../../utils';
 export function multiSelect() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function multiSelectStep(pipeline) {
@@ -44,7 +44,8 @@ export function multiSelect() {
     /** 所有有效的 keys（disable 状态为 false） */
 
     var allKeys = [];
-    dataSource.forEach(function (row, rowIndex) {
+    var flatDataSource = collectNodes(dataSource);
+    flatDataSource.forEach(function (row, rowIndex) {
       var rowKey = internals.safeGetRowKey(primaryKey, row, rowIndex);
       fullKeySet.add(rowKey); // 在 allKeys 中排除被禁用的 key
 

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

@@ -32,6 +32,8 @@ export interface TreeModeFeatureOptions {
     stopClickEventPropagation?: boolean;
     /** 指定表格每一行元信息的记录字段 */
     treeMetaKey?: string | symbol;
+    /** 指定展开列 */
+    expandColCode?: string;
 }
 export declare function treeMode(opts?: TreeModeFeatureOptions): (pipeline: TablePipeline) => TablePipeline;
 export {};

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

@@ -1,13 +1,13 @@
+import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
 import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
 import _getIteratorMethod from "@babel/runtime-corejs3/core-js/get-iterator-method";
-import _toArray from "@babel/runtime-corejs3/helpers/toArray";
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _toConsumableArray from "@babel/runtime-corejs3/helpers/toConsumableArray";
 
 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(_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 = _sliceInstanceProperty(_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); }
+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; }
 
@@ -15,7 +15,7 @@ import _Symbol from "@babel/runtime-corejs3/core-js-stable/symbol";
 import _Set from "@babel/runtime-corejs3/core-js-stable/set";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
-import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
+import _findIndexInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find-index";
 import cx from 'classnames';
 import React from 'react';
 import { ExpansionCell, icons, InlineFlexCell } from '../../common-views';
@@ -31,11 +31,6 @@ export function treeMode() {
     var stateKey = 'treeMode';
     var ctx = pipeline.ctx;
     var primaryKey = pipeline.ensurePrimaryKey('treeMode');
-
-    if (typeof primaryKey !== 'string') {
-      throw new Error('treeMode 仅支持字符串作为 primaryKey');
-    }
-
     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 openKeySet = new _Set(openKeys);
 
@@ -90,7 +85,7 @@ export function treeMode() {
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var node = _step.value;
-            var rowKey = node[primaryKey];
+            var rowKey = internals.safeGetRowKey(primaryKey, node, -1);
             var expanded = openKeySet.has(rowKey);
             var isLeaf = isLeafNode(node, {
               depth: depth,
@@ -120,18 +115,20 @@ export function treeMode() {
     }
 
     function processColumns(columns) {
-      var _context2;
-
       if (columns.length === 0) {
         return columns;
       }
 
-      var _columns = _toArray(columns),
-          firstCol = _columns[0],
-          others = _sliceInstanceProperty(_columns).call(_columns, 1);
+      var expandColIndex = _findIndexInstanceProperty(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.safeRender(firstCol, record, recordIndex);
+        var content = internals.safeRender(expandCol, record, recordIndex);
 
         if (record[treeMetaKey] == null) {
           // 没有 treeMeta 信息的话，就返回原先的渲染结果
@@ -191,7 +188,7 @@ export function treeMode() {
       };
 
       var getCellProps = function getCellProps(value, record, rowIndex) {
-        var prevProps = internals.safeGetCellProps(firstCol, record, rowIndex);
+        var prevProps = internals.safeGetCellProps(expandCol, record, rowIndex);
 
         if (record[treeMetaKey] == null) {
           // 没有 treeMeta 信息的话，就返回原先的 cellProps
@@ -220,15 +217,16 @@ export function treeMode() {
         });
       };
 
-      return _concatInstanceProperty(_context2 = [_extends(_extends({}, firstCol), {
+      columns[expandColIndex] = _extends(_extends({}, expandCol), {
         title: /*#__PURE__*/React.createElement("span", {
           style: {
             marginLeft: iconIndent + iconWidth + iconGap
           }
-        }, internals.safeRenderHeader(firstCol)),
+        }, internals.safeRenderHeader(expandCol)),
         render: render,
-        getCellProps: clickArea === 'cell' ? getCellProps : firstCol.getCellProps
-      })]).call(_context2, _toConsumableArray(others));
+        getCellProps: clickArea === 'cell' ? getCellProps : expandCol.getCellProps
+      });
+      return _toConsumableArray(columns);
     }
   };
 }

package/es/table/style/index.less

@@ -1 +1 @@
-
+

package/lib/style/color/colors.less

@@ -1,2 +1,2 @@
-// color palettes
+// color palettes
 @blue-base: #1890ff;

package/lib/style/components.less

@@ -1 +1 @@
-@import "../table\style\index.less";
+@import "../table/style/index.less";

package/lib/style/core/index.less

@@ -1,2 +1,2 @@
-@import 'motion';
+@import 'motion';
 @import 'reset';

package/lib/style/core/motion/other.less

@@ -1,28 +1,28 @@
-@keyframes loadingcircle {
-  100% {
-    transform: rotate(360deg);
-  }
-}
-
-@keyframes waveEffect {
-  100% {
-      box-shadow: 0 0 0 6px @theme-color;
-  }
-}
-
-@keyframes fadeEffect {
-  100% {
-      opacity: 0;
-  }
-}
-
-@keyframes kdRadioEffect {
-  0% {
-    transform: translateY(-50%) scale(0.5);
-    opacity: 0;
-  }
-  100% {
-    transform: translateY(-50%) scale(1);
-    opacity: 1;
-  }
+@keyframes loadingcircle {
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
+@keyframes waveEffect {
+  100% {
+      box-shadow: 0 0 0 6px @theme-color;
+  }
+}
+
+@keyframes fadeEffect {
+  100% {
+      opacity: 0;
+  }
+}
+
+@keyframes kdRadioEffect {
+  0% {
+    transform: translateY(-50%) scale(0.5);
+    opacity: 0;
+  }
+  100% {
+    transform: translateY(-50%) scale(1);
+    opacity: 1;
+  }
 }

package/lib/style/core/motion/slide.less

@@ -1,53 +1,53 @@
-@keyframes kdSlideDownIn {
-  0% {
-    transform: scaleY(0.8);
-    transform-origin: 50% 0%;
-    opacity: 0;
-  }
-  100% {
-    transform: scaleY(1);
-    transform-origin: 50% 0%;
-    opacity: 1;
-  }
-}
-
-@keyframes kdSlideDownOut {
-  0% {
-    transform: scaleY(1);
-    transform-origin: 50% 0%;
-    opacity: 1;
-  }
-  100% {
-    transform: scaleY(0.9);
-    transform-origin: 50% 0%;
-    opacity: 0;
-  }
-}
-
-@keyframes kdSlideUpIn {
-  0% {
-    transform-origin: 50% 100%;
-    opacity: 0;
-  }
-  5% {
-    transform: scaleY(0.8);
-  }
-  100% {
-    transform: scaleY(1);
-    transform-origin: 50% 100%;
-    opacity: 1;
-  }
-}
-
-@keyframes kdSlideUpOut {
-  0% {
-    transform: scaleY(1);
-    transform-origin: 50% 100%;
-    opacity: 1;
-  }
-  100% {
-    transform: scaleY(0.9);
-    transform-origin: 50% 100%;
-    opacity: 0;
-  }
-}
+@keyframes kdSlideDownIn {
+  0% {
+    transform: scaleY(0.8);
+    transform-origin: 50% 0%;
+    opacity: 0;
+  }
+  100% {
+    transform: scaleY(1);
+    transform-origin: 50% 0%;
+    opacity: 1;
+  }
+}
+
+@keyframes kdSlideDownOut {
+  0% {
+    transform: scaleY(1);
+    transform-origin: 50% 0%;
+    opacity: 1;
+  }
+  100% {
+    transform: scaleY(0.9);
+    transform-origin: 50% 0%;
+    opacity: 0;
+  }
+}
+
+@keyframes kdSlideUpIn {
+  0% {
+    transform-origin: 50% 100%;
+    opacity: 0;
+  }
+  5% {
+    transform: scaleY(0.8);
+  }
+  100% {
+    transform: scaleY(1);
+    transform-origin: 50% 100%;
+    opacity: 1;
+  }
+}
+
+@keyframes kdSlideUpOut {
+  0% {
+    transform: scaleY(1);
+    transform-origin: 50% 100%;
+    opacity: 1;
+  }
+  100% {
+    transform: scaleY(0.9);
+    transform-origin: 50% 100%;
+    opacity: 0;
+  }
+}

package/lib/style/core/motion.less

@@ -1,2 +1,2 @@
-@import 'motion/other';
+@import 'motion/other';
 @import 'motion/slide';