linkmore-design 1.1.28-alpha.5 → 1.1.28-alpha.7

package/dist/index.umd.js

@@ -293774,9 +293774,9 @@
       var _cloneDeep;
 
       var cloneCol = (_cloneDeep = lodash.cloneDeep(localColumns)) === null || _cloneDeep === void 0 ? void 0 : _cloneDeep.filter(function (item) {
-        var _item$title;
+        var _item$title, _item$title2;
 
-        return lodash.isFunction(item.title) ? false : ((_item$title = item.title) === null || _item$title === void 0 ? void 0 : _item$title.indexOf(searchValue)) > -1;
+        return lodash.isFunction(item.title) || ((_item$title = item.title) === null || _item$title === void 0 ? void 0 : _item$title.$$typeof) ? true : ((_item$title2 = item.title) === null || _item$title2 === void 0 ? void 0 : _item$title2.indexOf(searchValue)) > -1;
       });
       cloneCol.forEach(function (item, index) {
         if (colStateValue === null || colStateValue === void 0 ? void 0 : colStateValue.hasOwnProperty(item.dataIndex)) {
@@ -293940,7 +293940,6 @@
         }
       };
     });
-    console.log(sortMenu, 'sortMenu');
     return /*#__PURE__*/React__default['default'].createElement("div", {
       className: "lm_custom_option_columns"
     }, /*#__PURE__*/React__default['default'].createElement("div", {
@@ -313337,9 +313336,9 @@
     return lodash.keyBy(deepDataSource, rowKey);
   }
   function isExpandRow(children) {
-    var _children$, _children$$props, _children$$props$chil, _children$$props$chil2, _children$$props$chil3;
+    var _children$, _children$$props, _children$$props$chil, _children$$props$chil2, _children$$props$chil3, _children$2, _children$2$props, _children$2$props$chi, _children$2$props$chi2, _children$2$props$chi3, _children$2$props$chi4;
 
-    return ['Collapse row', 'Expand row'].includes(children === null || children === void 0 ? void 0 : (_children$ = children[0]) === null || _children$ === void 0 ? void 0 : (_children$$props = _children$.props) === null || _children$$props === void 0 ? void 0 : (_children$$props$chil = _children$$props.children) === null || _children$$props$chil === void 0 ? void 0 : (_children$$props$chil2 = _children$$props$chil[1]) === null || _children$$props$chil2 === void 0 ? void 0 : (_children$$props$chil3 = _children$$props$chil2.props) === null || _children$$props$chil3 === void 0 ? void 0 : _children$$props$chil3['aria-label']);
+    return ['Collapse row', 'Expand row'].includes(children === null || children === void 0 ? void 0 : (_children$ = children[0]) === null || _children$ === void 0 ? void 0 : (_children$$props = _children$.props) === null || _children$$props === void 0 ? void 0 : (_children$$props$chil = _children$$props.children) === null || _children$$props$chil === void 0 ? void 0 : (_children$$props$chil2 = _children$$props$chil[1]) === null || _children$$props$chil2 === void 0 ? void 0 : (_children$$props$chil3 = _children$$props$chil2.props) === null || _children$$props$chil3 === void 0 ? void 0 : _children$$props$chil3['aria-label']) || (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$chi4 = _children$2$props$chi3.className) === null || _children$2$props$chi4 === void 0 ? void 0 : _children$2$props$chi4.indexOf('ant-table-row-expand-icon')) > -1;
   }
   function checkRowKeyByDataSource(dataSource, rowKey) {
     var addRowKey = function addRowKey(children, pkey) {
@@ -313368,9 +313367,9 @@
     return res || [];
   }
   function getExpandStatus(children) {
-    var _children$2, _children$2$props, _children$2$props$chi, _children$2$props$chi2, _children$2$props$chi3;
+    var _children$3, _children$3$props, _children$3$props$chi, _children$3$props$chi2, _children$3$props$chi3;
 
-    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'] : '';
+    return isExpandRow(children) ? children === null || children === void 0 ? void 0 : (_children$3 = children[0]) === null || _children$3 === void 0 ? void 0 : (_children$3$props = _children$3.props) === null || _children$3$props === void 0 ? void 0 : (_children$3$props$chi = _children$3$props.children) === null || _children$3$props$chi === void 0 ? void 0 : (_children$3$props$chi2 = _children$3$props$chi[1]) === null || _children$3$props$chi2 === void 0 ? void 0 : (_children$3$props$chi3 = _children$3$props$chi2.props) === null || _children$3$props$chi3 === void 0 ? void 0 : _children$3$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, _prevCol$componentPro5, _nextCol$componentPro5, _next$className, _prevCol$componentPro6, _nextCol$componentPro6;
@@ -314280,7 +314279,13 @@
           onClick: toggleEdit
         }, childNode);
       } else if (isEdit && editable) {
-        childNode = /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, isExpandRow(childNode) && childNode[0], /*#__PURE__*/React__default['default'].createElement(Form$4.Item, _objectSpread(_objectSpread({
+        childNode = /*#__PURE__*/React__default['default'].createElement("div", {
+          style: {
+            display: 'flex',
+            flexDirection: 'row',
+            flexWrap: 'nowrap'
+          }
+        }, isExpandRow(childNode) && childNode[0], /*#__PURE__*/React__default['default'].createElement(Form$4.Item, _objectSpread(_objectSpread({
           errorPlacement: "right",
           valuePropName: editable === 'switch' ? 'checked' : 'value',
           style: {
@@ -314292,7 +314297,13 @@
         }), Control(editable)));
 
         if (editable === 'input' && ((resultComponentProps === null || resultComponentProps === void 0 ? void 0 : resultComponentProps.addonBefore) || (resultComponentProps === null || resultComponentProps === void 0 ? void 0 : resultComponentProps.addonAfter))) {
-          childNode = /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, isExpandRow(childNode) && childNode[0], /*#__PURE__*/React__default['default'].createElement(Form$4.Item, _objectSpread(_objectSpread({
+          childNode = /*#__PURE__*/React__default['default'].createElement("div", {
+            style: {
+              display: 'flex',
+              flexDirection: 'row',
+              flexWrap: 'nowrap'
+            }
+          }, isExpandRow(childNode) && childNode[0], /*#__PURE__*/React__default['default'].createElement(Form$4.Item, _objectSpread(_objectSpread({
             errorPlacement: "right",
             style: {
               margin: 0
@@ -314498,80 +314509,7 @@
         draft.push(_objectSpread(_defineProperty$1({}, _rowKey, "".concat(Date.now())), addDataInfo || {}));
       });
       setDataSource(res);
-    }, 40);
-
-    var handleSave = function handleSave(row, options) {
-      var _deepDataSourceRef$cu, _deepDataSourceRef$cu2;
-
-      var preKeys = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : (_deepDataSourceRef$cu = deepDataSourceRef.current) === null || _deepDataSourceRef$cu === void 0 ? void 0 : (_deepDataSourceRef$cu2 = _deepDataSourceRef$cu[row[_rowKey]]) === null || _deepDataSourceRef$cu2 === void 0 ? void 0 : _deepDataSourceRef$cu2.preKeys;
-      var res = fn(dataSourceRef.current, function (draft) {
-        if (options === null || options === void 0 ? void 0 : options.only) {
-          var _options$only = options === null || options === void 0 ? void 0 : options.only,
-              key = _options$only.key,
-              value = _options$only.value;
-
-          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) {
-                if (preKeys.includes(item[_rowKey])) {
-                  if (item[_rowKey] === row[_rowKey]) {
-                    var _Object$keys;
-
-                    children === null || children === void 0 ? void 0 : children.forEach(function (c) {
-                      c[key] = value;
-                    });
-                    (_Object$keys = Object.keys(item)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (v) {
-                      item[v] = row[v] || item[v];
-                    });
-                  } else if (item.children) {
-                    deeps(item.children);
-                  }
-                }
-              });
-            };
-
-            deeps(draft);
-          } else {
-            draft === null || draft === void 0 ? void 0 : draft.forEach(function (item, index) {
-              if (row[_rowKey] === item[_rowKey]) {
-                draft[index] = row;
-              } else {
-                draft[index][key] = value;
-              }
-            });
-          }
-        } else {
-          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) {
-                if (preKeys.includes(item[_rowKey])) {
-                  if (item[_rowKey] === row[_rowKey]) {
-                    var _Object$keys2;
-
-                    (_Object$keys2 = Object.keys(row)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.forEach(function (v) {
-                      item[v] = row[v] || item[v];
-                    });
-                  } else if (item.children) {
-                    _deeps(item.children);
-                  }
-                }
-              });
-            };
-
-            _deeps(draft);
-          } else {
-            var index = draft.findIndex(function (item) {
-              return row[_rowKey] === item[_rowKey];
-            });
-
-            if (index !== -1) {
-              draft[index] = row;
-            }
-          }
-        }
-      });
-      setDataSource(res);
-    }; // const reWriteOriginSource = (rowKey: string, rowValue, dataIndex: number, nextValue) => {
+    }, 40); // const reWriteOriginSource = (rowKey: string, rowValue, dataIndex: number, nextValue) => {
     //   setDataSource((prevDataSource) => {
     //     return prevDataSource?.map((item) => {
     //       if (get(item, rowKey) === rowValue) {
@@ -314585,12 +314523,11 @@
 
     /** 删除当前行 */
 
-
     var handleTableRowDelete = lodash.debounce(function (key) {
-      var _deepDataSourceRef$cu3, _deepDataSourceRef$cu4;
+      var _deepDataSourceRef$cu, _deepDataSourceRef$cu2;
 
       var rkey = lodash.isObject(key) ? key[_rowKey] : key;
-      var preKeys = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : (_deepDataSourceRef$cu3 = deepDataSourceRef.current) === null || _deepDataSourceRef$cu3 === void 0 ? void 0 : (_deepDataSourceRef$cu4 = _deepDataSourceRef$cu3[rkey]) === null || _deepDataSourceRef$cu4 === void 0 ? void 0 : _deepDataSourceRef$cu4.preKeys;
+      var preKeys = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : (_deepDataSourceRef$cu = deepDataSourceRef.current) === null || _deepDataSourceRef$cu === void 0 ? void 0 : (_deepDataSourceRef$cu2 = _deepDataSourceRef$cu[rkey]) === null || _deepDataSourceRef$cu2 === void 0 ? void 0 : _deepDataSourceRef$cu2.preKeys;
 
       if (preKeys.length > 1) {
         /** 说明删除的是children中的数据 */
@@ -314638,10 +314575,10 @@
     /** 替换当前行 */
 
     var handleTableRowReplace = lodash.debounce(function (record, defaultRecord) {
-      var _deepDataSourceRef$cu5, _deepDataSourceRef$cu6;
+      var _deepDataSourceRef$cu3, _deepDataSourceRef$cu4;
 
       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; // const res = cloneDeep(dataSourceRef.current)
+      var preKeys = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : (_deepDataSourceRef$cu3 = deepDataSourceRef.current) === null || _deepDataSourceRef$cu3 === void 0 ? void 0 : (_deepDataSourceRef$cu4 = _deepDataSourceRef$cu3[rkey]) === null || _deepDataSourceRef$cu4 === void 0 ? void 0 : _deepDataSourceRef$cu4.preKeys; // const res = cloneDeep(dataSourceRef.current)
 
       var deep = function deep(children) {
         return children.map(function (item) {
@@ -314660,14 +314597,14 @@
 
       var res = deep(dataSourceRef.current);
       setDataSource(res);
-    }, 40);
+    }, 20);
     /** 快捷添加 */
 
     var handleTableRowAdd = lodash.debounce(function (record, isAppendInChindren, defaultRecord) {
-      var _deepDataSourceRef$cu7, _deepDataSourceRef$cu8;
+      var _deepDataSourceRef$cu5, _deepDataSourceRef$cu6;
 
       var rkey = lodash.isObject(record) ? record[_rowKey] : record;
-      var preKeys = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : (_deepDataSourceRef$cu7 = deepDataSourceRef.current) === null || _deepDataSourceRef$cu7 === void 0 ? void 0 : (_deepDataSourceRef$cu8 = _deepDataSourceRef$cu7[rkey]) === null || _deepDataSourceRef$cu8 === void 0 ? void 0 : _deepDataSourceRef$cu8.preKeys;
+      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;
       var res = fn(dataSourceRef.current, function (draft) {
         if ((preKeys === null || preKeys === void 0 ? void 0 : preKeys.length) > 1) {
           var deeps = function deeps(children) {
@@ -314745,8 +314682,87 @@
       });
       setDataSource(res);
     }, 50);
+
+    var handleSave = function handleSave(row, options) {
+      var _deepDataSourceRef$cu7, _deepDataSourceRef$cu8;
+
+      var preKeys = deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : (_deepDataSourceRef$cu7 = deepDataSourceRef.current) === null || _deepDataSourceRef$cu7 === void 0 ? void 0 : (_deepDataSourceRef$cu8 = _deepDataSourceRef$cu7[row[_rowKey]]) === null || _deepDataSourceRef$cu8 === void 0 ? void 0 : _deepDataSourceRef$cu8.preKeys;
+
+      if (options === null || options === void 0 ? void 0 : options.only) {
+        var res = fn(dataSourceRef.current, function (draft) {
+          if (options === null || options === void 0 ? void 0 : options.only) {
+            var _options$only = options === null || options === void 0 ? void 0 : options.only,
+                key = _options$only.key,
+                value = _options$only.value;
+
+            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) {
+                  if (preKeys.includes(item[_rowKey])) {
+                    if (item[_rowKey] === row[_rowKey]) {
+                      var _Object$keys;
+
+                      children === null || children === void 0 ? void 0 : children.forEach(function (c) {
+                        c[key] = value;
+                      });
+                      (_Object$keys = Object.keys(item)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (v) {
+                        item[v] = row[v] || item[v];
+                      });
+                    } else if (item.children) {
+                      deeps(item.children);
+                    }
+                  }
+                });
+              };
+
+              deeps(draft);
+            } else {
+              draft === null || draft === void 0 ? void 0 : draft.forEach(function (item, index) {
+                if (row[_rowKey] === item[_rowKey]) {
+                  draft[index] = row;
+                } else {
+                  draft[index][key] = value;
+                }
+              });
+            }
+          } else {
+            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) {
+                  if (preKeys.includes(item[_rowKey])) {
+                    if (item[_rowKey] === row[_rowKey]) {
+                      var _Object$keys2;
+
+                      (_Object$keys2 = Object.keys(row)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.forEach(function (v) {
+                        item[v] = row[v] || item[v];
+                      });
+                    } else if (item.children) {
+                      _deeps(item.children);
+                    }
+                  }
+                });
+              };
+
+              _deeps(draft);
+            } else {
+              var index = draft.findIndex(function (item) {
+                return row[_rowKey] === item[_rowKey];
+              });
+
+              if (index !== -1) {
+                draft[index] = row;
+              }
+            }
+          }
+        });
+        setDataSource(res);
+      } else {
+        handleTableRowReplace(row[_rowKey], row);
+      }
+    };
     /** 快捷刷子功能 */
 
+
     var handleCopy = function handleCopy(key, value, type, rowIndex) {
       var res = fn(dataSourceRef.current, function (draft) {
         draft === null || draft === void 0 ? void 0 : draft.forEach(function (item, index) {
@@ -315356,6 +315372,29 @@
         };
       }
     }, []);
+    var checkFormItem = React.useMemo(function () {
+      var arr = [];
+      columns.forEach(function (item) {
+        if (item.children) {
+          var _item$children3;
+
+          (_item$children3 = item.children) === null || _item$children3 === void 0 ? void 0 : _item$children3.forEach(function (c) {
+            arr.push( /*#__PURE__*/React__default['default'].createElement(Form$4.Item, _objectSpread({
+              noStyle: true,
+              key: c.dataIndex,
+              name: c.dataIndex
+            }, (c === null || c === void 0 ? void 0 : c['formProps']) || {}), c.dataIndex || 'text'));
+          });
+        } else {
+          arr.push( /*#__PURE__*/React__default['default'].createElement(Form$4.Item, _objectSpread({
+            noStyle: true,
+            key: item.dataIndex,
+            name: item.dataIndex
+          }, (item === null || item === void 0 ? void 0 : item['formProps']) || {}), item.dataIndex || 'text'));
+        }
+      });
+      return arr;
+    }, [columns]);
 
     if (colSortOpen) {
       var _localRowSelectList$s;
@@ -315407,13 +315446,7 @@
       }, /*#__PURE__*/React__default['default'].createElement(Form$4, {
         form: checkForm,
         component: false
-      }, columns.map(function (item) {
-        return /*#__PURE__*/React__default['default'].createElement(Form$4.Item, _objectSpread({
-          noStyle: true,
-          key: item.dataIndex,
-          name: item.dataIndex
-        }, (item === null || item === void 0 ? void 0 : item['formProps']) || {}), item.dataIndex || 'text');
-      }))));
+      }, checkFormItem)));
     } // @ts-ignore
 
 
@@ -315473,13 +315506,7 @@
     }, /*#__PURE__*/React__default['default'].createElement(Form$4, {
       form: checkForm,
       component: false
-    }, columns.map(function (item) {
-      return /*#__PURE__*/React__default['default'].createElement(Form$4.Item, _objectSpread({
-        noStyle: true,
-        key: item.dataIndex,
-        name: item.dataIndex
-      }, (item === null || item === void 0 ? void 0 : item['formProps']) || {}), item.dataIndex || 'text');
-    }))));
+    }, checkFormItem)));
   });
   var LmEditTable = /*#__PURE__*/React.memo(EditTable$1);