@kdcloudjs/table 1.2.0-canary.6 → 1.2.0-canary.6-hotfix.2

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

@@ -1,51 +1,38 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.autoRowSpan = autoRowSpan;
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _internals = require("../../internals");
-
 var _utils = require("../../utils");
-
 function isIdentity(x, y) {
   return x === y;
 }
-
 function autoRowSpan() {
   return function autoRowSpanStep(pipeline) {
     var dataSource = pipeline.getDataSource();
     return pipeline.mapColumns((0, _utils.makeRecursiveMapper)(function (col, _ref) {
       var startIndex = _ref.startIndex,
-          endIndex = _ref.endIndex;
-
+        endIndex = _ref.endIndex;
       var _a;
-
       if (!((_a = col.features) === null || _a === void 0 ? void 0 : _a.autoRowSpan)) {
         return col;
       }
-
       if (!(0, _utils.isLeafNode)(col)) {
         return col;
       }
-
       var isFunc = typeof col.features.autoRowSpan === 'function';
       var shouldMergeCell = isFunc ? col.features.autoRowSpan : isIdentity;
       var spanRects = [];
       var lastBottom = 0;
       var prevValue = null;
       var prevRow = null;
-
       for (var rowIndex = 0; rowIndex < dataSource.length; rowIndex++) {
         var row = dataSource[rowIndex];
-
         var value = _internals.internals.safeGetValue(col, row, rowIndex);
-
         if (rowIndex === 0 || !shouldMergeCell(prevValue, value, prevRow, row)) {
           var spanRect = {
             top: lastBottom,
@@ -53,18 +40,14 @@ function autoRowSpan() {
             left: startIndex,
             right: endIndex
           };
-
           for (var i = lastBottom; i < rowIndex; i++) {
             spanRects.push(spanRect);
           }
-
           lastBottom = rowIndex;
         }
-
         prevValue = value;
         prevRow = row;
       }
-
       for (var _i = lastBottom; _i < dataSource.length; _i++) {
         spanRects.push({
           top: lastBottom,
@@ -73,7 +56,6 @@ function autoRowSpan() {
           right: endIndex
         });
       }
-
       return (0, _extends2.default)((0, _extends2.default)({}, col), {
         getSpanRect: function getSpanRect(value, row, rowIndex) {
           return spanRects[rowIndex];

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

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.buildTree = buildTree;
-
 var _utils = require("../../utils");
-
 function buildTree(idProp, parentIdProp) {
   return function (pipeline) {
     return pipeline.mapDataSource(function (rows) {

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

@@ -1,43 +1,28 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.colGroupExtendable = void 0;
-
 var _splice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/splice"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/taggedTemplateLiteral"));
-
 var _react = _interopRequireDefault(require("react"));
-
 var _styledComponents = _interopRequireDefault(require("styled-components"));
-
 var _internals = require("../../internals");
-
 var _utils = require("../../utils");
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 var _styles = require("../../base/styles");
-
 var _templateObject;
-
 var ExtendIconStyle = _styledComponents.default.span(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  font-size:12px;\n  margin-left:4px;\n"])));
-
 var stateKey = 'colExtend';
-
 var ExpandIcon = function ExpandIcon(_ref) {
   var style = _ref.style,
-      className = _ref.className,
-      size = _ref.size,
-      isExtend = _ref.isExtend;
+    className = _ref.className,
+    size = _ref.size,
+    isExtend = _ref.isExtend;
   return isExtend ? /*#__PURE__*/_react.default.createElement("svg", {
     className: className,
     width: size,
@@ -56,15 +41,12 @@ var ExpandIcon = function ExpandIcon(_ref) {
     d: "M321.652913 178.347087C309.449029 166.143203 309.449029 146.356797 321.652913 134.152913C333.856797 121.949029 353.643203 121.949029 365.847088 134.152913L709.597087 477.902913C721.800972 490.106797 721.800972 509.893203 709.597087 522.097087L365.847088 865.847087C353.643203 878.050972 333.856797 878.050972 321.652913 865.847087C309.449029 853.643203 309.449029 833.856797 321.652913 821.652913L643.305825 500L321.652913 178.347087z"
   }));
 };
-
 var colGroupExtendable = function colGroupExtendable() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function (pipeline) {
     var _a, _b;
-
     var columns = pipeline.getColumns();
     var curState = (_b = (_a = opts.extendStatus) !== null && _a !== void 0 ? _a : pipeline.getStateAtKey(stateKey)) !== null && _b !== void 0 ? _b : {};
-
     var processColumns = function processColumns(columns) {
       // 当组合列可伸缩，且处于收缩状态时，只渲染一个子列，其他不渲染
       var toggle = function toggle(col) {
@@ -74,12 +56,10 @@ var colGroupExtendable = function colGroupExtendable() {
         pipeline.setStateAtKey(stateKey, (0, _extends2.default)({}, curState));
         (opts === null || opts === void 0 ? void 0 : opts.onChangeExtendStatus) && opts.onChangeExtendStatus(curState, changedValue);
       };
-
       var addIcon = function addIcon(col) {
         var result = (0, _extends2.default)({}, col);
         var curColState = curState[col.code];
         var displaycolExtendIcon = typeof opts.extendIcon === 'function' ? opts.extendIcon(curColState) : opts.extendIcon;
-
         var addIconNode = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, _internals.internals.safeRenderHeader((0, _extends2.default)({}, col)), /*#__PURE__*/_react.default.createElement(ExtendIconStyle, {
           onClick: function onClick() {
             toggle(col);
@@ -96,31 +76,23 @@ var colGroupExtendable = function colGroupExtendable() {
           size: 14,
           isExtend: curColState
         })));
-
         result.title = addIconNode;
         return result;
       };
-
       return (0, _utils.makeRecursiveMapper)(function (col) {
         var _a;
-
         var _ref2 = (col === null || col === void 0 ? void 0 : col.features) || {},
-            showExtendIcon = _ref2.showExtendIcon;
-
+          showExtendIcon = _ref2.showExtendIcon;
         if (showExtendIcon === true && ((_a = col.children) === null || _a === void 0 ? void 0 : _a.length) > 1) {
           var _context;
-
           col = addIcon(col);
           curState[col.code] === false && (0, _splice.default)(_context = col.children).call(_context, 1, col.children.length);
         }
-
         return col;
       })(columns);
     };
-
     pipeline.columns(processColumns(columns));
     return pipeline;
   };
 };
-
 exports.colGroupExtendable = colGroupExtendable;

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

@@ -1,74 +1,58 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.columnDrag = columnDrag;
-
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
-
 var _utils = require("../../utils");
-
 var _autoFill = require("./autoFill");
-
 var stateKey = 'columnDrag';
 var SCROLL_SIZE = 30;
-
 function disableSelect(event) {
   event.preventDefault();
 }
-
 function sortColumns(columns, sort) {
   var res = new Array(columns.length);
   var lastColumns = (0, _toConsumableArray2.default)(columns);
-
   while (columns.length) {
     var cloumn = columns.pop();
     res[sort[cloumn.code]] = cloumn;
   }
-
   if ((0, _filter.default)(res).call(res, Boolean).length !== lastColumns.length) {
     return lastColumns;
   }
-
   return res;
 }
-
 function stopClickPropagation(e) {
   e.stopPropagation();
 }
-
 function columnDrag() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function (pipeline) {
     var _pipeline$getStateAtK = pipeline.getStateAtKey(stateKey, {}),
-        cloumnsTranslateData = _pipeline$getStateAtK.cloumnsTranslateData;
-
+      cloumnsTranslateData = _pipeline$getStateAtK.cloumnsTranslateData;
     var columns = pipeline.getColumns();
-    var tableBody = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.tableBody; // if (cloumnsSortData) {
+    var tableBody = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.tableBody;
+    // if (cloumnsSortData) {
     //   columns = sortColumns(columns, cloumnsSortData)
     // }
-
     pipeline.columns((0, _filter.default)(columns).call(columns, function (column) {
       return column;
     }));
     return pipeline.mapColumns((0, _utils.makeRecursiveMapper)(function (col, recursiveFlatMapInfo) {
       var path = recursiveFlatMapInfo.path,
-          isLeaf = recursiveFlatMapInfo.isLeaf;
+        isLeaf = recursiveFlatMapInfo.isLeaf;
       var style = cloumnsTranslateData ? {
         transition: '.3s',
         transform: "translate3d(".concat(cloumnsTranslateData[col.code], "px, 0px, 0px)")
       } : {};
-      var prevGetCellProps = col.getCellProps; // !col.code: 选择列 col.lock: 固定列 不允许拖拽
-
+      var prevGetCellProps = col.getCellProps;
+      // !col.code: 选择列 col.lock: 固定列 不允许拖拽
       if (col.lock || !col.code) return col;
       return (0, _extends2.default)((0, _extends2.default)({}, col), {
         getCellProps: function getCellProps(value, record, rowIndex) {
@@ -82,8 +66,8 @@ function columnDrag() {
             if (e.button !== 0 || !e.currentTarget.contains(e.target)) {
               return;
             }
-
-            window.addEventListener('selectstart', disableSelect); // const cx = e.clientX
+            window.addEventListener('selectstart', disableSelect);
+            // const cx = e.clientX
             // const width = col.width
             // const a = startIndex
             // const b = endIndex
@@ -91,13 +75,10 @@ function columnDrag() {
             // let newColumn = [...columns]
             // let newStartIndex = startIndex
             // let endIdx = endIndex
-
             var columnMoved = false;
             var columns = pipeline.getColumns();
-
             var _pipeline$getStateAtK2 = pipeline.getStateAtKey(stateKey, {}),
-                cloumnsTranslateData = _pipeline$getStateAtK2.cloumnsTranslateData;
-
+              cloumnsTranslateData = _pipeline$getStateAtK2.cloumnsTranslateData;
             var cloumnsSortData = {};
             columns.forEach(function (item, index) {
               cloumnsSortData[item.code] = index;
@@ -111,21 +92,17 @@ function columnDrag() {
             var allColumns = (0, _utils.collectNodes)(columns);
             var tableBodyClientRect = tableBody.getBoundingClientRect();
             var startScrollLeft = pipeline.ref.current.domHelper.virtual.scrollLeft;
-
             var updateScrollPosition = function updateScrollPosition(client) {
               var clientX = client.clientX;
               var left = tableBodyClientRect.left,
-                  width = tableBodyClientRect.width;
-
+                width = tableBodyClientRect.width;
               if (clientX + SCROLL_SIZE >= left + width) {
                 pipeline.ref.current.domHelper.virtual.scrollLeft += SCROLL_SIZE;
               }
-
               if (clientX - SCROLL_SIZE <= left) {
                 pipeline.ref.current.domHelper.virtual.scrollLeft -= SCROLL_SIZE;
               }
             };
-
             function handleMouseMove(e) {
               var client = {
                 clientX: e.clientX,
@@ -133,17 +110,15 @@ function columnDrag() {
               };
               var scrollDistance = pipeline.ref.current.domHelper.virtual.scrollLeft - startScrollLeft;
               var leftPosition = startX - scrollDistance; // 表头最左边起点
-
               updateScrollPosition(client);
-
               if (e.clientX - leftPosition < 20) {
                 return;
               } else {
                 e.stopPropagation();
               }
-
               document.body.style.userSelect = 'none';
-              currentTarget.style.cursor = 'move'; // 循环计算每一个的位置
+              currentTarget.style.cursor = 'move';
+              // 循环计算每一个的位置
               // if (startIndex !== replaceIndex) {
               //   const optionColumn = columns[startIndex]
               //   const move = startIndex > replaceIndex ? 1 : -1
@@ -166,21 +141,18 @@ function columnDrag() {
               //   index++
               // }
               // 重置位置信息
-
               cloumnsTranslateData = {};
               allColumns.forEach(function (item) {
                 cloumnsTranslateData[item.code] = 0;
-              }); // 计算平移位置
-
+              });
+              // 计算平移位置
               var replaceIndex = 0;
               var totalWitdth = getColumnWidth(columns[replaceIndex]);
-
               while (totalWitdth < e.clientX - leftPosition && replaceIndex < columns.length - 1) {
                 replaceIndex++;
                 totalWitdth += getColumnWidth(columns[replaceIndex]);
-              } // 需要取最新startIndex, 不能直接用makeRecursiveMapper提供的startIndex（因为map时还没添加选择列、充满列等后面use添加的列）
-
-
+              }
+              // 需要取最新startIndex, 不能直接用makeRecursiveMapper提供的startIndex（因为map时还没添加选择列、充满列等后面use添加的列）
               var startIndex;
               columns.forEach(function (column, index) {
                 if (column.code === col.code) {
@@ -189,63 +161,53 @@ function columnDrag() {
               });
               var optionColumn = columns[startIndex];
               var index = replaceIndex;
-
               if (startIndex > replaceIndex) {
                 // 左移
                 while (index < startIndex) {
                   var _columns$index = columns[index],
-                      code = _columns$index.code,
-                      lock = _columns$index.lock,
-                      width = _columns$index.width,
-                      children = _columns$index.children;
-
+                    code = _columns$index.code,
+                    lock = _columns$index.lock,
+                    width = _columns$index.width,
+                    children = _columns$index.children;
                   if (enableMove({
                     code: code,
                     lock: lock
                   })) {
                     cloumnsTranslateData[code] += optionColumn.width;
-
                     if ((0, _utils.isLeafNode)(columns[index])) {
                       cloumnsTranslateData[optionColumn.code] -= width;
                     } else {
                       cloumnsTranslateData[optionColumn.code] -= getColumnWidth(columns[index]);
                       moveAllChildren(children, cloumnsTranslateData, optionColumn.width);
                     }
-
                     columnMoved = true;
                   }
-
                   index++;
                 }
               } else if (startIndex < replaceIndex) {
                 // 右移
                 while (startIndex < index) {
                   var _columns$index2 = columns[index],
-                      _code = _columns$index2.code,
-                      _lock = _columns$index2.lock,
-                      _width = _columns$index2.width,
-                      _children = _columns$index2.children;
-
+                    _code = _columns$index2.code,
+                    _lock = _columns$index2.lock,
+                    _width = _columns$index2.width,
+                    _children = _columns$index2.children;
                   if (enableMove({
                     code: _code,
                     lock: _lock
                   })) {
                     cloumnsTranslateData[_code] -= optionColumn.width;
-
                     if ((0, _utils.isLeafNode)(columns[index])) {
                       cloumnsTranslateData[optionColumn.code] += _width;
                     } else {
                       cloumnsTranslateData[optionColumn.code] += getColumnWidth(columns[index]);
                       moveAllChildren(_children, cloumnsTranslateData, optionColumn.width, true);
                     }
-
                     columnMoved = true;
                   }
-
                   index--;
                 }
               }
-
               window.requestAnimationFrame(function () {
                 pipeline.setStateAtKey(stateKey, {
                   cloumnsTranslateData: cloumnsTranslateData
@@ -253,15 +215,12 @@ function columnDrag() {
                 moveData = [startIndex, replaceIndex];
               });
             }
-
             function handleMouseUp(e) {
               document.body.removeEventListener('mousemove', handleMouseMove);
               document.body.removeEventListener('mouseup', handleMouseUp);
               window.removeEventListener('selectstart', disableSelect);
-
               if (_isMoveWhenClicking(mouseDownClientX, mouseDownClientY, e.clientX, e.clientY)) {
                 e.stopPropagation(); // 存在移动就阻止冒泡
-
                 currentTarget.addEventListener('click', stopClickPropagation); // 阻止列头点击事件，防止拖动后触发列头过滤事件
               }
 
@@ -269,13 +228,12 @@ function columnDrag() {
                 // 取消阻止列头点击事件
                 currentTarget.removeEventListener('click', stopClickPropagation);
                 currentTarget = null;
-
                 var _moveData = moveData,
-                    _moveData2 = (0, _slicedToArray2.default)(_moveData, 2),
-                    startIndex = _moveData2[0],
-                    replaceIndex = _moveData2[1];
-
-                var optionColumn = columns[startIndex]; // const move = startIndex > replaceIndex ? 1 : -1
+                  _moveData2 = (0, _slicedToArray2.default)(_moveData, 2),
+                  startIndex = _moveData2[0],
+                  replaceIndex = _moveData2[1];
+                var optionColumn = columns[startIndex];
+                // const move = startIndex > replaceIndex ? 1 : -1
                 // let index = Math.min(startIndex, replaceIndex)
                 // while (index < Math.max(startIndex, replaceIndex) && index > 0) {
                 //   const code = columns[index].code
@@ -283,16 +241,13 @@ function columnDrag() {
                 //   cloumnsSortData[code] += move
                 //   index += move
                 // }
-
                 var index = replaceIndex;
-
                 if (startIndex > replaceIndex) {
                   // 左移
                   while (index < startIndex) {
                     var _columns$index3 = columns[index],
-                        code = _columns$index3.code,
-                        lock = _columns$index3.lock;
-
+                      code = _columns$index3.code,
+                      lock = _columns$index3.lock;
                     if (enableMove({
                       code: code,
                       lock: lock
@@ -301,16 +256,14 @@ function columnDrag() {
                       cloumnsSortData[optionColumn.code] -= 1;
                       columnMoved = true;
                     }
-
                     index++;
                   }
                 } else if (startIndex < replaceIndex) {
                   // 右移
                   while (index > startIndex) {
                     var _columns$index4 = columns[index],
-                        _code2 = _columns$index4.code,
-                        _lock2 = _columns$index4.lock;
-
+                      _code2 = _columns$index4.code,
+                      _lock2 = _columns$index4.lock;
                     if (enableMove({
                       code: _code2,
                       lock: _lock2
@@ -319,24 +272,20 @@ function columnDrag() {
                       cloumnsSortData[optionColumn.code] += 1;
                       columnMoved = true;
                     }
-
                     index--;
                   }
                 }
-
-                var onColumnDragStopped = opts.onColumnDragStopped; // 拖拽结束返回列顺序
-
+                var onColumnDragStopped = opts.onColumnDragStopped;
+                // 拖拽结束返回列顺序
                 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;
-                  }); // TODO drag需要在resize之后use,否则这里返回的列对应的宽度不是拖拽后的
-
+                  });
+                  // TODO drag需要在resize之后use,否则这里返回的列对应的宽度不是拖拽后的
                   onColumnDragStopped(columnMoved, newColumns);
                 }
-
                 pipeline.setStateAtKey(stateKey, {
                   cloumnsTranslateData: null
                 });
@@ -345,7 +294,6 @@ function columnDrag() {
               currentTarget.style.opacity = '';
               currentTarget.style.cursor = '';
             }
-
             document.body.addEventListener('mousemove', handleMouseMove);
             document.body.addEventListener('mouseup', handleMouseUp);
           },
@@ -355,45 +303,37 @@ function columnDrag() {
     }));
   };
 }
-
 function enableMove(_ref2) {
   var lock = _ref2.lock,
-      code = _ref2.code;
+    code = _ref2.code;
   return code && code !== _autoFill.FILL_COLUMN_CODE && !lock;
 }
-
 function getColumnWidth(col) {
   if (col.children) {
     return col.children.reduce(function (acc, col) {
       return acc + getColumnWidth(col);
     }, 0);
   }
-
   return col.width;
 }
-
 function moveAllChildren(cols, cloumnsTranslateData, width, isMinus) {
   cols.forEach(function (col) {
     var _a;
-
     var code = col.code,
-        children = col.children;
+      children = col.children;
     var movedWidth = (_a = cloumnsTranslateData[code]) !== null && _a !== void 0 ? _a : 0;
     cloumnsTranslateData[code] = movedWidth + (isMinus ? -width : width);
-
     if (!(0, _utils.isLeafNode)(col)) {
       moveAllChildren(children, cloumnsTranslateData, width);
     }
   });
 }
-
 function _isMoveWhenClicking(mouseDownClientX, mouseDownClientY, mouseUpClientX, mouseUpClientY) {
   var xDiff = mouseUpClientX - mouseDownClientX;
-  var yDiff = mouseUpClientY - mouseDownClientY; // 鼠标点按和松开的偏移量大于5px，认为存在移动
-
+  var yDiff = mouseUpClientY - mouseDownClientY;
+  // 鼠标点按和松开的偏移量大于5px，认为存在移动
   if (Math.sqrt(xDiff * xDiff + yDiff * yDiff) > 5) {
     return true;
   }
-
   return false;
 }