linkmore-design 1.1.13-alpha.5 → 1.1.13-alpha.6

package/dist/LmEditTable/EditTable.d.ts

@@ -33,7 +33,7 @@ export interface CountdownHandle {
     clearSelect: () => void;
     customSetCheckboxRecords: (data: any[]) => void;
     deleteRowData: (record: string | Record<string, any>) => void;
-    addRowData: (record: string | Record<string, any>, addInChind: boolean, defaultValue?: Record<string, any>) => void;
+    addRowData: (record: string | Record<string, any>, defaultValue?: Record<string, any> | Record<string, any>[], addInChild?: boolean) => void;
     valid: () => void;
 }
 interface ILmColumns extends TableColumnType<any> {

package/dist/index.umd.js

@@ -312883,21 +312883,46 @@
   var SortableItem$2 = /*#__PURE__*/React.memo(SortableItem$1);
 
   var _excluded$2S = ["children"];
+  //   children: React.ReactNode
+  // }
+  // interface ItemInstance {}
+  // @ts-ignore
+
   var Item$5 = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     var children = _ref.children,
         props = _objectWithoutProperties$1(_ref, _excluded$2S);
 
-    var rProps = lodash.omit(_objectSpread(_objectSpread({}, props), children.props), ['isSticky', 'colStart', 'colEnd', 'prefixCls', 'fixLeft', 'fixRight', 'lastFixLeft', 'firstFixRight', 'lastFixRight', 'firstFixLeft', 'isSticky', 'additionalProps', 'rowType']);
-    return /*#__PURE__*/React__default['default'].createElement("th", _objectSpread(_objectSpread({}, rProps), {}, {
-      ref: ref
-    })); // <th {...props} ref={ref as any}>
-    //   {/* {(children as any)?.props?.children || children} */}
-    //   { children }
-    // </th>
+    // const rProps = omit({ ...props, ...children.props }, [
+    //   'isSticky',
+    //   'colStart',
+    //   'colEnd',
+    //   'prefixCls',
+    //   'fixLeft',
+    //   'fixRight',
+    //   'lastFixLeft',
+    //   'firstFixRight',
+    //   'lastFixRight',
+    //   'firstFixLeft',
+    //   'isSticky',
+    //   'additionalProps',
+    //   'rowType',
+    // ])
+    return (
+      /*#__PURE__*/
+      // <th {...rProps} ref={ref as any} />
+      React__default['default'].createElement("th", _objectSpread(_objectSpread(_objectSpread({}, props), children.props), {}, {
+        ref: ref
+      })) // <th {...props} ref={ref as any}>
+      //   {(children as any)?.props?.children || children}
+      // </th>
+
+    );
   });
   function SortableItem$3(props) {
+    var id = props.id;
+
     var _useSortable = useSortable({
-      id: props.id
+      id: id
     }),
         attributes = _useSortable.attributes,
         listeners = _useSortable.listeners,
@@ -313003,7 +313028,7 @@
     return isExpandRow(children) ? children === null || children === void 0 ? void 0 : (_children$2 = children[0]) === null || _children$2 === void 0 ? void 0 : (_children$2$props = _children$2.props) === null || _children$2$props === void 0 ? void 0 : (_children$2$props$chi = _children$2$props.children) === null || _children$2$props$chi === void 0 ? void 0 : (_children$2$props$chi2 = _children$2$props$chi[1]) === null || _children$2$props$chi2 === void 0 ? void 0 : (_children$2$props$chi3 = _children$2$props$chi2.props) === null || _children$2$props$chi3 === void 0 ? void 0 : _children$2$props$chi3['aria-label'] : '';
   }
   function checkMemoShouldUploadSpecialFun(prev, next) {
-    var _prevCol$componentPro, _nextCol$componentPro, _prevCol$componentPro2, _nextCol$componentPro2, _prevCol$componentPro3, _nextCol$componentPro3, _prevCol$componentPro4, _nextCol$componentPro4;
+    var _prevCol$componentPro, _nextCol$componentPro, _prevCol$componentPro2, _nextCol$componentPro2, _prevCol$componentPro3, _nextCol$componentPro3, _prevCol$componentPro4, _nextCol$componentPro4, _prevCol$componentPro5, _nextCol$componentPro5, _prevCol$componentPro6, _nextCol$componentPro6;
 
     var checkExpandStatus = getExpandStatus(prev.children) === getExpandStatus(next.children);
 
@@ -313028,7 +313053,14 @@
     }
 
     if (((prevCol === null || prevCol === void 0 ? void 0 : (_prevCol$componentPro2 = prevCol.componentProps) === null || _prevCol$componentPro2 === void 0 ? void 0 : _prevCol$componentPro2.optionOnly) || (nextCol === null || nextCol === void 0 ? void 0 : (_nextCol$componentPro2 = nextCol.componentProps) === null || _nextCol$componentPro2 === void 0 ? void 0 : _nextCol$componentPro2.optionOnly)) && !lodash.isEqual(prevCol === null || prevCol === void 0 ? void 0 : (_prevCol$componentPro3 = prevCol.componentProps) === null || _prevCol$componentPro3 === void 0 ? void 0 : _prevCol$componentPro3.options, nextCol === null || nextCol === void 0 ? void 0 : (_nextCol$componentPro3 = nextCol.componentProps) === null || _nextCol$componentPro3 === void 0 ? void 0 : _nextCol$componentPro3.options)) {
-      // return isEqual(prevCol?.componentProps?.options, nextCol?.componentProps?.options)
+      return false;
+    }
+
+    if (((prevCol === null || prevCol === void 0 ? void 0 : (_prevCol$componentPro4 = prevCol.componentProps) === null || _prevCol$componentPro4 === void 0 ? void 0 : _prevCol$componentPro4.options) || (nextCol === null || nextCol === void 0 ? void 0 : (_nextCol$componentPro4 = nextCol.componentProps) === null || _nextCol$componentPro4 === void 0 ? void 0 : _nextCol$componentPro4.options)) && !lodash.isEqual(prevCol === null || prevCol === void 0 ? void 0 : (_prevCol$componentPro5 = prevCol.componentProps) === null || _prevCol$componentPro5 === void 0 ? void 0 : _prevCol$componentPro5.options, nextCol === null || nextCol === void 0 ? void 0 : (_nextCol$componentPro5 = nextCol.componentProps) === null || _nextCol$componentPro5 === void 0 ? void 0 : _nextCol$componentPro5.options)) {
+      return false;
+    }
+
+    if ((lodash.isFunction(prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) || lodash.isFunction(nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps)) && !lodash.isEqual(prevCol.newOptions, nextCol.newOptions) && !lodash.isEqual(prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps, nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps)) {
       return false;
     }
 
@@ -313037,6 +313069,10 @@
       return false;
     }
 
+    if (next.className.indexOf('drag-visible') > -1) {
+      return lodash.isEqual(prev.style, next.style);
+    }
+
     if (next.className.indexOf('ant-table-selection-column') > -1) {
       var _prev$children, _prev$children$, _next$children, _next$children$;
 
@@ -313045,7 +313081,7 @@
     /** 如果启用了快速复制功能，需要实时判断rowIndex与getLength */
 
 
-    if ((prevCol === null || prevCol === void 0 ? void 0 : (_prevCol$componentPro4 = prevCol.componentProps) === null || _prevCol$componentPro4 === void 0 ? void 0 : _prevCol$componentPro4.quickcopy) || (nextCol === null || nextCol === void 0 ? void 0 : (_nextCol$componentPro4 = nextCol.componentProps) === null || _nextCol$componentPro4 === void 0 ? void 0 : _nextCol$componentPro4.quickcopy)) {
+    if ((prevCol === null || prevCol === void 0 ? void 0 : (_prevCol$componentPro6 = prevCol.componentProps) === null || _prevCol$componentPro6 === void 0 ? void 0 : _prevCol$componentPro6.quickcopy) || (nextCol === null || nextCol === void 0 ? void 0 : (_nextCol$componentPro6 = nextCol.componentProps) === null || _nextCol$componentPro6 === void 0 ? void 0 : _nextCol$componentPro6.quickcopy)) {
       var pickProps = ['record', 'colIndex', 'rowIndex', 'getLength'];
       var p = lodash.pick(prev, pickProps);
       var n = lodash.pick(next, pickProps);
@@ -313481,7 +313517,16 @@
     };
 
     var Control = function Control(con) {
+      var _col$newOptions;
+
       var resultComponentProps = lodash.isFunction(componentProps) ? componentProps === null || componentProps === void 0 ? void 0 : componentProps(record, col) : componentProps;
+
+      if (lodash.isFunction(componentProps) && (col === null || col === void 0 ? void 0 : (_col$newOptions = col.newOptions) === null || _col$newOptions === void 0 ? void 0 : _col$newOptions.length)) {
+        resultComponentProps = _objectSpread(_objectSpread({}, resultComponentProps), {}, {
+          options: col === null || col === void 0 ? void 0 : col.newOptions
+        });
+      }
+
       var clearAttrComponentProps = lodash.omit(resultComponentProps, ['optionOnly', 'isOnlyValue', 'quickcopy']);
 
       switch (con) {
@@ -313609,7 +313654,8 @@
 
         case 'render':
           {
-            var render = resultComponentProps.render;
+            var _resultComponentProps = resultComponentProps,
+                render = _resultComponentProps.render;
             var fromData = form.getFieldsValue();
             return render === null || render === void 0 ? void 0 : render(_objectSpread(_objectSpread({}, !isObjEmpty(fromData) ? _objectSpread(_objectSpread({}, record), {}, _defineProperty$1({}, dataIndex, fromData[dataIndex])) : record), {}, {
               onChange: save
@@ -313718,7 +313764,8 @@
   var MemoEditableCell = /*#__PURE__*/React.memo(EditableCell$1, function (prev, next) {
     var pickProps = ['record', 'colIndex'];
     var p = lodash.pick(prev, pickProps);
-    var n = lodash.pick(next, pickProps); // console.log(prev, next, '22', checkMemoShouldUploadSpecialFun(prev, next), isEqual(p, n))
+    var n = lodash.pick(next, pickProps);
+    console.log(prev, next, 222); // console.log(prev, next, '22', checkMemoShouldUploadSpecialFun(prev, next), isEqual(p, n))
 
     /** TODO: 在record中带有children，子列表数据修改之后，会导致父级的record对比不一样 */
 
@@ -313994,24 +314041,39 @@
 
       var rkey = lodash.isObject(record) ? record[_rowKey] : record;
       var preKeys = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : (_deepDataSourceRef$cu5 = deepDataSourceRef.current) === null || _deepDataSourceRef$cu5 === void 0 ? void 0 : (_deepDataSourceRef$cu6 = _deepDataSourceRef$cu5[rkey]) === null || _deepDataSourceRef$cu6 === void 0 ? void 0 : _deepDataSourceRef$cu6.preKeys;
+      console.log(record, isAppendInChindren, defaultRecord, '333', preKeys);
       var res = fn(dataSourceRef.current, function (draft) {
-        if (preKeys.length > 1) {
+        if ((preKeys === null || preKeys === void 0 ? void 0 : preKeys.length) > 1) {
           var deeps = function deeps(children) {
             children === null || children === void 0 ? void 0 : children.forEach(function (item, index) {
               if (preKeys === null || preKeys === void 0 ? void 0 : preKeys.includes(item[_rowKey])) {
                 if (item[_rowKey] === rkey) {
                   if (isAppendInChindren) {
                     if (item === null || item === void 0 ? void 0 : item.children) {
-                      var _item$children;
+                      if (Array.isArray(defaultRecord)) {
+                        var _item$children;
+
+                        item === null || item === void 0 ? void 0 : (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.push.apply(_item$children, _toConsumableArray$1(defaultRecord));
+                      } else {
+                        var _item$children2;
 
-                      item === null || item === void 0 ? void 0 : (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.push(defaultRecord || _defineProperty$1({}, _rowKey, "".concat(Date.now())));
+                        item === null || item === void 0 ? void 0 : (_item$children2 = item.children) === null || _item$children2 === void 0 ? void 0 : _item$children2.push(defaultRecord || _defineProperty$1({}, _rowKey, "".concat(Date.now())));
+                      }
                     } else {
-                      item.children = [defaultRecord || _defineProperty$1({}, _rowKey, "".concat(Date.now()))];
+                      if (Array.isArray(defaultRecord)) {
+                        item.children = _toConsumableArray$1(defaultRecord);
+                      } else {
+                        item.children = [defaultRecord || _defineProperty$1({}, _rowKey, "".concat(Date.now()))];
+                      }
                     }
 
                     !expandedRowKeys.includes(item[_rowKey]) && setExpandedRowKeys([].concat(_toConsumableArray$1(expandedRowKeys), [item[_rowKey]]));
                   } else {
-                    children.splice(index + 1, 0, defaultRecord || _defineProperty$1({}, _rowKey, "".concat(Date.now())));
+                    if (Array.isArray(defaultRecord)) {
+                      children.splice.apply(children, [index + 1, 0].concat(_toConsumableArray$1(defaultRecord)));
+                    } else {
+                      children.splice(index + 1, 0, defaultRecord || _defineProperty$1({}, _rowKey, "".concat(Date.now())));
+                    }
                   }
                 } else if (item.children) {
                   deeps(item.children);
@@ -314031,21 +314093,32 @@
               var _draft$index$children, _draft$index, _draft$index2;
 
               if ((_draft$index$children = draft[index].children) === null || _draft$index$children === void 0 ? void 0 : _draft$index$children.length) {
-                var _draft$index$children2;
+                if (Array.isArray(defaultRecord)) {
+                  var _draft$index$children2;
+
+                  (_draft$index$children2 = draft[index].children) === null || _draft$index$children2 === void 0 ? void 0 : _draft$index$children2.push.apply(_draft$index$children2, _toConsumableArray$1(defaultRecord));
+                } else {
+                  var _draft$index$children3;
 
-                (_draft$index$children2 = draft[index].children) === null || _draft$index$children2 === void 0 ? void 0 : _draft$index$children2.push(_defineProperty$1({}, _rowKey, "".concat(Date.now())));
+                  (_draft$index$children3 = draft[index].children) === null || _draft$index$children3 === void 0 ? void 0 : _draft$index$children3.push(defaultRecord || _defineProperty$1({}, _rowKey, "".concat(Date.now())));
+                }
               } else {
-                draft[index].children = [_defineProperty$1({}, _rowKey, "".concat(Date.now()))];
+                draft[index].children = Array.isArray(defaultRecord) ? _toConsumableArray$1(defaultRecord) : [defaultRecord || _defineProperty$1({}, _rowKey, "".concat(Date.now()))];
               }
 
               !expandedRowKeys.includes((_draft$index = draft[index]) === null || _draft$index === void 0 ? void 0 : _draft$index[_rowKey]) && setExpandedRowKeys([].concat(_toConsumableArray$1(expandedRowKeys), [(_draft$index2 = draft[index]) === null || _draft$index2 === void 0 ? void 0 : _draft$index2[_rowKey]]));
             } else {
-              draft.splice(index + 1, 0, _defineProperty$1({}, _rowKey, "".concat(Date.now())));
+              if (Array.isArray(defaultRecord)) {
+                console.log(1);
+                draft.splice.apply(draft, [index + 1, 0].concat(_toConsumableArray$1(defaultRecord)));
+              } else {
+                console.log(2);
+                draft.splice(index + 1, 0, defaultRecord || _defineProperty$1({}, _rowKey, "".concat(Date.now())));
+              }
             }
           }
         }
       });
-      console.log(preKeys, '--preKeys', res);
       setDataSource(res);
     };
 
@@ -314066,8 +314139,9 @@
       var hasOnlyOptionsDatas = columns.filter(function (item) {
         var _item$componentProps;
 
-        return item === null || item === void 0 ? void 0 : (_item$componentProps = item.componentProps) === null || _item$componentProps === void 0 ? void 0 : _item$componentProps.optionOnly;
-      });
+        var resultComponentProps = lodash.isFunction(item === null || item === void 0 ? void 0 : item.componentProps) ? item === null || item === void 0 ? void 0 : (_item$componentProps = item.componentProps) === null || _item$componentProps === void 0 ? void 0 : _item$componentProps.call(item, {}, item) : item === null || item === void 0 ? void 0 : item.componentProps;
+        return resultComponentProps === null || resultComponentProps === void 0 ? void 0 : resultComponentProps.optionOnly;
+      }); // const hasOnlyOptionsDatas = columns.filter((item) => item?.componentProps?.optionOnly)
 
       if (hasOnlyOptionsDatas.length) {
         return hasOnlyOptionsDatas === null || hasOnlyOptionsDatas === void 0 ? void 0 : hasOnlyOptionsDatas.map(function (item) {
@@ -314081,9 +314155,13 @@
 
     var DisableOptions = React.useMemo(function () {
       var newColumns = columns === null || columns === void 0 ? void 0 : columns.map(function (item) {
-        var _ref10 = item.componentProps || {},
-            optionOnly = _ref10.optionOnly,
-            options = _ref10.options;
+        var _item$componentProps2;
+
+        var resultComponentProps = lodash.isFunction(item.componentProps) ? (_item$componentProps2 = item.componentProps) === null || _item$componentProps2 === void 0 ? void 0 : _item$componentProps2.call(item, {}, item) : item.componentProps;
+
+        var _ref12 = resultComponentProps || {},
+            optionOnly = _ref12.optionOnly,
+            options = _ref12.options;
 
         if (optionOnly && options) {
           var dataIndex = item.dataIndex;
@@ -314095,6 +314173,13 @@
               disabled: !!dataIndexData.includes(o === null || o === void 0 ? void 0 : o.value)
             });
           });
+
+          if (lodash.isFunction(item.componentProps)) {
+            return _objectSpread(_objectSpread({}, item), {}, {
+              newOptions: newOptions
+            });
+          }
+
           return _objectSpread(_objectSpread({}, item), {}, {
             componentProps: _objectSpread(_objectSpread({}, item.componentProps), {}, {
               options: newOptions
@@ -314124,7 +314209,7 @@
         fixed: 'left',
         render: function render(_, record) {
           return /*#__PURE__*/React__default['default'].createElement(Dragger$1, {
-            id: record[_rowKey] || record.id
+            id: record[_rowKey] || (record === null || record === void 0 ? void 0 : record.id)
           });
         }
       } : null, indexCol ? lodash.isBoolean(indexCol) ? {
@@ -314250,10 +314335,10 @@
       setDataSource(arrayMove(cloneArr, oldIndex, newIndex));
     };
 
-    var colDraggableContainer = React.useCallback(function (_ref11) {
+    var colDraggableContainer = React.useCallback(function (_ref13) {
       var _React$Children;
 
-      var props = _extends$2({}, _ref11);
+      var props = _extends$2({}, _ref13);
 
       return /*#__PURE__*/React__default['default'].createElement("tr", null, (_React$Children = React__default['default'].Children) === null || _React$Children === void 0 ? void 0 : _React$Children.map(props.children, function (child) {
         var _child$props, _child$props$column;
@@ -314276,8 +314361,8 @@
         deleteRowData: function deleteRowData(data) {
           return handleTableRowDelete(data);
         },
-        addRowData: function addRowData(data, addInChind, defaultValue) {
-          return handleTableRowAdd(data, addInChind, defaultValue);
+        addRowData: function addRowData(data, defaultValue, addInChild) {
+          return handleTableRowAdd(data, addInChild, defaultValue);
         },
         clearSelect: function clearSelect() {
           setLocalRowSelectList({