@kdcloudjs/table 1.1.4-canary.1 → 1.1.4

package/es/table/base/html-table.js

@@ -124,7 +124,7 @@ export function HtmlTable(_ref) {
       positionStyle.left = hozInfo.stickyLeftMap.get(colIndex);
     } else if (colIndex >= fullFlatCount - rightFlatCount) {
       positionStyle.position = 'sticky';
-      positionStyle.right = hozInfo.stickyRightMap.get(colIndex) - (typeof stickyRightOffset === 'number' ? stickyRightOffset : 0);
+      positionStyle.right = hozInfo.stickyRightMap.get(colIndex) - stickyRightOffset;
     }
 
     return /*#__PURE__*/React.createElement('td', _extends(_extends(_extends(_extends({

package/es/table/base/styles.d.ts

@@ -2,7 +2,6 @@ export declare const LOCK_SHADOW_PADDING = 20;
 export declare const Classes: {
     /** BaseTable 表格组件的外层包裹 div */
     readonly artTableWrapper: string;
-    readonly artTableBordered: string;
     readonly artTable: string;
     readonly tableHeaderMain: string;
     readonly tableHeader: string;
@@ -41,8 +40,6 @@ export declare const Classes: {
     readonly button: string;
     readonly buttonPrimary: string;
     readonly filterIcon: string;
-    readonly rangeSelection: string;
-    readonly tableCellRangeSingleCell: string;
     readonly tableCellRangeSelected: string;
     readonly tableCellRangeTop: string;
     readonly tableCellRangeLeft: string;
@@ -115,13 +112,13 @@ export declare type BaseTableCSSVariables = Partial<{
     '--border-color': string;
     /** 单元格边框，默认为 1px solid #dfe3e8 */
     '--cell-border': string;
-    /** 单元格上下边框，默认为 none ，默认值为 1px solid #dfe3e8 */
+    /** 单元格上下边框，默认为 #dfe3e8 */
     '--cell-border-horizontal': string;
     /** 单元格左右边框，默认为 #dfe3e8 */
     '--cell-border-vertical': string;
     /** 表头单元格边框，默认为 1px solid #dfe3e8 */
     '--header-cell-border': string;
-    /** 表头单元格上下边框，默认为 none ，默认值为 1px solid #dfe3e8 */
+    /** 表头单元格上下边框，默认为 1px solid #dfe3e8 */
     '--header-cell-border-horizontal': string;
     /** 表头单元格左右边框，默认为 1px solid #dfe3e8 */
     '--header-cell-border-vertical': string;
@@ -151,9 +148,7 @@ export declare const defaultCSSVariables: {
     '--cell-border-horizontal': string;
     '---cell-border-vertical': string;
     '--header-cell-border': string;
-    '--cell-border-vertical': string;
     '--header-cell-border-horizontal': string;
-    '--header-cell-border-vertical': string;
 };
 export declare const variableConst: string;
 export declare const StyledArtTableWrapper: any;

package/es/table/base/styles.js

@@ -1,6 +1,6 @@
 import _taggedTemplateLiteral from "@babel/runtime-corejs3/helpers/taggedTemplateLiteral";
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
+var _templateObject, _templateObject2, _templateObject3;
 
 import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
@@ -10,7 +10,6 @@ var prefix = 'kd-';
 export 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"),
@@ -54,8 +53,6 @@ export var Classes = {
   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"),
@@ -94,7 +91,7 @@ var Z = {
   scrollItem: 30,
   loadingIndicator: 40
 };
-var outerBorderStyleMixin = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\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 = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\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);
 export var defaultCSSVariables = {
   '--row-height': '48px',
   '--color': '#333',
@@ -104,7 +101,7 @@ export var defaultCSSVariables = {
   '--primary-color': '#5582F3',
   '--primary-color-level1': 'rgb(242, 248, 255)',
   '--primary-color-level2': 'rgb(135, 173, 255)',
-  '--icon-color': '#666666',
+  '--icon-color': '#bfbfbf',
   '--strong-border-color': '#d9d9d9',
   '--header-row-height': '32px',
   '--header-color': '#333',
@@ -120,15 +117,11 @@ export var defaultCSSVariables = {
   '--cell-border-horizontal': '1px solid #dfe3e8',
   '---cell-border-vertical': '1px solid #dfe3e8',
   '--header-cell-border': '1px solid #dfe3e8',
-  '--cell-border-vertical': '1px solid #dfe3e8',
-  '--header-cell-border-horizontal': '1px solid #dfe3e8',
-  '--header-cell-border-vertical': '1px solid #dfe3e8'
+  '--header-cell-border-horizontal': '1px solid #dfe3e8'
 };
 export var variableConst = getCssVariableText(defaultCSSVariables);
-var notBorderedStyleMixin = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  --cell-border-vertical: none;\n  --header-cell-border-vertical: none;\n"])));
-var borderedStyleMixin = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\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);
-export var StyledArtTableWrapper = styled.div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\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  }\n  .", " {\n    display: flex\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  \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.filterIcon, Classes.tableSortIcon, Classes.verticalScrollPlaceholder, Classes.tableFooter, Classes.verticalScrollPlaceholder, Classes.tableHeaderCellResize);
-export var ButtonCSS = css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\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);
+export var StyledArtTableWrapper = styled.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\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);
+export var ButtonCSS = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\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);
 
 function getCssVariableText(obj) {
   return _Object$keys(obj).reduce(function (acc, key) {

package/es/table/base/table.d.ts

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

package/es/table/base/table.js

@@ -3,13 +3,13 @@ import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
 import _Symbol from "@babel/runtime-corejs3/core-js-stable/symbol";
 import _getIteratorMethod from "@babel/runtime-corejs3/core-js/get-iterator-method";
 import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
-import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
 import _createClass from "@babel/runtime-corejs3/helpers/createClass";
 import _inherits from "@babel/runtime-corejs3/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime-corejs3/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime-corejs3/helpers/getPrototypeOf";
+import _extends from "@babel/runtime-corejs3/helpers/extends";
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
@@ -37,10 +37,37 @@ import { getFullRenderRange, makeRowHeightManager } from './helpers/rowHeightMan
 import { TableDOMHelper } from './helpers/TableDOMUtils';
 import { HtmlTable } from './html-table';
 import Loading from './loading';
-import { Classes, LOCK_SHADOW_PADDING, StyledArtTableWrapper } from './styles';
-import { addResizeObserver, getScrollbarSize, OVERSCAN_SIZE, shallowEqual, STYLED_REF_PROP, sum, syncScrollLeft, throttledWindowResize$, getTableScrollFooterDOM, getTableScrollHeaderDOM, cssPolifill } from './utils';
+import { Classes, LOCK_SHADOW_PADDING, StyledArtTableWrapper, defaultCSSVariables } from './styles';
+import { addResizeObserver, getScrollbarSize, OVERSCAN_SIZE, shallowEqual, STYLED_REF_PROP, sum, syncScrollLeft, throttledWindowResize$, getTableScrollFooterDOM, getTableScrollHeaderDOM } from './utils';
+import cssVars from 'css-vars-ponyfill';
 import { console, browserType } from '../utils';
 import getTableRenderTemplate from './renderTemplates';
+
+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;
+  }
+
+  cssVars({
+    // exclude: 'link[href*="semantic-ui"]',
+    // onlyLegacy: false,
+    // rootElement: rootElement,
+    include: 'style[data-styled]',
+    variables: _extends({}, defaultCSSVariables, variables),
+    watch: true,
+    silent: true
+  });
+};
+
 var propsDotEmptyContentDeprecatedWarned = false;
 
 function warnPropsDotEmptyContentIsDeprecated() {
@@ -450,8 +477,6 @@ export var BaseTable = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _cx;
-
       // console.log('render table')
       var info = calculateRenderInfo(this);
       this.lastInfo = info;
@@ -467,31 +492,30 @@ export var BaseTable = /*#__PURE__*/function (_React$Component) {
           isLoading = _this$props6.isLoading,
           getTableProps = _this$props6.getTableProps,
           footerDataSource = _this$props6.footerDataSource,
-          components = _this$props6.components,
-          bordered = _this$props6.bordered;
-      var artTableWrapperClassName = cx(Classes.artTableWrapper, (_cx = {
+          components = _this$props6.components;
+      var artTableWrapperClassName = cx(Classes.artTableWrapper, {
         '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
-      }, _defineProperty(_cx, Classes.artTableBordered, bordered), _defineProperty(_cx, 'ie-polyfill-wrapper', browserType.isIE), _cx), className);
+        'sticky-footer': isStickyFooter,
+        'ie-polyfill-wrapper': browserType.isIE
+      }, className);
 
       var artTableWrapperProps = _defineProperty({
         className: artTableWrapperClassName,
         style: style
       }, STYLED_REF_PROP, this.artTableWrapperRef);
 
-      var tableProps = getTableProps() || {};
       return /*#__PURE__*/React.createElement(StyledArtTableWrapper, _extends({}, artTableWrapperProps), /*#__PURE__*/React.createElement(Loading, {
         visible: isLoading,
         LoadingIcon: components.LoadingIcon,
         LoadingContentWrapper: components.LoadingContentWrapper
-      }, /*#__PURE__*/React.createElement("div", _extends({}, tableProps, {
-        className: cx(Classes.artTable, tableProps.className)
-      }), this.renderTableHeader(info), this.renderTableBody(info), this.renderTableFooter(info), this.renderLockShadows(info)), this.renderStickyScroll(info)));
+      }, /*#__PURE__*/React.createElement("div", _extends({
+        className: Classes.artTable
+      }, getTableProps()), this.renderTableHeader(info), this.renderTableBody(info), this.renderTableFooter(info), this.renderLockShadows(info)), this.renderStickyScroll(info)));
     }
   }, {
     key: "componentDidMount",
@@ -508,12 +532,10 @@ export var BaseTable = /*#__PURE__*/function (_React$Component) {
 
       var _this$props7 = this.props,
           cssVariables = _this$props7.cssVariables,
-          enableCSSVariables = _this$props7.enableCSSVariables,
-          bordered = _this$props7.bordered;
+          enableCSSVariables = _this$props7.enableCSSVariables;
       cssPolifill({
         variables: cssVariables || {},
-        enableCSSVariables: enableCSSVariables,
-        bordered: bordered
+        enableCSSVariables: enableCSSVariables
       });
       (_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);
@@ -585,15 +607,15 @@ export var BaseTable = /*#__PURE__*/function (_React$Component) {
 
       this.rootSubscription.add(combineLatest([richVisibleRects$.pipe(op.map(function (p) {
         return p.clipRect;
-      }), op.distinctUntilChanged(shallowEqual)), this.props$.pipe(op.startWith(null), op.pairwise(), op.filter(function (_ref) {
-        var _ref2 = _slicedToArray(_ref, 2),
-            prevProps = _ref2[0],
-            props = _ref2[1];
+      }), op.distinctUntilChanged(shallowEqual)), this.props$.pipe(op.startWith(null), op.pairwise(), op.filter(function (_ref2) {
+        var _ref3 = _slicedToArray(_ref2, 2),
+            prevProps = _ref3[0],
+            props = _ref3[1];
 
         return prevProps == null || !prevProps.isLoading && props.isLoading;
-      }))]).subscribe(function (_ref3) {
-        var _ref4 = _slicedToArray(_ref3, 1),
-            clipRect = _ref4[0];
+      }))]).subscribe(function (_ref4) {
+        var _ref5 = _slicedToArray(_ref4, 1),
+            clipRect = _ref5[0];
 
         var loadingIndicator = _this2.domHelper.getLoadingIndicator();
 
@@ -612,9 +634,9 @@ export var BaseTable = /*#__PURE__*/function (_React$Component) {
             horizontal = _this2$lastInfo$useVi.horizontal,
             vertical = _this2$lastInfo$useVi.vertical;
         return horizontal || vertical;
-      }), op.map(function (_ref5) {
-        var clipRect = _ref5.clipRect,
-            offsetY = _ref5.offsetY;
+      }), op.map(function (_ref6) {
+        var clipRect = _ref6.clipRect,
+            offsetY = _ref6.offsetY;
         return {
           maxRenderHeight: clipRect.bottom - clipRect.top,
           maxRenderWidth: clipRect.right - clipRect.left,
@@ -631,9 +653,9 @@ export var BaseTable = /*#__PURE__*/function (_React$Component) {
       })).subscribe(function (sizeAndOffset) {
         _this2.setState(sizeAndOffset);
       }));
-      this.rootSubscription.add(richVisibleRects$.pipe(op.map(function (_ref6) {
-        var clipRect = _ref6.clipRect,
-            offsetY = _ref6.offsetY;
+      this.rootSubscription.add(richVisibleRects$.pipe(op.map(function (_ref7) {
+        var clipRect = _ref7.clipRect,
+            offsetY = _ref7.offsetY;
         return {
           maxRenderHeight: clipRect.bottom - clipRect.top,
           maxRenderWidth: clipRect.right - clipRect.left,

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

@@ -36,11 +36,4 @@ 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/es/table/base/utils.js

@@ -18,10 +18,8 @@ import { asyncScheduler, BehaviorSubject, defer, fromEvent, Subscription } from
 import { map, throttleTime } from 'rxjs/operators';
 import ResizeObserver from 'resize-observer-polyfill';
 import * as styledComponents from 'styled-components';
-import cssVars from 'css-vars-ponyfill';
 import mergeCellProps from '../utils/mergeCellProps';
 import { browserType } from '../utils';
-import { defaultCSSVariables } from './styles';
 /** styled-components 类库的版本，ali-react-table 同时支持 v3 和 v5 */
 
 export var STYLED_VERSION = styledComponents.createGlobalStyle != null ? 'v5' : 'v3';
@@ -213,30 +211,4 @@ export function getTableScrollHeaderDOM(domHelper) {
 }
 export function getTableScrollFooterDOM(domHelper) {
   return browserType.isIE ? domHelper.tableFooterMain : domHelper.tableFooter;
-}
-export 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';
-  }
-
-  cssVars({
-    // exclude: 'link[href*="semantic-ui"]',
-    // onlyLegacy: false,
-    // rootElement: rootElement,
-    include: 'style[data-styled]',
-    variables: _extends({}, defaultCSSVariables, variables, conditionCSSVariables),
-    watch: true,
-    silent: true
-  });
-};
+}

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

@@ -65,7 +65,7 @@ export function columnDrag() {
         },
         headerCellProps: mergeCellProps(col.headerCellProps, {
           onMouseDown: !isLeaf || path.length > 1 ? undefined : function (e) {
-            if (e.button !== 0 || !e.currentTarget.contains(e.target)) {
+            if (e.button !== 0) {
               return;
             }
 
@@ -241,14 +241,13 @@ export 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)) {
-                e.stopPropagation(); // 存在移动就阻止冒泡
-
-                currentTarget.addEventListener('click', stopClickPropagation); // 阻止列头点击事件，防止拖动后触发列头过滤事件
+                currentTarget.addEventListener('click', stopClickPropagation);
               }
 
               window.requestAnimationFrame(function () {

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

@@ -12,8 +12,8 @@ export interface FilterFeatureOptions {
     keepDataSource?: boolean;
     /** 过滤模式。单列过滤 single，多列过滤 multiple，默认为多选 */
     mode?: 'single' | 'multiple';
-    /** 过滤图标 */
-    filterIcon?: ReactNode | ((filtered: boolean) => ReactNode);
+    /**过滤图标 */
+    filterIcon?: ReactNode;
     /** 是否对触发弹出过滤面板 的 click 事件调用 event.stopPropagation() */
     stopClickEventPropagation?: boolean;
 }

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

@@ -39,7 +39,7 @@ export function filter() {
       return _mapInstanceProperty(columns).call(columns, dfs);
 
       function dfs(col) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e;
 
         var result = _extends({}, col);
 
@@ -81,13 +81,12 @@ export function filter() {
           };
 
           var filterPanel = (_d = col.features) === null || _d === void 0 ? void 0 : _d.filterPanel;
-          var colFilterIcon = (_f = (_e = col.features) === null || _e === void 0 ? void 0 : _e.filterIcon) !== null && _f !== void 0 ? _f : filterIcon;
-          result.title = _concatInstanceProperty(_context = []).call(_context, _toConsumableArray(_concatInstanceProperty(_context2 = []).call(_context2, (_g = result.title) !== null && _g !== void 0 ? _g : [internals.safeRenderHeader(_extends(_extends({}, col), {
+          result.title = _concatInstanceProperty(_context = []).call(_context, _toConsumableArray(_concatInstanceProperty(_context2 = []).call(_context2, (_e = result.title) !== null && _e !== void 0 ? _e : [internals.safeRenderHeader(_extends(_extends({}, col), {
             title: null
           }))])), [/*#__PURE__*/React.createElement(Filter, {
             key: "filter",
             FilterPanelContent: filterPanel,
-            filterIcon: colFilterIcon,
+            filterIcon: filterIcon,
             filterModel: inputFiltersMap.get(col.code),
             setFilterModel: handleFilterChanged,
             setFilter: setFilter,
@@ -135,8 +134,8 @@ export function filter() {
         return [item.key, _extends({}, item)];
       }));
 
-      function isMatchedFilterCondition(record) {
-        return filtersKeys.every(function (key) {
+      function isMatchedFilterCondition(record, rowIndex) {
+        return !filtersKeys.some(function (key) {
           var _a, _b;
 
           var filterItem = inputFiltersMap.get(key);
@@ -150,43 +149,24 @@ export function filter() {
           } else {
             console.warn("\u5217[".concat(key, "]\u672A\u914D\u7F6E\u7B5B\u9009\u51FD\u6570\uFF0C\u8BF7\u8BBE\u7F6E column.features.filterable \u6765\u4F5C\u4E3A\u8BE5\u5217\u7684\u7B5B\u9009\u51FD\u6570, \u76EE\u524D\u4F7F\u7528\u9ED8\u8BA4\u5305\u542B\u7B5B\u9009\u51FD\u6570"));
             comparisonFn = _filterInstanceProperty(defaultFilterOptionsMap.get('contain'));
-          }
+          } // 不符合过滤条件,退出循环
 
-          return comparisonFn(_filterInstanceProperty(filterItem), filterItem)(internals.safeGetValue(columnsMap.get(key), record, -1), record);
+
+          return !comparisonFn(_filterInstanceProperty(filterItem), filterItem)(internals.safeGetValue(columnsMap.get(key), record, rowIndex), record);
         });
       }
 
-      return layeredFilter(dataSource, isMatchedFilterCondition);
+      return dataSource.reduce(function (pre, record, rowIndex) {
+        if (isMatchedFilterCondition(record, rowIndex)) {
+          return _concatInstanceProperty(pre).call(pre, [record]);
+        }
+
+        return pre;
+      }, []);
     }
 
     pipeline.dataSource(processDataSource(dataSource));
     pipeline.columns(processColumns(columns));
     return pipeline;
   };
-}
-
-function layeredFilter(array, matchFn) {
-  return dfs(array);
-
-  function dfs(rows) {
-    var _context6;
-
-    var parentMatched = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    return _filterInstanceProperty(_context6 = _mapInstanceProperty(rows).call(rows, function (row) {
-      var currentMatched = matchFn(row);
-
-      if (isLeafNode(row)) {
-        return (parentMatched || currentMatched) && _extends({}, row);
-      }
-
-      var children = row.children;
-
-      var rowAfterFilterChildren = _extends(_extends({}, row), {
-        children: dfs(children, parentMatched || currentMatched)
-      });
-
-      var matchedByChildren = !isLeafNode(rowAfterFilterChildren);
-      return (parentMatched || currentMatched || matchedByChildren) && rowAfterFilterChildren;
-    })).call(_context6, Boolean);
-  }
 }

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

@@ -12,7 +12,7 @@ import * as op from 'rxjs/operators';
 import { mergeCellProps, collectNodes, makeRecursiveMapper, isGroupColumn } from '../../utils';
 import { internals } from '../../internals';
 import { Classes } from '../../base/styles';
-var TableHeaderCellResize = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: absolute;\n  top: 0;\n  right: -5px;\n  height: 100%;\n  width: 10px;\n  cursor: ew-resize;\n  display: flex;\n  flex-direction: column;\n  align-items: center;\n  z-index:1;\n\n  &:after {\n    content: \"\";\n    position: absolute;\n    display: block;\n    left: calc(50% - 1px);\n    width: 1px;\n    height: calc(100% - 14px);\n    top: 7px;\n  }\n"])));
+var TableHeaderCellResize = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: absolute;\n  top: 0;\n  right: -5px;\n  height: 100%;\n  width: 10px;\n  cursor: ew-resize;\n  display: flex;\n  flex-direction: column;\n  align-items: center;\n  z-index:1;\n\n  &:after {\n    content: \"\";\n    position: absolute;\n    display: block;\n    left: calc(50% - 1px);\n    width: 1px;\n    height: calc(100% - 14px);\n    top: 7px;\n    background-color: var(--border-color);\n  }\n"])));
 var TableHeaderGroupCellResize = styled(TableHeaderCellResize)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  &:after {\n    height: 100%;\n    top: 0;\n  }\n"])));
 
 function clamp(min, x, max) {

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

@@ -6,12 +6,11 @@ var _templateObject;
 
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect } from 'react';
 import styled from 'styled-components';
 import cx from 'classnames';
 import { DEFAULT_FILTER_OPTIONS } from './util';
 import { Classes, ButtonCSS } from '../../../base/styles';
-import KeyCode from '../../../utils/keyCode';
 var DefaultFilterContentStyle = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n  background-color: #ffffff;\n  border-radius: 2px;\n  width: 100%;\n\n  ", "\n  .filter-option-list {\n    display: flex;\n    flex-direction: column;\n    margin-top: 8px;\n    ul {\n      margin: 0;\n      padding: 0;\n      li {\n        display: flex;\n        position: relative;\n        flex-shrink: 0;\n        height: 32px;\n        align-items: center;\n        border-radius: 2px;\n        font-size: 12px;\n        color: var(--color);\n        padding: 0 12px;\n        overflow: hidden;\n        cursor: pointer;\n        &:hover{\n          background-color: var(--primary-color-level1);\n        }\n      }\n      li.active{\n        background-color: var(--primary-color-level1);\n      }\n    }\n  }\n\n  .filter-search {\n    display: flex;\n    padding: 6px 12px;\n\n    .filter-search-inner {\n      width: 100%;\n      font-size: 12px;\n      color: #333333;\n      height: 28px;\n      line-height: 28px;\n      padding: 0 8px;\n      outline: none;\n      background-color: #FAFAFA;\n      border-radius: 2px;\n      border: 1px solid var(--strong-border-color);\n      &:hover{\n        border-color: var(--primary-color)\n      } \n      &:focus{\n        border-color: var(--primary-color)\n      }  \n    }\n  }\n\n  .filter-footer {\n    display: flex;\n    flex-direction: row;\n    padding: 8px 12px;\n    justify-content: space-between;\n\n    .filter-btn {\n      text-align: center;\n      font-size: 12px;\n      width: 60px;\n      height: 24px;\n      line-height: 24px;\n    }\n    \n  }\n"])), ButtonCSS);
 
 function DefaultFilterContent(_ref) {
@@ -31,7 +30,6 @@ function DefaultFilterContent(_ref) {
       innerValue = _React$useState4[0],
       setInnerValue = _React$useState4[1];
 
-  var inputRef = useRef();
   var handleClick = React.useCallback(function (option) {
     setSelectedValue(option.key);
   }, []);
@@ -49,26 +47,10 @@ function DefaultFilterContent(_ref) {
     });
   };
 
-  var handleKeyDown = function handleKeyDown(e) {
-    if (e.keyCode === KeyCode.ENTER) {
-      confirm();
-    }
-  };
-
   useEffect(function () {
     setSelectedValue((filterModel === null || filterModel === void 0 ? void 0 : filterModel.filterCondition) || 'contain');
     setInnerValue((filterModel === null || filterModel === void 0 ? void 0 : _filterInstanceProperty(filterModel)) || '');
   }, [filterModel]);
-  useEffect(function () {
-    // 兼容设置焦点后发生滚动
-    setTimeout(function () {
-      var _a;
-
-      (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus({
-        preventScroll: true
-      });
-    });
-  }, []);
   return /*#__PURE__*/React.createElement(DefaultFilterContentStyle, null, /*#__PURE__*/React.createElement("div", {
     className: 'filter-option-list'
   }, /*#__PURE__*/React.createElement("ul", null, _mapInstanceProperty(DEFAULT_FILTER_OPTIONS).call(DEFAULT_FILTER_OPTIONS, function (option, index) {
@@ -90,9 +72,7 @@ function DefaultFilterContent(_ref) {
     value: innerValue,
     onChange: function onChange(e) {
       setInnerValue(e.target.value);
-    },
-    onKeyDown: handleKeyDown,
-    ref: inputRef
+    }
   })), /*#__PURE__*/React.createElement("div", {
     className: 'filter-footer'
   }, /*#__PURE__*/React.createElement("button", {

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

@@ -6,7 +6,7 @@ interface FilterProps {
     size?: number;
     isFilterActive: boolean;
     FilterPanelContent?: FilterPanelType;
-    filterIcon?: ReactNode | ((filtered: boolean) => ReactNode);
+    filterIcon?: ReactNode;
     setFilterModel: DefaultFilterPanelProps['setFilterModel'];
     filterModel: DefaultFilterPanelProps['filterModel'];
     setFilter: CustomeFilterPanelProps['setFilter'];