@kdcloudjs/table 1.2.2-canary.16 → 1.2.2-canary.18

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

@@ -119,23 +119,46 @@ function multiSelect() {
           var key = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
           var selectValueSet = pipeline.getFeatureOptions(selectValueSetKey) || new _set.default();
           var checked = selectValueSet.has(key);
-          return /*#__PURE__*/_react.default.createElement(Checkbox, {
-            checked: checked,
-            disabled: isDisabled(row, rowIndex),
-            onChange: clickArea === 'checkbox' ? function (arg1, arg2) {
-              var _a;
-              // 这里要同时兼容 antd 和 fusion 的用法
-              // fusion: arg2?.nativeEvent
-              // antd: arg1.nativeEvent
-              var nativeEvent = (_a = arg2 === null || arg2 === void 0 ? void 0 : arg2.nativeEvent) !== null && _a !== void 0 ? _a : arg1.nativeEvent;
-              if (nativeEvent) {
-                if (opts.stopClickEventPropagation) {
-                  nativeEvent.stopPropagation();
-                }
-                onCheckboxChange(checked, key, nativeEvent.shiftKey);
+          var disabled = isDisabled(row, rowIndex);
+          var defaultOnChange = clickArea === 'checkbox' ? function (arg1, arg2) {
+            var _a;
+            // 这里要同时兼容 antd 和 fusion 的用法
+            // fusion: arg2?.nativeEvent
+            // antd: arg1.nativeEvent
+            var nativeEvent = (_a = arg2 === null || arg2 === void 0 ? void 0 : arg2.nativeEvent) !== null && _a !== void 0 ? _a : arg1.nativeEvent;
+            if (nativeEvent) {
+              if (opts.stopClickEventPropagation) {
+                nativeEvent.stopPropagation();
               }
-            } : undefined
+              onCheckboxChange(checked, key, nativeEvent.shiftKey);
+            }
+          } : undefined;
+          var defaultElement = /*#__PURE__*/_react.default.createElement(Checkbox, {
+            checked: checked,
+            disabled: disabled,
+            onChange: defaultOnChange
           });
+          var ctx = {
+            type: 'multi',
+            row: row,
+            rowIndex: rowIndex,
+            rowKey: key,
+            checked: checked,
+            disabled: disabled,
+            defaultElement: defaultElement,
+            actions: {
+              select: function select() {
+                if (!checked) onCheckboxChange(false, key, false);
+              },
+              toggle: function toggle(batch) {
+                return onCheckboxChange(checked, key, !!batch);
+              }
+            }
+          };
+          if (opts.customRender) {
+            return opts.customRender(ctx);
+          }
+          return defaultElement;
         },
         features: (0, _extends3.default)((0, _extends3.default)({}, (_l = opts.checkboxColumn) === null || _l === void 0 ? void 0 : _l.features), (0, _defineProperty2.default)({}, _utils.MULTI_SELECT_MARK_PROPNAME, true))
       });

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

@@ -1,4 +1,5 @@
-import { ArtColumn } from '../../interfaces';
+import React from 'react';
+import { ArtColumn, selectRenderProps } from '../../interfaces';
 import { TablePipeline } from '../pipeline';
 export interface SingleSelectFeatureOptions {
     /** 是否高亮被选中的行 */
@@ -19,5 +20,6 @@ export interface SingleSelectFeatureOptions {
     radioPlacement?: 'start' | 'end';
     /** 是否对触发 onChange 的 click 事件调用 event.stopPropagation() */
     stopClickEventPropagation?: boolean;
+    customRender?: (ctx: selectRenderProps) => React.ReactNode;
 }
 export declare function singleSelect(opts?: SingleSelectFeatureOptions): (pipeline: TablePipeline) => TablePipeline;

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

@@ -61,18 +61,42 @@ function singleSelect() {
           return null;
         }
         var rowKey = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
-        return /*#__PURE__*/_react.default.createElement(Radio, {
-          checked: value === rowKey,
-          disabled: isDisabled(row, rowIndex),
-          onChange: clickArea === 'radio' ? function (arg1, arg2) {
-            var _a;
-            var nativeEvent = (_a = arg2 === null || arg2 === void 0 ? void 0 : arg2.nativeEvent) !== null && _a !== void 0 ? _a : arg1 === null || arg1 === void 0 ? void 0 : arg1.nativeEvent;
-            if (nativeEvent && opts.stopClickEventPropagation) {
-              nativeEvent.stopPropagation();
-            }
-            onChange(rowKey);
-          } : undefined
+        var checked = value === rowKey;
+        var disabled = isDisabled(row, rowIndex);
+        var defaultOnChange = clickArea === 'radio' ? function (arg1, arg2) {
+          var _a;
+          var nativeEvent = (_a = arg2 === null || arg2 === void 0 ? void 0 : arg2.nativeEvent) !== null && _a !== void 0 ? _a : arg1 === null || arg1 === void 0 ? void 0 : arg1.nativeEvent;
+          if (nativeEvent && opts.stopClickEventPropagation) {
+            nativeEvent.stopPropagation();
+          }
+          onChange(rowKey);
+        } : undefined;
+        var defaultElement = /*#__PURE__*/_react.default.createElement(Radio, {
+          checked: checked,
+          disabled: disabled,
+          onChange: defaultOnChange
         });
+        var ctx = {
+          type: 'single',
+          row: row,
+          rowIndex: rowIndex,
+          rowKey: rowKey,
+          checked: checked,
+          disabled: disabled,
+          defaultElement: defaultElement,
+          actions: {
+            select: function select() {
+              return onChange(rowKey);
+            },
+            toggle: function toggle() {
+              return onChange(rowKey);
+            }
+          }
+        };
+        if (opts.customRender) {
+          return opts.customRender(ctx);
+        }
+        return defaultElement;
       },
       features: (0, _extends3.default)((0, _extends3.default)({}, (_e = opts.radioColumn) === null || _e === void 0 ? void 0 : _e.features), (0, _defineProperty2.default)({}, _utils.SINGLE_SELECT_MARK_PROPNAME, true))
     });

package/lib/table/utils/getTreeDepth.js

@@ -19,12 +19,15 @@ function getTreeDepth(nodes) {
   dfs(nodes, 0);
   return maxDepth;
   function dfs(columns, depth) {
+    var _a;
     var _iterator = _createForOfIteratorHelper(columns),
       _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var column = _step.value;
-        if ((0, _isLeafNode.default)(column)) {
+        var isHeaderMerge = ((_a = column) === null || _a === void 0 ? void 0 : _a.isHeaderMerge) === true;
+        // 当列配置了 isHeaderMerge 时，将其视作“可视叶子”，不再深入子层计算深度
+        if ((0, _isLeafNode.default)(column) || isHeaderMerge) {
           maxDepth = Math.max(maxDepth, depth);
         } else {
           dfs(column.children, depth + 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/table",
-  "version": "1.2.2-canary.16",
+  "version": "1.2.2-canary.18",
   "description": "金蝶 react table 组件",
   "title": "table",
   "keywords": [
@@ -56,6 +56,7 @@
     "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:canary-hotfix": "npm run build && cross-env PUB_ENV=pub np --no-cleanup --anyBranch --no-tests --tag=canaryHotFix",
     "new": "node scripts/create-component.js",
     "kd-ui": "npm install @kingdee-ui/kui --registry http://npm.kingdee.com/"
   },