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

package/lib/ProForm/components/render/Render.js

@@ -8,10 +8,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 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 _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -22,9 +23,9 @@ var _index = require("../../utils/index");
 var _transformNames = _interopRequireDefault(require("../../utils/transformNames"));
 var _valueType = _interopRequireDefault(require("../../utils/valueType"));
 var _useChanged = require("../../utils/useChanged");
-var _rulesCreator = require("../../utils/rulesCreator");
 var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
-var _excluded = ["labelWidth", "hiddenNames", "trim", "className", "rules", "required", "labelRequired", "tooltip"];
+var _useRules = _interopRequireDefault(require("../../utils/useRules"));
+var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
 /* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
@@ -34,7 +35,6 @@ var Render = function Render(props) {
     _props$formItemProps = props.formItemProps,
     formItemProps = _props$formItemProps === void 0 ? {} : _props$formItemProps,
     otherProps = props.otherProps,
-    colProps = props.colProps,
     componentProps = props.componentProps,
     _props$show = props.show,
     show = _props$show === void 0 ? true : _props$show,
@@ -44,11 +44,14 @@ var Render = function Render(props) {
     type = props.type,
     isSelect = props.isSelect,
     originalValues = props.originalValues,
-    equalWith = props.equalWith;
+    equalWith = props.equalWith,
+    requiredOnView = props.requiredOnView;
+  var colProps = props.colProps;
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
     hiddenNames = formItemProps.hiddenNames,
     trim = formItemProps.trim,
+    upperCase = formItemProps.upperCase,
     className = formItemProps.className,
     rules = formItemProps.rules,
     required = formItemProps.required,
@@ -66,7 +69,8 @@ var Render = function Render(props) {
       componentProps: componentProps,
       fieldProps: fieldProps,
       component: component,
-      originComponent: originComponent
+      originComponent: originComponent,
+      type: type
     }),
     shouldUpdate = _useShouldUpdate.shouldUpdate,
     _show = _useShouldUpdate.show,
@@ -90,43 +94,17 @@ var Render = function Render(props) {
       return Array.isArray(name) ? name.join('_') : name;
     }).join('-');
   }, [otherProps === null || otherProps === void 0 ? void 0 : otherProps.names]);
-  // 判断当前字段是否
+  // 判断当前字段是否变更
   var changed = (0, _useChanged.useChanged)(formItemProps.name, otherProps.names, namesStr, originalValues, form, equalWith);
-  // 根据 required 添加 rules
-  var internalRule = (0, _react.useMemo)(function () {
-    var result = {
-      rules: _rules || []
-    };
-    if (_required === true) {
-      var requiredRule = Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.find(function (rule) {
-        return 'required' in rule;
-      }));
-      if (!requiredRule) {
-        var message = isSelect ? "\u8BF7\u9009\u62E9".concat(otherFormItemProps.label || '') : "\u8BF7\u8F93\u5165".concat(otherFormItemProps.label || '');
-        var rule = {
-          required: _required,
-          message: message
-        };
-        result.rules = Array.isArray(rules) ? [].concat((0, _toConsumableArray2.default)(rules), [rule]) : [rule];
-      }
-    }
-    return result;
-  }, [_rules, _required]);
-  // type转换为内置rules
-  internalRule.rules = internalRule.rules && (0, _rulesCreator.rulesCreator)(internalRule.rules, otherProps.label, isSelect);
-  (0, _react.useEffect)(function () {
-    if (otherProps.names && !(0, _lodash.isBoolean)(labelRequired)) {
-      var customRequired = {
-        validator: function validator(rules, value) {
-          if (Array.isArray(value) && (0, _index.isNullArray)(value, otherProps.names.length)) {
-            return Promise.reject(new Error("\u8BF7\u5B8C\u6574\u586B\u5199".concat(otherFormItemProps.label || '')));
-          }
-          return Promise.resolve();
-        }
-      };
-      internalRule.rules.push(customRequired);
-    }
-  }, [internalRule]);
+  var internalRule = (0, _useRules.default)({
+    names: otherProps.names,
+    label: otherFormItemProps.label,
+    labelRequired: labelRequired,
+    required: _required,
+    rules: _rules,
+    isSelect: isSelect,
+    type: type
+  });
   /**
    * 基于formItem的normalize与getValueProps进行值类型转换
    * @returns {}
@@ -157,29 +135,42 @@ var Render = function Render(props) {
   Object.assign(otherFormItemProps, transforms, {
     names: otherProps.names
   }, internalRule, labelRequired || _required ? {
-    required: true
-  } : null, (0, _objectSpread2.default)({}, (0, _index.isTrim)(type, trim)), {
+    required: labelRequired || _required
+  } : null, otherProps.isView && !requiredOnView ? {
+    required: false
+  } : null, (0, _objectSpread2.default)({}, (0, _index.isTrim)(type, trim)), (0, _objectSpread2.default)({}, (0, _index.isUpperCase)(type, upperCase)), {
     validateFirst: true
   });
+  // 添加label宽度
+  if (labelWidth) {
+    otherFormItemProps.labelCol = {
+      flex: "".concat(labelWidth, "px")
+    };
+  }
   /** 移除多余参数，防止透传给formItem报错 */
   var _otherFormItemProps = (0, _lodash.omit)(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'switchValue', 'precision', 'clearNotShow']);
   // 优先取formDisabled（全局），其次取disabled函数返回值，最后取fieldProps函数返回的disabled
   var lastDisabled = componentProps.disabledStrictly ? formDisabled || _disabled || (_fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) : false;
-  // 取更新后的组件Props
+  /**
+   * 最新fieldProps: 更新后的组件Props
+   */
   var lastComponentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), _fieldProps), {}, {
     disabled: lastDisabled
   });
-  var _className = (0, _classnames.default)((_classNames = {}, (0, _defineProperty2.default)(_classNames, className, className), (0, _defineProperty2.default)(_classNames, 'pro-form-item-changed', changed), (0, _defineProperty2.default)(_classNames, 'label-width', labelWidth !== undefined), _classNames));
+  var _className = (0, _classnames.default)((_classNames = {}, (0, _defineProperty2.default)(_classNames, className, className), (0, _defineProperty2.default)(_classNames, 'pro-form-item-changed', changed), _classNames));
   if (formItemProps.hidden === true || _show === false) {
     // 为了监听shouldUpdate  必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
-    return /*#__PURE__*/_react.default.createElement(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _otherFormItemProps), {}, {
+    return (0, _jsxRuntime.jsx)(_antd.Form.Item, {
+      name: _otherFormItemProps.name,
+      shouldUpdate: _otherFormItemProps.shouldUpdate,
       className: _className,
       noStyle: true,
       hidden: true,
       rules: [{
         required: false
-      }]
-    }), /*#__PURE__*/_react.default.createElement(_antd.Input, null));
+      }],
+      children: (0, _jsxRuntime.jsx)(_antd.Input, {})
+    });
   }
   /**
    * 函数新参数组装
@@ -196,7 +187,7 @@ var Render = function Render(props) {
     // 优先处理FormList场景
     if (Array.isArray(_otherFormItemProps.namePath) && (_otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n = _otherFormItemProps.namePath) === null || _otherFormItemProps$n === void 0 ? void 0 : _otherFormItemProps$n.length)) {
       var _otherFormItemProps$n2;
-      _args[1] = (0, _index.filterInternalFields)((0, _lodash.cloneDeep)(form.getFieldValue(_otherFormItemProps.namePath)));
+      _args[1] = form.getFieldValue(_otherFormItemProps.namePath);
       _args[2].namePath = _otherFormItemProps.namePath;
       _args[2].index = _otherFormItemProps.namePath[(_otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n2 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n2 === void 0 ? void 0 : _otherFormItemProps$n2.length) - 1];
     }
@@ -246,6 +237,17 @@ var Render = function Render(props) {
       ((_AutoComponent$props$ = (_AutoComponent$props = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _AutoComponent$props$ === void 0 ? void 0 : _AutoComponent$props$.call.apply(_AutoComponent$props$, [_AutoComponent$props].concat((0, _toConsumableArray2.default)(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat((0, _toConsumableArray2.default)(_args))));
       return false;
     }
+    // Group默认校验, 延时校验解决值未同步最新的问题
+    if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
+      setTimeout(function () {
+        form.validateFields([formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames]);
+      }, 60);
+    }
+    // ProTreeSelect返回option
+    if (['ProTreeSelect', 'ProTree'].includes(type)) {
+      var _args2, _args2$;
+      _args[2].option = (0, _index.findOptionByValue)(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0]);
+    }
     (_lastComponentProps$c2 = lastComponentProps[changeKey]) === null || _lastComponentProps$c2 === void 0 ? void 0 : _lastComponentProps$c2.call.apply(_lastComponentProps$c2, [lastComponentProps].concat((0, _toConsumableArray2.default)(_args)));
   };
   /**
@@ -257,12 +259,12 @@ var Render = function Render(props) {
         args,
         _key2,
         _args,
-        _args2 = arguments;
+        _args3 = arguments;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            for (_len2 = _args2.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-              args[_key2] = _args2[_key2];
+            for (_len2 = _args3.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+              args[_key2] = _args3[_key2];
             }
             _args = functionArgs([].concat(args));
             _context.t0 = lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.onBlur;
@@ -282,19 +284,6 @@ var Render = function Render(props) {
       return _ref3.apply(this, arguments);
     };
   }();
-  if (type === 'FormList') {
-    lastComponentProps.disabled = lastDisabled;
-    return /*#__PURE__*/_react.default.createElement(_antd.Col, {
-      span: 24
-    }, /*#__PURE__*/_react.default.createElement(_antd.Form.List, (0, _objectSpread2.default)({}, _otherFormItemProps), function (fields, operation, meta) {
-      return /*#__PURE__*/_react.default.createElement(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
-        otherProps: otherProps,
-        fields: fields,
-        operation: operation,
-        meta: meta
-      }));
-    }));
-  }
   var renderItem = function renderItem() {
     // 表单渲染 start
     var childProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props), (0, _lodash.omit)(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
@@ -303,55 +292,123 @@ var Render = function Render(props) {
       onChange: handleChange,
       onBlur: handleBlur
     });
+    /**
+     * formItem前后值添加
+     */
+    var internalItemRender = {
+      mark: 'pro_table_render',
+      render: function render(inputProps, doms) {
+        return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+          children: [(0, _jsxRuntime.jsxs)("div", {
+            style: {
+              display: 'flex',
+              alignItems: 'center'
+            },
+            children: [(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.before) ? (0, _jsxRuntime.jsx)("div", {
+              style: {
+                marginInlineEnd: 8
+              },
+              children: formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.before
+            }) : null, doms.input, (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.after) ? (0, _jsxRuntime.jsx)("div", {
+              style: {
+                marginInlineStart: 8
+              },
+              children: formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.after
+            }) : null]
+          }), (0, _jsxRuntime.jsx)(_antd.Space, {
+            size: 0,
+            style: {
+              marginTop: 8
+            },
+            children: formItemProps.extra
+          }), doms.errorList]
+        });
+      }
+    };
     // 自定义组件移除otherProps参数
     if (originComponent) {
       delete childProps.otherProps;
     }
-    var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? /*#__PURE__*/_react.default.cloneElement(AutoComponent, childProps) : /*#__PURE__*/_react.default.createElement(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
-      otherProps: otherProps,
+    var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? /*#__PURE__*/_react.default.cloneElement(AutoComponent, childProps) : (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
+      otherProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
+        show: show,
+        disabled: lastDisabled,
+        required: required
+      }),
       onChange: handleChange,
       onBlur: handleBlur
     }));
-    // 表单渲染 end
-    if (labelWidth) {
-      _otherFormItemProps.label = /*#__PURE__*/_react.default.createElement("span", {
-        style: {
-          width: labelWidth
-        }
-      }, otherFormItemProps.label);
-    }
     // 表单提示
     if (tooltip) {
       _otherFormItemProps.tooltip = {
         title: (0, _lodash.isString)(tooltip) ? tooltip : tooltip.title,
-        icon: (0, _lodash.isString)(tooltip) ? /*#__PURE__*/_react.default.createElement(_reactSvg.ReactSVG, {
+        icon: (0, _lodash.isString)(tooltip) ? (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
           className: "pro-icon-tip",
           src: _tip.default
         }) : tooltip.icon
       };
     }
+    // 需要过滤掉的form_item的key
+    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
+    if (type === 'FormList') {
+      lastComponentProps.disabled = lastDisabled;
+      var lessMode = lastComponentProps.mode === 'less';
+      child = (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _otherFormItemProps), {}, {
+        children: function children(fields, operation, meta) {
+          return (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
+            otherProps: otherProps,
+            fields: fields,
+            operation: operation,
+            meta: meta
+          }));
+        }
+      }));
+      colProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
+        span: lessMode ? colProps.span : 24 // 默认占一行
+      });
+    }
+    //  默认占据一行
+    if (['ProCollapse', 'Container'].includes(type)) {
+      colProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
+        span: 24 // 默认占一行
+      });
+    }
     // 当存在shouldUpdate时补货所有form变更（防止表单onchange设置form值时无法更新的问题）
     if (_otherFormItemProps.shouldUpdate) {
-      return /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
+      return (0, _jsxRuntime.jsx)(_antd.Form.Item, {
         shouldUpdate: _otherFormItemProps.shouldUpdate,
-        noStyle: true
-      }, function () {
-        return /*#__PURE__*/_react.default.createElement(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, ['onFieldChange', 'shouldUpdate', 'namePath'])), {}, {
-          className: _className
-        }), child);
+        noStyle: true,
+        children: function children() {
+          return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
+            // @ts-ignore
+            _internalItemRender: internalItemRender,
+            className: _className,
+            children: child
+          }));
+        }
       });
     }
-    return /*#__PURE__*/_react.default.createElement(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, ['onFieldChange', 'shouldUpdate', 'namePath'])), {}, {
-      className: _className
-    }), child);
+    return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
+      // @ts-ignore
+      _internalItemRender: internalItemRender,
+      className: _className,
+      children: child
+    }));
   };
-  return /*#__PURE__*/_react.default.createElement(_antd.Col, (0, _objectSpread2.default)({}, colProps), renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {
-    return /*#__PURE__*/_react.default.createElement(_antd.Form.Item, {
-      hidden: true,
-      name: name,
-      key: name
-    }, /*#__PURE__*/_react.default.createElement(_antd.Input, null));
-  }) : null);
+  var FormItem = (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+    children: [renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {
+      return (0, _jsxRuntime.jsx)(_antd.Form.Item, {
+        hidden: true,
+        name: name,
+        children: (0, _jsxRuntime.jsx)(_antd.Input, {})
+      }, name);
+    }) : null]
+  });
+  if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
+    return FormItem;
+  }
+  return (0, _jsxRuntime.jsx)(_antd.Col, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
+    children: FormItem
+  }));
 };
-var _default = Render;
-exports.default = _default;
+var _default = exports.default = Render;

package/lib/ProForm/components/render/RenderFields.d.ts

@@ -8,13 +8,15 @@ interface Props<T = any> {
     columns: ProColumnProps[];
     disabled?: boolean;
     form: FormInstance<T>;
-    expand?: false | number;
+    expand?: boolean | number;
     colProps?: ColProps;
     viewEmpty?: React.ReactNode;
     openState?: boolean;
     labelWidth?: string | number;
     originalValues?: ProFormProps<T>['originalValues'];
     clearNotShow?: boolean;
+    requiredOnView?: boolean;
+    required?: boolean | (() => boolean);
 }
 declare const RenderFields: React.FC<Props>;
 export default RenderFields;

package/lib/ProForm/components/render/RenderFields.js

@@ -8,13 +8,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireDefault(require("react"));
 var _lodash = require("lodash");
 var _Render = _interopRequireDefault(require("./Render"));
-var _index = require("../../utils/index");
 var componentMap = _interopRequireWildcard(require("../index"));
 var _utils = require("../../utils");
-var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "disabled", "equalWith", "clearNotShow"];
+var _useFieldProps = require("../../utils/useFieldProps");
+var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "disabled", "equalWith", "clearNotShow", "required"];
 var RenderFields = function RenderFields(props) {
   var isView = props.isView,
     _props$columns = props.columns,
@@ -28,7 +29,9 @@ var RenderFields = function RenderFields(props) {
     openState = props.openState,
     labelWidth = props.labelWidth,
     originalValues = props.originalValues,
-    outerClearNotShow = props.clearNotShow;
+    outerClearNotShow = props.clearNotShow,
+    requiredOnView = props.requiredOnView,
+    required = props.required;
   // 是否包含隐藏字段
   var hiddenData = columns.filter(function (item) {
     return Array.isArray(item.hiddenNames);
@@ -47,8 +50,14 @@ var RenderFields = function RenderFields(props) {
     });
   }
   var comList = columns.flatMap(function (column, index) {
-    if (!!expand && !openState && index >= expand) {
-      return [];
+    if (!!expand && !openState) {
+      // expand为Number时 过滤掉大于expand 且 非fixed的column
+      if (typeof expand === 'number') {
+        if (index >= expand && column.fixed !== true) return [];
+      } else if (column.fixed !== true) {
+        // 否则只过滤非fixed的column
+        return [];
+      }
     }
     var show = column.show,
       type = column.type,
@@ -68,10 +77,13 @@ var RenderFields = function RenderFields(props) {
       equalWith = column.equalWith,
       _column$clearNotShow = column.clearNotShow,
       clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,
+      columnRequired = column.required,
       otherFormItemProps = (0, _objectWithoutProperties2.default)(column, _excluded);
     var component = column.component;
+    var _isView = typeof column.isView === 'boolean' ? column.isView : isView;
     // 允许formItem的属性放在column最外层 并优先级高于 formItemProps 内部参数
     var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, formItemProps), otherFormItemProps), {}, {
+      required: columnRequired !== null && columnRequired !== void 0 ? columnRequired : required,
       clearNotShow: clearNotShow
     });
     _formItemProps.labelWidth = _formItemProps.labelWidth || labelWidth; // 接收Form中的labelWidth
@@ -88,8 +100,9 @@ var RenderFields = function RenderFields(props) {
       var index;
       // FormList场景
       if (Array.isArray(column === null || column === void 0 ? void 0 : column.namePath) && (column === null || column === void 0 ? void 0 : (_column$namePath = column.namePath) === null || _column$namePath === void 0 ? void 0 : _column$namePath.length)) {
+        // @ts-ignore
         value = form.getFieldValue((0, _lodash.union)(column.namePath, (column === null || column === void 0 ? void 0 : column.name) || []));
-        record = (0, _index.filterInternalFields)((0, _lodash.cloneDeep)(form.getFieldValue(column.namePath)));
+        record = form.getFieldValue(column.namePath);
         index = column === null || column === void 0 ? void 0 : column.index;
       }
       return viewRender ? viewRender(value, record, {
@@ -99,16 +112,16 @@ var RenderFields = function RenderFields(props) {
       }) || null : null;
     };
     if (typeof _type === 'string') {
-      TargetComponent = isView && viewRender ? viewRenderHandle : componentMap[_type];
+      TargetComponent = _isView && viewRender ? viewRenderHandle : componentMap[_type];
     }
     if (component && /*#__PURE__*/_react.default.isValidElement(component)) {
       var _newComponent$props;
       var newComponent = component;
       var isProEditTable = (newComponent === null || newComponent === void 0 ? void 0 : (_newComponent$props = newComponent.props) === null || _newComponent$props === void 0 ? void 0 : _newComponent$props.onlyOneLineMsg) === '请先保存数据';
-      TargetComponent = isView ? viewRenderHandle || '' : component;
+      TargetComponent = _isView ? viewRenderHandle || '' : component;
       // 可编辑表格内部支持
       if (isProEditTable) {
-        TargetComponent = isView ? viewRenderHandle || component : component;
+        TargetComponent = _isView ? viewRenderHandle || component : component;
       }
     }
     var label = formItemChildProps.label,
@@ -151,7 +164,7 @@ var RenderFields = function RenderFields(props) {
       label: _formItemProps.label,
       name: _formItemProps.name,
       disabled: formDisabled,
-      isView: isView || column.isView,
+      isView: _isView,
       viewEmpty: viewEmpty,
       valueType: valueType,
       viewType: viewType,
@@ -161,25 +174,36 @@ var RenderFields = function RenderFields(props) {
       hiddenNames: column.hiddenNames,
       colProps: _colProps
     };
-    return /*#__PURE__*/_react.default.createElement(_Render.default, {
-      key: "".concat(_formItemProps.name || _formItemProps.label).concat(index),
-      show: show,
-      disabled: formDisabled,
-      form: form,
-      type: _type,
-      originComponent: component,
-      component: TargetComponent,
-      formItemProps: _formItemProps,
-      colProps: _colProps,
-      componentProps: componentProps,
-      otherProps: otherProps,
-      fieldProps: (0, _lodash.isFunction)(fieldProps) ? fieldProps : null,
-      isSelect: _isSelect,
-      originalValues: originalValues,
-      equalWith: equalWith
-    });
+    if (outerClearNotShow !== false && show === false && (column === null || column === void 0 ? void 0 : column.name) && form.getFieldValue(column === null || column === void 0 ? void 0 : column.name)) {
+      setTimeout(function () {
+        form.resetFields([column === null || column === void 0 ? void 0 : column.name]);
+      }, 200);
+      return null;
+    }
+    return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
+      value: otherProps,
+      children: (0, _jsxRuntime.jsx)(_Render.default, {
+        show: show,
+        disabled: formDisabled,
+        form: form,
+        type: _type,
+        originComponent: component,
+        component: TargetComponent,
+        // @ts-ignore
+        formItemProps: _formItemProps,
+        colProps: _colProps,
+        componentProps: componentProps,
+        otherProps: otherProps,
+        fieldProps: (0, _lodash.isFunction)(fieldProps) ? fieldProps : null,
+        isSelect: _isSelect,
+        originalValues: originalValues,
+        equalWith: equalWith,
+        requiredOnView: requiredOnView
+      })
+    }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
+  });
+  return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+    children: comList
   });
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, comList);
 };
-var _default = RenderFields;
-exports.default = _default;
+var _default = exports.default = RenderFields;