@kdcloudjs/table 1.2.0-canary.8 → 1.2.0

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

@@ -153,7 +153,9 @@ function getColumnWidthSum(pipeline) {
 }
 
 function getTableRemainingWidth(pipeline) {
-  var tableWidth = pipeline.getStateAtKey(tableWidthKey);
+  var _a, _b;
+
+  var tableWidth = ((_b = (_a = pipeline.ref.current.domHelper) === null || _a === void 0 ? void 0 : _a.tableBody) === null || _b === void 0 ? void 0 : _b.clientWidth) || pipeline.getStateAtKey(tableWidthKey);
   if (!tableWidth) return;
   var remainingWidth = Math.floor(tableWidth - getColumnWidthSum(pipeline));
   return remainingWidth > 0 ? remainingWidth : 0;

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

@@ -329,9 +329,13 @@ function columnDrag() {
                 if (onColumnDragStopped) {
                   var _context;
 
-                  var newColumns = (0, _filter.default)(_context = sortColumns(columns, cloumnsSortData)).call(_context, function (_ref) {
-                    var code = _ref.code;
-                    return code !== _autoFill.FILL_COLUMN_CODE;
+                  var isRowDragColumn = function isRowDragColumn(code) {
+                    var rowDragColumnKey = pipeline.getFeatureOptions('rowDragColumnKey');
+                    return code === rowDragColumnKey;
+                  };
+
+                  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);
@@ -356,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

@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.filter = filter;
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
+
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 
 var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
@@ -76,7 +76,7 @@ function filter() {
         var filterActive = filterable && ((_c = (_b = inputFiltersMap === null || inputFiltersMap === void 0 ? void 0 : inputFiltersMap.get(col.code)) === null || _b === void 0 ? void 0 : (0, _filter.default)(_b)) === null || _c === void 0 ? void 0 : _c.length) > 0;
 
         if (filterable) {
-          var _context, _context2, _cx;
+          var _cx;
 
           var handleFilterChanged = function handleFilterChanged(filterItem) {
             var nextFiltersMap = new _map.default(inputFiltersMap);
@@ -109,8 +109,9 @@ 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 = (0, _concat.default)(_context = []).call(_context, (0, _toConsumableArray2.default)((0, _concat.default)(_context2 = []).call(_context2, (_g = result.title) !== null && _g !== void 0 ? _g : [_internals.internals.safeRenderHeader((0, _extends2.default)({}, col))])), [/*#__PURE__*/_react.default.createElement(_filter2.Filter, {
-            key: "filter",
+
+          var _Filter = /*#__PURE__*/_react.default.createElement(_filter2.Filter, {
+            key: "".concat(col.code, "_filter"),
             FilterPanelContent: filterPanel,
             filterIcon: colFilterIcon,
             filterModel: inputFiltersMap.get(col.code),
@@ -123,11 +124,20 @@ function filter() {
             hideFilterPopupHeader: hideFilterPopupHeader,
             getPopupParent: getPopupParent,
             localeText: localeText
-          })]); // result.headerCellProps = mergeCellProps(col.headerCellProps, {
+          });
+
+          if (col.renderHeader) {
+            result.title = col.renderHeader(result.title, _Filter);
+          } else {
+            var _context, _context2;
+
+            result.title = (0, _concat.default)(_context = []).call(_context, (0, _toConsumableArray2.default)((0, _concat.default)(_context2 = []).call(_context2, (_g = result.title) !== null && _g !== void 0 ? _g : [_internals.internals.safeRenderHeader((0, _extends2.default)({}, col))])), [_Filter]);
+          } // result.headerCellProps = mergeCellProps(col.headerCellProps, {
           //   style: {
           //     paddingRight: '18px'
           //   }
           // })
+
         }
 
         if (!(0, _utils.isLeafNode)(col)) {

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

@@ -18,3 +18,4 @@ export { rangeSelection, RangeSelectionFeatureOptions } from './rangeSelection';
 export { mergeCellHover } from './mergeCellHover';
 export { footerDataSource, FooterDataSourceFeatureOptions, footerRowMetaSymbol } from './footerDataSource';
 export { colGroupExtendable, colGroupExtendOption } from './colGroupExtendable';
+export { rowDrag, RowDragFeatureOptions } from './rowDrag';

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

@@ -97,6 +97,12 @@ Object.defineProperty(exports, "rowDetail", {
     return _rowDetail.rowDetail;
   }
 });
+Object.defineProperty(exports, "rowDrag", {
+  enumerable: true,
+  get: function get() {
+    return _rowDrag.rowDrag;
+  }
+});
 Object.defineProperty(exports, "rowGrouping", {
   enumerable: true,
   get: function get() {
@@ -178,4 +184,6 @@ var _mergeCellHover = require("./mergeCellHover");
 
 var _footerDataSource = require("./footerDataSource");
 
-var _colGroupExtendable = require("./colGroupExtendable");
+var _colGroupExtendable = require("./colGroupExtendable");
+
+var _rowDrag = require("./rowDrag");

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"));
 
@@ -23,14 +25,10 @@ var _others = require("../../utils/others");
 
 var _utils = require("../../utils");
 
-var fullRowsSetKey = 'fullRowsSetKey';
-var allEnableKeys = 'allEnableKeys';
-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;
@@ -57,8 +55,9 @@ function multiSelect() {
         action: action
       });
     };
-    /** dataSource 中包含的所有 keys */
 
+    var dataSource = pipeline.getDataSource();
+    /** dataSource 中包含的所有 keys */
 
     var fullKeySet = new _set.default();
     /** 所有有效的 keys（disable 状态为 false） */
@@ -68,7 +67,7 @@ function multiSelect() {
     var isAllChecked = set.size !== 0; // 当前不存在选中则默认为false
 
     var isAnyChecked = false;
-    var flatDataSource = (0, _utils.collectNodes)(pipeline.getDataSource());
+    var flatDataSource = (0, _utils.collectNodes)(dataSource);
     flatDataSource.forEach(function (row, rowIndex) {
       var rowKey = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
 
@@ -97,8 +96,6 @@ function multiSelect() {
         checked: isAllChecked,
         indeterminate: !isAllChecked && isAnyChecked,
         onChange: function onChange(_) {
-          var allKeys = pipeline.getFeatureOptions(allEnableKeys);
-
           if (isAllChecked) {
             _onChange(_others.arrayUtils.diff(value, allKeys), '', allKeys, 'uncheck-all');
           } else {
@@ -107,7 +104,7 @@ function multiSelect() {
         }
       });
 
-      var checkboxColumn = (0, _extends2.default)((0, _extends2.default)({
+      var checkboxColumn = (0, _extends3.default)((0, _extends3.default)({
         name: '是否选中',
         title: defaultCheckboxColumnTitle,
         width: 50,
@@ -120,11 +117,9 @@ function multiSelect() {
 
           var checkboxCellProps = {};
           var preCellProps = (_b = (_a = opts.checkboxColumn) === null || _a === void 0 ? void 0 : _a.getCellProps) === null || _b === void 0 ? void 0 : _b.call(_a, value, row, rowIndex);
-          var fullRowsSet = pipeline.getFeatureOptions(fullRowsSetKey) || new _set.default();
-          var selectValueSet = pipeline.getFeatureOptions(selectValueSetKey) || new _set.default();
 
-          if (fullRowsSet.has(rowKey) && clickArea === 'cell') {
-            var prevChecked = selectValueSet.has(rowKey);
+          if (fullKeySet.has(rowKey) && clickArea === 'cell') {
+            var prevChecked = set.has(rowKey);
             var disabled = isDisabled(row, rowIndex);
             checkboxCellProps = {
               style: {
@@ -149,8 +144,7 @@ function multiSelect() {
 
           var key = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
 
-          var selectValueSet = pipeline.getFeatureOptions(selectValueSetKey) || new _set.default();
-          var checked = selectValueSet.has(key);
+          var checked = set.has(key);
           return /*#__PURE__*/_react.default.createElement(Checkbox, {
             checked: checked,
             disabled: isDisabled(row, rowIndex),
@@ -171,10 +165,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);
@@ -188,9 +183,7 @@ function multiSelect() {
     pipeline.appendRowPropsGetter(function (row, rowIndex) {
       var rowKey = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
 
-      var fullRowsSet = pipeline.getFeatureOptions(fullRowsSetKey) || new _set.default();
-
-      if (!fullRowsSet.has(rowKey)) {
+      if (!fullKeySet.has(rowKey)) {
         // rowKey 不在 fullKeySet 中说明这一行是在 multiSelect 之后才生成的，multiSelect 不对之后生成的行进行处理
         return;
       }
@@ -198,8 +191,7 @@ function multiSelect() {
       var style = {};
       var className;
       var onClick;
-      var selectValueSet = pipeline.getFeatureOptions(selectValueSetKey) || new _set.default();
-      var checked = selectValueSet.has(rowKey);
+      var checked = set.has(rowKey);
 
       if (opts.highlightRowWhenSelected && checked) {
         className = 'highlight';
@@ -226,32 +218,22 @@ function multiSelect() {
         style: style,
         onClick: onClick
       };
-    }); // 只保留一份到pipeline， 避免行数据过多时内容被握住
-
-    pipeline.setFeatureOptions(fullRowsSetKey, fullKeySet);
-    pipeline.setFeatureOptions(allEnableKeys, allKeys);
-    pipeline.setFeatureOptions(selectValueSetKey, set);
-    fullKeySet = null;
-    allKeys = null;
-    set = null;
+    });
     return pipeline;
 
     function onCheckboxChange(prevChecked, key, batch) {
       var batchKeys = [key];
 
       if (batch && lastKey) {
-        var _allKeys = pipeline.getFeatureOptions(allEnableKeys);
-
-        var lastIdx = _allKeys.indexOf(lastKey);
-
-        var cntIdx = _allKeys.indexOf(key);
+        var lastIdx = allKeys.indexOf(lastKey);
+        var cntIdx = allKeys.indexOf(key);
 
         var _ref = lastIdx < cntIdx ? [lastIdx, cntIdx] : [cntIdx, lastIdx],
             _ref2 = (0, _slicedToArray2.default)(_ref, 2),
             start = _ref2[0],
             end = _ref2[1];
 
-        batchKeys = (0, _slice.default)(_allKeys).call(_allKeys, start, end + 1);
+        batchKeys = (0, _slice.default)(allKeys).call(allKeys, start, end + 1);
       }
 
       if (prevChecked) {

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

@@ -176,7 +176,9 @@ function rangeSelection(opts) {
 
       var isCtrlKey = mouseDownEvent.ctrlKey || mouseDownEvent.metaKey;
       var isShiftKey = mouseDownEvent.shiftKey;
-      var target = mouseDownEvent.target; // 每次点击时先确认初始生效的框选范围
+      var target = mouseDownEvent.target;
+      var startDragCell = getTargetCell(target, columns);
+      if (!startDragCell) return; // 每次点击时先确认初始生效的框选范围
 
       setStartSelectedCellRanges(isCtrlKey, isShiftKey);
 
@@ -185,7 +187,6 @@ function rangeSelection(opts) {
         return;
       }
 
-      var startDragCell = getTargetCell(target, columns);
       pipeline.setFeatureOptions(lastClickCellKey, startDragCell);
       var draggingCell = startDragCell;
       var mousemove$ = (0, _rxjs.fromEvent)(window, 'mousemove');

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

@@ -0,0 +1,30 @@
+import { TablePipeline } from '../pipeline';
+import { ArtColumn } from '../../interfaces';
+interface RowDragEvent {
+    startRowIndex: number;
+    startRow: any;
+    endRowIndex: number;
+    endRow: any;
+    isFinished: boolean;
+    dragPosition: string;
+}
+export interface RowDragFeatureOptions {
+    /** 拖拽开始事件 */
+    onDragStart?: (event: RowDragEvent) => void;
+    /** 拖拽移动事件 */
+    onDragMove?: (event: RowDragEvent) => void;
+    /** 拖拽结束事件 */
+    onDragEnd?: (event: RowDragEvent) => void;
+    /** 判断一行是否要禁用拖拽 */
+    isDisabled?: (row: any, rowIndex: number) => boolean;
+    /** 拖拽列定义 */
+    rowDragColumn?: ArtColumn;
+    /** 行高 */
+    rowHeight?: number;
+    /** 拖拽过程中是否禁止滚动条滚动 */
+    suppressScrollMove?: boolean;
+}
+export declare const ROW_DRAG_COLUMN_CODE = "$_row_drag_column_&";
+export declare const rowDragKey = "rowDragKey";
+export declare function rowDrag(opt: RowDragFeatureOptions): (pipeline: TablePipeline) => TablePipeline;
+export {};