@kdcloudjs/table 1.1.4-canary.1 → 1.1.4

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

@@ -1,6 +1,6 @@
 "use strict";
 
-var _sliceInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
+var _sliceInstanceProperty2 = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
 
 var _Array$from = require("@babel/runtime-corejs3/core-js-stable/array/from");
 
@@ -16,6 +16,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.treeMetaSymbol = void 0;
 exports.treeMode = treeMode;
 
+var _toArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toArray"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 
 var _extends3 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
@@ -30,7 +32,7 @@ var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-sta
 
 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 _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
@@ -46,7 +48,7 @@ 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 _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); }
 
 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; }
 
@@ -61,6 +63,11 @@ 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.default(openKeys);
 
@@ -115,9 +122,7 @@ function treeMode() {
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var node = _step.value;
-
-            var rowKey = _internals.internals.safeGetRowKey(primaryKey, node, -1);
-
+            var rowKey = node[primaryKey];
             var expanded = openKeySet.has(rowKey);
             var isLeaf = isLeafNode(node, {
               depth: depth,
@@ -147,19 +152,18 @@ function treeMode() {
     }
 
     function processColumns(columns) {
+      var _context2;
+
       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 _columns = (0, _toArray2.default)(columns),
+          firstCol = _columns[0],
+          others = (0, _slice.default)(_columns).call(_columns, 1);
 
       var render = function render(value, record, recordIndex) {
-        var content = _internals.internals.safeRender(expandCol, record, recordIndex);
+        var content = _internals.internals.safeRender(firstCol, record, recordIndex);
 
         if (record[treeMetaKey] == null) {
           // 没有 treeMeta 信息的话，就返回原先的渲染结果
@@ -219,7 +223,7 @@ function treeMode() {
       };
 
       var getCellProps = function getCellProps(value, record, rowIndex) {
-        var prevProps = _internals.internals.safeGetCellProps(expandCol, record, rowIndex);
+        var prevProps = _internals.internals.safeGetCellProps(firstCol, record, rowIndex);
 
         if (record[treeMetaKey] == null) {
           // 没有 treeMeta 信息的话，就返回原先的 cellProps
@@ -248,16 +252,15 @@ function treeMode() {
         });
       };
 
-      columns[expandColIndex] = (0, _extends3.default)((0, _extends3.default)({}, expandCol), {
+      return (0, _concat.default)(_context2 = [(0, _extends3.default)((0, _extends3.default)({}, firstCol), {
         title: /*#__PURE__*/_react.default.createElement("span", {
           style: {
             marginLeft: iconIndent + iconWidth + iconGap
           }
-        }, _internals.internals.safeRenderHeader(expandCol)),
+        }, _internals.internals.safeRenderHeader(firstCol)),
         render: render,
-        getCellProps: clickArea === 'cell' ? getCellProps : expandCol.getCellProps
-      });
-      return (0, _toConsumableArray2.default)(columns);
+        getCellProps: clickArea === 'cell' ? getCellProps : firstCol.getCellProps
+      })]).call(_context2, (0, _toConsumableArray2.default)(others));
     }
   };
 }

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

@@ -36,7 +36,7 @@ export declare class TablePipeline {
     private _tableProps;
     private _dataSource;
     private _columns;
-    private _footerDataSource?;
+    private _footerDataSource;
     static defaultIndents: TablePipelineIndentsConfig;
     readonly ctx: TablePipelineCtx;
     private readonly state;
@@ -88,10 +88,6 @@ export declare class TablePipeline {
     setFeatureOptions(optionKey: string, value: any): void;
     /** 获取 BaseTable 的 props，结果中包含 dataSource/columns/primaryKey/getRowProps 四个字段 */
     getProps(this: TablePipeline): TableProps;
-    /**
-     * 清除范围选中内容
-     */
-    clearRangeSelection(): void;
 }
 export declare function useTablePipeline(ctx?: Partial<TablePipelineCtx>): TablePipeline;
 export {};

package/lib/table/pipeline/pipeline.js

@@ -28,8 +28,6 @@ var _utils = require("../utils");
 
 var _autoFill = require("./features/autoFill");
 
-var _rangeSelection = require("./features/rangeSelection");
-
 /**
  * 表格数据处理流水线。TablePipeline 提供了表格数据处理过程中的一些上下方与工具方法，包括……
  *
@@ -294,18 +292,18 @@ var TablePipeline = /*#__PURE__*/function () {
 
       result.setTableDomHelper = function (domHelper) {
         _this2.ref.current.domHelper = domHelper;
-      };
+      }; // if (this.getFeatureOptions(rangeSelectionKey)) {
+      //   result.clearRangeSelectionStatus = () => {
+      //     const { rangeSelectedChange } = this.getFeatureOptions(rangeSelectionKey)
+      //     const rangeSelection = this.getStateAtKey(rangeSelectionKey)
+      //     if (rangeSelection) {
+      //       rangeSelectedChange?.(null)
+      //     }
+      //   }
+      // }
 
-      return result;
-    }
-    /**
-     * 清除范围选中内容
-     */
 
-  }, {
-    key: "clearRangeSelection",
-    value: function clearRangeSelection() {
-      this.setStateAtKey(_rangeSelection.rangeSelectionKey, null);
+      return result;
     }
   }]);
   return TablePipeline;

package/lib/table/utils/mergeCellProps.js

@@ -17,9 +17,13 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 function composeEventHandler(handler1, handler2) {
   return function () {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
     // 先执行原有的事件回调函数
-    handler1.apply(void 0, arguments);
-    handler2.apply(void 0, arguments); // 事件回调函数没有返回值，故这里不进行 return
+    handler1(args);
+    handler2(args); // 事件回调函数没有返回值，故这里不进行 return
   };
 }
 /** 合并两个 cellProps（单元格属性）对象，返回一个合并后的全新对象。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/table",
-  "version": "1.1.4-canary.1",
+  "version": "1.1.4",
   "description": "金蝶 react table 组件",
   "title": "table",
   "keywords": [
@@ -54,8 +54,8 @@
     "test:update": "jest --config .jest.js --cache=false -u",
     "test:ci": "jest --config .jest.js  --coverage --ci --update-snapshot",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s --skip-unstable",
-    "pub": "npm run test:all && npm run build && cross-env PUB_ENV=pub np --no-cleanup --no-tests",
-    "pub:canary": "npm run build && cross-env PUB_ENV=pub np --no-cleanup --anyBranch --no-tests --tag=canary",
+    "pub": "npm run build && cross-env PUB_ENV=pub np --no-cleanup --no-tests",
+    "pub:beta": "npm run test:all && npm run build && cross-env PUB_ENV=pub np --no-cleanup --anyBranch --no-tests --tag=beta",
     "new": "node scripts/create-component.js",
     "kd-ui": "npm install @kingdee-ui/kui --registry http://npm.kingdee.com/"
   },

package/es/table/pipeline/features/filter/DefaultFilterIcon.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="react" />
-export default function DefaultFilterIcon({ width, height }: {
-    width: string | number;
-    height: string | number;
-}): JSX.Element;

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

@@ -1,20 +0,0 @@
-import React from 'react';
-export default function DefaultFilterIcon(_ref) {
-  var width = _ref.width,
-      height = _ref.height;
-  return /*#__PURE__*/React.createElement("svg", {
-    width: width,
-    height: height,
-    style: {
-      verticalAlign: 'middle'
-    },
-    viewBox: "0 0 1024 1024",
-    focusable: "false",
-    "data-icon": "filter",
-    fill: "currentColor",
-    version: "1.1",
-    xmlns: "http://www.w3.org/2000/svg"
-  }, /*#__PURE__*/React.createElement("path", {
-    d: "M891.448889 159.573333L626.460444 460.231111v443.221333c0 32.881778-25.429333 63.658667-55.864888 63.658667l-170.268445-172.942222V456.419556L132.266667 159.857778A59.619556 59.619556 0 0 1 173.511111 56.888889h676.977778c32.995556 0 59.733333 26.680889 59.733333 59.562667 0 17.066667-7.224889 32.312889-18.773333 43.121777z"
-  }));
-}

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

@@ -1,9 +0,0 @@
-import { TablePipeline } from '../pipeline';
-export interface FooterDataSourceFeatureOptions {
-    /** 指定表格页脚每一行元信息的记录字段 */
-    footerRowMetaKey?: string | symbol;
-    /** 表格页脚数据源 */
-    dataSource?: any[];
-}
-export declare const footerRowMetaSymbol: unique symbol;
-export declare function footerDataSource(opts?: FooterDataSourceFeatureOptions): (pipeline: TablePipeline) => TablePipeline;

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

@@ -1,25 +0,0 @@
-import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
-import _extends from "@babel/runtime-corejs3/helpers/extends";
-import _Symbol from "@babel/runtime-corejs3/core-js-stable/symbol";
-import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
-export var footerRowMetaSymbol = _Symbol('footer-row');
-export function footerDataSource() {
-  var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  return function footerDataSourceStep(pipeline) {
-    var _a, _b;
-
-    var footerDataSource = (_a = opts.dataSource) !== null && _a !== void 0 ? _a : pipeline.getFooterDataSource();
-    var footerRowMetaKey = (_b = opts.footerRowMetaKey) !== null && _b !== void 0 ? _b : footerRowMetaSymbol;
-    pipeline.setFeatureOptions('footerRowMetaKey', footerRowMetaKey);
-
-    if (footerDataSource) {
-      pipeline.footerDataSource(_mapInstanceProperty(footerDataSource).call(footerDataSource, function (row) {
-        return _extends(_defineProperty({}, footerRowMetaKey, true), row);
-      }));
-    } else {
-      console.warn('调用 pipeline.use(features.footerDataSource()) 前请先设置页脚数据源，设置方法有：pipeline.use(features.footerDataSource({dataSource:any[]})) 或者 pipeline.footerDataSource(any[])');
-    }
-
-    return pipeline;
-  };
-}

package/es/table/utils/keyCode.d.ts

@@ -1,4 +0,0 @@
-declare const KeyCode: {
-    ENTER: number;
-};
-export default KeyCode;

package/es/table/utils/keyCode.js

@@ -1,4 +0,0 @@
-var KeyCode = {
-  ENTER: 13
-};
-export default KeyCode;

package/lib/table/pipeline/features/filter/DefaultFilterIcon.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="react" />
-export default function DefaultFilterIcon({ width, height }: {
-    width: string | number;
-    height: string | number;
-}): JSX.Element;

package/lib/table/pipeline/features/filter/DefaultFilterIcon.js

@@ -1,30 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = DefaultFilterIcon;
-
-var _react = _interopRequireDefault(require("react"));
-
-function DefaultFilterIcon(_ref) {
-  var width = _ref.width,
-      height = _ref.height;
-  return /*#__PURE__*/_react.default.createElement("svg", {
-    width: width,
-    height: height,
-    style: {
-      verticalAlign: 'middle'
-    },
-    viewBox: "0 0 1024 1024",
-    focusable: "false",
-    "data-icon": "filter",
-    fill: "currentColor",
-    version: "1.1",
-    xmlns: "http://www.w3.org/2000/svg"
-  }, /*#__PURE__*/_react.default.createElement("path", {
-    d: "M891.448889 159.573333L626.460444 460.231111v443.221333c0 32.881778-25.429333 63.658667-55.864888 63.658667l-170.268445-172.942222V456.419556L132.266667 159.857778A59.619556 59.619556 0 0 1 173.511111 56.888889h676.977778c32.995556 0 59.733333 26.680889 59.733333 59.562667 0 17.066667-7.224889 32.312889-18.773333 43.121777z"
-  }));
-}

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

@@ -1,9 +0,0 @@
-import { TablePipeline } from '../pipeline';
-export interface FooterDataSourceFeatureOptions {
-    /** 指定表格页脚每一行元信息的记录字段 */
-    footerRowMetaKey?: string | symbol;
-    /** 表格页脚数据源 */
-    dataSource?: any[];
-}
-export declare const footerRowMetaSymbol: unique symbol;
-export declare function footerDataSource(opts?: FooterDataSourceFeatureOptions): (pipeline: TablePipeline) => TablePipeline;

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

@@ -1,41 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.footerDataSource = footerDataSource;
-exports.footerRowMetaSymbol = void 0;
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-
-var _extends3 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
-var _symbol = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/symbol"));
-
-var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-
-var footerRowMetaSymbol = (0, _symbol.default)('footer-row');
-exports.footerRowMetaSymbol = footerRowMetaSymbol;
-
-function footerDataSource() {
-  var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  return function footerDataSourceStep(pipeline) {
-    var _a, _b;
-
-    var footerDataSource = (_a = opts.dataSource) !== null && _a !== void 0 ? _a : pipeline.getFooterDataSource();
-    var footerRowMetaKey = (_b = opts.footerRowMetaKey) !== null && _b !== void 0 ? _b : footerRowMetaSymbol;
-    pipeline.setFeatureOptions('footerRowMetaKey', footerRowMetaKey);
-
-    if (footerDataSource) {
-      pipeline.footerDataSource((0, _map.default)(footerDataSource).call(footerDataSource, function (row) {
-        return (0, _extends3.default)((0, _defineProperty2.default)({}, footerRowMetaKey, true), row);
-      }));
-    } else {
-      console.warn('调用 pipeline.use(features.footerDataSource()) 前请先设置页脚数据源，设置方法有：pipeline.use(features.footerDataSource({dataSource:any[]})) 或者 pipeline.footerDataSource(any[])');
-    }
-
-    return pipeline;
-  };
-}

package/lib/table/utils/keyCode.d.ts

@@ -1,4 +0,0 @@
-declare const KeyCode: {
-    ENTER: number;
-};
-export default KeyCode;

package/lib/table/utils/keyCode.js

@@ -1,11 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var KeyCode = {
-  ENTER: 13
-};
-var _default = KeyCode;
-exports.default = _default;