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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (27) hide show
  1. package/dist/@kdcloudjs/table.css +1 -1
  2. package/dist/@kdcloudjs/table.js +104 -44
  3. package/dist/@kdcloudjs/table.js.map +1 -1
  4. package/dist/@kdcloudjs/table.min.css +1 -1
  5. package/dist/@kdcloudjs/table.min.js +2 -2
  6. package/dist/@kdcloudjs/table.min.js.map +1 -1
  7. package/es/table/base/BlankComponent.d.ts +0 -1
  8. package/es/table/base/BlankComponent.js +16 -9
  9. package/es/table/base/header.js +11 -7
  10. package/es/table/base/styles.js +1 -1
  11. package/es/table/interfaces.d.ts +19 -0
  12. package/es/table/pipeline/features/multiSelect.d.ts +3 -1
  13. package/es/table/pipeline/features/multiSelect.js +38 -15
  14. package/es/table/pipeline/features/singleSelect.d.ts +3 -1
  15. package/es/table/pipeline/features/singleSelect.js +35 -11
  16. package/es/table/utils/getTreeDepth.js +4 -1
  17. package/lib/table/base/BlankComponent.d.ts +0 -1
  18. package/lib/table/base/BlankComponent.js +15 -8
  19. package/lib/table/base/header.js +11 -7
  20. package/lib/table/base/styles.js +1 -1
  21. package/lib/table/interfaces.d.ts +19 -0
  22. package/lib/table/pipeline/features/multiSelect.d.ts +3 -1
  23. package/lib/table/pipeline/features/multiSelect.js +38 -15
  24. package/lib/table/pipeline/features/singleSelect.d.ts +3 -1
  25. package/lib/table/pipeline/features/singleSelect.js +35 -11
  26. package/lib/table/utils/getTreeDepth.js +4 -1
  27. package/package.json +2 -1
package/dist/@kdcloudjs/table.css CHANGED
@@ -1,6 +1,6 @@
1
1
  /*!
2
2
  *
3
- * @kdcloudjs/table v1.2.2-canary.15
3
+ * @kdcloudjs/table v1.2.2-canary.16
4
4
  *
5
5
  * Copyright 2020-present, Kingdee, Inc.
6
6
  * All rights reserved.
package/dist/@kdcloudjs/table.js CHANGED
@@ -1,6 +1,6 @@
1
1
  /*!
2
2
  *
3
- * @kdcloudjs/table v1.2.2-canary.15
3
+ * @kdcloudjs/table v1.2.2-canary.16
4
4
  *
5
5
  * Copyright 2020-present, Kingdee, Inc.
6
6
  * All rights reserved.
@@ -829,8 +829,11 @@ __webpack_require__.r(__webpack_exports__);
829
829
 
830
830
 
831
831
  var TopBlankComponent = /*#__PURE__*/Object(react__WEBPACK_IMPORTED_MODULE_1__["forwardRef"])(function (_ref, ref) {
832
- var initialHeight = _ref.height;
833
- var _useState = Object(react__WEBPACK_IMPORTED_MODULE_1__["useState"])(initialHeight),
832
+ var heightFromProps = _ref.height;
833
+ Object(react__WEBPACK_IMPORTED_MODULE_1__["useEffect"])(function () {
834
+ setHeight(heightFromProps);
835
+ }, [heightFromProps]);
836
+ var _useState = Object(react__WEBPACK_IMPORTED_MODULE_1__["useState"])(heightFromProps),
834
837
  _useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_0___default()(_useState, 2),
835
838
  height = _useState2[0],
836
839
  setHeight = _useState2[1];
@@ -844,6 +847,8 @@ var TopBlankComponent = /*#__PURE__*/Object(react__WEBPACK_IMPORTED_MODULE_1__["
844
847
  };
845
848
  }, [height]);
846
849
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("div", {
850
+ key: "top-blank",
851
+ className: classnames__WEBPACK_IMPORTED_MODULE_2___default()(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].virtualBlank, 'bottom'),
847
852
  style: {
848
853
  height: height
849
854
  }
@@ -851,12 +856,14 @@ var TopBlankComponent = /*#__PURE__*/Object(react__WEBPACK_IMPORTED_MODULE_1__["
851
856
  });
852
857
  TopBlankComponent.displayName = 'TopBlank';
853
858
  var BottomBlankComponent = /*#__PURE__*/Object(react__WEBPACK_IMPORTED_MODULE_1__["forwardRef"])(function (_ref2, ref) {
854
- var initialHeight = _ref2.height,
855
- className = _ref2.className;
856
- var _useState3 = Object(react__WEBPACK_IMPORTED_MODULE_1__["useState"])(initialHeight),
859
+ var heightFromProps = _ref2.height;
860
+ var _useState3 = Object(react__WEBPACK_IMPORTED_MODULE_1__["useState"])(heightFromProps),
857
861
  _useState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_0___default()(_useState3, 2),
858
862
  height = _useState4[0],
859
863
  setHeight = _useState4[1];
864
+ Object(react__WEBPACK_IMPORTED_MODULE_1__["useEffect"])(function () {
865
+ setHeight(heightFromProps);
866
+ }, [heightFromProps]);
860
867
  Object(react__WEBPACK_IMPORTED_MODULE_1__["useImperativeHandle"])(ref, function () {
861
868
  return {
862
869
  updateHeight: function updateHeight(newHeight) {
@@ -871,7 +878,7 @@ var BottomBlankComponent = /*#__PURE__*/Object(react__WEBPACK_IMPORTED_MODULE_1_
871
878
  }
872
879
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("div", {
873
880
  key: "bottom-blank",
874
- className: classnames__WEBPACK_IMPORTED_MODULE_2___default()(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].virtualBlank, 'bottom', className),
881
+ className: classnames__WEBPACK_IMPORTED_MODULE_2___default()(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].virtualBlank, 'bottom'),
875
882
  style: {
876
883
  height: height
877
884
  }
@@ -881,10 +888,10 @@ BottomBlankComponent.displayName = 'BottomBlank';
881
888
 
882
889
  // 使用 memo 优化，只有当 height 或 className 改变时才重新渲染
883
890
  var TopBlank = /*#__PURE__*/Object(react__WEBPACK_IMPORTED_MODULE_1__["memo"])(TopBlankComponent, function (prevProps, nextProps) {
884
- return prevProps.height === nextProps.height && prevProps.className === nextProps.className;
891
+ return prevProps.height === nextProps.height;
885
892
  });
886
893
  var BottomBlank = /*#__PURE__*/Object(react__WEBPACK_IMPORTED_MODULE_1__["memo"])(BottomBlankComponent, function (prevProps, nextProps) {
887
- return prevProps.height === nextProps.height && prevProps.className === nextProps.className;
894
+ return prevProps.height === nextProps.height;
888
895
  });
889
896
 
890
897
  /***/ }),
@@ -1588,12 +1595,12 @@ function calculateLeveledAndFlat(inputNested, rowCount) {
1588
1595
  leveled.push([]);
1589
1596
  }
1590
1597
  var flat = [];
1591
- dfs(inputNested, 0);
1598
+ dfs(inputNested, 0, false);
1592
1599
  return {
1593
1600
  flat: flat,
1594
1601
  leveled: leveled
1595
1602
  };
1596
- function dfs(input, depth) {
1603
+ function dfs(input, depth, suppressLeveled) {
1597
1604
  var leafCount = 0;
1598
1605
  for (var i = 0; i < input.length; i++) {
1599
1606
  var indexedCol = input[i];
@@ -1607,12 +1614,16 @@ function calculateLeveledAndFlat(inputNested, rowCount) {
1607
1614
  colSpan: 1,
1608
1615
  isLeaf: true
1609
1616
  };
1610
- leveled[depth].push(wrapped);
1617
+ if (!suppressLeveled) {
1618
+ leveled[depth].push(wrapped);
1619
+ }
1611
1620
  flat.push(wrapped);
1612
1621
  } else {
1613
- var dfsRes = dfs(indexedCol.children, depth + 1);
1622
+ var _indexedCol$col;
1623
+ var mergeHeader = Boolean((_indexedCol$col = indexedCol.col) === null || _indexedCol$col === void 0 ? void 0 : _indexedCol$col.isHeaderMerge);
1624
+ var dfsRes = dfs(indexedCol.children, depth + 1, suppressLeveled || mergeHeader);
1614
1625
  leafCount += dfsRes.leafCount;
1615
- if (dfsRes.leafCount > 0) {
1626
+ if (dfsRes.leafCount > 0 && !suppressLeveled) {
1616
1627
  leveled[depth].push({
1617
1628
  type: 'normal',
1618
1629
  width: indexedCol.col.width,
@@ -1757,9 +1768,9 @@ function TableHeader(_ref2) {
1757
1768
  var cell = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_24___default.a.createElement("th", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_15___default()({
1758
1769
  key: colIndex
1759
1770
  }, headerCellProps, {
1760
- className: classnames__WEBPACK_IMPORTED_MODULE_23___default()(_styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].tableHeaderCell, headerCellProps.className, (_cx = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_16___default()(_cx, _styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].first, colIndex === 0), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_16___default()(_cx, _styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].last, colIndex + colSpan === fullFlatCount), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_16___default()(_cx, _styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].lockLeft, colIndex < leftFlatCount || theaderPosition === 'left'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_16___default()(_cx, _styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].lockRight, colIndex >= fullFlatCount - rightFlatCount || theaderPosition === 'right'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_16___default()(_cx, _styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].leaf, wrapped.isLeaf), _cx)),
1771
+ className: classnames__WEBPACK_IMPORTED_MODULE_23___default()(_styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].tableHeaderCell, headerCellProps.className, (_cx = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_16___default()(_cx, _styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].first, colIndex === 0), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_16___default()(_cx, _styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].last, colIndex + colSpan === fullFlatCount), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_16___default()(_cx, _styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].lockLeft, colIndex < leftFlatCount || theaderPosition === 'left'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_16___default()(_cx, _styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].lockRight, colIndex >= fullFlatCount - rightFlatCount || theaderPosition === 'right'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_16___default()(_cx, _styles__WEBPACK_IMPORTED_MODULE_26__["Classes"].leaf, wrapped.isLeaf || col.isHeaderMerge), _cx)),
1761
1772
  colSpan: colSpan,
1762
- rowSpan: isLeaf ? rowCount - level : undefined,
1773
+ rowSpan: isLeaf || col.isHeaderMerge ? rowCount - level : undefined,
1763
1774
  style: _objectSpread(_objectSpread({
1764
1775
  textAlign: col.align,
1765
1776
  verticalAlign: (_col$verticalAlign = col.verticalAlign) !== null && _col$verticalAlign !== void 0 ? _col$verticalAlign : 'middle'
@@ -3594,7 +3605,7 @@ var defaultCSSVariables = {
3594
3605
  var variableConst = getCssVariableText(defaultCSSVariables);
3595
3606
  var notBorderedStyleMixin = Object(styled_components__WEBPACK_IMPORTED_MODULE_4__["css"])(_templateObject3 || (_templateObject3 = _babel_runtime_helpers_taggedTemplateLiteral__WEBPACK_IMPORTED_MODULE_0___default()(["\n --cell-border-vertical: none;\n --header-cell-border-vertical: none;\n"])));
3596
3607
  var borderedStyleMixin = Object(styled_components__WEBPACK_IMPORTED_MODULE_4__["css"])(_templateObject4 || (_templateObject4 = _babel_runtime_helpers_taggedTemplateLiteral__WEBPACK_IMPORTED_MODULE_0___default()(["\n //th\u9690\u85CF\u5217\u5BBD\u62D6\u62FD\u7684\u80CC\u666F\u8272\uFF0C\u4F7F\u7528th\u7684\u53F3\u8FB9\u6846\u4EE3\u66FF\n .", "::after{\n background-color: inherit;\n }\n"])), Classes.tableHeaderCellResize);
3597
- var StyledArtTableWrapper = styled_components__WEBPACK_IMPORTED_MODULE_4__["default"].div(_templateObject5 || (_templateObject5 = _babel_runtime_helpers_taggedTemplateLiteral__WEBPACK_IMPORTED_MODULE_0___default()(["\n ", "\n box-sizing: border-box;\n * {\n box-sizing: border-box;\n }\n cursor: default;\n color: var(--color);\n font-size: var(--font-size);\n line-height: var(--line-height);\n position: relative;\n\n // \u8868\u683C\u5916\u8FB9\u6846\u7531 art-table-wrapper \u63D0\u4F9B\uFF0C\u800C\u4E0D\u662F\u7531\u5355\u5143\u683C\u63D0\u4F9B\n &.use-outer-border {\n ", ";\n }\n\n // \u8868\u683C\u4E0D\u542F\u7528\u8FB9\u6846\u7EBF\uFF0C\u9690\u85CFth\u3001td\u7684\u5355\u5143\u683C\u5DE6\u53F3\u8FB9\u6846\u7EBF\n &:not(.", ") {\n ", "\n }\n &.", "{\n ", "\n }\n\n .no-scrollbar {\n ::-webkit-scrollbar {\n display: none;\n }\n }\n\n .", " {\n overflow: auto;\n flex-shrink: 1;\n flex-grow: 1;\n display: flex;\n flex-direction: column;\n }\n\n .", " {\n overflow: hidden;\n background: var(--header-bgcolor);\n display: flex;\n flex-shrink: 0;\n border-bottom: var(--header-cell-border-horizontal);\n }\n\n .", " {\n display: flex;\n // justify-content: flex-start;\n align-items: center;\n height: inherit;\n }\n\n .", " {\n overflow-x:auto;\n flex-shrink: 0;\n flex-grow: 0;\n scrollbar-width: none; // \u517C\u5BB9\u706B\u72D0\n & {\n ::-webkit-scrollbar {\n display:none;\n }\n }\n }\n\n .", " {\n display: flex;\n flex: none;\n }\n .", "{\n flex-grow:1;\n }\n .", ", .", " {\n background: var(--bgcolor);\n overflow: auto;\n overflow-x: hidden;\n overflow-anchor: none;\n position:relative;\n &.empty {\n position: relative;\n }\n }\n\n .", " {\n position: relative;\n }\n .", ", .", " {\n .", "{\n background-color: #e6effb !important;\n }\n .", "{\n border-top: 1px solid #0E5FD8 !important;\n }\n .", "{\n border-", ": 1px solid #0E5FD8 !important;\n }\n .", "{\n border-bottom: 1px solid #0E5FD8 !important;\n }\n .", "{\n border-", ": 1px solid #0E5FD8 !important;\n }\n }\n\n .", " {\n user-select:none;\n }\n\n .", " {\n user-select:none;\n // .", " .", " >td{\n // cursor:move;\n // }\n\n // .", " .", " >td{\n // cursor:no-drop;\n // }\n \n }\n\n .", "{\n opacity: 0.5;\n }\n .", "{\n border: 1px solid var(--primary-color)\n }\n\n .", " td{\n border-top: 1px solid var(--primary-color) !important;\n border-bottom: 1px solid var(--primary-color) !important;\n \n }\n .", " td:first-child{\n border-", ": 1px solid var(--primary-color) !important;\n \n }\n .", " td:last-child{\n border-", ": 1px solid var(--primary-color) !important;\n \n }\n\n\n // .", " td{\n // border-top: 1px solid var(--primary-color) !important;\n // }\n\n .", " td{\n border-top: 1px solid var(--primary-color) !important;\n border-bottom: 1px solid var(--primary-color) !important;\n }\n\n .", " td:first-child{\n border-", ": 1px solid var(--primary-color) !important;\n }\n\n .", " td:last-child{\n border-", ": 1px solid var(--primary-color) !important;\n }\n\n // .", " td{\n // border-bottom: 1px solid var(--primary-color) !important;\n // }\n\n .", " {\n cursor:pointer;\n }\n\n\n &.sticky-header .", " {\n position: sticky;\n top: 0;\n z-index: ", ";\n }\n\n &.sticky-footer .", " {\n position: sticky;\n bottom: 0;\n z-index: ", ";\n }\n\n table {\n width: 0;\n table-layout: fixed;\n border-collapse: separate;\n border-spacing: 0;\n display: table;\n margin: 0;\n padding: 0;\n flex-shrink: 0;\n flex-grow: 0;\n position:relative;\n }\n\n // \u5728 tr \u4E0A\u8BBE\u7F6E .no-hover \u53EF\u4EE5\u7981\u7528\u9F20\u6807\u60AC\u505C\u6548\u679C\n tr:not(.no-hover):hover > td {\n background: var(--hover-bgcolor);\n }\n // \u4F7F\u7528 js \u6DFB\u52A0\u60AC\u6D6E\u6548\u679C\n tr:not(.no-hover).row-hover > td {\n background: var(--hover-bgcolor);\n }\n // \u5728 tr \u8BBE\u7F6E highlight \u53EF\u4EE5\u4E3A\u5E95\u4E0B\u7684 td \u8BBE\u7F6E\u4E3A\u9AD8\u4EAE\u8272\n // \u800C\u8BBE\u7F6E .no-highlight \u7684\u8BDD\u5219\u53EF\u4EE5\u7981\u7528\u9AD8\u4EAE\u6548\u679C\uFF1B\n tr:not(.no-highlight).highlight > td {\n background: var(--highlight-bgcolor);\n }\n\n th {\n font-weight: normal;\n text-align: ", ";\n padding: var(--cell-padding);\n height: var(--header-row-height);\n color: var(--header-color);\n background: var(--header-bgcolor);\n border:1px solid transparent;\n border-", ": var(--header-cell-border-vertical);\n border-bottom: var(--header-cell-border-horizontal);\n position: relative;\n }\n\n th.resizeable{\n border-", ": var(--header-cell-border-vertical)\n }\n\n th.", " {\n border-", ": var(--header-cell-border-vertical);\n border-bottom: none;\n }\n\n tr.", " th {\n border-top: var(--header-cell-border-horizontal);\n }\n th.", " {\n border-", ": var(--header-cell-border-vertical);\n }\n\n td {\n padding: var(--cell-padding);\n background: var(--bgcolor);\n height: var(--row-height);\n border:1px solid transparent;\n border-", ": var(--cell-border-vertical);\n border-bottom: var(--cell-border-horizontal);\n word-break: break-all;\n }\n td.", " {\n border-", ": var(--cell-border-vertical);\n }\n tr.", " td {\n border-top: var(--cell-border-horizontal);\n }\n &.has-header tbody tr.", " td {\n border-top: none;\n }\n &.has-footer tbody tr.", " td {\n border-bottom: none;\n }\n\n .", ",\n .", " {\n z-index: ", ";\n }\n\n //#region \u9501\u5217\u9634\u5F71\n .", " {\n position: absolute;\n top: 0;\n bottom: 0;\n z-index: ", ";\n pointer-events: none;\n overflow: hidden;\n\n .", " {\n height: 100%;\n }\n\n .", " {\n margin-", ": ", "px;\n \n box-shadow: none;\n\n &.show-shadow {\n box-shadow: var(--lock-shadow);\n border-", ": var(--cell-border-vertical);\n }\n }\n\n .", " {\n margin-", ": ", "px;\n box-shadow: none;\n\n &.show-shadow {\n box-shadow: var(--lock-shadow);\n border-", ": var(--cell-border-vertical);\n }\n }\n }\n //#endregion\n\n //#region \u7A7A\u8868\u683C\u5C55\u73B0\n .", " {\n pointer-events: none;\n color: #99a3b3;\n font-size: 12px;\n text-align: center;\n position: absolute;\n left: 50%;\n top: 50%;\n transform: translate(-50%, -50%);\n\n .empty-image {\n width: 50px;\n height: 50px;\n }\n\n .empty-tips {\n margin-top: 16px;\n line-height: 1.5;\n }\n }\n //#endregion\n\n //#region sticky\u517C\u5BB9\n &.sticky-polyfill-wrapper{\n //\u9501\u5B9A\u5217\u517C\u5BB9 \u4EC5\u5728\u9501\u5B9A\u5217\u7684\u60C5\u51B5\u4E0B\u751F\u6548\n .", " {\n overflow-x: hidden;\n }\n .", ", .", " {\n position:relative;\n }\n .", " {\n overflow: hidden;\n display: flex;\n }\n .", " {\n position: relative;\n }\n\n .", " {\n display: flex;\n overflow: auto;\n overflow-x: hidden;\n overflow-anchor: none;\n }\n\n .", ", .", "{\n position: absolute;\n z-index: ", ";\n top: 0;\n }\n .", "{\n ", ":0;\n }\n .", "{\n rig", "ht:0;\n }\n\n .", "{\n .", "{\n position: absolute;\n top: 0;\n width: 100%;\n z-index: ", ";\n }\n }\n\n tr:not(.no-hover).row-hover > td {\n background: var(--hover-bgcolor);\n }\n }\n //#endregion sticky\u517C\u5BB9\n\n //#region \u7C98\u6027\u6EDA\u52A8\u6761\n .", "{\n display:flex;\n background: var(--bgcolor);\n }\n .", "{\n height: 1px;\n flex-shrink: 0;\n border-top: 1px solid var(--border-color);\n }\n\n .", "{\n height: 1px;\n flex-shrink: 0;\n border-top: 1px solid var(--border-color);\n }\n .", " {\n overflow-y: hidden;\n overflow-x: auto;\n z-index: ", ";\n flex-shrink: 1;\n flex-grow: 0;\n border-top: 1px solid var(--border-color);\n }\n\n .", " {\n // \u5FC5\u987B\u6709\u9AD8\u5EA6\u624D\u80FD\u51FA\u73B0\u6EDA\u52A8\u6761\n height: 1px;\n visibility: hidden;\n }\n //#endregion\n\n //#region \u52A0\u8F7D\u6837\u5F0F\n .", " {\n position: relative;\n width: 100%;\n height: 100%;\n overflow: auto;\n\n .", " {\n filter: none;\n width: 100%;\n height: 100%;\n overflow: hidden;//\u5217\u5168\u90E8\u56FA\u5B9A\u65F6\uFF0C\u5B58\u5728\u53CC\u6A2A\u5411\u6EDA\u52A8\u6761\n display: flex;\n position: relative;\n flex-direction: column;\n }\n\n .", " {\n position: absolute;\n left: 0;\n right: 0;\n top: 0;\n bottom: 0;\n pointer-events: none;\n }\n\n .", " {\n position: sticky;\n z-index: ", ";\n transform: translateY(-50%);\n }\n }\n //#endregion\n\n //#region \u8868\u683C\u8FC7\u6EE4\n .", " {\n color:var(--icon-color);\n &.active{\n color:var(--primary-color);\n }\n padding: 6px 4px;\n &:hover{\n background-color: #e5e5e5;\n }\n &:focus {\n outline: none\n }\n }\n //#endregion\n\n //#region \u8868\u683C\u6392\u5E8F\n .", " {\n color:var(--icon-color);\n &.active{\n color:var(--primary-color);\n }\n }\n .", " {\n color:var(--icon-color);\n &.active{\n color:var(--primary-color);\n }\n }\n //#endregion\n\n //#region \u6EDA\u52A8\u6761\u5360\u4F4D\n .", " {\n // visibility: hidden;\n background: var(--header-bgcolor);\n position:sticky;\n z-index:5;\n ", ":0px;\n flex-shrink: 0;\n }\n .", " .", " {\n border-top: var(--cell-border-horizontal);\n }\n //#endregion\n\n //#region \u62D6\u62FD\u5217\u5BBD\u5927\u5C0F\n .", "::after{\n background-color: var(--border-color);\n }\n //\u89E3\u51B3\u90E8\u5206\u6D4F\u89C8\u5668(chrome109)\u6700\u540E\u4E00\u4E2A\u5355\u5143\u683C\u7684\u5217\u5BBD\u62D6\u62FD\u533A\u57DF\u7EDD\u5BF9\u5B9A\u4F4D\u8D85\u51FA\u8868\u683C\uFF0C\u5BFC\u81F4\u8868\u683C\u7AD6\u5206\u5272\u7EBF\u65E0\u6CD5\u5BF9\u9F50\n .", " th.", " .", "{\n ", ": 0;\n width: 5px;\n &::after{\n ", ": 4px;\n }\n }\n"])), function (_ref) {
3608
+ var StyledArtTableWrapper = styled_components__WEBPACK_IMPORTED_MODULE_4__["default"].div(_templateObject5 || (_templateObject5 = _babel_runtime_helpers_taggedTemplateLiteral__WEBPACK_IMPORTED_MODULE_0___default()(["\n ", "\n box-sizing: border-box;\n * {\n box-sizing: border-box;\n }\n cursor: default;\n color: var(--color);\n font-size: var(--font-size);\n line-height: var(--line-height);\n position: relative;\n\n // \u8868\u683C\u5916\u8FB9\u6846\u7531 art-table-wrapper \u63D0\u4F9B\uFF0C\u800C\u4E0D\u662F\u7531\u5355\u5143\u683C\u63D0\u4F9B\n &.use-outer-border {\n ", ";\n }\n\n // \u8868\u683C\u4E0D\u542F\u7528\u8FB9\u6846\u7EBF\uFF0C\u9690\u85CFth\u3001td\u7684\u5355\u5143\u683C\u5DE6\u53F3\u8FB9\u6846\u7EBF\n &:not(.", ") {\n ", "\n }\n &.", "{\n ", "\n }\n\n .no-scrollbar {\n ::-webkit-scrollbar {\n display: none;\n }\n }\n\n .", " {\n overflow: auto;\n flex-shrink: 1;\n flex-grow: 1;\n display: flex;\n flex-direction: column;\n }\n\n .", " {\n overflow: hidden;\n background: var(--header-bgcolor);\n display: flex;\n flex-shrink: 0;\n border-bottom: var(--header-cell-border-horizontal);\n }\n\n .", " {\n display: flex;\n // justify-content: flex-start;\n align-items: center;\n height: inherit;\n }\n\n .", " {\n overflow-x:auto;\n flex-shrink: 0;\n flex-grow: 0;\n scrollbar-width: none; // \u517C\u5BB9\u706B\u72D0\n & {\n ::-webkit-scrollbar {\n display:none;\n }\n }\n }\n\n .", " {\n display: flex;\n flex: none;\n }\n .", "{\n flex-grow:1;\n }\n .", ", .", " {\n background: var(--bgcolor);\n overflow: auto;\n overflow-x: hidden;\n overflow-anchor: none;\n position:relative;\n &.empty {\n position: relative;\n }\n }\n\n .", " {\n position: relative;\n }\n .", ", .", " {\n .", "{\n background-color: #e6effb !important;\n }\n .", "{\n border-top: 1px solid #0E5FD8 !important;\n }\n .", "{\n border-", ": 1px solid #0E5FD8 !important;\n }\n .", "{\n border-bottom: 1px solid #0E5FD8 !important;\n }\n .", "{\n border-", ": 1px solid #0E5FD8 !important;\n }\n }\n\n .", " {\n user-select:none;\n }\n\n .", " {\n user-select:none;\n // .", " .", " >td{\n // cursor:move;\n // }\n\n // .", " .", " >td{\n // cursor:no-drop;\n // }\n \n }\n\n .", "{\n opacity: 0.5;\n }\n .", "{\n border: 1px solid var(--primary-color)\n }\n\n .", " td{\n border-top: 1px solid var(--primary-color) !important;\n border-bottom: 1px solid var(--primary-color) !important;\n \n }\n .", " td:first-child{\n border-", ": 1px solid var(--primary-color) !important;\n \n }\n .", " td:last-child{\n border-", ": 1px solid var(--primary-color) !important;\n \n }\n\n\n // .", " td{\n // border-top: 1px solid var(--primary-color) !important;\n // }\n\n .", " td{\n border-top: 1px solid var(--primary-color) !important;\n border-bottom: 1px solid var(--primary-color) !important;\n }\n\n .", " td:first-child{\n border-", ": 1px solid var(--primary-color) !important;\n }\n\n .", " td:last-child{\n border-", ": 1px solid var(--primary-color) !important;\n }\n\n // .", " td{\n // border-bottom: 1px solid var(--primary-color) !important;\n // }\n\n .", " {\n cursor:pointer;\n }\n\n\n &.sticky-header .", " {\n position: sticky;\n top: 0;\n z-index: ", ";\n }\n\n &.sticky-footer .", " {\n position: sticky;\n bottom: 0;\n z-index: ", ";\n }\n\n table {\n width: 0;\n table-layout: fixed;\n border-collapse: separate;\n border-spacing: 0;\n display: table;\n margin: 0;\n padding: 0;\n flex-shrink: 0;\n flex-grow: 0;\n position:relative;\n }\n\n // \u5728 tr \u4E0A\u8BBE\u7F6E .no-hover \u53EF\u4EE5\u7981\u7528\u9F20\u6807\u60AC\u505C\u6548\u679C\n tr:not(.no-hover):hover > td {\n background: var(--hover-bgcolor);\n }\n // \u4F7F\u7528 js \u6DFB\u52A0\u60AC\u6D6E\u6548\u679C\n tr:not(.no-hover).row-hover > td {\n background: var(--hover-bgcolor);\n }\n // \u5728 tr \u8BBE\u7F6E highlight \u53EF\u4EE5\u4E3A\u5E95\u4E0B\u7684 td \u8BBE\u7F6E\u4E3A\u9AD8\u4EAE\u8272\n // \u800C\u8BBE\u7F6E .no-highlight \u7684\u8BDD\u5219\u53EF\u4EE5\u7981\u7528\u9AD8\u4EAE\u6548\u679C\uFF1B\n tr:not(.no-highlight).highlight > td {\n background: var(--highlight-bgcolor);\n }\n\n th {\n font-weight: normal;\n text-align: ", ";\n padding: var(--cell-padding);\n height: var(--header-row-height);\n color: var(--header-color);\n background: var(--header-bgcolor);\n border:1px solid transparent;\n border-", ": var(--header-cell-border-vertical);\n border-bottom: var(--header-cell-border-horizontal);\n position: relative;\n }\n\n th.resizeable{\n border-", ": var(--header-cell-border-vertical)\n }\n\n th.", " {\n border-", ": var(--header-cell-border-vertical);\n border-bottom: none;\n }\n\n tr.", " th {\n border-top: var(--header-cell-border-horizontal);\n }\n th.", " {\n border-", ": var(--header-cell-border-vertical);\n }\n\n td {\n padding: var(--cell-padding);\n background: var(--bgcolor);\n height: var(--row-height);\n border:1px solid transparent;\n border-", ": var(--cell-border-vertical);\n border-bottom: var(--cell-border-horizontal);\n word-break: break-all;\n }\n td.", " {\n border-", ": var(--cell-border-vertical);\n }\n tr.", " td {\n border-top: var(--cell-border-horizontal);\n }\n &.has-header tbody tr.", " td {\n border-top: none;\n }\n &.has-footer tbody tr.", " td {\n border-bottom: none;\n }\n\n .", ",\n .", " {\n z-index: ", ";\n }\n\n //#region \u9501\u5217\u9634\u5F71\n .", " {\n position: absolute;\n top: 0;\n bottom: 0;\n z-index: ", ";\n pointer-events: none;\n overflow: hidden;\n\n .", " {\n height: 100%;\n }\n\n .", " {\n margin-", ": ", "px;\n \n box-shadow: none;\n\n &.show-shadow {\n box-shadow: var(--lock-shadow);\n border-", ": var(--cell-border-vertical);\n }\n }\n\n .", " {\n margin-", ": ", "px;\n box-shadow: none;\n\n &.show-shadow {\n box-shadow: var(--lock-shadow);\n border-", ": var(--cell-border-vertical);\n }\n }\n }\n //#endregion\n\n //#region \u7A7A\u8868\u683C\u5C55\u73B0\n .", " {\n pointer-events: none;\n color: #99a3b3;\n font-size: 12px;\n text-align: center;\n position: absolute;\n left: 50%;\n top: 50%;\n transform: translate(-50%, -50%);\n\n .empty-image {\n width: 50px;\n height: 50px;\n }\n\n .empty-tips {\n margin-top: 16px;\n line-height: 1.5;\n }\n }\n //#endregion\n\n //#region sticky\u517C\u5BB9\n &.sticky-polyfill-wrapper{\n //\u9501\u5B9A\u5217\u517C\u5BB9 \u4EC5\u5728\u9501\u5B9A\u5217\u7684\u60C5\u51B5\u4E0B\u751F\u6548\n .", " {\n overflow-x: hidden;\n }\n .", ", .", " {\n position:relative;\n }\n .", " {\n overflow: hidden;\n display: flex;\n }\n .", " {\n position: relative;\n }\n\n .", " {\n display: flex;\n overflow: auto;\n overflow-x: hidden;\n overflow-anchor: none;\n }\n\n .", ", .", "{\n position: absolute;\n z-index: ", ";\n top: 0;\n }\n .", "{\n ", ":0;\n }\n .", "{\n ", ":0;\n }\n\n .", "{\n .", "{\n position: absolute;\n top: 0;\n width: 100%;\n z-index: ", ";\n }\n }\n\n tr:not(.no-hover).row-hover > td {\n background: var(--hover-bgcolor);\n }\n }\n //#endregion sticky\u517C\u5BB9\n\n //#region \u7C98\u6027\u6EDA\u52A8\u6761\n .", "{\n display:flex;\n background: var(--bgcolor);\n }\n .", "{\n height: 1px;\n flex-shrink: 0;\n border-top: 1px solid var(--border-color);\n }\n\n .", "{\n height: 1px;\n flex-shrink: 0;\n border-top: 1px solid var(--border-color);\n }\n .", " {\n overflow-y: hidden;\n overflow-x: auto;\n z-index: ", ";\n flex-shrink: 1;\n flex-grow: 0;\n border-top: 1px solid var(--border-color);\n }\n\n .", " {\n // \u5FC5\u987B\u6709\u9AD8\u5EA6\u624D\u80FD\u51FA\u73B0\u6EDA\u52A8\u6761\n height: 1px;\n visibility: hidden;\n }\n //#endregion\n\n //#region \u52A0\u8F7D\u6837\u5F0F\n .", " {\n position: relative;\n width: 100%;\n height: 100%;\n overflow: auto;\n\n .", " {\n filter: none;\n width: 100%;\n height: 100%;\n overflow: hidden;//\u5217\u5168\u90E8\u56FA\u5B9A\u65F6\uFF0C\u5B58\u5728\u53CC\u6A2A\u5411\u6EDA\u52A8\u6761\n display: flex;\n position: relative;\n flex-direction: column;\n }\n\n .", " {\n position: absolute;\n left: 0;\n right: 0;\n top: 0;\n bottom: 0;\n pointer-events: none;\n }\n\n .", " {\n position: sticky;\n z-index: ", ";\n transform: translateY(-50%);\n }\n }\n //#endregion\n\n //#region \u8868\u683C\u8FC7\u6EE4\n .", " {\n color:var(--icon-color);\n &.active{\n color:var(--primary-color);\n }\n padding: 6px 4px;\n &:hover{\n background-color: #e5e5e5;\n }\n &:focus {\n outline: none\n }\n }\n //#endregion\n\n //#region \u8868\u683C\u6392\u5E8F\n .", " {\n color:var(--icon-color);\n &.active{\n color:var(--primary-color);\n }\n }\n .", " {\n color:var(--icon-color);\n &.active{\n color:var(--primary-color);\n }\n }\n //#endregion\n\n //#region \u6EDA\u52A8\u6761\u5360\u4F4D\n .", " {\n // visibility: hidden;\n background: var(--header-bgcolor);\n position:sticky;\n z-index:5;\n ", ":0px;\n flex-shrink: 0;\n }\n .", " .", " {\n border-top: var(--cell-border-horizontal);\n }\n //#endregion\n\n //#region \u62D6\u62FD\u5217\u5BBD\u5927\u5C0F\n .", "::after{\n background-color: var(--border-color);\n }\n //\u89E3\u51B3\u90E8\u5206\u6D4F\u89C8\u5668(chrome109)\u6700\u540E\u4E00\u4E2A\u5355\u5143\u683C\u7684\u5217\u5BBD\u62D6\u62FD\u533A\u57DF\u7EDD\u5BF9\u5B9A\u4F4D\u8D85\u51FA\u8868\u683C\uFF0C\u5BFC\u81F4\u8868\u683C\u7AD6\u5206\u5272\u7EBF\u65E0\u6CD5\u5BF9\u9F50\n .", " th.", " .", "{\n ", ": 0;\n width: 5px;\n &::after{\n ", ": 4px;\n }\n }\n"])), function (_ref) {
3598
3609
  var prefixCls = _ref.prefixCls;
3599
3610
  return prefixCls ? "&.".concat(prefixCls, "-table {:root {").concat(variableConst, "} ").concat(variableConst, "}") : ":root {".concat(variableConst, "} ").concat(variableConst);
3600
3611
  }, outerBorderStyleMixin, Classes.artTableBordered, notBorderedStyleMixin, Classes.artTableBordered, borderedStyleMixin, Classes.artTable, Classes.tableHeader, Classes.tableHeaderCellContent, Classes.virtual, Classes.tableFooter, Classes.tableBody, Classes.tableBody, Classes.tableFooter, Classes.tableRow, Classes.tableBody, Classes.tableFooter, Classes.tableCellRangeSelected, Classes.tableCellRangeTop, Classes.tableCellRangeLeft, function (props) {
@@ -8369,23 +8380,46 @@ function multiSelect() {
8369
8380
  var key = _internals__WEBPACK_IMPORTED_MODULE_15__["internals"].safeGetRowKey(primaryKey, row, rowIndex);
8370
8381
  var selectValueSet = pipeline.getFeatureOptions(selectValueSetKey) || new Set();
8371
8382
  var checked = selectValueSet.has(key);
8372
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_14___default.a.createElement(Checkbox, {
8373
- checked: checked,
8374
- disabled: isDisabled(row, rowIndex),
8375
- onChange: clickArea === 'checkbox' ? function (arg1, arg2) {
8376
- var _arg2$nativeEvent;
8377
- // 这里要同时兼容 antd 和 fusion 的用法
8378
- // fusion: arg2?.nativeEvent
8379
- // antd: arg1.nativeEvent
8380
- var nativeEvent = (_arg2$nativeEvent = arg2 === null || arg2 === void 0 ? void 0 : arg2.nativeEvent) !== null && _arg2$nativeEvent !== void 0 ? _arg2$nativeEvent : arg1.nativeEvent;
8381
- if (nativeEvent) {
8382
- if (opts.stopClickEventPropagation) {
8383
- nativeEvent.stopPropagation();
8384
- }
8385
- onCheckboxChange(checked, key, nativeEvent.shiftKey);
8383
+ var disabled = isDisabled(row, rowIndex);
8384
+ var defaultOnChange = clickArea === 'checkbox' ? function (arg1, arg2) {
8385
+ var _arg2$nativeEvent;
8386
+ // 这里要同时兼容 antd 和 fusion 的用法
8387
+ // fusion: arg2?.nativeEvent
8388
+ // antd: arg1.nativeEvent
8389
+ var nativeEvent = (_arg2$nativeEvent = arg2 === null || arg2 === void 0 ? void 0 : arg2.nativeEvent) !== null && _arg2$nativeEvent !== void 0 ? _arg2$nativeEvent : arg1.nativeEvent;
8390
+ if (nativeEvent) {
8391
+ if (opts.stopClickEventPropagation) {
8392
+ nativeEvent.stopPropagation();
8386
8393
  }
8387
- } : undefined
8394
+ onCheckboxChange(checked, key, nativeEvent.shiftKey);
8395
+ }
8396
+ } : undefined;
8397
+ var defaultElement = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_14___default.a.createElement(Checkbox, {
8398
+ checked: checked,
8399
+ disabled: disabled,
8400
+ onChange: defaultOnChange
8388
8401
  });
8402
+ var ctx = {
8403
+ type: 'multi',
8404
+ row: row,
8405
+ rowIndex: rowIndex,
8406
+ rowKey: key,
8407
+ checked: checked,
8408
+ disabled: disabled,
8409
+ defaultElement: defaultElement,
8410
+ actions: {
8411
+ select: function select() {
8412
+ if (!checked) onCheckboxChange(false, key, false);
8413
+ },
8414
+ toggle: function toggle(batch) {
8415
+ return onCheckboxChange(checked, key, !!batch);
8416
+ }
8417
+ }
8418
+ };
8419
+ if (opts.customRender) {
8420
+ return opts.customRender(ctx);
8421
+ }
8422
+ return defaultElement;
8389
8423
  },
8390
8424
  features: _objectSpread(_objectSpread({}, (_opts$checkboxColumn2 = opts.checkboxColumn) === null || _opts$checkboxColumn2 === void 0 ? void 0 : _opts$checkboxColumn2.features), {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_6___default()({}, _utils__WEBPACK_IMPORTED_MODULE_17__["MULTI_SELECT_MARK_PROPNAME"], true))
8391
8425
  });
@@ -10550,18 +10584,42 @@ function singleSelect() {
10550
10584
  return null;
10551
10585
  }
10552
10586
  var rowKey = _internals__WEBPACK_IMPORTED_MODULE_10__["internals"].safeGetRowKey(primaryKey, row, rowIndex);
10553
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement(Radio, {
10554
- checked: value === rowKey,
10555
- disabled: isDisabled(row, rowIndex),
10556
- onChange: clickArea === 'radio' ? function (arg1, arg2) {
10557
- var _arg2$nativeEvent;
10558
- var nativeEvent = (_arg2$nativeEvent = arg2 === null || arg2 === void 0 ? void 0 : arg2.nativeEvent) !== null && _arg2$nativeEvent !== void 0 ? _arg2$nativeEvent : arg1 === null || arg1 === void 0 ? void 0 : arg1.nativeEvent;
10559
- if (nativeEvent && opts.stopClickEventPropagation) {
10560
- nativeEvent.stopPropagation();
10561
- }
10562
- onChange(rowKey);
10563
- } : undefined
10587
+ var checked = value === rowKey;
10588
+ var disabled = isDisabled(row, rowIndex);
10589
+ var defaultOnChange = clickArea === 'radio' ? function (arg1, arg2) {
10590
+ var _arg2$nativeEvent;
10591
+ var nativeEvent = (_arg2$nativeEvent = arg2 === null || arg2 === void 0 ? void 0 : arg2.nativeEvent) !== null && _arg2$nativeEvent !== void 0 ? _arg2$nativeEvent : arg1 === null || arg1 === void 0 ? void 0 : arg1.nativeEvent;
10592
+ if (nativeEvent && opts.stopClickEventPropagation) {
10593
+ nativeEvent.stopPropagation();
10594
+ }
10595
+ onChange(rowKey);
10596
+ } : undefined;
10597
+ var defaultElement = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement(Radio, {
10598
+ checked: checked,
10599
+ disabled: disabled,
10600
+ onChange: defaultOnChange
10564
10601
  });
10602
+ var ctx = {
10603
+ type: 'single',
10604
+ row: row,
10605
+ rowIndex: rowIndex,
10606
+ rowKey: rowKey,
10607
+ checked: checked,
10608
+ disabled: disabled,
10609
+ defaultElement: defaultElement,
10610
+ actions: {
10611
+ select: function select() {
10612
+ return onChange(rowKey);
10613
+ },
10614
+ toggle: function toggle() {
10615
+ return onChange(rowKey);
10616
+ }
10617
+ }
10618
+ };
10619
+ if (opts.customRender) {
10620
+ return opts.customRender(ctx);
10621
+ }
10622
+ return defaultElement;
10565
10623
  },
10566
10624
  features: _objectSpread(_objectSpread({}, (_opts$radioColumn2 = opts.radioColumn) === null || _opts$radioColumn2 === void 0 ? void 0 : _opts$radioColumn2.features), {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7___default()({}, _utils__WEBPACK_IMPORTED_MODULE_12__["SINGLE_SELECT_MARK_PROPNAME"], true))
10567
10625
  });
@@ -14813,7 +14871,9 @@ function getTreeDepth(nodes) {
14813
14871
  try {
14814
14872
  for (_iterator.s(); !(_step = _iterator.n()).done;) {
14815
14873
  var column = _step.value;
14816
- if (Object(_isLeafNode__WEBPACK_IMPORTED_MODULE_11__["default"])(column)) {
14874
+ var isHeaderMerge = (column === null || column === void 0 ? void 0 : column.isHeaderMerge) === true;
14875
+ // 当列配置了 isHeaderMerge 时，将其视作“可视叶子”，不再深入子层计算深度
14876
+ if (Object(_isLeafNode__WEBPACK_IMPORTED_MODULE_11__["default"])(column) || isHeaderMerge) {
14817
14877
  maxDepth = Math.max(maxDepth, depth);
14818
14878
  } else {
14819
14879
  dfs(column.children, depth + 1);