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

package/dist/@kdcloudjs/table.css

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.2.0-canary.9
+ *   @kdcloudjs/table v1.2.0-canary.11
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.

package/dist/@kdcloudjs/table.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.2.0-canary.9
+ *   @kdcloudjs/table v1.2.0-canary.11
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -304,7 +304,7 @@ __webpack_require__.r(__webpack_exports__);
 /*!******************************!*\
   !*** ./components/index.tsx ***!
   \******************************/
-/*! exports provided: ConfigProvider, Table, TableProps, PrimaryKey, LoadingContentWrapperProps, Classes, TableCSSVariables, collectNodes, getTreeDepth, groupBy, isLeafNode, isGroupColumn, applyTransforms, buildTree, exportTableAsExcel, layeredSort, mergeCellProps, proto, makeRecursiveMapper, smartCompare, traverseColumn, copyDataToClipboard, executeOnTempElement, layeredFilter, getEventPath, isElementInEventPath, getTargetEleInEventPath, calculatePointerRelative, calculatePopupRelative, keepWithinBounds, console, browserType, makeAutoRowSpanTransform, useAutoWidthTransform, makeBuildTreeTransform, makeColumnHoverTransform, ColumnHoverOptions, useColumnHoverTransform, makeColumnRangeHoverTransform, ColumnRangeHoverOptions, useColumnHoverRangeTransform, makeColumnResizeTransform, ColumnResizeOptions, useColumnResizeTransform, makeFlattenTransform, makeOrderFieldTransform, makeSortTransform, SortHeaderCellProps, SortOptions, useSortTransform, makeTipsTransform, TipsOptions, makeTreeModeTransform, TreeModeOptions, useTreeModeTransform, makeVisibleTransform, TablePipeline, useTablePipeline, features, internals */
+/*! exports provided: ConfigProvider, Table, TableProps, PrimaryKey, LoadingContentWrapperProps, Classes, TableCSSVariables, collectNodes, getTreeDepth, groupBy, isLeafNode, isGroupColumn, applyTransforms, buildTree, exportTableAsExcel, layeredSort, mergeCellProps, proto, makeRecursiveMapper, smartCompare, traverseColumn, copyDataToClipboard, executeOnTempElement, layeredFilter, getEventPath, isElementInEventPath, getTargetEleInEventPath, calculatePointerRelative, calculatePopupRelative, keepWithinBounds, console, browserType, MULTI_SELECT_MARK_PROPNAME, SINGLE_SELECT_MARK_PROPNAME, isSelectColumn, makeAutoRowSpanTransform, useAutoWidthTransform, makeBuildTreeTransform, makeColumnHoverTransform, ColumnHoverOptions, useColumnHoverTransform, makeColumnRangeHoverTransform, ColumnRangeHoverOptions, useColumnHoverRangeTransform, makeColumnResizeTransform, ColumnResizeOptions, useColumnResizeTransform, makeFlattenTransform, makeOrderFieldTransform, makeSortTransform, SortHeaderCellProps, SortOptions, useSortTransform, makeTipsTransform, TipsOptions, makeTreeModeTransform, TreeModeOptions, useTreeModeTransform, makeVisibleTransform, TablePipeline, useTablePipeline, features, internals */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -375,6 +375,12 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "browserType", function() { return _table__WEBPACK_IMPORTED_MODULE_1__["browserType"]; });
 
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "MULTI_SELECT_MARK_PROPNAME", function() { return _table__WEBPACK_IMPORTED_MODULE_1__["MULTI_SELECT_MARK_PROPNAME"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "SINGLE_SELECT_MARK_PROPNAME", function() { return _table__WEBPACK_IMPORTED_MODULE_1__["SINGLE_SELECT_MARK_PROPNAME"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isSelectColumn", function() { return _table__WEBPACK_IMPORTED_MODULE_1__["isSelectColumn"]; });
+
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "makeAutoRowSpanTransform", function() { return _table__WEBPACK_IMPORTED_MODULE_1__["makeAutoRowSpanTransform"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "useAutoWidthTransform", function() { return _table__WEBPACK_IMPORTED_MODULE_1__["useAutoWidthTransform"]; });
@@ -3558,7 +3564,9 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
 
     _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_18___default()(_babel_runtime_helpers_assertThisInitialized__WEBPACK_IMPORTED_MODULE_14___default()(_this), "domHelper", void 0);
 
-    _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_18___default()(_babel_runtime_helpers_assertThisInitialized__WEBPACK_IMPORTED_MODULE_14___default()(_this), "rootSubscription", new rxjs__WEBPACK_IMPORTED_MODULE_28__["Subscription"]());
+    _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_18___default()(_babel_runtime_helpers_assertThisInitialized__WEBPACK_IMPORTED_MODULE_14___default()(_this), "rootSubscription", void 0);
+
+    _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_18___default()(_babel_runtime_helpers_assertThisInitialized__WEBPACK_IMPORTED_MODULE_14___default()(_this), "resizeSubject", void 0);
 
     _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_18___default()(_babel_runtime_helpers_assertThisInitialized__WEBPACK_IMPORTED_MODULE_14___default()(_this), "lastInfo", void 0);
 
@@ -3568,8 +3576,6 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
 
     _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_18___default()(_babel_runtime_helpers_assertThisInitialized__WEBPACK_IMPORTED_MODULE_14___default()(_this), "resizeObserver", void 0);
 
-    _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_18___default()(_babel_runtime_helpers_assertThisInitialized__WEBPACK_IMPORTED_MODULE_14___default()(_this), "resizeSubject", new rxjs__WEBPACK_IMPORTED_MODULE_28__["Subject"]());
-
     _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_18___default()(_babel_runtime_helpers_assertThisInitialized__WEBPACK_IMPORTED_MODULE_14___default()(_this), "offsetY", 0);
 
     _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_18___default()(_babel_runtime_helpers_assertThisInitialized__WEBPACK_IMPORTED_MODULE_14___default()(_this), "handleRowMouseEnter", function (e) {
@@ -4017,10 +4023,9 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
     value: function componentDidMount() {
       var _this$props$setTableW2, _this$props9, _this$props$setTableD, _this$props10, _this$props$setRowHei, _this$props11;
 
-      // console.log('did mount start')
-      // console.log('update dom helper start')
-      this.updateDOMHelper(); // console.log('update dom helper end')
-
+      this.rootSubscription = new rxjs__WEBPACK_IMPORTED_MODULE_28__["Subscription"]();
+      this.resizeSubject = new rxjs__WEBPACK_IMPORTED_MODULE_28__["Subject"]();
+      this.updateDOMHelper();
       this.props$ = new rxjs__WEBPACK_IMPORTED_MODULE_28__["BehaviorSubject"](this.props);
       this.initSubscriptions();
       this.didMountOrUpdate(); // console.log('did mount end')
@@ -4759,7 +4764,7 @@ var ContextMenuStyleWrap = styled_components__WEBPACK_IMPORTED_MODULE_3__["defau
 /*!************************************!*\
   !*** ./components/table/index.tsx ***!
   \************************************/
-/*! exports provided: Table, TableProps, PrimaryKey, LoadingContentWrapperProps, Classes, TableCSSVariables, collectNodes, getTreeDepth, groupBy, isLeafNode, isGroupColumn, applyTransforms, buildTree, exportTableAsExcel, layeredSort, mergeCellProps, proto, makeRecursiveMapper, smartCompare, traverseColumn, copyDataToClipboard, executeOnTempElement, layeredFilter, getEventPath, isElementInEventPath, getTargetEleInEventPath, calculatePointerRelative, calculatePopupRelative, keepWithinBounds, console, browserType, makeAutoRowSpanTransform, useAutoWidthTransform, makeBuildTreeTransform, makeColumnHoverTransform, ColumnHoverOptions, useColumnHoverTransform, makeColumnRangeHoverTransform, ColumnRangeHoverOptions, useColumnHoverRangeTransform, makeColumnResizeTransform, ColumnResizeOptions, useColumnResizeTransform, makeFlattenTransform, makeOrderFieldTransform, makeSortTransform, SortHeaderCellProps, SortOptions, useSortTransform, makeTipsTransform, TipsOptions, makeTreeModeTransform, TreeModeOptions, useTreeModeTransform, makeVisibleTransform, TablePipeline, useTablePipeline, features, internals */
+/*! exports provided: Table, TableProps, PrimaryKey, LoadingContentWrapperProps, Classes, TableCSSVariables, collectNodes, getTreeDepth, groupBy, isLeafNode, isGroupColumn, applyTransforms, buildTree, exportTableAsExcel, layeredSort, mergeCellProps, proto, makeRecursiveMapper, smartCompare, traverseColumn, copyDataToClipboard, executeOnTempElement, layeredFilter, getEventPath, isElementInEventPath, getTargetEleInEventPath, calculatePointerRelative, calculatePopupRelative, keepWithinBounds, console, browserType, MULTI_SELECT_MARK_PROPNAME, SINGLE_SELECT_MARK_PROPNAME, isSelectColumn, makeAutoRowSpanTransform, useAutoWidthTransform, makeBuildTreeTransform, makeColumnHoverTransform, ColumnHoverOptions, useColumnHoverTransform, makeColumnRangeHoverTransform, ColumnRangeHoverOptions, useColumnHoverRangeTransform, makeColumnResizeTransform, ColumnResizeOptions, useColumnResizeTransform, makeFlattenTransform, makeOrderFieldTransform, makeSortTransform, SortHeaderCellProps, SortOptions, useSortTransform, makeTipsTransform, TipsOptions, makeTreeModeTransform, TreeModeOptions, useTreeModeTransform, makeVisibleTransform, TablePipeline, useTablePipeline, features, internals */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4829,6 +4834,12 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "browserType", function() { return _utils__WEBPACK_IMPORTED_MODULE_2__["browserType"]; });
 
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "MULTI_SELECT_MARK_PROPNAME", function() { return _utils__WEBPACK_IMPORTED_MODULE_2__["MULTI_SELECT_MARK_PROPNAME"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "SINGLE_SELECT_MARK_PROPNAME", function() { return _utils__WEBPACK_IMPORTED_MODULE_2__["SINGLE_SELECT_MARK_PROPNAME"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isSelectColumn", function() { return _utils__WEBPACK_IMPORTED_MODULE_2__["isSelectColumn"]; });
+
 /* harmony import */ var _transforms__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./transforms */ "./components/table/transforms/index.ts");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "makeAutoRowSpanTransform", function() { return _transforms__WEBPACK_IMPORTED_MODULE_3__["makeAutoRowSpanTransform"]; });
 
@@ -5164,7 +5175,9 @@ function getColumnWidthSum(pipeline) {
 }
 
 function getTableRemainingWidth(pipeline) {
-  var tableWidth = pipeline.getStateAtKey(tableWidthKey);
+  var _pipeline$ref$current, _pipeline$ref$current2;
+
+  var tableWidth = ((_pipeline$ref$current = pipeline.ref.current.domHelper) === null || _pipeline$ref$current === void 0 ? void 0 : (_pipeline$ref$current2 = _pipeline$ref$current.tableBody) === null || _pipeline$ref$current2 === void 0 ? void 0 : _pipeline$ref$current2.clientWidth) || pipeline.getStateAtKey(tableWidthKey);
   if (!tableWidth) return;
   var remainingWidth = Math.floor(tableWidth - getColumnWidthSum(pipeline));
   return remainingWidth > 0 ? remainingWidth : 0;
@@ -5851,9 +5864,13 @@ function columnDrag() {
                 var onColumnDragStopped = opts.onColumnDragStopped; // 拖拽结束返回列顺序
 
                 if (onColumnDragStopped) {
-                  var newColumns = sortColumns(columns, cloumnsSortData).filter(function (_ref) {
-                    var code = _ref.code;
-                    return code !== _autoFill__WEBPACK_IMPORTED_MODULE_11__["FILL_COLUMN_CODE"];
+                  var isRowDragColumn = function isRowDragColumn(code) {
+                    var rowDragColumnKey = pipeline.getFeatureOptions('rowDragColumnKey');
+                    return code === rowDragColumnKey;
+                  };
+
+                  var newColumns = sortColumns(columns, cloumnsSortData).filter(function (column) {
+                    return column.code !== _autoFill__WEBPACK_IMPORTED_MODULE_11__["FILL_COLUMN_CODE"] && !isRowDragColumn(column.code) && !Object(_utils__WEBPACK_IMPORTED_MODULE_10__["isSelectColumn"])(column);
                   }); // TODO drag需要在resize之后use,否则这里返回的列对应的宽度不是拖拽后的
 
                   onColumnDragStopped(columnMoved, newColumns);
@@ -5878,9 +5895,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__WEBPACK_IMPORTED_MODULE_11__["FILL_COLUMN_CODE"] && !lock;
 }
 
@@ -8176,7 +8193,7 @@ function multiSelect() {
     var hiddenSelectColumn = opts.checkboxColumn && opts.checkboxColumn.hidden === true;
 
     if (!hiddenSelectColumn) {
-      var _opts$checkboxPlaceme;
+      var _opts$checkboxColumn2, _opts$checkboxPlaceme;
 
       var defaultCheckboxColumnTitle = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_14___default.a.createElement(Checkbox, {
         checked: isAllChecked,
@@ -8254,7 +8271,8 @@ function multiSelect() {
               }
             } : undefined
           });
-        }
+        },
+        features: _objectSpread(_objectSpread({}, (_opts$checkboxColumn2 = opts.checkboxColumn) === null || _opts$checkboxColumn2 === void 0 ? void 0 : _opts$checkboxColumn2.features), {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_6___default()({}, _utils__WEBPACK_IMPORTED_MODULE_17__["MULTI_SELECT_MARK_PROPNAME"], true))
       });
 
       var nextColumns = pipeline.getColumns().slice();
@@ -9423,6 +9441,7 @@ function rowDrag(opt) {
     };
 
     var updateScrollPosition = function updateScrollPosition(mouseMoveEvent) {
+      if (opt !== null && opt !== void 0 && opt.suppressScrollMove) return;
       var clientY = mouseMoveEvent.clientY;
       var tableBodyClientRect = tableBody.getBoundingClientRect();
       var top = tableBodyClientRect.top,
@@ -9519,6 +9538,7 @@ function rowDrag(opt) {
     };
 
     var rowDragColumn = (opt === null || opt === void 0 ? void 0 : opt.rowDragColumn) || defaultRowDragColumn;
+    pipeline.setFeatureOptions('rowDragColumnKey', rowDragColumn.code);
     var nextColumns = pipeline.getColumns().slice();
     nextColumns.unshift(rowDragColumn);
     pipeline.columns(nextColumns);
@@ -9982,7 +10002,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function singleSelect() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function singleSelectStep(pipeline) {
-    var _opts$clickArea, _opts$isDisabled, _ref, _opts$value, _opts$radioPlacement;
+    var _opts$clickArea, _opts$isDisabled, _ref, _opts$value, _opts$radioColumn2, _opts$radioPlacement;
 
     var Radio = pipeline.ctx.components.Radio;
 
@@ -10053,7 +10073,8 @@ function singleSelect() {
             onChange(rowKey);
           } : undefined
         });
-      }
+      },
+      features: _objectSpread(_objectSpread({}, (_opts$radioColumn2 = opts.radioColumn) === null || _opts$radioColumn2 === void 0 ? void 0 : _opts$radioColumn2.features), {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7___default()({}, _utils__WEBPACK_IMPORTED_MODULE_12__["SINGLE_SELECT_MARK_PROPNAME"], true))
     });
 
     var nextColumns = pipeline.getColumns().slice();
@@ -14590,7 +14611,7 @@ function groupBy(list, iteratee) {
 /*!******************************************!*\
   !*** ./components/table/utils/index.tsx ***!
   \******************************************/
-/*! exports provided: collectNodes, getTreeDepth, groupBy, isLeafNode, isGroupColumn, applyTransforms, buildTree, exportTableAsExcel, layeredSort, mergeCellProps, proto, makeRecursiveMapper, smartCompare, traverseColumn, copyDataToClipboard, executeOnTempElement, layeredFilter, getEventPath, isElementInEventPath, getTargetEleInEventPath, calculatePointerRelative, calculatePopupRelative, keepWithinBounds, console, browserType */
+/*! exports provided: collectNodes, getTreeDepth, groupBy, isLeafNode, isGroupColumn, applyTransforms, buildTree, exportTableAsExcel, layeredSort, mergeCellProps, proto, makeRecursiveMapper, smartCompare, traverseColumn, copyDataToClipboard, executeOnTempElement, layeredFilter, getEventPath, isElementInEventPath, getTargetEleInEventPath, calculatePointerRelative, calculatePopupRelative, keepWithinBounds, console, browserType, MULTI_SELECT_MARK_PROPNAME, SINGLE_SELECT_MARK_PROPNAME, isSelectColumn */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -14664,6 +14685,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _browserType__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./browserType */ "./components/table/utils/browserType.tsx");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "browserType", function() { return _browserType__WEBPACK_IMPORTED_MODULE_18__["browserType"]; });
 
+/* harmony import */ var _selectColumn__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ./selectColumn */ "./components/table/utils/selectColumn.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "MULTI_SELECT_MARK_PROPNAME", function() { return _selectColumn__WEBPACK_IMPORTED_MODULE_19__["MULTI_SELECT_MARK_PROPNAME"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "SINGLE_SELECT_MARK_PROPNAME", function() { return _selectColumn__WEBPACK_IMPORTED_MODULE_19__["SINGLE_SELECT_MARK_PROPNAME"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isSelectColumn", function() { return _selectColumn__WEBPACK_IMPORTED_MODULE_19__["isSelectColumn"]; });
+
+
 
 
 
@@ -15385,6 +15414,27 @@ proto.array = function (baseRecord) {
 
 /***/ }),
 
+/***/ "./components/table/utils/selectColumn.ts":
+/*!************************************************!*\
+  !*** ./components/table/utils/selectColumn.ts ***!
+  \************************************************/
+/*! exports provided: MULTI_SELECT_MARK_PROPNAME, SINGLE_SELECT_MARK_PROPNAME, isSelectColumn */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MULTI_SELECT_MARK_PROPNAME", function() { return MULTI_SELECT_MARK_PROPNAME; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SINGLE_SELECT_MARK_PROPNAME", function() { return SINGLE_SELECT_MARK_PROPNAME; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isSelectColumn", function() { return isSelectColumn; });
+var MULTI_SELECT_MARK_PROPNAME = 'checkboxSelection';
+var SINGLE_SELECT_MARK_PROPNAME = 'radioSelection';
+function isSelectColumn(column) {
+  var features = column.features || {};
+  return features[MULTI_SELECT_MARK_PROPNAME] === true || features[SINGLE_SELECT_MARK_PROPNAME] === true;
+}
+
+/***/ }),
+
 /***/ "./components/table/utils/smartCompare.ts":
 /*!************************************************!*\
   !*** ./components/table/utils/smartCompare.ts ***!