@kdcloudjs/table 1.2.0-canary.12 → 1.2.0-canary.14

package/es/table/base/table.js

@@ -439,7 +439,8 @@ export var BaseTable = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/React.createElement("div", {
         className: cx(Classes.horizontalScrollLeftSpacer),
         style: {
-          width: info.leftLockTotalWidth
+          width: info.leftLockTotalWidth,
+          display: hasStickyScroll && hasScroll ? 'block' : 'none'
         }
       }), /*#__PURE__*/React.createElement("div", {
         className: cx(Classes.stickyScroll),
@@ -452,7 +453,8 @@ export var BaseTable = /*#__PURE__*/function (_React$Component) {
       })), /*#__PURE__*/React.createElement("div", {
         className: cx(Classes.horizontalScrollRightSpacer),
         style: {
-          width: info.rightLockTotalWidth
+          width: info.rightLockTotalWidth,
+          display: hasStickyScroll && hasScroll ? 'block' : 'none'
         }
       }));
     }

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

@@ -88,7 +88,7 @@ export function filter() {
           var colFilterIcon = (_f = (_e = col.features) === null || _e === void 0 ? void 0 : _e.filterIcon) !== null && _f !== void 0 ? _f : filterIcon;
 
           var _Filter = /*#__PURE__*/React.createElement(Filter, {
-            key: "filter",
+            key: "".concat(col.code, "_filter"),
             FilterPanelContent: filterPanel,
             filterIcon: colFilterIcon,
             filterModel: inputFiltersMap.get(col.code),

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

@@ -71,6 +71,11 @@ export function treeMode() {
     return pipeline.mapDataSource(processDataSource).mapColumns(processColumns);
 
     function processDataSource(input) {
+      if (pipeline.isSameInputDataSource() && openKeys === pipeline.getFeatureOptions('lastOpenKeys')) {
+        return pipeline.getFeatureOptions('lastTreeMode');
+      }
+
+      pipeline.setFeatureOptions('lastOpenKeys', pipeline.getStateAtKey(stateKey));
       var result = [];
       dfs(input, 0);
 
@@ -111,6 +116,7 @@ export function treeMode() {
         }
       }
 
+      pipeline.setFeatureOptions('lastTreeMode', result);
       return result;
     }
 

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

@@ -35,6 +35,7 @@ export declare class TablePipeline {
     private readonly _rowPropsGetters;
     private _tableProps;
     private _dataSource;
+    private _isSameInputDataSource;
     private _columns;
     private _footerDataSource?;
     static defaultIndents: TablePipelineIndentsConfig;
@@ -51,6 +52,7 @@ export declare class TablePipeline {
     appendRowPropsGetter(getter: RowPropsGetter): this;
     addTableProps(props: React.HTMLAttributes<HTMLTableElement>): void;
     getDataSource(name?: string): any[];
+    isSameInputDataSource(): boolean;
     getColumns(name?: string): any[];
     getFooterDataSource(): any[];
     getStateAtKey<T = any>(stateKey: string, defaultValue?: T): T;

package/es/table/pipeline/pipeline.js

@@ -76,6 +76,11 @@ export var TablePipeline = /*#__PURE__*/function () {
         return this._snapshots[name].dataSource;
       }
     }
+  }, {
+    key: "isSameInputDataSource",
+    value: function isSameInputDataSource() {
+      return this._isSameInputDataSource;
+    }
   }, {
     key: "getColumns",
     value: function getColumns(name) {
@@ -127,9 +132,12 @@ export var TablePipeline = /*#__PURE__*/function () {
 
       if (this._dataSource != null || this._columns != null) {
         throw new Error('input 不能调用两次');
-      }
+      } // 在 pipeline 中识别本次更新是否有数据变化
+
 
+      this._isSameInputDataSource = _input.dataSource === this.ref.current._lastInputDataSource;
       this._dataSource = _input.dataSource;
+      this.ref.current._lastInputDataSource = _input.dataSource;
       this._columns = _mapInstanceProperty(_context = _input.columns).call(_context, function (col) {
         return _extends(_extends({}, col), {
           key: _this.guid()

package/lib/table/base/table.js

@@ -488,7 +488,8 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: (0, _classnames.default)(_styles.Classes.horizontalScrollLeftSpacer),
         style: {
-          width: info.leftLockTotalWidth
+          width: info.leftLockTotalWidth,
+          display: hasStickyScroll && hasScroll ? 'block' : 'none'
         }
       }), /*#__PURE__*/_react.default.createElement("div", {
         className: (0, _classnames.default)(_styles.Classes.stickyScroll),
@@ -501,7 +502,8 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
       })), /*#__PURE__*/_react.default.createElement("div", {
         className: (0, _classnames.default)(_styles.Classes.horizontalScrollRightSpacer),
         style: {
-          width: info.rightLockTotalWidth
+          width: info.rightLockTotalWidth,
+          display: hasStickyScroll && hasScroll ? 'block' : 'none'
         }
       }));
     }

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

@@ -111,7 +111,7 @@ function filter() {
           var colFilterIcon = (_f = (_e = col.features) === null || _e === void 0 ? void 0 : _e.filterIcon) !== null && _f !== void 0 ? _f : filterIcon;
 
           var _Filter = /*#__PURE__*/_react.default.createElement(_filter2.Filter, {
-            key: "filter",
+            key: "".concat(col.code, "_filter"),
             FilterPanelContent: filterPanel,
             filterIcon: colFilterIcon,
             filterModel: inputFiltersMap.get(col.code),

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

@@ -101,6 +101,11 @@ function treeMode() {
     return pipeline.mapDataSource(processDataSource).mapColumns(processColumns);
 
     function processDataSource(input) {
+      if (pipeline.isSameInputDataSource() && openKeys === pipeline.getFeatureOptions('lastOpenKeys')) {
+        return pipeline.getFeatureOptions('lastTreeMode');
+      }
+
+      pipeline.setFeatureOptions('lastOpenKeys', pipeline.getStateAtKey(stateKey));
       var result = [];
       dfs(input, 0);
 
@@ -143,6 +148,7 @@ function treeMode() {
         }
       }
 
+      pipeline.setFeatureOptions('lastTreeMode', result);
       return result;
     }
 

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

@@ -35,6 +35,7 @@ export declare class TablePipeline {
     private readonly _rowPropsGetters;
     private _tableProps;
     private _dataSource;
+    private _isSameInputDataSource;
     private _columns;
     private _footerDataSource?;
     static defaultIndents: TablePipelineIndentsConfig;
@@ -51,6 +52,7 @@ export declare class TablePipeline {
     appendRowPropsGetter(getter: RowPropsGetter): this;
     addTableProps(props: React.HTMLAttributes<HTMLTableElement>): void;
     getDataSource(name?: string): any[];
+    isSameInputDataSource(): boolean;
     getColumns(name?: string): any[];
     getFooterDataSource(): any[];
     getStateAtKey<T = any>(stateKey: string, defaultValue?: T): T;

package/lib/table/pipeline/pipeline.js

@@ -92,6 +92,11 @@ var TablePipeline = /*#__PURE__*/function () {
         return this._snapshots[name].dataSource;
       }
     }
+  }, {
+    key: "isSameInputDataSource",
+    value: function isSameInputDataSource() {
+      return this._isSameInputDataSource;
+    }
   }, {
     key: "getColumns",
     value: function getColumns(name) {
@@ -143,9 +148,12 @@ var TablePipeline = /*#__PURE__*/function () {
 
       if (this._dataSource != null || this._columns != null) {
         throw new Error('input 不能调用两次');
-      }
+      } // 在 pipeline 中识别本次更新是否有数据变化
+
 
+      this._isSameInputDataSource = _input.dataSource === this.ref.current._lastInputDataSource;
       this._dataSource = _input.dataSource;
+      this.ref.current._lastInputDataSource = _input.dataSource;
       this._columns = (0, _map.default)(_context = _input.columns).call(_context, function (col) {
         return (0, _extends3.default)((0, _extends3.default)({}, col), {
           key: _this.guid()

package/package.json

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