linkmore-design 1.1.13-alpha.1 → 1.1.13-alpha.12

package/lib/LmEditTable/util.js

@@ -5,6 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.checkExpandIconColumnIndex = checkExpandIconColumnIndex;
 exports.checkMemoShouldUploadSpecialFun = checkMemoShouldUploadSpecialFun;
 exports.checkRowKeyByDataSource = checkRowKeyByDataSource;
 exports.deepDataSourcePreKeys = deepDataSourcePreKeys;
@@ -28,19 +29,20 @@ function isObjEmpty(obj) {
 function deepDataSourcePreKeys(dataSource, rowKey) {
   var deepDataSource = [];
 
-  var eachChildren = function eachChildren(children, preKeys) {
-    children === null || children === void 0 ? void 0 : children.forEach(function (item) {
+  var eachChildren = function eachChildren(children, preKeys, deepIds) {
+    children === null || children === void 0 ? void 0 : children.forEach(function (item, index) {
       deepDataSource.push(Object.assign(Object.assign({}, item), {
-        preKeys: [].concat((0, _toConsumableArray2.default)(preKeys), [item === null || item === void 0 ? void 0 : item[rowKey]])
+        preKeys: [].concat((0, _toConsumableArray2.default)(preKeys), [item === null || item === void 0 ? void 0 : item[rowKey]]),
+        _deepIds: [].concat((0, _toConsumableArray2.default)(deepIds), [index + 1])
       }));
 
       if (item === null || item === void 0 ? void 0 : item.children) {
-        eachChildren(item === null || item === void 0 ? void 0 : item.children, [].concat((0, _toConsumableArray2.default)(preKeys), [item === null || item === void 0 ? void 0 : item[rowKey]])); // deepDataSource.push({ ...item, preKeys: [...preKeys, item[rowKey]] })
+        eachChildren(item === null || item === void 0 ? void 0 : item.children, [].concat((0, _toConsumableArray2.default)(preKeys), [item === null || item === void 0 ? void 0 : item[rowKey]]), [].concat((0, _toConsumableArray2.default)(deepIds), [index + 1])); // deepDataSource.push({ ...item, preKeys: [...preKeys, item[rowKey]] })
       }
     });
   };
 
-  eachChildren(dataSource, []);
+  eachChildren(dataSource, [], []);
   return (0, _lodash.keyBy)(deepDataSource, rowKey);
 }
 
@@ -74,7 +76,7 @@ function checkRowKeyByDataSource(dataSource, rowKey) {
 
     return Object.assign(Object.assign({}, v), (0, _defineProperty2.default)({}, rowKey, v[rowKey] || "v".concat(idx + 1)));
   });
-  return res;
+  return res || [];
 }
 
 function getExpandStatus(children) {
@@ -84,7 +86,7 @@ function getExpandStatus(children) {
 }
 
 function checkMemoShouldUploadSpecialFun(prev, next) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
 
   var checkExpandStatus = getExpandStatus(prev.children) === getExpandStatus(next.children);
 
@@ -94,13 +96,38 @@ function checkMemoShouldUploadSpecialFun(prev, next) {
 
   var prevCol = prev === null || prev === void 0 ? void 0 : prev.col;
   var nextCol = next === null || next === void 0 ? void 0 : next.col;
+  /** TODO: 使用了自定义render, 是否要判断rowIndex? 这样排序之后，渲染的性能就会变差 */
+
+  if (((prevCol === null || prevCol === void 0 ? void 0 : prevCol.render) || (nextCol === null || nextCol === void 0 ? void 0 : nextCol.render)) && !(0, _lodash.isEqual)((0, _lodash.pick)(prev, ['colIndex', 'record', 'children']), (0, _lodash.pick)(next, ['colIndex', 'record', 'children']))) {
+    return false;
+  }
+
+  if (!(next === null || next === void 0 ? void 0 : next.quickOpetateClearAll) && ((next === null || next === void 0 ? void 0 : next.getLength) < 2 || (prev === null || prev === void 0 ? void 0 : prev.getLength) === 1) && (next === null || next === void 0 ? void 0 : next.dataIndex) === 'lm_edit_opetate') {
+    return false;
+  }
+
+  if (prev.isEdit !== next.isEdit) {
+    return false;
+  } // console.log(22, prevCol?.editable === 'render', nextCol?.editable === 'render', prevCol?.componentProps, prevCol?.componentProps)
+
+
+  if (((prevCol === null || prevCol === void 0 ? void 0 : prevCol.editable) === 'render' || (nextCol === null || nextCol === void 0 ? void 0 : nextCol.editable) === 'render') && (((_a = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _a === void 0 ? void 0 : _a.render) || ((_b = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _b === void 0 ? void 0 : _b.render)) && (!(0, _lodash.isEqual)((0, _lodash.omit)(prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps, ['render']), (0, _lodash.omit)(nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps, ['render'])) || !(0, _lodash.isEqual)((0, _lodash.pick)(prev, ['colIndex', 'record', 'rowIndex']), (0, _lodash.pick)(next, ['colIndex', 'record', 'rowIndex'])))) {
+    return false;
+  }
 
   if (((prevCol === null || prevCol === void 0 ? void 0 : prevCol.fixed) || (nextCol === null || nextCol === void 0 ? void 0 : nextCol.fixed)) && !(0, _lodash.isEqual)(prev === null || prev === void 0 ? void 0 : prev.style, next === null || next === void 0 ? void 0 : next.style)) {
     return false;
   }
 
-  if ((((_a = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _a === void 0 ? void 0 : _a.optionOnly) || ((_b = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _b === void 0 ? void 0 : _b.optionOnly)) && !(0, _lodash.isEqual)((_c = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _c === void 0 ? void 0 : _c.options, (_d = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _d === void 0 ? void 0 : _d.options)) {
-    // return isEqual(prevCol?.componentProps?.options, nextCol?.componentProps?.options)
+  if ((((_c = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _c === void 0 ? void 0 : _c.optionOnly) || ((_d = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _d === void 0 ? void 0 : _d.optionOnly)) && !(0, _lodash.isEqual)((_e = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _e === void 0 ? void 0 : _e.options, (_f = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _f === void 0 ? void 0 : _f.options)) {
+    return false;
+  }
+
+  if ((((_g = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _g === void 0 ? void 0 : _g.options) || ((_h = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _h === void 0 ? void 0 : _h.options)) && !(0, _lodash.isEqual)((_j = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _j === void 0 ? void 0 : _j.options, (_k = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _k === void 0 ? void 0 : _k.options)) {
+    return false;
+  }
+
+  if (((0, _lodash.isFunction)(prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) || (0, _lodash.isFunction)(nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps)) && !(0, _lodash.isEqual)(prevCol.newOptions, nextCol.newOptions) && !(0, _lodash.isEqual)(prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps, nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps)) {
     return false;
   }
 
@@ -109,13 +136,17 @@ function checkMemoShouldUploadSpecialFun(prev, next) {
     return false;
   }
 
+  if (next.className.indexOf('drag-visible') > -1) {
+    return (0, _lodash.isEqual)(prev.style, next.style);
+  }
+
   if (next.className.indexOf('ant-table-selection-column') > -1) {
-    return (0, _lodash.isEqual)((_f = (_e = prev.children) === null || _e === void 0 ? void 0 : _e[1]) === null || _f === void 0 ? void 0 : _f.props, (_h = (_g = next.children) === null || _g === void 0 ? void 0 : _g[1]) === null || _h === void 0 ? void 0 : _h.props);
+    return (0, _lodash.isEqual)((_m = (_l = prev.children) === null || _l === void 0 ? void 0 : _l[1]) === null || _m === void 0 ? void 0 : _m.props, (_p = (_o = next.children) === null || _o === void 0 ? void 0 : _o[1]) === null || _p === void 0 ? void 0 : _p.props);
   }
   /** 如果启用了快速复制功能，需要实时判断rowIndex与getLength */
 
 
-  if (((_j = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _j === void 0 ? void 0 : _j.quickcopy) || ((_k = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _k === void 0 ? void 0 : _k.quickcopy)) {
+  if (((_q = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _q === void 0 ? void 0 : _q.quickcopy) || ((_r = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _r === void 0 ? void 0 : _r.quickcopy)) {
     var pickProps = ['record', 'colIndex', 'rowIndex', 'getLength'];
     var p = (0, _lodash.pick)(prev, pickProps);
     var n = (0, _lodash.pick)(next, pickProps);
@@ -125,6 +156,16 @@ function checkMemoShouldUploadSpecialFun(prev, next) {
   return true;
 }
 
+function checkExpandIconColumnIndex(_ref) {
+  var rowSelection = _ref.rowSelection,
+      sortOpen = _ref.sortOpen,
+      indexCol = _ref.indexCol;
+  var arr = [rowSelection, sortOpen, indexCol].filter(function (item) {
+    return !!item;
+  });
+  return arr.length;
+}
+
 var _default = {
   isObjEmpty: isObjEmpty
 };

package/lib/LmEditTable/virtual/VirtualRow.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 interface rowProps {
     children?: any;
+    pref?: any;
 }
 declare const VirtualRow: React.NamedExoticComponent<rowProps>;
 export default VirtualRow;

package/lib/LmEditTable/virtual/VirtualRow.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
 
 Object.defineProperty(exports, "__esModule", {
@@ -11,6 +13,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _context = require("./context");
 
+var _useForkRef = _interopRequireDefault(require("../hooks/useForkRef"));
+
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
 
@@ -26,7 +30,8 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
 
 var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
   var children = _a.children,
-      resetProps = __rest(_a, ["children"]);
+      pref = _a.pref,
+      resetProps = __rest(_a, ["children", "pref"]);
 
   var _useStore = (0, _context.useStore)(),
       state = _useStore.state,
@@ -62,10 +67,10 @@ var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
       }
     };
 
-    initHeight(Object.prototype.hasOwnProperty.call(ref, 'current') ? ref : trRef);
+    initHeight(trRef);
   }, [trRef, dispatch, rowHeight, totalLen, ref]);
   return /*#__PURE__*/_react.default.createElement("tr", Object.assign({}, resetProps, {
-    ref: Object.prototype.hasOwnProperty.call(ref, 'current') ? ref : trRef
+    ref: (0, _useForkRef.default)(pref, trRef)
   }), children);
 });
 

package/lib/LmEditTable/virtual/VirtualRowBack.js

@@ -36,12 +36,16 @@ var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
   var rowHeight = state.rowHeight,
       totalLen = state.totalLen;
   var virtualItems = instance.columnVirtual.virtualItems;
-  var trRef = (0, _react.useRef)(null); // 列长度
+  var trRef = (0, _react.useRef)(null); // 非固定列长度
 
   var columnsLen = (0, _react.useMemo)(function () {
     var _a;
 
-    return (_a = children === null || children === void 0 ? void 0 : children.length) !== null && _a !== void 0 ? _a : 0;
+    return (_a = children === null || children === void 0 ? void 0 : children.filter(function (v) {
+      var _a, _b;
+
+      return typeof ((_a = v.props) === null || _a === void 0 ? void 0 : _a.fixLeft) !== 'number' && typeof ((_b = v.props) === null || _b === void 0 ? void 0 : _b.fixRight) !== 'number';
+    }).length) !== null && _a !== void 0 ? _a : 0;
   }, [children]);
   (0, _react.useEffect)(function () {
     if (state.columnsLen !== columnsLen) {
@@ -88,26 +92,20 @@ var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
       fixedRight: [],
       columns: []
     });
-  }, [children]); // 截取非固定列
-
-  var resetVirtualItems = (0, _react.useMemo)(function () {
-    var fixedLeft = fixedColumns.fixedLeft,
-        columns = fixedColumns.columns;
-    return virtualItems.slice(fixedLeft.length, fixedLeft.length + columns.length);
-  }, [fixedColumns, virtualItems]); // 横向单元格合并
+  }, [children]); // 横向单元格合并
 
   var colSpan = (0, _react.useMemo)(function () {
     var _a;
 
-    var startIndex = ((_a = resetVirtualItems === null || resetVirtualItems === void 0 ? void 0 : resetVirtualItems[0]) === null || _a === void 0 ? void 0 : _a.index) || 0;
-    return startIndex ? startIndex - fixedColumns.fixedLeft.length : startIndex;
-  }, [fixedColumns, resetVirtualItems]);
+    return (_a = virtualItems[0]) === null || _a === void 0 ? void 0 : _a.index;
+  }, [virtualItems]);
+  console.log('virtualItems', virtualItems);
   return /*#__PURE__*/_react.default.createElement("tr", Object.assign({}, resetProps, {
     ref: Object.prototype.hasOwnProperty.call(ref, 'current') ? ref : trRef
   }), fixedColumns.fixedLeft, !!colSpan && /*#__PURE__*/_react.default.createElement("td", {
     colSpan: colSpan
-  }), resetVirtualItems.map(function (virtualCol) {
-    return children[virtualCol.index];
+  }), virtualItems.map(function (virtualCol) {
+    return fixedColumns.columns[virtualCol.index];
   }), fixedColumns.fixedRight);
 });
 

package/lib/LmFilter/LmFilter.js

@@ -21,9 +21,10 @@ var _FilterRoot = _interopRequireDefault(require("./wrapper/FilterRoot"));
 
 var _localization = require("./localization");
 
-var _excluded = ["searchConfig", "localization"];
+var _components = _interopRequireDefault(require("./components"));
 
-var LmFilter = function LmFilter(_ref, ref) {
+var _excluded = ["searchConfig", "localization"];
+var LmFilter = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var _ref$searchConfig = _ref.searchConfig,
       searchConfig = _ref$searchConfig === void 0 ? {} : _ref$searchConfig,
       _ref$localization = _ref.localization,
@@ -64,8 +65,7 @@ var LmFilter = function LmFilter(_ref, ref) {
   return /*#__PURE__*/_react.default.createElement(_FilterRoot.default, (0, _extends2.default)({
     ref: ref || defaultRef
   }, defaultProps, resetProps));
-};
-
-var _default = /*#__PURE__*/(0, _react.forwardRef)(LmFilter);
-
+});
+LmFilter.FilterControl = _components.default;
+var _default = LmFilter;
 exports.default = _default;

package/lib/LmFilter/components/CheckboxFilter.js

@@ -43,7 +43,9 @@ var CheckboxFilter = function CheckboxFilter(_ref) {
       visible = instance.visible,
       setVisible = instance.setVisible;
   var _itemProps$data = itemProps.data,
-      filters = _itemProps$data === void 0 ? [] : _itemProps$data;
+      filters = _itemProps$data === void 0 ? [] : _itemProps$data,
+      showSearch = itemProps.showSearch,
+      showAllChecked = itemProps.showAllChecked;
   var inputRef = (0, _react.useRef)(); // 选中的数据项: [key, key, ...];
 
   var _useState = (0, _react.useState)(filterValue),
@@ -62,8 +64,11 @@ var CheckboxFilter = function CheckboxFilter(_ref) {
   var delayedFn = (0, _hooks.useDelayedFn)(); // 是否存在搜索, 当数据大于8时存在搜索
 
   var isSearch = (0, _react.useMemo)(function () {
-    return filters.length > 8;
-  }, [filters.length]); // 是否全选: 选中的数据大于等于筛选后的数据 && 筛选后的数据全部存在于选中的数据中
+    return filters.length > 8 && !!(showSearch !== null && showSearch !== void 0 ? showSearch : true);
+  }, [filters.length, showSearch]);
+  var isAllCheck = (0, _react.useMemo)(function () {
+    return !!(showAllChecked !== null && showAllChecked !== void 0 ? showAllChecked : true);
+  }, [showAllChecked]); // 是否全选: 选中的数据大于等于筛选后的数据 && 筛选后的数据全部存在于选中的数据中
 
   var checkAll = (0, _react.useMemo)(function () {
     var isAll = checkedValues.length >= options.length;
@@ -145,7 +150,7 @@ var CheckboxFilter = function CheckboxFilter(_ref) {
     ref: inputRef,
     onSearch: handleFilter,
     onChange: handleFilter
-  }), /*#__PURE__*/_react.default.createElement("div", {
+  }), isAllCheck && /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_header_operate"
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox, {
     indeterminate: indeterminate,