@zat-design/sisyphus-react 3.13.19-beta.1 → 3.13.19-beta.10

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

@@ -12,23 +12,16 @@ require("antd/es/space/style");
 var _space = _interopRequireDefault(require("antd/es/space"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-require("antd/es/input/style");
-var _input = _interopRequireDefault(require("antd/es/input"));
 require("antd/es/form/style");
 var _form = _interopRequireDefault(require("antd/es/form"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+require("antd/es/input/style");
+var _input = _interopRequireDefault(require("antd/es/input"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _debounce2 = _interopRequireDefault(require("lodash/debounce"));
-var _set2 = _interopRequireDefault(require("lodash/set"));
-var _omit2 = _interopRequireDefault(require("lodash/omit"));
-var _isString2 = _interopRequireDefault(require("lodash/isString"));
-var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
-var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reactSvg = require("react-svg");
+var _lodash = require("lodash");
 var _useShouldUpdate2 = _interopRequireDefault(require("../../utils/useShouldUpdate"));
 var _index = require("../../utils/index");
 var _ProConfigProvider = require("../../../ProConfigProvider");
@@ -38,10 +31,11 @@ var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
 var _useRules = _interopRequireDefault(require("../../utils/useRules"));
 var _ConfirmWrapper = _interopRequireDefault(require("./ConfirmWrapper"));
 var _ChangedWrapper = _interopRequireDefault(require("./ChangedWrapper"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip", "validateFirst"];
 /* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
-var Render = function Render(props) {
+var Render = props => {
   var _ref2, _ref3, _ref4, _ref5, _otherProps$names3;
   var component = props.component,
     originComponent = props.originComponent,
@@ -65,6 +59,7 @@ var Render = function Render(props) {
     viewRender = props.viewRender,
     desensitization = props.desensitization;
   var colProps = props.colProps;
+
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
     hiddenNames = formItemProps.hiddenNames,
@@ -78,19 +73,20 @@ var Render = function Render(props) {
     _formItemProps$valida = formItemProps.validateFirst,
     validateFirst = _formItemProps$valida === void 0 ? true : _formItemProps$valida,
     otherFormItemProps = (0, _objectWithoutProperties2.default)(formItemProps, _excluded);
+
   // 更新show & disabled & rules
   var _useShouldUpdate = (0, _useShouldUpdate2.default)({
-      show: show,
-      formItemProps: formItemProps,
-      form: form,
-      disabled: disabled,
-      rules: rules,
-      required: required,
-      fieldProps: fieldProps,
-      component: component,
-      originComponent: originComponent,
-      type: type,
-      desensitization: desensitization
+      show,
+      formItemProps,
+      form,
+      disabled,
+      rules,
+      required,
+      fieldProps,
+      component,
+      originComponent,
+      type,
+      desensitization
     }),
     shouldUpdate = _useShouldUpdate.shouldUpdate,
     _show = _useShouldUpdate.show,
@@ -101,7 +97,7 @@ var Render = function Render(props) {
     AutoComponent = _useShouldUpdate.component,
     _desensitization = _useShouldUpdate.desensitization;
   otherFormItemProps.shouldUpdate = shouldUpdate;
-  var namesStr = (0, _react.useMemo)(function () {
+  var namesStr = (0, _react.useMemo)(() => {
     var _otherProps$names;
     if (!Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.names)) {
       return '';
@@ -110,24 +106,25 @@ var Render = function Render(props) {
     if (Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.name)) {
       return otherProps === null || otherProps === void 0 ? void 0 : otherProps.name;
     }
-    return (_otherProps$names = otherProps.names) === null || _otherProps$names === void 0 ? void 0 : _otherProps$names.map(function (name) {
+    return (_otherProps$names = otherProps.names) === null || _otherProps$names === void 0 ? void 0 : _otherProps$names.map(name => {
       return Array.isArray(name) ? name.join('_') : name;
     }).join('-');
   }, [otherProps === null || otherProps === void 0 ? void 0 : otherProps.names]);
   var internalRule = (0, _useRules.default)({
     names: otherProps.names,
     label: otherFormItemProps.label,
-    labelRequired: labelRequired,
+    labelRequired,
     required: _required,
     rules: _rules,
-    isSelect: isSelect,
-    type: type
+    isSelect,
+    type
   });
+
   /**
    * 基于formItem的normalize与getValueProps进行值类型转换
    * @returns {}
    */
-  var valueTypeTransform = function valueTypeTransform() {
+  var valueTypeTransform = () => {
     var _ref = otherProps || {},
       valueType = _ref.valueType;
     // SwitchCheckbox默认YN, 兼容已有组件
@@ -142,8 +139,9 @@ var Render = function Render(props) {
       return {};
     }
     var params = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), otherFormItemProps);
-    return (0, _isFunction2.default)(_valueType.default[valueType]) ? _valueType.default[valueType](params) : {};
+    return (0, _lodash.isFunction)(_valueType.default[valueType]) ? _valueType.default[valueType](params) : {};
   };
+
   /**
    * transform对象
    * 存在names通过transformNames转换平铺处理
@@ -152,37 +150,40 @@ var Render = function Render(props) {
   var transforms = Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.names) ? (0, _transformNames.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherFormItemProps), valueTypeTransform()),
   // 合并valueType的transform
   form, otherProps.names, namesStr, otherProps.type) : valueTypeTransform();
+
   /**
    * globalControl 全局控制优先
    * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】
    * globalControl false时，优先级 组件上【fieldProps.disabled】 > formitem上【column.disabled】 >  全局【formDisabled】
    */
   var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
+
   // ↑↑↑↑↑↑  formItem参数整理  ↑↑↑↑↑↑
   Object.assign(otherFormItemProps, transforms, {
     names: otherProps.names
   }, internalRule, {
-    required: typeof labelRequired === 'boolean' ? labelRequired : _required || Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.some(function (item) {
-      return item === null || item === void 0 ? void 0 : item.required;
-    })) || false
+    required: typeof labelRequired === 'boolean' ? labelRequired : _required || Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.some(item => item === null || item === void 0 ? void 0 : item.required)) || false
   }, otherProps.isView && !requiredOnView ? {
     required: false
   } : null, (0, _objectSpread2.default)({}, (0, _index.isTrim)(type, trim, (0, _ProConfigProvider.useProConfig)())), // 优先取传进来的，其次取ProConfigProvider配置的
   (0, _objectSpread2.default)({}, (0, _index.isUpperCase)(type, upperCase)), {
-    validateFirst: validateFirst
+    validateFirst
   },
   // 当某一规则校验不通过时，是否停止剩下的规则的校验
   {
     disabled: lastDisabled
   });
+
   // 添加label宽度
   if (labelWidth) {
     otherFormItemProps.labelCol = {
-      flex: "".concat(labelWidth, "px")
+      flex: `${labelWidth}px`
     };
   }
+
   /** 移除多余参数，防止透传给formItem报错 */
-  var _otherFormItemProps = (0, _omit2.default)(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames']);
+  var _otherFormItemProps = (0, _lodash.omit)(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames']);
+
   /**
    * 最新fieldProps: 更新后的组件Props
    */
@@ -190,10 +191,13 @@ var Render = function Render(props) {
     disabled: lastDisabled,
     desensitization: _desensitization
   });
-  var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-width-auto', ['Switch'].includes(type)));
+  var _className = (0, _classnames.default)({
+    [className]: className,
+    'pro-form-item-width-auto': ['Switch'].includes(type)
+  });
   if (formItemProps.hidden === true || _show === false) {
     // 为了监听shouldUpdate  必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
-    return (0, _jsxRuntime.jsx)(_form.default.Item, {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.Item, {
       name: _otherFormItemProps.name || 'proFormItemHidden',
       shouldUpdate: _otherFormItemProps.shouldUpdate,
       className: _className,
@@ -202,30 +206,33 @@ var Render = function Render(props) {
       rules: [{
         required: false
       }],
-      children: (0, _jsxRuntime.jsx)(_input.default, {})
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_input.default, {})
     });
   }
+
   /**
    * 函数新参数组装
    */
-  var functionArgs = function functionArgs(args) {
+  var functionArgs = args => {
     var _otherFormItemProps$n;
-    var _args = (0, _toConsumableArray2.default)(args);
+    var _args = [...args];
     var _ref6 = otherProps || {},
       valueType = _ref6.valueType;
     _args[1] = form.getFieldsValue();
     _args[2] = {
-      form: form
+      form
     };
     // 优先处理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)) {
+    if (Array.isArray(_otherFormItemProps.namePath) && _otherFormItemProps !== null && _otherFormItemProps !== void 0 && (_otherFormItemProps$n = _otherFormItemProps.namePath) !== null && _otherFormItemProps$n !== void 0 && _otherFormItemProps$n.length) {
       var _otherFormItemProps$n2;
       _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];
+      _args[2].index = _otherFormItemProps.namePath[(_otherFormItemProps === null || _otherFormItemProps === void 0 || (_otherFormItemProps$n2 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n2 === void 0 ? void 0 : _otherFormItemProps$n2.length) - 1];
     }
+
     // 返回表单元素默认值
     _args[2].extra = args;
+
     // 当设置valueType后返回转换后的值
     if (valueType) {
       _args[2].transformValue = form.getFieldValue(_otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : _otherFormItemProps.name) || undefined;
@@ -244,6 +251,7 @@ var Render = function Render(props) {
     }
     return _args;
   };
+
   /**
    * onChange参数重置 (value, record, { form, index, namePath, option }) => void
    */
@@ -252,49 +260,53 @@ var Render = function Render(props) {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    var _args = [].concat(args);
+    var _args = [...args];
+
     // 优先使用onFieldChange
     var changeKey = Object.keys(lastComponentProps).includes('onFieldChange') ? 'onFieldChange' : 'onChange';
     if (changeKey === 'onChange') {
       _args[2] = form;
     }
     if (changeKey === 'onFieldChange') {
-      _args = functionArgs([].concat(args));
+      _args = functionArgs([...args]);
     }
-    var inList = _otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n3 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n3 === void 0 ? void 0 : _otherFormItemProps$n3.length;
-    if (/*#__PURE__*/_react.default.isValidElement(AutoComponent)) {
-      var _AutoComponent$props$, _AutoComponent$props, _lastComponentProps$c;
-      ((_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))));
+    var inList = _otherFormItemProps === null || _otherFormItemProps === void 0 || (_otherFormItemProps$n3 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n3 === void 0 ? void 0 : _otherFormItemProps$n3.length;
+    if ( /*#__PURE__*/_react.default.isValidElement(AutoComponent)) {
+      var _changeKey, _ref7, _lastComponentProps$c;
+      ((_changeKey = (_ref7 = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _changeKey === void 0 ? void 0 : _changeKey.call(_ref7, ..._args)) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call(lastComponentProps, ..._args));
       return false;
     }
+
     // FormList 和 Group场景 对比值改变的话, 回显到表单上
     if (inList && changeKey === 'onFieldChange') {
       var values = form.getFieldsValue();
-      var newValues = (0, _set2.default)(values, _otherFormItemProps.namePath, _args[1]);
+      var newValues = (0, _lodash.set)(values, _otherFormItemProps.namePath, _args[1]);
       form.setFieldsValue(newValues);
     }
+
     // Group默认校验, 延时与重新setFieldValue，为了解决校验值未同步最新的问题,
-    if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
-      setTimeout(function () {
+    if (formItemProps !== null && formItemProps !== void 0 && formItemProps.parentNames) {
+      setTimeout(() => {
         var namePath = (0, _index.parseNamePath)(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames);
         form.setFieldValue(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames, form.getFieldValue(namePath));
         form.validateFields(namePath);
       }, 60);
     }
+
     // ProTreeSelect返回option
     if (['ProTree'].includes(type) && !_args[2].option) {
-      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 === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.fieldNames) || {});
+      var _args2;
+      _args[2].option = (0, _index.findOptionByValue)(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 || (_args2 = _args2[0]) === null || _args2 === void 0 ? void 0 : _args2[0], (lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.fieldNames) || {});
     }
-    (_lastComponentProps$c2 = lastComponentProps[changeKey]) === null || _lastComponentProps$c2 === void 0 ? void 0 : _lastComponentProps$c2.call.apply(_lastComponentProps$c2, [lastComponentProps].concat((0, _toConsumableArray2.default)(_args)));
+    (_lastComponentProps$c2 = lastComponentProps[changeKey]) === null || _lastComponentProps$c2 === void 0 || _lastComponentProps$c2.call(lastComponentProps, ..._args);
   };
-  var debouncedHandleChange = (0, _debounce2.default)(defaultHandleChange, lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.debounceWait);
+  var debouncedHandleChange = (0, _lodash.debounce)(defaultHandleChange, lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.debounceWait);
   var handleChange = function handleChange() {
     for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
       args[_key2] = arguments[_key2];
     }
-    var _args = [].concat(args);
-    if (lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.debounceWait) {
+    var _args = [...args];
+    if (lastComponentProps !== null && lastComponentProps !== void 0 && lastComponentProps.debounceWait) {
       // 为了兼容 Input 和 TextArea 的 onChange 事件，需要将 event 对象转换为 value
       if (['Input', 'TextArea'].includes(type)) {
         _args[0] = {
@@ -303,16 +315,17 @@ var Render = function Render(props) {
           }
         };
       }
-      debouncedHandleChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
+      debouncedHandleChange(..._args);
     } else {
-      defaultHandleChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
+      defaultHandleChange(..._args);
     }
   };
+
   /**
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _len3,
         args,
         _key3,
@@ -324,14 +337,14 @@ var Render = function Render(props) {
             for (_len3 = _args3.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
               args[_key3] = _args3[_key3];
             }
-            _args = functionArgs([].concat(args));
+            _args = functionArgs([...args]);
             _context.t0 = lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.onBlur;
             if (!_context.t0) {
               _context.next = 6;
               break;
             }
             _context.next = 6;
-            return lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.onBlur.apply(lastComponentProps, (0, _toConsumableArray2.default)(_args));
+            return lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.onBlur(..._args);
           case 6:
           case "end":
             return _context.stop();
@@ -339,88 +352,90 @@ var Render = function Render(props) {
       }, _callee);
     }));
     return function handleBlur() {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
-  var renderItem = function renderItem() {
+  var renderItem = () => {
     // 移除多余字段，group保留onFieldChange
     var lastComponentPropsFilter = ['onFieldChange', 'disabledStrictly'];
+
     // 表单渲染 start
-    var childProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props), (0, _omit2.default)(lastComponentProps, lastComponentPropsFilter)), {}, {
+    var childProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props), (0, _lodash.omit)(lastComponentProps, lastComponentPropsFilter)), {}, {
       // @ts-ignore
-      otherProps: otherProps,
+      otherProps,
       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.jsx)(_space.default, {
-            size: 0,
+      render: (inputProps, doms) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
+          size: 0,
+          style: {
+            marginTop: 8
+          },
+          children: formItemProps.above
+        }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          style: {
+            display: 'flex',
+            alignItems: 'center'
+          },
+          children: [formItemProps !== null && formItemProps !== void 0 && formItemProps.before ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
             style: {
-              marginTop: 8
+              marginInlineEnd: 8
             },
-            children: formItemProps.above
-          }), (0, _jsxRuntime.jsxs)("div", {
+            children: formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.before
+          }) : null, doms.input, formItemProps !== null && formItemProps !== void 0 && formItemProps.after ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
             style: {
-              display: 'flex',
-              alignItems: 'center'
+              marginInlineStart: 8
             },
-            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)(_space.default, {
-            size: 0,
-            style: {
-              marginTop: 8
-            },
-            children: formItemProps.extra
-          }), doms.errorList]
-        });
-      }
+            children: formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.after
+          }) : null]
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
+          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)) : (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
+    var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? ( /*#__PURE__*/_react.default.cloneElement(AutoComponent, childProps)) : /*#__PURE__*/(0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, [...lastComponentPropsFilter, 'debounceWait'])), {}, {
       otherProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
-        show: show,
+        show,
         disabled: lastDisabled,
-        required: required
+        required
       }),
       onChange: handleChange,
       onBlur: handleBlur
     }));
     if (confirm) {
-      child = (0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      child = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         confirm: confirm
       }, childProps), {}, {
         children: child
       }));
     }
+
     // 表单提示
     if (tooltip) {
       _otherFormItemProps.tooltip = {
-        title: (0, _isString2.default)(tooltip) ? tooltip : tooltip.title,
-        icon: (0, _isString2.default)(tooltip) ? (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
+        title: (0, _lodash.isString)(tooltip) ? tooltip : tooltip.title,
+        icon: (0, _lodash.isString)(tooltip) ? /*#__PURE__*/(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', 'globalControl', 'listName', 'fixed'];
     if (type === 'FormList') {
@@ -429,15 +444,15 @@ var Render = function Render(props) {
       colProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
         span: lessMode ? colProps.span : 24 // 默认占一行
       });
-      return (0, _jsxRuntime.jsx)(_form.default.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(_otherFormItemProps, filterFormItemKey)), {}, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
         // @ts-ignore
         _internalItemRender: internalItemRender,
         className: _className,
-        children: (0, _jsxRuntime.jsx)(_form.default.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
           name: _otherFormItemProps.name
-        }, (0, _omit2.default)(_otherFormItemProps, ['rules'])), {}, {
-          children: function children(fields, operation, meta) {
-            return (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(lastComponentProps, lastComponentPropsFilter)), {}, {
+        }, (0, _lodash.omit)(_otherFormItemProps, ['rules'])), {}, {
+          children: (fields, operation, meta) => {
+            return /*#__PURE__*/(0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, lastComponentPropsFilter)), {}, {
               otherProps: otherProps,
               fields: fields,
               operation: operation,
@@ -447,24 +462,23 @@ var Render = function Render(props) {
         }))
       }));
     }
+
     //  默认占据一行
     if (['ProCollapse', 'Container'].includes(type)) {
       colProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
         span: 24 // 默认占一行
       });
     }
-    if (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues) {
+    if (diffConfig !== null && diffConfig !== void 0 && diffConfig.originalValues) {
       var _otherProps$namePath, _otherProps$names2;
       var _names = otherProps.names;
       // FormList中的names字段需要去除前缀
-      if ((otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$namePath = otherProps.namePath) === null || _otherProps$namePath === void 0 ? void 0 : _otherProps$namePath.length) && ((_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length)) {
+      if (otherProps !== null && otherProps !== void 0 && (_otherProps$namePath = otherProps.namePath) !== null && _otherProps$namePath !== void 0 && _otherProps$namePath.length && (_otherProps$names2 = otherProps.names) !== null && _otherProps$names2 !== void 0 && _otherProps$names2.length) {
         var _otherProps$namePath2;
-        var prefixLength = (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$namePath2 = otherProps.namePath) === null || _otherProps$namePath2 === void 0 ? void 0 : _otherProps$namePath2.length) - 1;
-        _names = otherProps.names.map(function (name) {
-          return name.slice(prefixLength);
-        });
+        var prefixLength = (otherProps === null || otherProps === void 0 || (_otherProps$namePath2 = otherProps.namePath) === null || _otherProps$namePath2 === void 0 ? void 0 : _otherProps$namePath2.length) - 1;
+        _names = otherProps.names.map(name => name.slice(prefixLength));
       }
-      child = (0, _jsxRuntime.jsx)(_ChangedWrapper.default, {
+      child = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChangedWrapper.default, {
         name: formItemProps.name,
         names: _names,
         namesStr: namesStr,
@@ -481,36 +495,35 @@ var Render = function Render(props) {
         children: child
       });
     }
-    return (0, _jsxRuntime.jsx)(_form.default.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(_otherFormItemProps, filterFormItemKey)), {}, {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
       children: child
     }));
   };
-  var FormItem = (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+  var FormItem = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [_otherFormItemProps.shouldUpdate ?
+    /*#__PURE__*/
     // 空标签防止气泡不显示
     (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-      children: (0, _jsxRuntime.jsx)(_form.default.Item, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.Item, {
         shouldUpdate: _otherFormItemProps.shouldUpdate,
         noStyle: true,
-        children: function children() {
-          return renderItem();
-        }
+        children: () => renderItem()
       })
-    }) : renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names3 = otherProps.names) === null || _otherProps$names3 === void 0 ? void 0 : _otherProps$names3.length) ? otherProps.names.map(function (name) {
-      return (0, _jsxRuntime.jsx)(_form.default.Item, {
+    }) : renderItem(), otherProps !== null && otherProps !== void 0 && (_otherProps$names3 = otherProps.names) !== null && _otherProps$names3 !== void 0 && _otherProps$names3.length ? otherProps.names.map(name => {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.Item, {
         hidden: true,
         name: name,
-        children: (0, _jsxRuntime.jsx)(_input.default, {})
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_input.default, {})
       }, name);
     }) : null]
   });
-  if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
+  if (formItemProps !== null && formItemProps !== void 0 && formItemProps.parentNames) {
     return FormItem;
   }
-  return (0, _jsxRuntime.jsx)(_col.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_col.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
     children: FormItem
   }));
 };