@zat-design/sisyphus-react 3.0.16-beta.4 → 3.1.4

package/lib/ProEditTable/components/RenderField/index.js

@@ -11,21 +11,24 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _valueType = _interopRequireDefault(require("../../../ProForm/utils/valueType"));
 var _transform = _interopRequireDefault(require("../../utils/transform"));
 var _tools = require("../../utils/tools");
-var _index = require("../../../ProForm/utils/index");
 var componentMap = _interopRequireWildcard(require("../../../ProForm/components"));
 var _Container = _interopRequireDefault(require("../../../ProForm/components/Container"));
 var _transformNames = _interopRequireDefault(require("../../../ProForm/utils/transformNames"));
-var _excluded = ["type", "valueType", "rules", "names", "fieldProps", "required", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable"];
+var _useFieldProps = require("../../../ProForm/utils/useFieldProps");
+var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"));
+var _utils = require("../../../ProForm/utils");
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _names, _fieldProps$rules, _formItemChildProps$p, _TargetComponent4;
+  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _formItemChildProps$p, _TargetComponent4;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -33,11 +36,8 @@ var RenderField = function RenderField(_ref) {
     config = _ref.config;
   var type = column.type,
     valueType = column.valueType,
-    _column$rules = column.rules,
-    rules = _column$rules === void 0 ? [] : _column$rules,
     names = column.names,
     fieldProps = column.fieldProps,
-    required = column.required,
     labelRequired = column.labelRequired,
     editRender = column.editRender,
     component = column.component,
@@ -49,6 +49,10 @@ var RenderField = function RenderField(_ref) {
     formItemProps = column.formItemProps,
     _column$isEditable = column.isEditable,
     isEditable = _column$isEditable === void 0 ? true : _column$isEditable,
+    _column$required = column.required,
+    required = _column$required === void 0 ? false : _column$required,
+    _column$rules = column.rules,
+    rules = _column$rules === void 0 ? [] : _column$rules,
     resetProps = (0, _objectWithoutProperties2.default)(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -59,79 +63,78 @@ var RenderField = function RenderField(_ref) {
     cellName = config.cellName,
     cellNamePath = config.cellNamePath,
     isEditing = config.isEditing,
-    disabled = config.disabled,
     form = config.form,
     setState = config.setState,
     name = config.name,
     virtualKey = config.virtualKey,
     viewEmpty = config.viewEmpty;
+  var _fieldProps = fieldProps || formItemProps || {};
+  var _rules = rules || [];
+  var _required = required;
+  var _disabled = false;
   var isCell = mode === 'cell';
   if (isCell) {
-    record.isView = !(0, _lodash.isEqual)(cellNamePath, cellName);
+    record['is-view'] = !(0, _lodash.isEqual)(cellNamePath, cellName);
   }
-  // 是否只读文本
-  var isView = !isEditable || (record === null || record === void 0 ? void 0 : record.isView) || config.isView || virtualKey && !isEditing;
   // type类型 首字母转大写
   type = ((_type = type) === null || _type === void 0 ? void 0 : (_type$replace = _type.replace) === null || _type$replace === void 0 ? void 0 : _type$replace.call(_type, type[0], type[0].toUpperCase())) || 'Input';
   // 单行正在编辑时，临时生成一套formItem用来存储中间值，点击取消时候重置回上一次状态
   var namePath = (0, _tools.getNamePath)(name, virtualKey);
-  // 只读文本时，采用当前formItem的name，单行编辑时，使用生成的虚拟的name
-  var baseName = isView ? name : namePath;
-  var rowData = form.getFieldValue([].concat((0, _toConsumableArray2.default)(namePath), [index])) || record;
+  var rowData = form.getFieldValue([].concat((0, _toConsumableArray2.default)(namePath), [index])) || record || {};
   var currentValue = dataIndex ? rowData === null || rowData === void 0 ? void 0 : rowData[dataIndex] : null;
-  var TargetComponent;
   // 第三个参数
   var options = {
     index: index,
     form: form,
     namePath: [].concat((0, _toConsumableArray2.default)(namePath), [index])
   };
-  if (typeof fieldProps === 'function') {
-    fieldProps = fieldProps(currentValue, rowData, options);
+  if (typeof isEditable === 'function') {
+    isEditable = isEditable(currentValue, rowData, options);
   }
-  var _fieldProps = fieldProps || formItemProps;
-  if (typeof (_fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.rules) === 'function') {
-    _fieldProps.rules = _fieldProps.rules(currentValue, rowData, options);
+  // 是否只读文本
+  var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !isEditing;
+  // 只读文本时，采用当前formItem的name，单行编辑时，使用生成的虚拟的name
+  var baseName = isView ? name : namePath;
+  var TargetComponent;
+  if (typeof required === 'function') {
+    _required = required(currentValue, rowData, options);
   }
-  if (typeof rules === 'function') {
-    rules = rules(currentValue, rowData, options);
+  if (typeof fieldProps === 'function') {
+    _fieldProps = fieldProps(currentValue, rowData, options);
   }
-  if (typeof (_fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) === 'function') {
-    _fieldProps.disabled = _fieldProps.disabled(currentValue, rowData, options);
+  if (typeof ((_fieldProps2 = _fieldProps) === null || _fieldProps2 === void 0 ? void 0 : _fieldProps2.disabled) === 'function') {
+    _disabled = _fieldProps.disabled(currentValue, rowData, options);
+  } else if (((_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.disabled) === true) {
+    _disabled = _fieldProps.disabled;
   }
-  if (typeof required === 'function') {
-    required = required(currentValue, rowData, options);
+  if (typeof column.disabled === 'function') {
+    _disabled = column.disabled(currentValue, rowData, options);
+  } else if (column.disabled === true) {
+    _disabled = column.disabled;
   }
-  // 必填规则内置 仅为title为字符串时
-  if (required) {
-    var _rules2;
-    var errorMsg = "".concat(originTitle, "\u4E0D\u80FD\u4E3A\u7A7A");
-    rules = ((_rules2 = rules) !== null && _rules2 !== void 0 ? _rules2 : []).concat([{
-      required: required,
-      message: errorMsg
-    }]);
+  if ((config === null || config === void 0 ? void 0 : config.disabled) === true) {
+    _disabled = config === null || config === void 0 ? void 0 : config.disabled;
   }
-  // names 默认需要校验所有值是否已填写完整
-  if (((_names = names) === null || _names === void 0 ? void 0 : _names.length) && !(0, _lodash.isBoolean)(labelRequired)) {
-    var _rules3;
-    rules = ((_rules3 = rules) !== null && _rules3 !== void 0 ? _rules3 : []).concat([{
-      validator: function validator(_rule, value) {
-        if (value === null || value === void 0 ? void 0 : value.length) {
-          if ((0, _index.isNullArray)(value, names.length)) {
-            return Promise.reject(new Error("\u8BF7\u5B8C\u6574\u586B\u5199".concat(title)));
-          }
-          return Promise.resolve();
-        }
-        return Promise.resolve();
-      }
-    }]);
+  if (typeof rules === 'function') {
+    _rules = rules(currentValue, rowData, options);
   }
+  // 设置校验规则
+  var internalRule = (0, _useRules.default)({
+    names: names,
+    label: label,
+    labelRequired: labelRequired,
+    required: _required,
+    rules: isEditing ? _rules : [],
+    isSelect: (0, _utils.isSelect)({
+      dataSource: (_fieldProps4 = _fieldProps) === null || _fieldProps4 === void 0 ? void 0 : _fieldProps4.dataSource,
+      type: type
+    }),
+    type: type
+  });
   // 分离form item参数，防止对于参数透传（如onChange,防止重复触发）并优先级高于 _fieldProps 内部参数
-  var formItemChildProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _fieldProps), fieldProps);
+  var formItemChildProps = (0, _objectSpread2.default)({}, _fieldProps);
   // 允许formItem的属性放在column最外层
-  var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps), {}, {
-    rules: [].concat((0, _toConsumableArray2.default)((_fieldProps$rules = _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.rules) !== null && _fieldProps$rules !== void 0 ? _fieldProps$rules : []), (0, _toConsumableArray2.default)(rules))
-  });
+  var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps), internalRule);
   if (['Switch', 'Checkbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
     valueType = 'switch';
@@ -149,7 +152,7 @@ var RenderField = function RenderField(_ref) {
     var types = ['DatePicker', 'RangePicker'];
     if (!valueType && types.includes(type)) {
       var _transformMap$type;
-      return _transform.default === null || _transform.default === void 0 ? void 0 : (_transformMap$type = _transform.default[type]) === null || _transformMap$type === void 0 ? void 0 : _transformMap$type.call(_transform.default, fieldProps || {});
+      return _transform.default === null || _transform.default === void 0 ? void 0 : (_transformMap$type = _transform.default[type]) === null || _transformMap$type === void 0 ? void 0 : _transformMap$type.call(_transform.default, _fieldProps || {});
     }
     return {};
   };
@@ -169,6 +172,15 @@ var RenderField = function RenderField(_ref) {
     var params = (0, _objectSpread2.default)({}, column);
     return (0, _lodash.isFunction)(_valueType.default[valueType]) ? _valueType.default[valueType](params) : {};
   }, [valueType]);
+  if ((_names = names) === null || _names === void 0 ? void 0 : _names.length) {
+    // 支持names配置，临时生成对应的formItem，用来存储单个对应的值
+    names = names.map(function (key) {
+      if (Array.isArray(key)) {
+        return [].concat((0, _toConsumableArray2.default)(baseName), [index], (0, _toConsumableArray2.default)(key));
+      }
+      return [].concat((0, _toConsumableArray2.default)(baseName), [index, key]);
+    });
+  }
   /**
    * 配置names时，基于formItem的normalize与getValueProps进行值类型转换
    * @returns {}
@@ -178,19 +190,16 @@ var RenderField = function RenderField(_ref) {
     if (!((_names2 = names) === null || _names2 === void 0 ? void 0 : _names2.length)) {
       return {};
     }
-    // 支持names配置，临时生成对应的formItem，用来存储单个对应的值
-    names = names.map(function (key) {
-      if (Array.isArray(key)) {
-        return [].concat((0, _toConsumableArray2.default)(baseName), [index], (0, _toConsumableArray2.default)(key));
-      }
-      return [].concat((0, _toConsumableArray2.default)(baseName), [index, key]);
-    });
     var namesStr = [baseName, index, dataIndex];
-    return (0, _transformNames.default)(_formItemProps, form, names, namesStr);
+    var transform = {};
+    if (valueType) {
+      transform = valueTypeTransform();
+    }
+    return (0, _transformNames.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _formItemProps), transform), form, names, namesStr);
   };
   if (!_editRender && typeof type === 'string') {
     var _componentMap$type;
-    TargetComponent = (_componentMap$type = componentMap[type]) !== null && _componentMap$type !== void 0 ? _componentMap$type : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
+    TargetComponent = (_componentMap$type = componentMap[type]) !== null && _componentMap$type !== void 0 ? _componentMap$type : (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
   }
   if (isEditable && isEditing) {
     if (typeof _editRender === 'function') {
@@ -207,9 +216,10 @@ var RenderField = function RenderField(_ref) {
       var _column$dataIndex;
       currentValue = (column === null || column === void 0 ? void 0 : (_column$dataIndex = column.dataIndex) === null || _column$dataIndex === void 0 ? void 0 : _column$dataIndex.includes('-')) ? value : currentValue;
       var View = viewRender(currentValue, record, options);
-      TargetComponent = /*#__PURE__*/_react.default.createElement(_Container.default, {
-        viewEmpty: viewEmpty
-      }, View);
+      TargetComponent = (0, _jsxRuntime.jsx)(_Container.default, {
+        viewEmpty: viewEmpty,
+        children: View
+      });
     }
     if ( /*#__PURE__*/_react.default.isValidElement(viewRender)) {
       TargetComponent = viewRender;
@@ -217,8 +227,6 @@ var RenderField = function RenderField(_ref) {
   }
   var defaultPlaceholder = ['Select', 'EnumSelect', 'DatePicker', 'RangePicker', 'Cascader', 'ProSelect', 'ProEnum', 'ProTimeLimit'].includes(type) ? "\u8BF7\u9009\u62E9".concat((0, _lodash.isString)(label) ? label || title : '') : "\u8BF7\u8F93\u5165".concat((0, _lodash.isString)(label) ? label || title : '');
   var _placeholder = (_formItemChildProps$p = formItemChildProps === null || formItemChildProps === void 0 ? void 0 : formItemChildProps.placeholder) !== null && _formItemChildProps$p !== void 0 ? _formItemChildProps$p : defaultPlaceholder;
-  var _disabled = disabled || (formItemChildProps === null || formItemChildProps === void 0 ? void 0 : formItemChildProps.disabled);
-  var _rules = isEditing ? _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.rules : [];
   var onChange = formItemChildProps === null || formItemChildProps === void 0 ? void 0 : formItemChildProps.onChange;
   var onFieldChange = formItemChildProps === null || formItemChildProps === void 0 ? void 0 : formItemChildProps.onFieldChange;
   var onBlur = formItemChildProps === null || formItemChildProps === void 0 ? void 0 : formItemChildProps.onBlur;
@@ -226,31 +234,30 @@ var RenderField = function RenderField(_ref) {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    var _args = (0, _toConsumableArray2.default)(args === null || args === void 0 ? void 0 : args[0]);
-    var rowPath = [].concat((0, _toConsumableArray2.default)(namePath), [index]);
-    var row = form.getFieldValue(rowPath);
-    _args[1] = row;
+    var _args = args === null || args === void 0 ? void 0 : args[0];
+    var nextArgs = [];
+    nextArgs[0] = _args[0];
     // 返回表单元素默认值
-    _args[2] = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, options), {}, {
-      extra: args
+    nextArgs[2] = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, options), {}, {
+      extra: _args
     });
     switch (type) {
       case 'ProSelect':
       case 'ProModalSelect':
       case 'ProEnum':
-        _args[2].option = args[1];
+        nextArgs[2].option = _args[1];
         break;
       case 'ProAddressBar':
-        _args[2].selectedOptions = args[1];
+        nextArgs[2].selectedOptions = _args[1];
         break;
       case 'DatePicker':
       case 'RangePicker':
-        _args[2].dateString = args[1];
+        nextArgs[2].dateString = _args[1];
         break;
       default:
         break;
     }
-    return _args;
+    return nextArgs;
   };
   // 单元格更新数据时，加个防抖，防止更新频率过快，卡顿
   var _onchange = (0, _lodash.debounce)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
@@ -283,48 +290,47 @@ var RenderField = function RenderField(_ref) {
           row = form.getFieldValue(rowPath);
           orgRow = (0, _lodash.cloneDeep)(row);
           if (!onFieldChange) {
-            _context.next = 17;
+            _context.next = 18;
             break;
           }
           _args = formatArgs(args);
+          _args[1] = row;
           _context.t0 = (_TargetComponent = TargetComponent) === null || _TargetComponent === void 0 ? void 0 : (_TargetComponent$prop = _TargetComponent.props) === null || _TargetComponent$prop === void 0 ? void 0 : _TargetComponent$prop.onFieldChange;
           if (!_context.t0) {
-            _context.next = 11;
+            _context.next = 12;
             break;
           }
-          _context.next = 11;
+          _context.next = 12;
           return (_TargetComponent$prop2 = TargetComponent.props).onFieldChange.apply(_TargetComponent$prop2, (0, _toConsumableArray2.default)(_args));
-        case 11:
+        case 12:
           _context.t1 = onFieldChange;
           if (!_context.t1) {
-            _context.next = 15;
+            _context.next = 16;
             break;
           }
-          _context.next = 15;
+          _context.next = 16;
           return onFieldChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
-        case 15:
-          _context.next = 28;
+        case 16:
+          _context.next = 27;
           break;
-        case 17:
-          _args.push(row);
-          _args.push(index);
-          _args.push(form);
+        case 18:
+          _args = _args.concat([row, index, form]);
           _context.t2 = (_TargetComponent2 = TargetComponent) === null || _TargetComponent2 === void 0 ? void 0 : (_TargetComponent2$pro = _TargetComponent2.props) === null || _TargetComponent2$pro === void 0 ? void 0 : _TargetComponent2$pro.onChange;
           if (!_context.t2) {
-            _context.next = 24;
+            _context.next = 23;
             break;
           }
-          _context.next = 24;
+          _context.next = 23;
           return (_TargetComponent$prop3 = TargetComponent.props).onChange.apply(_TargetComponent$prop3, (0, _toConsumableArray2.default)(_args));
-        case 24:
+        case 23:
           _context.t3 = onChange;
           if (!_context.t3) {
-            _context.next = 28;
+            _context.next = 27;
             break;
           }
-          _context.next = 28;
+          _context.next = 27;
           return onChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
-        case 28:
+        case 27:
           // 判断属性是否变动
           form.setFieldValue(rowPath, row);
           if (!(0, _lodash.isEqual)(orgRow, row)) {
@@ -336,15 +342,20 @@ var RenderField = function RenderField(_ref) {
               form.validateFields(validateFieldKeys);
             }
           }
-          if (virtualKey) {
-            // 单行编辑时需要 强制更新视图
-            setState({
-              forceUpdate: {
-                d: Date.now()
-              }
-            });
-          }
-        case 31:
+          setState({
+            forceUpdate: {
+              d: Date.now()
+            }
+          });
+          // if (virtualKey) {
+          //   // 单行编辑时需要 强制更新视图
+          //   setState({
+          //     forceUpdate: {
+          //       d: Date.now(),
+          //     },
+          //   });
+          // }
+        case 30:
         case "end":
           return _context.stop();
       }
@@ -353,13 +364,13 @@ var RenderField = function RenderField(_ref) {
   var _onblur = /*#__PURE__*/function () {
     var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
       var _TargetComponent3, _TargetComponent3$pro, _TargetComponent$prop4;
-      var _len3,
+      var rowPath,
+        row,
+        orgRow,
+        _len3,
         args,
         _key3,
         _args,
-        rowPath,
-        row,
-        orgRow,
         _Object$keys2,
         _Object$keys2$map,
         diff,
@@ -368,29 +379,30 @@ var RenderField = function RenderField(_ref) {
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            rowPath = [].concat((0, _toConsumableArray2.default)(namePath), [index]);
+            row = form.getFieldValue(rowPath);
+            orgRow = (0, _lodash.cloneDeep)(row);
             for (_len3 = _args3.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
               args[_key3] = _args3[_key3];
             }
             _args = formatArgs(args);
-            rowPath = [].concat((0, _toConsumableArray2.default)(namePath), [index]);
-            row = form.getFieldValue(rowPath);
-            orgRow = (0, _lodash.cloneDeep)(row);
+            _args[1] = row;
             _context2.t0 = (_TargetComponent3 = TargetComponent) === null || _TargetComponent3 === void 0 ? void 0 : (_TargetComponent3$pro = _TargetComponent3.props) === null || _TargetComponent3$pro === void 0 ? void 0 : _TargetComponent3$pro.onBlur;
             if (!_context2.t0) {
-              _context2.next = 9;
+              _context2.next = 10;
               break;
             }
-            _context2.next = 9;
+            _context2.next = 10;
             return (_TargetComponent$prop4 = TargetComponent.props).onBlur.apply(_TargetComponent$prop4, (0, _toConsumableArray2.default)(_args));
-          case 9:
+          case 10:
             _context2.t1 = onBlur;
             if (!_context2.t1) {
-              _context2.next = 13;
+              _context2.next = 14;
               break;
             }
-            _context2.next = 13;
+            _context2.next = 14;
             return onBlur.apply(void 0, (0, _toConsumableArray2.default)(_args));
-          case 13:
+          case 14:
             // 判断属性是否变动
             form.setFieldValue(rowPath, row);
             if (!(0, _lodash.isEqual)(orgRow, row)) {
@@ -403,16 +415,16 @@ var RenderField = function RenderField(_ref) {
               }
             }
             if (!isCell) {
-              _context2.next = 19;
+              _context2.next = 20;
               break;
             }
-            _context2.next = 18;
+            _context2.next = 19;
             return form.validateFields([cellName]);
-          case 18:
+          case 19:
             setState({
               cellNamePath: []
             });
-          case 19:
+          case 20:
             if (virtualKey) {
               // 单行编辑时需要 强制更新视图
               setState({
@@ -421,7 +433,7 @@ var RenderField = function RenderField(_ref) {
                 }
               });
             }
-          case 20:
+          case 21:
           case "end":
             return _context2.stop();
         }
@@ -435,11 +447,14 @@ var RenderField = function RenderField(_ref) {
     form: form,
     name: cellName,
     placeholder: _placeholder
-  }, fieldProps), (_TargetComponent4 = TargetComponent) === null || _TargetComponent4 === void 0 ? void 0 : _TargetComponent4.props), {}, {
+  }, _fieldProps), (_TargetComponent4 = TargetComponent) === null || _TargetComponent4 === void 0 ? void 0 : _TargetComponent4.props), {}, {
     disabled: _disabled,
     onChange: _onchange,
     onBlur: _onblur,
     otherProps: {
+      form: form,
+      names: names,
+      name: cellName,
       viewEmpty: viewEmpty,
       valueType: valueType,
       isView: isView
@@ -447,11 +462,8 @@ var RenderField = function RenderField(_ref) {
   });
   // 单元格编辑时，设置各个单元格disabled属性
   if (isCell) {
-    record["$".concat(dataIndex, "Disabled")] = _disabled;
+    record["".concat(dataIndex, "-Disabled")] = _disabled;
   }
-  // if (isCell) {
-  //   _formItemProps.validateTrigger = 'onBlur';
-  // }
   if (['Switch', 'Checkbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
   }
@@ -462,13 +474,24 @@ var RenderField = function RenderField(_ref) {
       editingDom === null || editingDom === void 0 ? void 0 : (_editingDom$focus = editingDom.focus) === null || _editingDom$focus === void 0 ? void 0 : _editingDom$focus.call(editingDom);
     }
   }, [cellNamePath]);
-  return /*#__PURE__*/_react.default.createElement(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-    validateFirst: true,
-    noStyle: !isEditing
-  }, defaultTransform()), valueTypeTransform()), namesTransform()), (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key'])), {}, {
-    name: cellName,
-    rules: _rules
-  }), /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange']))) : /*#__PURE__*/_react.default.createElement(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange']))));
+  // 可编辑表格默认关闭scrollFollowParent
+  if (['Select', 'ProSelect', 'ProEnum'].includes(type)) {
+    componentProps.scrollFollowParent = false;
+  }
+  Object.assign(_formItemProps, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultTransform()), valueTypeTransform()), namesTransform()));
+  // 编辑&保存模式，在查看状态下移除表单的rules不做校验
+  if (!isEditing) {
+    delete _formItemProps.rules;
+  }
+  return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
+    value: componentProps === null || componentProps === void 0 ? void 0 : componentProps.otherProps,
+    children: (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      validateFirst: true,
+      noStyle: !isEditing
+    }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+      name: cellName,
+      children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange']))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])))
+    }))
+  });
 };
-var _default = RenderField;
-exports.default = _default;
+var _default = exports.default = RenderField;

package/lib/ProEditTable/components/RenderToolbar/index.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const RenderToolbar: (config: any) => React.JSX.Element;
+declare const RenderToolbar: (config: any) => JSX.Element;
 export default RenderToolbar;