@kdcloudjs/table 1.1.4 → 1.1.5-canary.1

package/lib/table/base/styles.js

@@ -21,7 +21,7 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime-cor
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
-var _templateObject, _templateObject2, _templateObject3;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -33,6 +33,7 @@ var prefix = 'kd-';
 var Classes = {
   /** BaseTable 表格组件的外层包裹 div */
   artTableWrapper: "".concat(prefix, "table-wrapper"),
+  artTableBordered: "".concat(prefix, "table-bordered"),
   artTable: "".concat(prefix, "table"),
   tableHeaderMain: "".concat(prefix, "table-header-main"),
   tableHeader: "".concat(prefix, "table-header"),
@@ -73,9 +74,12 @@ var Classes = {
   tableHeaderCellLine: "".concat(prefix, "table-header-cell-line"),
   tableFilterTrigger: "".concat(prefix, "filter-trigger"),
   tableSortIcon: "".concat(prefix, "sort-icon"),
+  tableExtendIcon: "".concat(prefix, "extend-icon"),
   button: "".concat(prefix, "btn"),
   buttonPrimary: "".concat(prefix, "btn-primary"),
   filterIcon: "".concat(prefix, "filter-icon"),
+  rangeSelection: "".concat(prefix, "range-selection"),
+  tableCellRangeSingleCell: "".concat(prefix, "table-cell-range-single-cell"),
   tableCellRangeSelected: "".concat(prefix, "table-cell-range-selected"),
   tableCellRangeTop: "".concat(prefix, "table-cell-range-top"),
   tableCellRangeLeft: "".concat(prefix, "table-cell-range-left"),
@@ -95,7 +99,10 @@ var Classes = {
   rowSpan: "".concat(prefix, "row-span"),
   leaf: "".concat(prefix, "leaf"),
   expanded: "".concat(prefix, "expanded"),
-  collapsed: "".concat(prefix, "collapsed")
+  collapsed: "".concat(prefix, "collapsed"),
+  popup: "".concat(prefix, "popup"),
+  popupHeader: "".concat(prefix, "popup-header"),
+  popupBody: "".concat(prefix, "popup-body")
 };
 exports.Classes = Classes;
 var MenuClasses = {
@@ -116,7 +123,7 @@ var Z = {
   scrollItem: 30,
   loadingIndicator: 40
 };
-var outerBorderStyleMixin = (0, _styledComponents.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  border-top: 1px solid #cccccc;\n  border-right: 1px solid #cccccc;\n  border-bottom: 1px solid #cccccc;\n  border-left: 1px solid #cccccc;\n\n  td.", ",\n  th.", " {\n    border-left: none;\n  }\n  td.", ",\n  th.", " {\n    --border-right: none;\n  }\n\n  thead tr.", " th,\n  tbody tr.", " td {\n    border-top: none;\n  }\n  &.has-footer tfoot tr.", " td {\n    border-bottom: none;\n  }\n  &:not(.has-footer) tbody tr.", " td {\n    border-bottom: none;\n  }\n  td.", ":not(.", "){\n    border-left: var(---cell-border-vertical);\n  }\n  td.", ":not(.", "){\n    border-right: var(---cell-border-vertical);\n  }\n"])), Classes.first, Classes.first, Classes.last, Classes.last, Classes.first, Classes.first, Classes.last, Classes.last, Classes.rowSpan, Classes.first, Classes.rowSpan, Classes.last);
+var outerBorderStyleMixin = (0, _styledComponents.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  border-top: 1px solid #cccccc;\n  border-right: 1px solid #cccccc;\n  border-bottom: 1px solid #cccccc;\n  border-left: 1px solid #cccccc;\n\n  td.", ",\n  th.", " {\n    border-left: none;\n  }\n  td.", ",\n  th.", " {\n    border-right: none;\n  }\n\n  thead tr.", " th,\n  tbody tr.", " td {\n    border-top: none;\n  }\n  &.has-footer tfoot tr.", " td {\n    border-bottom: none;\n  }\n  &:not(.has-footer) tbody tr.", " td {\n    border-bottom: none;\n  }\n  td.", ":not(.", "){\n    border-left: var(---cell-border-vertical);\n  }\n  td.", ":not(.", "){\n    border-right: var(---cell-border-vertical);\n  }\n"])), Classes.first, Classes.first, Classes.last, Classes.last, Classes.first, Classes.first, Classes.last, Classes.last, Classes.rowSpan, Classes.first, Classes.rowSpan, Classes.last);
 var defaultCSSVariables = {
   '--row-height': '48px',
   '--color': '#333',
@@ -126,7 +133,7 @@ var defaultCSSVariables = {
   '--primary-color': '#5582F3',
   '--primary-color-level1': 'rgb(242, 248, 255)',
   '--primary-color-level2': 'rgb(135, 173, 255)',
-  '--icon-color': '#bfbfbf',
+  '--icon-color': '#666666',
   '--strong-border-color': '#d9d9d9',
   '--header-row-height': '32px',
   '--header-color': '#333',
@@ -142,16 +149,20 @@ var defaultCSSVariables = {
   '--cell-border-horizontal': '1px solid #dfe3e8',
   '---cell-border-vertical': '1px solid #dfe3e8',
   '--header-cell-border': '1px solid #dfe3e8',
-  '--header-cell-border-horizontal': '1px solid #dfe3e8'
+  '--cell-border-vertical': '1px solid #dfe3e8',
+  '--header-cell-border-horizontal': '1px solid #dfe3e8',
+  '--header-cell-border-vertical': '1px solid #dfe3e8'
 };
 exports.defaultCSSVariables = defaultCSSVariables;
 var variableConst = getCssVariableText(defaultCSSVariables);
 exports.variableConst = variableConst;
+var notBorderedStyleMixin = (0, _styledComponents.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  --cell-border-vertical: none;\n  --header-cell-border-vertical: none;\n"])));
+var borderedStyleMixin = (0, _styledComponents.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.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);
 
-var StyledArtTableWrapper = _styledComponents.default.div(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  :root {\n    ", "\n  }\n  ", "\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  .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    user-select:none;\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    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-left: 1px solid #0E5FD8 !important;\n    }\n    .", "{\n      border-bottom: 1px solid #0E5FD8 !important;\n    }\n    .", "{\n      border-right: 1px solid #0E5FD8 !important;\n    }\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: left;\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-right: var(--header-cell-border-vertical);\n    border-bottom: var(--header-cell-border-horizontal);\n    position: relative;\n  }\n\n  th.resizeable{\n    border-right:none\n  }\n\n  th.", " {\n    border-right: none;\n    border-bottom: none;\n  }\n\n  tr.", " th {\n    border-top: var(--header-cell-border-horizontal);\n  }\n  th.", " {\n    border-left: 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-right: var(--cell-border-vertical);\n    border-bottom: var(--cell-border-horizontal);\n    word-break: break-all;\n  }\n  td.", " {\n    border-left: 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-right: ", "px;\n      box-shadow: none;\n\n      &.show-shadow {\n        box-shadow: var(--lock-shadow);\n        border-right: var(--cell-border-vertical);\n      }\n    }\n\n    .", " {\n      margin-left: ", "px;\n      box-shadow: none;\n\n      &.show-shadow {\n        box-shadow: var(--lock-shadow);\n        border-left: 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 IE\u517C\u5BB9\n  &.ie-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    }\n    .", " {\n      position: relative;\n    }\n\n    .", " {\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      left:0;\n    }\n    .", "{\n      right: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\n\n  //#region \u7C98\u6027\u6EDA\u52A8\u6761\n  .", " {\n    overflow-y: hidden;\n    overflow-x: auto;\n    z-index: ", ";\n    flex-shrink: 0;\n    flex-grow: 0;\n    border-top: 1px solid var(--border-color);\n    background: var(--bgcolor);\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: auto;\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  }\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  //#endregion\n\n  //#region \u6EDA\u52A8\u6761\u5360\u4F4D\n  .", " {\n    visibility: hidden;\n    flex-shrink: 0;\n  }\n  .", " .", " {\n    border-top: var(--cell-border-horizontal);\n  }\n  //#endregion\n  "])), variableConst, variableConst, outerBorderStyleMixin, Classes.artTable, Classes.tableHeader, Classes.tableHeaderCellContent, Classes.virtual, Classes.tableFooter, Classes.tableBody, Classes.tableFooter, Classes.tableRow, Classes.tableBody, Classes.tableCellRangeSelected, Classes.tableCellRangeTop, Classes.tableCellRangeLeft, Classes.tableCellRangeBottom, Classes.tableCellRangeRight, Classes.tableHeader, Z.header, Classes.tableFooter, Z.footer, Classes.leaf, Classes.first, Classes.first, Classes.first, Classes.first, Classes.first, Classes.last, Classes.lockLeft, Classes.lockRight, Z.lock, Classes.lockShadowMask, Z.lockShadow, Classes.lockShadow, Classes.leftLockShadow, LOCK_SHADOW_PADDING, Classes.rightLockShadow, LOCK_SHADOW_PADDING, Classes.emptyWrapper, Classes.virtual, Classes.tableBody, Classes.tableFooter, Classes.tableHeaderMain, Classes.tableHeader, Classes.tableFooterMain, Classes.fixedLeft, Classes.fixedRight, Z.lock, Classes.fixedLeft, Classes.fixedRight, Classes.rowDetailContainer, Classes.rowDetailItem, Z.rowDetail, Classes.stickyScroll, Z.scrollItem, Classes.stickyScrollItem, Classes.loadingWrapper, Classes.loadingContentWrapper, Classes.loadingIndicatorWrapper, Classes.loadingIndicator, Z.loadingIndicator, Classes.tableFilterTrigger, Classes.tableSortIcon, Classes.verticalScrollPlaceholder, Classes.tableFooter, Classes.verticalScrollPlaceholder);
+var StyledArtTableWrapper = _styledComponents.default.div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  :root {\n    ", "\n  }\n  ", "\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    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-left: 1px solid #0E5FD8 !important;\n    }\n    .", "{\n      border-bottom: 1px solid #0E5FD8 !important;\n    }\n    .", "{\n      border-right: 1px solid #0E5FD8 !important;\n    }\n  }\n\n  .", " {\n    user-select:none;\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: left;\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-right: var(--header-cell-border-vertical);\n    border-bottom: var(--header-cell-border-horizontal);\n    position: relative;\n  }\n\n  th.resizeable{\n    border-right: var(--header-cell-border-vertical)\n  }\n\n  th.", " {\n    border-right: 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-left: 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-right: var(--cell-border-vertical);\n    border-bottom: var(--cell-border-horizontal);\n    word-break: break-all;\n  }\n  td.", " {\n    border-left: 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-right: ", "px;\n      box-shadow: none;\n\n      &.show-shadow {\n        box-shadow: var(--lock-shadow);\n        border-right: var(--cell-border-vertical);\n      }\n    }\n\n    .", " {\n      margin-left: ", "px;\n      box-shadow: none;\n\n      &.show-shadow {\n        box-shadow: var(--lock-shadow);\n        border-left: 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 IE\u517C\u5BB9\n  &.ie-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    }\n    .", " {\n      position: relative;\n    }\n\n    .", " {\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      left:0;\n    }\n    .", "{\n      right: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\n\n  //#region \u7C98\u6027\u6EDA\u52A8\u6761\n  .", " {\n    overflow-y: hidden;\n    overflow-x: auto;\n    z-index: ", ";\n    flex-shrink: 0;\n    flex-grow: 0;\n    border-top: 1px solid var(--border-color);\n    background: var(--bgcolor);\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    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  //#endregion\n\n  "])), variableConst, variableConst, outerBorderStyleMixin, Classes.artTableBordered, notBorderedStyleMixin, Classes.artTableBordered, borderedStyleMixin, Classes.artTable, Classes.tableHeader, Classes.tableHeaderCellContent, Classes.virtual, Classes.tableFooter, Classes.tableBody, Classes.tableFooter, Classes.tableRow, Classes.tableBody, Classes.tableFooter, Classes.tableCellRangeSelected, Classes.tableCellRangeTop, Classes.tableCellRangeLeft, Classes.tableCellRangeBottom, Classes.tableCellRangeRight, Classes.rangeSelection, Classes.tableHeader, Z.header, Classes.tableFooter, Z.footer, Classes.leaf, Classes.first, Classes.first, Classes.first, Classes.first, Classes.first, Classes.last, Classes.lockLeft, Classes.lockRight, Z.lock, Classes.lockShadowMask, Z.lockShadow, Classes.lockShadow, Classes.leftLockShadow, LOCK_SHADOW_PADDING, Classes.rightLockShadow, LOCK_SHADOW_PADDING, Classes.emptyWrapper, Classes.virtual, Classes.tableBody, Classes.tableFooter, Classes.tableHeaderMain, Classes.tableHeader, Classes.tableFooterMain, Classes.fixedLeft, Classes.fixedRight, Z.lock, Classes.fixedLeft, Classes.fixedRight, Classes.rowDetailContainer, Classes.rowDetailItem, Z.rowDetail, Classes.stickyScroll, Z.scrollItem, Classes.stickyScrollItem, Classes.loadingWrapper, Classes.loadingContentWrapper, Classes.loadingIndicatorWrapper, Classes.loadingIndicator, Z.loadingIndicator, Classes.tableFilterTrigger, Classes.tableSortIcon, Classes.tableExtendIcon, Classes.verticalScrollPlaceholder, Classes.tableFooter, Classes.verticalScrollPlaceholder, Classes.tableHeaderCellResize);
 
 exports.StyledArtTableWrapper = StyledArtTableWrapper;
-var ButtonCSS = (0, _styledComponents.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n  //#region \u6309\u94AE\n  .", "{\n    color: var(--color);\n    background:#ffffff;\n    border:1px solid var(--strong-border-color);\n    border-radius: 2px;\n    cursor: pointer;\n    &:hover{\n      color: var(--primary-color);\n      border:1px solid var(--primary-color);\n    }\n  }\n  .", " {\n    color:#ffffff;\n    background-color: var(--primary-color);\n    border:none;\n    &:hover{\n      color:#ffffff;\n      background-color: var(--primary-color-level2);\n      border:none;\n    }\n  }\n//#endregion\n"])), variableConst, Classes.button, Classes.buttonPrimary);
+var ButtonCSS = (0, _styledComponents.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n  //#region \u6309\u94AE\n  .", "{\n    color: var(--color);\n    background:#ffffff;\n    border:1px solid var(--strong-border-color);\n    border-radius: 2px;\n    cursor: pointer;\n    &:hover{\n      color: var(--primary-color);\n      border:1px solid var(--primary-color);\n    }\n  }\n  .", " {\n    color:#ffffff;\n    background-color: var(--primary-color);\n    border:none;\n    &:hover{\n      color:#ffffff;\n      background-color: var(--primary-color-level2);\n      border:none;\n    }\n  }\n//#endregion\n"])), variableConst, Classes.button, Classes.buttonPrimary);
 exports.ButtonCSS = ButtonCSS;
 
 function getCssVariableText(obj) {

package/lib/table/base/table.d.ts

@@ -47,6 +47,8 @@ export interface BaseTableProps {
     scrollbarWidth?: number;
     /** 使用来自外层 div 的边框代替单元格的外边框 */
     useOuterBorder?: boolean;
+    /** 显示表格单元格边框线 */
+    bordered?: boolean;
     /** 表格是否在加载中 */
     isLoading?: boolean;
     /** 数据为空时，单元格的高度 */

package/lib/table/base/table.js

@@ -31,6 +31,8 @@ var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
@@ -43,8 +45,6 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/getPrototypeOf"));
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _react = _interopRequireDefault(require("react"));
@@ -73,8 +73,6 @@ var _styles = require("./styles");
 
 var _utils = require("./utils");
 
-var _cssVarsPonyfill = _interopRequireDefault(require("css-vars-ponyfill"));
-
 var _utils2 = require("../utils");
 
 var _renderTemplates = _interopRequireDefault(require("./renderTemplates"));
@@ -93,31 +91,6 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !_Reflect$construct) return false; if (_Reflect$construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-var cssPolifill = function cssPolifill(_ref) {
-  var variables = _ref.variables,
-      enableCSSVariables = _ref.enableCSSVariables;
-
-  // const style = document.createElement('style')
-  // style.type = 'text/css'
-  // style.innerHTML = '.aaa{ --color: red; }'
-  // document.getElementsByTagName('head').item(0).appendChild(style)
-  // const variableNames = variableConst.match(/--.*?(?=:)/g)
-  // variables = variableNames.map((name) => rootElement.style[name])
-  if (enableCSSVariables === false) {
-    return;
-  }
-
-  (0, _cssVarsPonyfill.default)({
-    // exclude: 'link[href*="semantic-ui"]',
-    // onlyLegacy: false,
-    // rootElement: rootElement,
-    include: 'style[data-styled]',
-    variables: (0, _extends2.default)({}, _styles.defaultCSSVariables, variables),
-    watch: true,
-    silent: true
-  });
-};
-
 var propsDotEmptyContentDeprecatedWarned = false;
 
 function warnPropsDotEmptyContentIsDeprecated() {
@@ -526,6 +499,8 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
+      var _cx;
+
       // console.log('render table')
       var info = (0, _calculations.calculateRenderInfo)(this);
       this.lastInfo = info;
@@ -541,28 +516,29 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
           isLoading = _this$props6.isLoading,
           getTableProps = _this$props6.getTableProps,
           footerDataSource = _this$props6.footerDataSource,
-          components = _this$props6.components;
-      var artTableWrapperClassName = (0, _classnames.default)(_styles.Classes.artTableWrapper, {
+          components = _this$props6.components,
+          bordered = _this$props6.bordered;
+      var artTableWrapperClassName = (0, _classnames.default)(_styles.Classes.artTableWrapper, (_cx = {
         'use-outer-border': useOuterBorder,
         empty: dataSource.length === 0,
         lock: info.hasLockColumn,
         'has-header': hasHeader,
         'sticky-header': isStickyHeader !== null && isStickyHeader !== void 0 ? isStickyHeader : isStickyHead,
         'has-footer': footerDataSource.length > 0,
-        'sticky-footer': isStickyFooter,
-        'ie-polyfill-wrapper': _utils2.browserType.isIE
-      }, className);
+        'sticky-footer': isStickyFooter
+      }, (0, _defineProperty2.default)(_cx, _styles.Classes.artTableBordered, bordered), (0, _defineProperty2.default)(_cx, 'ie-polyfill-wrapper', _utils2.browserType.isIE), _cx), className);
       var artTableWrapperProps = (0, _defineProperty2.default)({
         className: artTableWrapperClassName,
         style: style
       }, _utils.STYLED_REF_PROP, this.artTableWrapperRef);
+      var tableProps = getTableProps() || {};
       return /*#__PURE__*/_react.default.createElement(_styles.StyledArtTableWrapper, (0, _extends2.default)({}, artTableWrapperProps), /*#__PURE__*/_react.default.createElement(_loading.default, {
         visible: isLoading,
         LoadingIcon: components.LoadingIcon,
         LoadingContentWrapper: components.LoadingContentWrapper
-      }, /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
-        className: _styles.Classes.artTable
-      }, getTableProps()), this.renderTableHeader(info), this.renderTableBody(info), this.renderTableFooter(info), this.renderLockShadows(info)), this.renderStickyScroll(info)));
+      }, /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, tableProps, {
+        className: (0, _classnames.default)(_styles.Classes.artTable, tableProps.className)
+      }), this.renderTableHeader(info), this.renderTableBody(info), this.renderTableFooter(info), this.renderLockShadows(info)), this.renderStickyScroll(info)));
     }
   }, {
     key: "componentDidMount",
@@ -579,10 +555,12 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
 
       var _this$props7 = this.props,
           cssVariables = _this$props7.cssVariables,
-          enableCSSVariables = _this$props7.enableCSSVariables;
-      cssPolifill({
+          enableCSSVariables = _this$props7.enableCSSVariables,
+          bordered = _this$props7.bordered;
+      (0, _utils.cssPolifill)({
         variables: cssVariables || {},
-        enableCSSVariables: enableCSSVariables
+        enableCSSVariables: enableCSSVariables,
+        bordered: bordered
       });
       (_b = (_a = this.props).setTableWidth) === null || _b === void 0 ? void 0 : _b.call(_a, this.domHelper.tableBody.clientWidth);
       (_d = (_c = this.props).setTableDomHelper) === null || _d === void 0 ? void 0 : _d.call(_c, this.domHelper);
@@ -618,7 +596,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
         var currentHasFooter = this.props.footerDataSource.length > 0;
 
         if (!prevHasFooter && currentHasFooter) {
-          (0, _utils.getTableScrollFooterDOM)(this.domHelper).scrollLeft = this.domHelper.tableBody.scrollLeft;
+          (0, _utils.getTableScrollFooterDOM)(this.domHelper).scrollLeft = this.domHelper.virtual.scrollLeft;
         }
       }
     }
@@ -654,15 +632,15 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
 
       this.rootSubscription.add((0, _rxjs.combineLatest)([richVisibleRects$.pipe(op.map(function (p) {
         return p.clipRect;
-      }), op.distinctUntilChanged(_utils.shallowEqual)), this.props$.pipe(op.startWith(null), op.pairwise(), op.filter(function (_ref2) {
-        var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
-            prevProps = _ref3[0],
-            props = _ref3[1];
+      }), op.distinctUntilChanged(_utils.shallowEqual)), this.props$.pipe(op.startWith(null), op.pairwise(), op.filter(function (_ref) {
+        var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
+            prevProps = _ref2[0],
+            props = _ref2[1];
 
         return prevProps == null || !prevProps.isLoading && props.isLoading;
-      }))]).subscribe(function (_ref4) {
-        var _ref5 = (0, _slicedToArray2.default)(_ref4, 1),
-            clipRect = _ref5[0];
+      }))]).subscribe(function (_ref3) {
+        var _ref4 = (0, _slicedToArray2.default)(_ref3, 1),
+            clipRect = _ref4[0];
 
         var loadingIndicator = _this2.domHelper.getLoadingIndicator();
 
@@ -681,9 +659,9 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
             horizontal = _this2$lastInfo$useVi.horizontal,
             vertical = _this2$lastInfo$useVi.vertical;
         return horizontal || vertical;
-      }), op.map(function (_ref6) {
-        var clipRect = _ref6.clipRect,
-            offsetY = _ref6.offsetY;
+      }), op.map(function (_ref5) {
+        var clipRect = _ref5.clipRect,
+            offsetY = _ref5.offsetY;
         return {
           maxRenderHeight: clipRect.bottom - clipRect.top,
           maxRenderWidth: clipRect.right - clipRect.left,
@@ -700,9 +678,9 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
       })).subscribe(function (sizeAndOffset) {
         _this2.setState(sizeAndOffset);
       }));
-      this.rootSubscription.add(richVisibleRects$.pipe(op.map(function (_ref7) {
-        var clipRect = _ref7.clipRect,
-            offsetY = _ref7.offsetY;
+      this.rootSubscription.add(richVisibleRects$.pipe(op.map(function (_ref6) {
+        var clipRect = _ref6.clipRect,
+            offsetY = _ref6.offsetY;
         return {
           maxRenderHeight: clipRect.bottom - clipRect.top,
           maxRenderWidth: clipRect.right - clipRect.left,

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

@@ -36,4 +36,11 @@ export declare function shallowEqual<T>(objA: T, objB: T): boolean;
 export declare function composeRowPropsGetter(getRowProps: (record: any, rowIndex: number) => React.HTMLAttributes<HTMLTableRowElement>, pendingRowProps?: React.HTMLAttributes<HTMLTableRowElement>): (record: any, rowIndex: number) => React.HTMLAttributes<HTMLTableRowElement>;
 export declare function getTableScrollHeaderDOM(domHelper: TableDOMHelper): HTMLDivElement;
 export declare function getTableScrollFooterDOM(domHelper: TableDOMHelper): HTMLDivElement;
+export declare const cssPolifill: ({ variables, enableCSSVariables, bordered }: {
+    variables: {
+        [key: string]: any;
+    };
+    enableCSSVariables?: boolean;
+    bordered?: boolean;
+}) => void;
 export {};

package/lib/table/base/utils.js

@@ -23,6 +23,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.addResizeObserver = exports.STYLED_VERSION = exports.STYLED_REF_PROP = exports.OVERSCAN_SIZE = exports.AUTO_VIRTUAL_THRESHOLD = void 0;
 exports.composeRowPropsGetter = composeRowPropsGetter;
+exports.cssPolifill = void 0;
 exports.getScrollbarSize = getScrollbarSize;
 exports.getTableScrollFooterDOM = getTableScrollFooterDOM;
 exports.getTableScrollHeaderDOM = getTableScrollHeaderDOM;
@@ -49,10 +50,16 @@ var _resizeObserverPolyfill = _interopRequireDefault(require("resize-observer-po
 
 var styledComponents = _interopRequireWildcard(require("styled-components"));
 
+var _cssVarsPonyfill = _interopRequireDefault(require("css-vars-ponyfill"));
+
 var _mergeCellProps = _interopRequireDefault(require("../utils/mergeCellProps"));
 
 var _utils = require("../utils");
 
+var _styles = require("./styles");
+
+var _element = require("../utils/element");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -190,7 +197,12 @@ function syncScrollLeft(elements, callback) {
           return;
         }
 
-        var scrollLeft = ele.scrollLeft;
+        var scrollLeft = ele.scrollLeft; // 某一元素当滚动条消失时会触发scroll事件（scrolLeft重置为0），不同步其他其他元素的scrollLeft
+
+        if (scrollLeft === 0 && !(0, _element.hasScroll)(ele)) {
+          return;
+        }
+
         publishScrollLeft(ele, scrollLeft);
         callback(scrollLeft);
       };
@@ -268,4 +280,33 @@ function getTableScrollHeaderDOM(domHelper) {
 
 function getTableScrollFooterDOM(domHelper) {
   return _utils.browserType.isIE ? domHelper.tableFooterMain : domHelper.tableFooter;
-}
+}
+
+var cssPolifill = function cssPolifill(_ref) {
+  var variables = _ref.variables,
+      enableCSSVariables = _ref.enableCSSVariables,
+      bordered = _ref.bordered;
+
+  if (enableCSSVariables === false) {
+    return;
+  }
+
+  var conditionCSSVariables = {}; // 默认情况下存在td、th无左右边框，开启`bordered`属性后才开启，否则隐藏这两种属性
+
+  if (!bordered) {
+    conditionCSSVariables['--cell-border-vertical'] = 'none';
+    conditionCSSVariables['--header-cell-border-vertical'] = 'none';
+  }
+
+  (0, _cssVarsPonyfill.default)({
+    // exclude: 'link[href*="semantic-ui"]',
+    // onlyLegacy: false,
+    // rootElement: rootElement,
+    include: 'style[data-styled]',
+    variables: (0, _extends2.default)({}, _styles.defaultCSSVariables, variables, conditionCSSVariables),
+    watch: true,
+    silent: true
+  });
+};
+
+exports.cssPolifill = cssPolifill;

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

@@ -0,0 +1,6 @@
+import { TablePipeline } from "../pipeline";
+export interface colGroupExtendOption {
+    onChangeExtendStatus?({}: any, {}: any): void;
+    extendStatus?: {};
+}
+export declare const colGroupExtendable: (opts?: colGroupExtendOption) => (pipeline: TablePipeline) => TablePipeline;

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

@@ -0,0 +1,124 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.colGroupExtendable = void 0;
+
+var _splice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/splice"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
+
+var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/taggedTemplateLiteral"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+
+var _internals = require("../../internals");
+
+var _utils = require("../../utils");
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _styles = require("../../base/styles");
+
+var _templateObject;
+
+var ExtendIconStyle = _styledComponents.default.span(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  font-size:12px;\n  margin-left:4px;\n"])));
+
+var stateKey = 'colExtend';
+
+var ExpandIcon = function ExpandIcon(_ref) {
+  var style = _ref.style,
+      className = _ref.className,
+      size = _ref.size,
+      isExtend = _ref.isExtend;
+  return isExtend ? /*#__PURE__*/_react.default.createElement("svg", {
+    className: className,
+    width: size,
+    height: size,
+    style: style,
+    viewBox: "96 96 896 896"
+  }, /*#__PURE__*/_react.default.createElement("path", {
+    d: "M678.347087 178.347087C690.550972 166.143203 690.550972 146.356797 678.347087 134.152913C666.143203 121.949029 646.356797 121.949029 634.152913 134.152913L290.402913 477.902913C278.199029 490.106797 278.199029 509.893203 290.402913 522.097087L634.152913 865.847087C646.356797 878.050972 666.143203 878.050972 678.347087 865.847087C690.550972 853.643203 690.550972 833.856797 678.347087 821.652913L356.694175 500L678.347087 178.347087z"
+  })) : /*#__PURE__*/_react.default.createElement("svg", {
+    className: className,
+    width: size,
+    height: size,
+    style: style,
+    viewBox: "96 96 896 896"
+  }, /*#__PURE__*/_react.default.createElement("path", {
+    d: "M321.652913 178.347087C309.449029 166.143203 309.449029 146.356797 321.652913 134.152913C333.856797 121.949029 353.643203 121.949029 365.847088 134.152913L709.597087 477.902913C721.800972 490.106797 721.800972 509.893203 709.597087 522.097087L365.847088 865.847087C353.643203 878.050972 333.856797 878.050972 321.652913 865.847087C309.449029 853.643203 309.449029 833.856797 321.652913 821.652913L643.305825 500L321.652913 178.347087z"
+  }));
+};
+
+var colGroupExtendable = function colGroupExtendable() {
+  var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return function (pipeline) {
+    var _a, _b;
+
+    var columns = pipeline.getColumns();
+    var curState = (_b = (_a = opts.extendStatus) !== null && _a !== void 0 ? _a : pipeline.getStateAtKey(stateKey)) !== null && _b !== void 0 ? _b : {};
+
+    var processColumns = function processColumns(columns) {
+      // 当组合列可伸缩，且处于收缩状态时，只渲染一个子列，其他不渲染
+      var toggle = function toggle(col) {
+        // 对应的 col 进行状态切换
+        var changedValue = (0, _defineProperty2.default)({}, col.code, !curState[col.code]);
+        curState[col.code] = !curState[col.code];
+        pipeline.setStateAtKey(stateKey, (0, _extends2.default)({}, curState));
+        (opts === null || opts === void 0 ? void 0 : opts.onChangeExtendStatus) && opts.onChangeExtendStatus(curState, changedValue);
+      };
+
+      var addIcon = function addIcon(col) {
+        var result = (0, _extends2.default)({}, col);
+
+        var addIconNode = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, _internals.internals.safeRenderHeader((0, _extends2.default)({}, col)), /*#__PURE__*/_react.default.createElement(ExtendIconStyle, {
+          onClick: function onClick() {
+            toggle(col);
+          }
+        }, /*#__PURE__*/_react.default.createElement(ExpandIcon, {
+          style: {
+            userSelect: 'none',
+            marginLeft: 2,
+            flexShrink: 0,
+            cursor: "pointer",
+            verticalAlign: 'middle'
+          },
+          className: (0, _classnames.default)((0, _defineProperty2.default)({}, _styles.Classes.tableExtendIcon, true)),
+          size: 16,
+          isExtend: curState[col.code]
+        })));
+
+        result.title = addIconNode;
+        return result;
+      };
+
+      return (0, _utils.makeRecursiveMapper)(function (col) {
+        var _a;
+
+        var _ref2 = (col === null || col === void 0 ? void 0 : col.features) || {},
+            showExtendIcon = _ref2.showExtendIcon;
+
+        if (showExtendIcon === true && ((_a = col.children) === null || _a === void 0 ? void 0 : _a.length) > 1) {
+          var _context;
+
+          col = addIcon(col);
+          curState[col.code] === false && (0, _splice.default)(_context = col.children).call(_context, 1, col.children.length);
+        }
+
+        return col;
+      })(columns);
+    };
+
+    pipeline.columns(processColumns(columns));
+    return pipeline;
+  };
+};
+
+exports.colGroupExtendable = colGroupExtendable;

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

@@ -79,7 +79,7 @@ function columnDrag() {
         },
         headerCellProps: (0, _utils.mergeCellProps)(col.headerCellProps, {
           onMouseDown: !isLeaf || path.length > 1 ? undefined : function (e) {
-            if (e.button !== 0) {
+            if (e.button !== 0 || !e.currentTarget.contains(e.target)) {
               return;
             }
 
@@ -255,13 +255,14 @@ function columnDrag() {
             }
 
             function handleMouseUp(e) {
-              e.stopPropagation();
               document.body.removeEventListener('mousemove', handleMouseMove);
               document.body.removeEventListener('mouseup', handleMouseUp);
-              window.removeEventListener('selectstart', disableSelect); // 阻止列头点击事件，防止拖动后触发列头过滤事件
+              window.removeEventListener('selectstart', disableSelect);
 
               if (_isMoveWhenClicking(mouseDownClientX, mouseDownClientY, e.clientX, e.clientY)) {
-                currentTarget.addEventListener('click', stopClickPropagation);
+                e.stopPropagation(); // 存在移动就阻止冒泡
+
+                currentTarget.addEventListener('click', stopClickPropagation); // 阻止列头点击事件，防止拖动后触发列头过滤事件
               }
 
               window.requestAnimationFrame(function () {

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

@@ -12,9 +12,11 @@ export interface FilterFeatureOptions {
     keepDataSource?: boolean;
     /** 过滤模式。单列过滤 single，多列过滤 multiple，默认为多选 */
     mode?: 'single' | 'multiple';
-    /**过滤图标 */
-    filterIcon?: ReactNode;
+    /** 过滤图标 */
+    filterIcon?: ReactNode | ((filtered: boolean) => ReactNode);
     /** 是否对触发弹出过滤面板 的 click 事件调用 event.stopPropagation() */
     stopClickEventPropagation?: boolean;
+    /** 是否隐藏过滤弹出菜单header区域 */
+    hideFilterPopupHeader?: boolean;
 }
 export declare function filter(opts?: FilterFeatureOptions): (pipeline: TablePipeline) => TablePipeline;