@kdcloudjs/table 1.1.3-canary.1 → 1.1.3-canary.10

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

@@ -76,6 +76,10 @@ function singleSelect() {
         return preCellProps;
       },
       render: function render(_, row, rowIndex) {
+        if (row[pipeline.getFeatureOptions('footerRowMetaKey')]) {
+          return null;
+        }
+
         var rowKey = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
 
         return /*#__PURE__*/_react.default.createElement(Radio, {

package/lib/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/lib/table/pipeline/features/treeMode.js

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

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,6 +88,10 @@ 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,6 +28,8 @@ var _utils = require("../utils");
 
 var _autoFill = require("./features/autoFill");
 
+var _rangeSelection = require("./features/rangeSelection");
+
 /**
  * 表格数据处理流水线。TablePipeline 提供了表格数据处理过程中的一些上下方与工具方法，包括……
  *
@@ -292,19 +294,19 @@ 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 TablePipeline;
 }();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/table",
-  "version": "1.1.3-canary.1",
+  "version": "1.1.3-canary.10",
   "description": "金蝶 react table 组件",
   "title": "table",
   "keywords": [