linkmore-design 1.1.27-alpha.2 → 1.1.27-alpha.4

package/lib/LmEditTable/EditTable.js

@@ -112,6 +112,9 @@ var EditableRow = function EditableRow(_a) {
       _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
       form = _Form$useForm2[0];
 
+  var dataKey = props.dataKey,
+      pushAllForm = props.pushAllForm;
+  pushAllForm === null || pushAllForm === void 0 ? void 0 : pushAllForm(form, dataKey, index);
   return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form, {
     form: form,
     disabled: props.disabled || false,
@@ -129,6 +132,9 @@ var EditableSortRow = function EditableSortRow(_a) {
       _Form$useForm4 = (0, _slicedToArray2.default)(_Form$useForm3, 1),
       form = _Form$useForm4[0];
 
+  var dataKey = props.dataKey,
+      pushAllForm = props.pushAllForm;
+  pushAllForm === null || pushAllForm === void 0 ? void 0 : pushAllForm(form, dataKey, index);
   return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form, {
     form: form,
     disabled: props.disabled || false,
@@ -762,6 +768,12 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   disabledDataSourceRowKeys.current = (0, _util.checkTableRowIsDisable)(deepDataSourceRef.current, localDisabledRows.disabledRows, _rowKey);
   var tableWarpRef = (0, _react.useRef)(null);
   var autoSizerRef = (0, _react.useRef)(null);
+  var allFormListRef = (0, _react.useRef)({});
+  var scrollToIndexRef = (0, _react.useRef)(null);
+
+  var _Form$useForm5 = _linkmoreDesign.Form.useForm(),
+      _Form$useForm6 = (0, _slicedToArray2.default)(_Form$useForm5, 1),
+      checkForm = _Form$useForm6[0];
 
   var onColSortEnd = function onColSortEnd(active, over) {
     var _a;
@@ -1305,12 +1317,249 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       },
       columns: columns.map(function (item) {
         return (0, _lodash.omit)(item, ['render', 'sorter', 'onFilter', 'filters', 'componentProps', 'formProps', 'editable']);
-      })
+      }),
+      // verify: async () => {
+      //   let allRule = {}
+      //   let time
+      //   let fullNum = 0
+      //   columns.forEach((col: any) => {
+      //     if (col?.formProps?.rules) {
+      //       allRule[col.dataIndex] = col?.formProps?.rules || []
+      //     }
+      //   })
+      //   const validator = new AsyncValidator(allRule);
+      //   let flag = true
+      //   let messageIndex = null
+      //   let errorRowKey = null
+      //   let errorInfo = null
+      //   const deepValidator = async (data, index) => {
+      //     for (let i = 0; i < data.length; i++) {
+      //       if (flag) {
+      //         try {
+      //           await validator.validate(data[i], (errors, fields) => {
+      //             if (errors) {
+      //               errorInfo = { errors, fields, value: data[i] };
+      //               flag = false
+      //               messageIndex = index === null ? i : index
+      //               errorRowKey = data?.[i]?.[rowKey]
+      //             } else if (data[i].children) {
+      //               deepValidator(data[i].children, i)
+      //             }
+      //           })
+      //         } catch (error) {
+      //           break;
+      //         }
+      //       }
+      //     }
+      //   }
+      //   await deepValidator(dataSource, null)
+      //   console.log(flag, 'fff')
+      //   if (flag) {
+      //     return Promise.resolve(dataSource)
+      //   } else {
+      //     setTimeout(() => {
+      //       if (messageIndex !== null) {
+      //         scrollToIndexRef.current?.(messageIndex, { align: 'center' })
+      //         time = setInterval(async () => {
+      //           fullNum++
+      //           if (fullNum > 5) {
+      //             clearInterval(time)
+      //           } else {
+      //             const form = (Object.values(allFormListRef.current || []).find((item: any) => item.key === errorRowKey) as any)?.form
+      //             if (form) {
+      //               try {
+      //                 await form.validateFields()
+      //                 console.log('验证成功')
+      //               } catch (error) {
+      //                 console.log('验证失败', error)
+      //                 return error
+      //               } finally {
+      //                 clearInterval(time)
+      //               }
+      //             }
+      //           }
+      //         }, 500)
+      //       }
+      //     }, 100)
+      //     return Promise.reject(errorInfo)
+      //   }
+      // },
+      verify: function verify() {
+        return __awaiter(void 0, void 0, void 0, /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
+          var time, fullNum, flag, messageIndex, errorRowKey, errorInfo, deepValidator;
+          return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
+            while (1) {
+              switch (_context4.prev = _context4.next) {
+                case 0:
+                  fullNum = 0;
+                  flag = true;
+                  messageIndex = null;
+                  errorRowKey = null;
+                  errorInfo = null;
+
+                  deepValidator = function deepValidator(data, index) {
+                    return __awaiter(void 0, void 0, void 0, /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+                      var _c, i;
+
+                      return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
+                        while (1) {
+                          switch (_context2.prev = _context2.next) {
+                            case 0:
+                              i = 0;
+
+                            case 1:
+                              if (!(i < data.length)) {
+                                _context2.next = 21;
+                                break;
+                              }
+
+                              if (!flag) {
+                                _context2.next = 18;
+                                break;
+                              }
+
+                              _context2.prev = 3;
+                              checkForm.resetFields();
+                              checkForm.setFieldsValue(data[i]);
+                              _context2.next = 8;
+                              return checkForm.validateFields();
+
+                            case 8:
+                              if (data[i].children) {
+                                deepValidator(data[i].children, i);
+                              }
+
+                              _context2.next = 18;
+                              break;
+
+                            case 11:
+                              _context2.prev = 11;
+                              _context2.t0 = _context2["catch"](3);
+                              errorInfo = {
+                                error: _context2.t0,
+                                value: data[i]
+                              };
+                              flag = false;
+                              messageIndex = index === null ? i : index;
+                              errorRowKey = (_c = data === null || data === void 0 ? void 0 : data[i]) === null || _c === void 0 ? void 0 : _c[_rowKey];
+                              return _context2.abrupt("break", 21);
+
+                            case 18:
+                              i++;
+                              _context2.next = 1;
+                              break;
+
+                            case 21:
+                            case "end":
+                              return _context2.stop();
+                          }
+                        }
+                      }, _callee2, null, [[3, 11]]);
+                    }));
+                  };
+
+                  _context4.next = 8;
+                  return deepValidator(dataSource, null);
+
+                case 8:
+                  if (!flag) {
+                    _context4.next = 12;
+                    break;
+                  }
+
+                  return _context4.abrupt("return", Promise.resolve(dataSource));
+
+                case 12:
+                  setTimeout(function () {
+                    var _a;
+
+                    if (messageIndex !== null) {
+                      (_a = scrollToIndexRef.current) === null || _a === void 0 ? void 0 : _a.call(scrollToIndexRef, messageIndex, {
+                        align: 'center'
+                      });
+                      time = setInterval(function () {
+                        return __awaiter(void 0, void 0, void 0, /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
+                          var _b, form;
+
+                          return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
+                            while (1) {
+                              switch (_context3.prev = _context3.next) {
+                                case 0:
+                                  fullNum++;
+
+                                  if (!(fullNum > 5)) {
+                                    _context3.next = 5;
+                                    break;
+                                  }
+
+                                  clearInterval(time);
+                                  _context3.next = 20;
+                                  break;
+
+                                case 5:
+                                  form = (_b = Object.values(allFormListRef.current || []).find(function (item) {
+                                    return item.key === errorRowKey;
+                                  })) === null || _b === void 0 ? void 0 : _b.form;
+
+                                  if (!form) {
+                                    _context3.next = 20;
+                                    break;
+                                  }
+
+                                  _context3.prev = 7;
+                                  _context3.next = 10;
+                                  return form.validateFields();
+
+                                case 10:
+                                  console.log('验证成功');
+                                  _context3.next = 17;
+                                  break;
+
+                                case 13:
+                                  _context3.prev = 13;
+                                  _context3.t0 = _context3["catch"](7);
+                                  console.log('验证失败', _context3.t0);
+                                  return _context3.abrupt("return", _context3.t0);
+
+                                case 17:
+                                  _context3.prev = 17;
+                                  clearInterval(time);
+                                  return _context3.finish(17);
+
+                                case 20:
+                                case "end":
+                                  return _context3.stop();
+                              }
+                            }
+                          }, _callee3, null, [[7, 13, 17, 20]]);
+                        }));
+                      }, 500);
+                    }
+                  }, 100);
+                  return _context4.abrupt("return", Promise.reject(errorInfo));
+
+                case 14:
+                case "end":
+                  return _context4.stop();
+              }
+            }
+          }, _callee4);
+        }));
+      }
     };
   });
   var isShowAddAction = (0, _react.useMemo)(function () {
     return isEdit && isAdd || isHoverEdit && isAdd;
   }, [isEdit, isAdd, isHoverEdit]);
+
+  var pushAllForm = function pushAllForm(form, key, index) {
+    allFormListRef.current[key] = {
+      form: form,
+      key: key,
+      index: index
+    };
+  };
+
   var config = (0, _react.useRef)(Object.assign({
     pagination: false,
     tableLayout: 'fixed',
@@ -1321,7 +1570,11 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       return record[_rowKey] || record.index || Math.random();
     },
     components: {
-      table: virtual ? _virtual.VirtualTable : null,
+      table: virtual ? function (props) {
+        return /*#__PURE__*/_react.default.createElement(_virtual.VirtualTable, Object.assign({}, props, {
+          fn: scrollToIndexRef
+        }));
+      } : null,
       body: Object.assign({
         row: function row(rowProps) {
           return sortOpen ? EditableSortRow(Object.assign(Object.assign({}, rowProps), {
@@ -1330,7 +1583,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
             virtual: virtual
           }));
         },
-        cell: MemoEditableCell
+        cell: props.shouldUpdate ? EditableCell : MemoEditableCell
       }, sortOpen ? {
         wrapper: function wrapper(wrapperProps) {
           var _a, _b, _c;
@@ -1357,7 +1610,10 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       var _a;
 
       return {
-        disabled: disabled || !!((_a = disabledDataSourceRowKeys.current) === null || _a === void 0 ? void 0 : _a.includes(record[_rowKey]))
+        disabled: disabled || !!((_a = disabledDataSourceRowKeys.current) === null || _a === void 0 ? void 0 : _a.includes(record[_rowKey])),
+        dataKey: record[_rowKey],
+        index: index,
+        pushAllForm: pushAllForm
       };
     }
   }, resetProps));
@@ -1429,7 +1685,15 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       isShowAddAction: isShowAddAction,
       recordCreatorProps: recordCreatorProps,
       handleAdd: handleAdd
-    }));
+    }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form, {
+      form: checkForm,
+      component: false
+    }, columns.map(function (item) {
+      return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
+        noStyle: true,
+        name: item.dataIndex
+      }, (item === null || item === void 0 ? void 0 : item['formProps']) || {}));
+    })));
   } // @ts-ignore
 
 
@@ -1482,7 +1746,15 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     isShowAddAction: isShowAddAction,
     recordCreatorProps: recordCreatorProps,
     handleAdd: handleAdd
-  }));
+  }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form, {
+    form: checkForm,
+    component: false
+  }, columns.map(function (item) {
+    return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
+      noStyle: true,
+      name: item.dataIndex
+    }, (item === null || item === void 0 ? void 0 : item['formProps']) || {}));
+  })));
 });
 
 var _default = /*#__PURE__*/(0, _react.memo)(EditTable);

package/lib/LmEditTable/rowSort/DndContainerRow.js

@@ -82,8 +82,7 @@ var DndContainer = function DndContainer(_ref) {
     move: move,
     items: items,
     tableWidth: tableWidth
-  }; // console.log('instance', instance)
-
+  };
   return /*#__PURE__*/_react.default.createElement(_core.DndContext, {
     sensors: sensors,
     onDragStart: handleDragStart,

package/lib/LmEditTable/util.js

@@ -88,7 +88,7 @@ function getExpandStatus(children) {
 }
 
 function checkMemoShouldUploadSpecialFun(prev, next) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
 
   var checkExpandStatus = getExpandStatus(prev.children) === getExpandStatus(next.children);
 
@@ -142,13 +142,17 @@ function checkMemoShouldUploadSpecialFun(prev, next) {
     return (0, _lodash.isEqual)(prev.style, next.style);
   }
 
+  if (((_l = next.className) === null || _l === void 0 ? void 0 : _l.indexOf('ant-table-row-expand-icon-cell')) > -1) {
+    return false;
+  }
+
   if (next.className.indexOf('ant-table-selection-column') > -1) {
-    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);
+    return (0, _lodash.isEqual)((_o = (_m = prev.children) === null || _m === void 0 ? void 0 : _m[1]) === null || _o === void 0 ? void 0 : _o.props, (_q = (_p = next.children) === null || _p === void 0 ? void 0 : _p[1]) === null || _q === void 0 ? void 0 : _q.props);
   }
   /** 如果启用了快速复制功能，需要实时判断rowIndex与getLength */
 
 
-  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)) {
+  if (((_r = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _r === void 0 ? void 0 : _r.quickcopy) || ((_s = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _s === void 0 ? void 0 : _s.quickcopy)) {
     var pickProps = ['record', 'colIndex', 'rowIndex', 'getLength'];
     var p = (0, _lodash.pick)(prev, pickProps);
     var n = (0, _lodash.pick)(next, pickProps);

package/lib/LmEditTable/virtual/VirtualRow.js

@@ -33,6 +33,8 @@ var useOptions = function useOptions(_ref) {
       ref = _ref.ref,
       trRef = _ref.trRef;
 
+  var _a;
+
   var _useStore = (0, _context.useStore)(),
       state = _useStore.state,
       dispatch = _useStore.dispatch,
@@ -42,7 +44,9 @@ var useOptions = function useOptions(_ref) {
   var rowHeight = state.rowHeight,
       totalLen = state.totalLen;
   var sliceColumns = (0, _react.useMemo)(function () {
-    return children === null || children === void 0 ? void 0 : children.reduce(function (pre, cur) {
+    var _a;
+
+    return (_a = children === null || children === void 0 ? void 0 : children.reduce) === null || _a === void 0 ? void 0 : _a.call(children, function (pre, cur) {
       var _a, _b;
 
       if (typeof ((_a = cur.props) === null || _a === void 0 ? void 0 : _a.fixLeft) === 'number') {
@@ -71,9 +75,9 @@ var useOptions = function useOptions(_ref) {
   }, [sliceColumns]); // 非固定列长度
 
   var centerColumnsLen = (0, _react.useMemo)(function () {
-    var _a;
+    var _a, _b;
 
-    return (_a = sliceColumns.centerColumns.length) !== null && _a !== void 0 ? _a : 0;
+    return (_b = (_a = sliceColumns === null || sliceColumns === void 0 ? void 0 : sliceColumns.centerColumns) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
   }, [sliceColumns]);
   (0, _react.useEffect)(function () {
     if (state.columnsLen !== centerColumnsLen) {
@@ -107,8 +111,10 @@ var useOptions = function useOptions(_ref) {
   }, [virtualItems]); // 右侧隐藏数量
 
   var rightColSpan = (0, _react.useMemo)(function () {
-    return sliceColumns.centerColumns.length - virtualItems.length - leftColSpan || 0;
-  }, [sliceColumns.centerColumns.length, virtualItems.length, leftColSpan]);
+    var _a;
+
+    return ((_a = sliceColumns === null || sliceColumns === void 0 ? void 0 : sliceColumns.centerColumns) === null || _a === void 0 ? void 0 : _a.length) - (virtualItems === null || virtualItems === void 0 ? void 0 : virtualItems.length) - leftColSpan || 0;
+  }, [(_a = sliceColumns === null || sliceColumns === void 0 ? void 0 : sliceColumns.centerColumns) === null || _a === void 0 ? void 0 : _a.length, virtualItems.length, leftColSpan]);
   return Object.assign(Object.assign({
     virtualItems: virtualItems
   }, sliceColumns), {

package/lib/LmEditTable/virtual/VirtualTable.js

@@ -20,6 +20,7 @@ var _context = require("./context");
 var VirtualTable = /*#__PURE__*/_react.default.memo(function (tableProps) {
   var _a, _b, _c, _d;
 
+  var fn = tableProps.fn;
   var bodyRef = (0, _react.useRef)(null);
 
   var _useRealive = (0, _context.useRealive)(),
@@ -38,7 +39,8 @@ var VirtualTable = /*#__PURE__*/_react.default.memo(function (tableProps) {
       return state.rowHeight;
     }, [state.rowHeight]),
     overscan: 5
-  }); // 列动态宽度
+  });
+  fn.current = rowVirtual.scrollToIndex; // 列动态宽度
 
   var columnEstimateSize = (0, _react.useCallback)(function (i) {
     var _a, _b;

package/lib/styles/variables.css

@@ -1759,6 +1759,9 @@ p {
   color: var(--primary-color);
   cursor: pointer;
 }
+.lm_custom_option_columns .custom_hiddle {
+  display: none;
+}
 .lm_custom_option_columns .fixed_title {
   color: var(--color-45);
   font-size: 12px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.1.27-alpha.2",
+  "version": "1.1.27-alpha.4",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"