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

package/dist/LmEditTable/components/DraggableContainer.d.ts

@@ -1,7 +1,10 @@
-declare const DraggableContainer: ({ keys, onSortEnd, virtual, ...props }: {
+declare const DraggableContainer: ({ keys, onSortEnd, virtual, rowKey, options, tableWidth, ...props }: {
     [x: string]: any;
     keys: any;
     onSortEnd: any;
     virtual: any;
+    rowKey: any;
+    options: any;
+    tableWidth: any;
 }) => JSX.Element;
 export default DraggableContainer;

package/dist/LmEditTable/components/index.d.ts

@@ -3,11 +3,14 @@ import BottomOpetateComponent from './bottomOpetateComponent';
 import QuickOpetate from './QuickOpetate';
 export { DraggableContainer, BottomOpetateComponent, QuickOpetate };
 declare const _default: {
-    DraggableContainer: ({ keys, onSortEnd, virtual, ...props }: {
+    DraggableContainer: ({ keys, onSortEnd, virtual, rowKey, options, tableWidth, ...props }: {
         [x: string]: any;
         keys: any;
         onSortEnd: any;
         virtual: any;
+        rowKey: any;
+        options: any;
+        tableWidth: any;
     }) => JSX.Element;
 };
 export default _default;

package/dist/LmEditTable/hooks/useForkRef.d.ts

@@ -0,0 +1,2 @@
+import { Ref } from 'react';
+export default function useForkRef<InstanceA, InstanceB>(refA: Ref<InstanceA> | null | undefined, refB: Ref<InstanceB> | null | undefined): Ref<InstanceA & InstanceB> | null;

package/dist/LmEditTable/rowSort/DndContainerRow.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+declare const _default: React.MemoExoticComponent<({ children, options, move, rowKey, items, tableWidth }: {
+    children: any;
+    options: any;
+    move: any;
+    rowKey: any;
+    items: any;
+    tableWidth: any;
+}) => JSX.Element>;
+export default _default;

package/dist/LmEditTable/util.d.ts

@@ -4,6 +4,11 @@ export declare function isExpandRow(children: any): boolean;
 export declare function checkRowKeyByDataSource(dataSource: any, rowKey: any): any;
 export declare function getExpandStatus(children: any): any;
 export declare function checkMemoShouldUploadSpecialFun(prev: any, next: any): any;
+export declare function checkExpandIconColumnIndex({ rowSelection, sortOpen, indexCol }: {
+    rowSelection: any;
+    sortOpen: any;
+    indexCol: any;
+}): number;
 declare const _default: {
     isObjEmpty: typeof isObjEmpty;
 };

package/dist/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/dist/index.umd.js

@@ -92885,7 +92885,7 @@
             fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
             type: item.type,
             value: Array.isArray(itemValue) ? itemValue : [itemValue],
-            operator: obj[cur].mode === 'and' ? 'equal' : 'contains'
+            operator: (item === null || item === void 0 ? void 0 : item.operator) || obj[cur].mode === 'and' ? 'equal' : 'contains'
           }]);
         }
 
@@ -233633,6 +233633,14 @@
     return restrictToBoundingRect(transform, draggingNodeRect, containerNodeRect);
   };
 
+  const restrictToVerticalAxis = ({
+    transform
+  }) => {
+    return { ...transform,
+      x: 0
+    };
+  };
+
   var DndContainer = function DndContainer(_ref) {
     var children = _ref.children,
         move = _ref.move;
@@ -285974,12 +285982,16 @@
     var rowHeight = state.rowHeight,
         totalLen = state.totalLen;
     var virtualItems = instance.columnVirtual.virtualItems;
-    var trRef = React.useRef(null); // 列长度
+    var trRef = React.useRef(null); // 非固定列长度
 
     var columnsLen = React.useMemo(function () {
-      var _children$length;
+      var _children$filter$leng;
 
-      return (_children$length = children === null || children === void 0 ? void 0 : children.length) !== null && _children$length !== void 0 ? _children$length : 0;
+      return (_children$filter$leng = children === null || children === void 0 ? void 0 : children.filter(function (v) {
+        var _v$props, _v$props2;
+
+        return typeof ((_v$props = v.props) === null || _v$props === void 0 ? void 0 : _v$props.fixLeft) !== 'number' && typeof ((_v$props2 = v.props) === null || _v$props2 === void 0 ? void 0 : _v$props2.fixRight) !== 'number';
+      }).length) !== null && _children$filter$leng !== void 0 ? _children$filter$leng : 0; // return children?.length ?? 0
     }, [children]);
     React.useEffect(function () {
       if (state.columnsLen !== columnsLen) {
@@ -286028,26 +286040,20 @@
         fixedRight: [],
         columns: []
       });
-    }, [children]); // 截取非固定列
-
-    var resetVirtualItems = React.useMemo(function () {
-      var fixedLeft = fixedColumns.fixedLeft,
-          columns = fixedColumns.columns;
-      return virtualItems.slice(fixedLeft.length, fixedLeft.length + columns.length);
-    }, [fixedColumns, virtualItems]); // 横线单元格合并
+    }, [children]); // 横线单元格合并
 
     var colSpan = React.useMemo(function () {
-      var _resetVirtualItems$;
+      var _virtualItems$;
 
-      var startIndex = (resetVirtualItems === null || resetVirtualItems === void 0 ? void 0 : (_resetVirtualItems$ = resetVirtualItems[0]) === null || _resetVirtualItems$ === void 0 ? void 0 : _resetVirtualItems$.index) || 0;
-      return startIndex ? startIndex - fixedColumns.fixedLeft.length : startIndex;
-    }, [fixedColumns, resetVirtualItems]);
+      return (_virtualItems$ = virtualItems[0]) === null || _virtualItems$ === void 0 ? void 0 : _virtualItems$.index;
+    }, [virtualItems]);
+    console.log('virtualItems', virtualItems);
     return /*#__PURE__*/React__default['default'].createElement("tr", _objectSpread(_objectSpread({}, resetProps), {}, {
       ref: Object.prototype.hasOwnProperty.call(ref, 'current') ? ref : trRef
     }), fixedColumns.fixedLeft, !!colSpan && /*#__PURE__*/React__default['default'].createElement("td", {
       colSpan: colSpan
-    }), resetVirtualItems.map(function (virtualCol) {
-      return children[virtualCol.index];
+    }), virtualItems.map(function (virtualCol) {
+      return fixedColumns.columns[virtualCol.index];
     }), fixedColumns.fixedRight);
   });
 
@@ -312840,9 +312846,31 @@
     })));
   });
 
-  var _excluded$2Q = ["children"];
+  function setRef(ref, value) {
+    if (typeof ref === 'function') {
+      ref(value);
+    } else if (ref) {
+      ref.current = value;
+    }
+  }
+
+  function useForkRef(refA, refB) {
+    return React.useMemo(function () {
+      if (refA == null && refB == null) {
+        return null;
+      }
+
+      return function (refValue) {
+        setRef(refA, refValue);
+        setRef(refB, refValue);
+      };
+    }, [refA, refB]);
+  }
+
+  var _excluded$2Q = ["children", "pref"];
   var VirtualRow$1 = /*#__PURE__*/React__default['default'].memo(function (_ref, ref) {
     var children = _ref.children,
+        pref = _ref.pref,
         resetProps = _objectWithoutProperties$1(_ref, _excluded$2Q);
 
     var _useStore = useStore$1(),
@@ -312881,10 +312909,10 @@
         }
       };
 
-      initHeight(Object.prototype.hasOwnProperty.call(ref, 'current') ? ref : trRef);
+      initHeight(trRef);
     }, [trRef, dispatch, rowHeight, totalLen, ref]);
     return /*#__PURE__*/React__default['default'].createElement("tr", _objectSpread(_objectSpread({}, resetProps), {}, {
-      ref: Object.prototype.hasOwnProperty.call(ref, 'current') ? ref : trRef
+      ref: useForkRef(pref, trRef)
     }), children);
   });
 
@@ -312920,6 +312948,7 @@
 
     return /*#__PURE__*/React__default['default'].createElement(VirtualRow$1, _objectSpread(_objectSpread({}, resetField), {}, {
       ref: setNodeRef,
+      pref: setNodeRef,
       key: key,
       style: style
     }, attributes), children);
@@ -313009,7 +313038,7 @@
         touchAction: 'none',
         cursor: 'move'
       },
-      className: 'icon_drag' + (isDragging ? 'bing' : '')
+      className: "icon_drag".concat(isDragging ? 'bing' : '')
     }));
   };
 
@@ -313090,6 +313119,10 @@
       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)
@@ -313141,6 +313174,91 @@
 
     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 DndContainer$3 = function DndContainer(_ref) {
+    var children = _ref.children,
+        options = _ref.options,
+        move = _ref.move,
+        rowKey = _ref.rowKey,
+        items = _ref.items,
+        tableWidth = _ref.tableWidth;
+
+    var _React$useState = React__default['default'].useState(false),
+        _React$useState2 = _slicedToArray$1(_React$useState, 2),
+        isDragging = _React$useState2[0],
+        setIsDragging = _React$useState2[1]; // 是否拖拽中
+
+
+    var _React$useState3 = React__default['default'].useState(null),
+        _React$useState4 = _slicedToArray$1(_React$useState3, 2),
+        activeId = _React$useState4[0],
+        setActiveId = _React$useState4[1]; // 是否拖拽中
+
+
+    var sensors = useSensors(useSensor(PointerSensor), useSensor(KeyboardSensor, {
+      coordinateGetter: sortableKeyboardCoordinates
+    })); // 开始拖拽
+
+    var handleDragStart = function handleDragStart(_ref2) {
+      var active = _ref2.active;
+      setIsDragging(true);
+
+      if (!active) {
+        return;
+      }
+
+      setActiveId(active.id);
+    }; // 拖拽结束
+
+
+    var handleDragEnd = function handleDragEnd(event) {
+      var active = event.active,
+          over = event.over;
+      setActiveId(null); // 未移入时触发
+
+      if (!(over === null || over === void 0 ? void 0 : over.id)) {
+        return;
+      } // 移入时触发更新数据
+
+
+      if (active.id !== over.id) {
+        move(active.id, over.id);
+      }
+    };
+
+    var instance = {
+      isDragging: isDragging,
+      activeId: activeId,
+      options: options,
+      rowKey: rowKey,
+      children: children,
+      move: move,
+      items: items,
+      tableWidth: tableWidth
+    };
+    console.log('instance', instance);
+    return /*#__PURE__*/React__default['default'].createElement(DndContext, {
+      sensors: sensors,
+      onDragStart: handleDragStart,
+      onDragCancel: function onDragCancel() {
+        return setActiveId(null);
+      },
+      collisionDetection: closestCenter,
+      onDragEnd: handleDragEnd,
+      modifiers: [restrictToParentElement, restrictToVerticalAxis]
+    }, children);
+  };
+
+  var DndContainer$4 = /*#__PURE__*/React.memo(DndContainer$3);
 
   var SortableBox$2 = function SortableBox(_ref) {
     var items = _ref.items,
@@ -313151,16 +313269,23 @@
     }, children);
   };
 
-  var _excluded$2T = ["keys", "onSortEnd", "virtual"];
+  var _excluded$2T = ["keys", "onSortEnd", "virtual", "rowKey", "options", "tableWidth"];
 
   var DraggableContainer = function DraggableContainer(_ref) {
     var keys = _ref.keys,
         onSortEnd = _ref.onSortEnd,
         virtual = _ref.virtual,
+        rowKey = _ref.rowKey,
+        options = _ref.options,
+        tableWidth = _ref.tableWidth,
         props = _objectWithoutProperties$1(_ref, _excluded$2T);
 
-    return /*#__PURE__*/React__default['default'].createElement(DndContainer$2, {
-      move: onSortEnd
+    return /*#__PURE__*/React__default['default'].createElement(DndContainer$4, {
+      move: onSortEnd,
+      items: keys,
+      rowKey: rowKey,
+      options: options,
+      tableWidth: tableWidth
     }, /*#__PURE__*/React__default['default'].createElement(SortableBox$2, {
       items: keys
     }, virtual ? /*#__PURE__*/React__default['default'].createElement(VirtualWrapper$1, _objectSpread({}, props)) : /*#__PURE__*/React__default['default'].createElement("tbody", _objectSpread({}, props))));
@@ -313322,7 +313447,7 @@
       _excluded3$b = ["value", "onChange", "record", "rowIndex", "colIndex", "validator"],
       _excluded4$2 = ["record", "rowKey", "isEdit", "col", "rowIndex", "colIndex", "handleTableRowDelete", "handleTableRowAdd", "quickOpetateClearAll", "getLength", "isHoverEdit", "editEnum", "valueType", "children", "handleSave", "handleAdd", "handleDelete", "handleCopy", "itemProps"],
       _excluded5 = ["onMouseEnter", "onMouseLeave"],
-      _excluded6 = ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "virtual", "sortOpen", "disabled", "colSortOpen", "indexCol", "filterChange", "size", "recordCreatorProps", "shouldUpdate"];
+      _excluded6 = ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "virtual", "sortOpen", "disabled", "colSortOpen", "indexCol", "filterChange", "size", "recordCreatorProps", "shouldUpdate", "loading"];
   var UploadBtn$1 = UploadOss.UploadBtn;
   var EditableContext$1 = /*#__PURE__*/React__default['default'].createContext(null); // 表格行
 
@@ -313933,6 +314058,8 @@
         recordCreatorProps = props.recordCreatorProps,
         _props$shouldUpdate = props.shouldUpdate,
         shouldUpdate = _props$shouldUpdate === void 0 ? false : _props$shouldUpdate,
+        _props$loading = props.loading,
+        loading = _props$loading === void 0 ? false : _props$loading,
         resetProps = _objectWithoutProperties$1(props, _excluded6);
 
     var _useControllableValue = useControllableValue({
@@ -313970,6 +314097,7 @@
     var deepDataSourceRef = React.useRef(deepDataSourcePreKeys(dataSource, _rowKey));
     dataSourceRef.current = dataSource;
     deepDataSourceRef.current = deepDataSourcePreKeys(dataSource, _rowKey);
+    var tableWarpRef = React.useRef(null);
 
     var onColSortEnd = function onColSortEnd(active, over) {
       var _arrayMove;
@@ -314118,7 +314246,7 @@
           return newData;
         };
 
-        var res = filter(dataSource, key);
+        var res = filter(dataSourceRef.current, key);
         setDataSource(res);
       } else {
         var _dataSourceRef$curren;
@@ -314550,14 +314678,17 @@
           cell: MemoEditableCell
         }, sortOpen ? {
           wrapper: function wrapper(wrapperProps) {
-            var _dataSourceRef$curren2;
+            var _dataSourceRef$curren2, _tableWarpRef$current, _tableWarpRef$current2;
 
             return DraggableContainer(_objectSpread(_objectSpread({}, wrapperProps), {}, {
               virtual: virtual,
               keys: (_dataSourceRef$curren2 = dataSourceRef.current) === null || _dataSourceRef$curren2 === void 0 ? void 0 : _dataSourceRef$curren2.map(function (item) {
                 return item[_rowKey];
               }),
-              onSortEnd: onSortEnd
+              options: dataSourceRef.current,
+              rowKey: _rowKey,
+              onSortEnd: onSortEnd,
+              tableWidth: tableWarpRef === null || tableWarpRef === void 0 ? void 0 : (_tableWarpRef$current = tableWarpRef.current) === null || _tableWarpRef$current === void 0 ? void 0 : (_tableWarpRef$current2 = _tableWarpRef$current.getBoundingClientRect()) === null || _tableWarpRef$current2 === void 0 ? void 0 : _tableWarpRef$current2.width
             }));
           }
         } : virtual ? {
@@ -314578,7 +314709,8 @@
       var _localRowSelectList$s;
 
       return /*#__PURE__*/React__default['default'].createElement("div", {
-        className: "lm_editTable_warpper"
+        className: "lm_editTable_warpper",
+        ref: tableWarpRef
       }, /*#__PURE__*/React__default['default'].createElement(DndContainer$2, {
         move: onColSortEnd
       }, /*#__PURE__*/React__default['default'].createElement(SortableBox$1, {
@@ -314586,6 +314718,7 @@
           return [].concat(_toConsumableArray$1(acc), [item.dataIndex]);
         }, [])
       }, /*#__PURE__*/React__default['default'].createElement(Table$1, _objectSpread(_objectSpread({}, config.current), {}, {
+        loading: loading,
         size: size || 'small',
         columns: resultColumns,
         rowClassName: "editable-row",
@@ -314614,19 +314747,25 @@
 
 
     return /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "lm_editTable_warpper"
+      className: "lm_editTable_warpper",
+      ref: tableWarpRef
     }, /*#__PURE__*/React__default['default'].createElement(Table$1, _objectSpread(_objectSpread({}, config.current), {}, {
       size: size || 'small',
       columns: resultColumns,
       rowClassName: "editable-row",
       bordered: true,
+      loading: loading,
       pagination: false,
       // components={tableComponents}
       expandable: (resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable) || {
         expandedRowKeys: expandedRowKeys,
         fixed: true,
         // indentSize: 0,
-        expandIconColumnIndex: rowSelection && sortOpen ? 3 : rowSelection || sortOpen ? 2 : 0,
+        expandIconColumnIndex: checkExpandIconColumnIndex({
+          rowSelection: rowSelection,
+          sortOpen: sortOpen,
+          indexCol: indexCol
+        }) || 0,
         onExpandedRowsChange: function onExpandedRowsChange(expandedRows) {
           return setExpandedRowKeys(expandedRows);
         }
@@ -325594,7 +325733,7 @@
    */
   // 可拖拽容器
 
-  var DndContainer$3 = function DndContainer(_ref2) {
+  var DndContainer$5 = function DndContainer(_ref2) {
     var options = _ref2.options,
         rowKey = _ref2.rowKey,
         children = _ref2.children,
@@ -325691,7 +325830,7 @@
     React.useImperativeHandle(ref, function () {
       return {};
     });
-    return /*#__PURE__*/React__default['default'].createElement(DndContainer$3, _objectSpread({}, props));
+    return /*#__PURE__*/React__default['default'].createElement(DndContainer$5, _objectSpread({}, props));
   };
 
   var Root$2 = /*#__PURE__*/React.forwardRef(Root$1);