@kdcloudjs/table 1.2.0-canary.11 → 1.2.0-canary.13

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

@@ -130,11 +130,11 @@ export declare class BaseTable extends React.Component<BaseTableProps, BaseTable
     private artTableWrapperRef;
     private domHelper;
     private rootSubscription;
+    private resizeSubject;
     private lastInfo;
     private props$;
     private hasScrollY;
     private resizeObserver?;
-    private resizeSubject;
     private offsetY;
     /** @deprecated BaseTable.getDoms() 已经过时，请勿调用 */
     getDoms(): TableDOMHelper;

package/es/table/base/table.js

@@ -63,9 +63,7 @@ export var BaseTable = /*#__PURE__*/function (_React$Component) {
     _this = _super.call(this, props);
     _this.rowHeightManager = makeRowHeightManager(_this.props.dataSource.length, _this.props.estimatedRowHeight);
     _this.artTableWrapperRef = /*#__PURE__*/React.createRef();
-    _this.rootSubscription = new Subscription();
     _this.hasScrollY = false;
-    _this.resizeSubject = new Subject();
     _this.offsetY = 0;
 
     _this.handleRowMouseEnter = function (e) {
@@ -441,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),
@@ -454,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'
         }
       }));
     }
@@ -512,12 +512,11 @@ export var BaseTable = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "componentDidMount",
     value: function componentDidMount() {
-      var _a, _b, _c, _d, _e, _f; // console.log('did mount start')
-      // console.log('update dom helper start')
-
-
-      this.updateDOMHelper(); // console.log('update dom helper end')
+      var _a, _b, _c, _d, _e, _f;
 
+      this.rootSubscription = new Subscription();
+      this.resizeSubject = new Subject();
+      this.updateDOMHelper();
       this.props$ = new BehaviorSubject(this.props);
       this.initSubscriptions();
       this.didMountOrUpdate(); // console.log('did mount end')

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

@@ -2,7 +2,7 @@ import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _toConsumableArray from "@babel/runtime-corejs3/helpers/toConsumableArray";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
-import { makeRecursiveMapper, mergeCellProps, collectNodes, isLeafNode } from '../../utils';
+import { makeRecursiveMapper, mergeCellProps, collectNodes, isLeafNode, isSelectColumn } from '../../utils';
 import { FILL_COLUMN_CODE } from './autoFill';
 var stateKey = 'columnDrag';
 var SCROLL_SIZE = 30;
@@ -320,9 +320,8 @@ export function columnDrag() {
                     return code === rowDragColumnKey;
                   };
 
-                  var newColumns = _filterInstanceProperty(_context = sortColumns(columns, cloumnsSortData)).call(_context, function (_ref) {
-                    var code = _ref.code;
-                    return code !== FILL_COLUMN_CODE && !isRowDragColumn(code);
+                  var newColumns = _filterInstanceProperty(_context = sortColumns(columns, cloumnsSortData)).call(_context, function (column) {
+                    return column.code !== FILL_COLUMN_CODE && !isRowDragColumn(column.code) && !isSelectColumn(column);
                   }); // TODO drag需要在resize之后use,否则这里返回的列对应的宽度不是拖拽后的
 
 
@@ -348,9 +347,9 @@ export function columnDrag() {
   };
 }
 
-function enableMove(_ref2) {
-  var lock = _ref2.lock,
-      code = _ref2.code;
+function enableMove(_ref) {
+  var lock = _ref.lock,
+      code = _ref.code;
   return code && code !== FILL_COLUMN_CODE && !lock;
 }
 

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/multiSelect.js

@@ -1,18 +1,19 @@
 import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
+import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _Set from "@babel/runtime-corejs3/core-js-stable/set";
 import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
 import React from 'react';
 import { internals } from '../../internals';
 import { always, arrayUtils } from '../../utils/others';
-import { collectNodes, mergeCellProps } from '../../utils';
+import { collectNodes, mergeCellProps, MULTI_SELECT_MARK_PROPNAME } from '../../utils';
 var fullRowsSetKey = 'fullRowsSetKey';
 var allEnableKeys = 'allEnableKeys';
 var selectValueSetKey = 'selectValueSetKey';
 export function multiSelect() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function multiSelectStep(pipeline) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
 
     var stateKey = 'multiSelect';
     var Checkbox = pipeline.ctx.components.Checkbox;
@@ -150,12 +151,13 @@ export function multiSelect() {
               }
             } : undefined
           });
-        }
+        },
+        features: _extends(_extends({}, (_l = opts.checkboxColumn) === null || _l === void 0 ? void 0 : _l.features), _defineProperty({}, MULTI_SELECT_MARK_PROPNAME, true))
       });
 
       var nextColumns = _sliceInstanceProperty(_context = pipeline.getColumns()).call(_context);
 
-      var checkboxPlacement = (_l = opts.checkboxPlacement) !== null && _l !== void 0 ? _l : 'start';
+      var checkboxPlacement = (_m = opts.checkboxPlacement) !== null && _m !== void 0 ? _m : 'start';
 
       if (checkboxPlacement === 'start') {
         nextColumns.unshift(checkboxColumn);

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

@@ -1,15 +1,16 @@
+import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
 import React from 'react';
 import { internals } from '../../internals';
 import { always } from '../../utils/others';
-import { mergeCellProps } from '../../utils';
+import { mergeCellProps, SINGLE_SELECT_MARK_PROPNAME } from '../../utils';
 export function singleSelect() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function singleSelectStep(pipeline) {
     var _context;
 
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
 
     var Radio = pipeline.ctx.components.Radio;
 
@@ -80,12 +81,13 @@ export function singleSelect() {
             onChange(rowKey);
           } : undefined
         });
-      }
+      },
+      features: _extends(_extends({}, (_e = opts.radioColumn) === null || _e === void 0 ? void 0 : _e.features), _defineProperty({}, SINGLE_SELECT_MARK_PROPNAME, true))
     });
 
     var nextColumns = _sliceInstanceProperty(_context = pipeline.getColumns()).call(_context);
 
-    var radioPlacement = (_e = opts.radioPlacement) !== null && _e !== void 0 ? _e : 'start';
+    var radioPlacement = (_f = opts.radioPlacement) !== null && _f !== void 0 ? _f : 'start';
 
     if (radioPlacement === 'start') {
       nextColumns.unshift(radioColumn);

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

@@ -17,3 +17,4 @@ export { default as layeredFilter } from './layeredFilter';
 export { getEventPath, isElementInEventPath, getTargetEleInEventPath, calculatePointerRelative, calculatePopupRelative, keepWithinBounds } from './element';
 export { default as console } from './console';
 export { browserType } from './browserType';
+export { MULTI_SELECT_MARK_PROPNAME, SINGLE_SELECT_MARK_PROPNAME, isSelectColumn } from './selectColumn';

package/es/table/utils/index.js

@@ -16,4 +16,5 @@ export { copyDataToClipboard, executeOnTempElement } from './copyToClipboard';
 export { default as layeredFilter } from './layeredFilter';
 export { getEventPath, isElementInEventPath, getTargetEleInEventPath, calculatePointerRelative, calculatePopupRelative, keepWithinBounds } from './element';
 export { default as console } from './console';
-export { browserType } from './browserType';
+export { browserType } from './browserType';
+export { MULTI_SELECT_MARK_PROPNAME, SINGLE_SELECT_MARK_PROPNAME, isSelectColumn } from './selectColumn';

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

@@ -0,0 +1,4 @@
+import { ArtColumn } from '../interfaces';
+export declare const MULTI_SELECT_MARK_PROPNAME = "checkboxSelection";
+export declare const SINGLE_SELECT_MARK_PROPNAME = "radioSelection";
+export declare function isSelectColumn(column: ArtColumn): boolean;

package/es/table/utils/selectColumn.js

@@ -0,0 +1,6 @@
+export var MULTI_SELECT_MARK_PROPNAME = 'checkboxSelection';
+export var SINGLE_SELECT_MARK_PROPNAME = 'radioSelection';
+export function isSelectColumn(column) {
+  var features = column.features || {};
+  return features[MULTI_SELECT_MARK_PROPNAME] === true || features[SINGLE_SELECT_MARK_PROPNAME] === true;
+}

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

@@ -130,11 +130,11 @@ export declare class BaseTable extends React.Component<BaseTableProps, BaseTable
     private artTableWrapperRef;
     private domHelper;
     private rootSubscription;
+    private resizeSubject;
     private lastInfo;
     private props$;
     private hasScrollY;
     private resizeObserver?;
-    private resizeSubject;
     private offsetY;
     /** @deprecated BaseTable.getDoms() 已经过时，请勿调用 */
     getDoms(): TableDOMHelper;

package/lib/table/base/table.js

@@ -113,9 +113,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
     _this = _super.call(this, props);
     _this.rowHeightManager = (0, _rowHeightManager.makeRowHeightManager)(_this.props.dataSource.length, _this.props.estimatedRowHeight);
     _this.artTableWrapperRef = /*#__PURE__*/_react.default.createRef();
-    _this.rootSubscription = new _rxjs.Subscription();
     _this.hasScrollY = false;
-    _this.resizeSubject = new _rxjs.Subject();
     _this.offsetY = 0;
 
     _this.handleRowMouseEnter = function (e) {
@@ -490,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),
@@ -503,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'
         }
       }));
     }
@@ -559,12 +559,11 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "componentDidMount",
     value: function componentDidMount() {
-      var _a, _b, _c, _d, _e, _f; // console.log('did mount start')
-      // console.log('update dom helper start')
-
-
-      this.updateDOMHelper(); // console.log('update dom helper end')
+      var _a, _b, _c, _d, _e, _f;
 
+      this.rootSubscription = new _rxjs.Subscription();
+      this.resizeSubject = new _rxjs.Subject();
+      this.updateDOMHelper();
       this.props$ = new _rxjs.BehaviorSubject(this.props);
       this.initSubscriptions();
       this.didMountOrUpdate(); // console.log('did mount end')

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

@@ -334,9 +334,8 @@ function columnDrag() {
                     return code === rowDragColumnKey;
                   };
 
-                  var newColumns = (0, _filter.default)(_context = sortColumns(columns, cloumnsSortData)).call(_context, function (_ref) {
-                    var code = _ref.code;
-                    return code !== _autoFill.FILL_COLUMN_CODE && !isRowDragColumn(code);
+                  var newColumns = (0, _filter.default)(_context = sortColumns(columns, cloumnsSortData)).call(_context, function (column) {
+                    return column.code !== _autoFill.FILL_COLUMN_CODE && !isRowDragColumn(column.code) && !(0, _utils.isSelectColumn)(column);
                   }); // TODO drag需要在resize之后use,否则这里返回的列对应的宽度不是拖拽后的
 
                   onColumnDragStopped(columnMoved, newColumns);
@@ -361,9 +360,9 @@ function columnDrag() {
   };
 }
 
-function enableMove(_ref2) {
-  var lock = _ref2.lock,
-      code = _ref2.code;
+function enableMove(_ref) {
+  var lock = _ref.lock,
+      code = _ref.code;
   return code && code !== _autoFill.FILL_COLUMN_CODE && !lock;
 }
 

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/multiSelect.js

@@ -9,7 +9,9 @@ exports.multiSelect = multiSelect;
 
 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 _extends3 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 
 var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
 
@@ -30,7 +32,7 @@ var selectValueSetKey = 'selectValueSetKey';
 function multiSelect() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function multiSelectStep(pipeline) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
 
     var stateKey = 'multiSelect';
     var Checkbox = pipeline.ctx.components.Checkbox;
@@ -107,7 +109,7 @@ function multiSelect() {
         }
       });
 
-      var checkboxColumn = (0, _extends2.default)((0, _extends2.default)({
+      var checkboxColumn = (0, _extends3.default)((0, _extends3.default)({
         name: '是否选中',
         title: defaultCheckboxColumnTitle,
         width: 50,
@@ -171,10 +173,11 @@ function multiSelect() {
               }
             } : undefined
           });
-        }
+        },
+        features: (0, _extends3.default)((0, _extends3.default)({}, (_l = opts.checkboxColumn) === null || _l === void 0 ? void 0 : _l.features), (0, _defineProperty2.default)({}, _utils.MULTI_SELECT_MARK_PROPNAME, true))
       });
       var nextColumns = (0, _slice.default)(_context = pipeline.getColumns()).call(_context);
-      var checkboxPlacement = (_l = opts.checkboxPlacement) !== null && _l !== void 0 ? _l : 'start';
+      var checkboxPlacement = (_m = opts.checkboxPlacement) !== null && _m !== void 0 ? _m : 'start';
 
       if (checkboxPlacement === 'start') {
         nextColumns.unshift(checkboxColumn);

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

@@ -9,7 +9,9 @@ exports.singleSelect = singleSelect;
 
 var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
+
+var _extends3 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -24,7 +26,7 @@ function singleSelect() {
   return function singleSelectStep(pipeline) {
     var _context;
 
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
 
     var Radio = pipeline.ctx.components.Radio;
 
@@ -45,7 +47,7 @@ function singleSelect() {
       pipeline.setStateAtKey(stateKey, rowKey);
     };
 
-    var radioColumn = (0, _extends2.default)((0, _extends2.default)({
+    var radioColumn = (0, _extends3.default)((0, _extends3.default)({
       name: '',
       width: 50,
       align: 'center'
@@ -97,10 +99,11 @@ function singleSelect() {
             onChange(rowKey);
           } : undefined
         });
-      }
+      },
+      features: (0, _extends3.default)((0, _extends3.default)({}, (_e = opts.radioColumn) === null || _e === void 0 ? void 0 : _e.features), (0, _defineProperty2.default)({}, _utils.SINGLE_SELECT_MARK_PROPNAME, true))
     });
     var nextColumns = (0, _slice.default)(_context = pipeline.getColumns()).call(_context);
-    var radioPlacement = (_e = opts.radioPlacement) !== null && _e !== void 0 ? _e : 'start';
+    var radioPlacement = (_f = opts.radioPlacement) !== null && _f !== void 0 ? _f : 'start';
 
     if (radioPlacement === 'start') {
       nextColumns.unshift(radioColumn);

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

@@ -17,3 +17,4 @@ export { default as layeredFilter } from './layeredFilter';
 export { getEventPath, isElementInEventPath, getTargetEleInEventPath, calculatePointerRelative, calculatePopupRelative, keepWithinBounds } from './element';
 export { default as console } from './console';
 export { browserType } from './browserType';
+export { MULTI_SELECT_MARK_PROPNAME, SINGLE_SELECT_MARK_PROPNAME, isSelectColumn } from './selectColumn';

package/lib/table/utils/index.js

@@ -5,6 +5,18 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "MULTI_SELECT_MARK_PROPNAME", {
+  enumerable: true,
+  get: function get() {
+    return _selectColumn.MULTI_SELECT_MARK_PROPNAME;
+  }
+});
+Object.defineProperty(exports, "SINGLE_SELECT_MARK_PROPNAME", {
+  enumerable: true,
+  get: function get() {
+    return _selectColumn.SINGLE_SELECT_MARK_PROPNAME;
+  }
+});
 Object.defineProperty(exports, "applyTransforms", {
   enumerable: true,
   get: function get() {
@@ -107,6 +119,12 @@ Object.defineProperty(exports, "isLeafNode", {
     return _isLeafNode.default;
   }
 });
+Object.defineProperty(exports, "isSelectColumn", {
+  enumerable: true,
+  get: function get() {
+    return _selectColumn.isSelectColumn;
+  }
+});
 Object.defineProperty(exports, "keepWithinBounds", {
   enumerable: true,
   get: function get() {
@@ -192,4 +210,6 @@ var _element = require("./element");
 
 var _console = _interopRequireDefault(require("./console"));
 
-var _browserType = require("./browserType");
+var _browserType = require("./browserType");
+
+var _selectColumn = require("./selectColumn");

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

@@ -0,0 +1,4 @@
+import { ArtColumn } from '../interfaces';
+export declare const MULTI_SELECT_MARK_PROPNAME = "checkboxSelection";
+export declare const SINGLE_SELECT_MARK_PROPNAME = "radioSelection";
+export declare function isSelectColumn(column: ArtColumn): boolean;

package/lib/table/utils/selectColumn.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SINGLE_SELECT_MARK_PROPNAME = exports.MULTI_SELECT_MARK_PROPNAME = void 0;
+exports.isSelectColumn = isSelectColumn;
+var MULTI_SELECT_MARK_PROPNAME = 'checkboxSelection';
+exports.MULTI_SELECT_MARK_PROPNAME = MULTI_SELECT_MARK_PROPNAME;
+var SINGLE_SELECT_MARK_PROPNAME = 'radioSelection';
+exports.SINGLE_SELECT_MARK_PROPNAME = SINGLE_SELECT_MARK_PROPNAME;
+
+function isSelectColumn(column) {
+  var features = column.features || {};
+  return features[MULTI_SELECT_MARK_PROPNAME] === true || features[SINGLE_SELECT_MARK_PROPNAME] === true;
+}

package/package.json

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