@zat-design/sisyphus-react 3.13.19-beta.6 → 3.13.19-beta.8

package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js

@@ -1,43 +1,43 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+require("antd/es/space/style");
+var _space = _interopRequireDefault(require("antd/es/space"));
 require("antd/es/button/style");
 var _button = _interopRequireDefault(require("antd/es/button"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-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"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _omit2 = _interopRequireDefault(require("lodash/omit"));
-var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
-var _jsxRuntime = require("react/jsx-runtime");
 var _icons = require("@ant-design/icons");
-var _react = require("react");
+var _lodash = require("lodash");
+var _react = _interopRequireWildcard(require("react"));
 var _locale = _interopRequireDefault(require("../../../../../locale"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["label", "onClick", "onHandle", "type"],
   _excluded2 = ["onClick", "label"];
 /* eslint-disable react/no-array-index-key */
 var actions = {
   add: {
-    onClick: function onClick(value, _ref) {
+    onClick: (value, _ref) => {
       var operation = _ref.operation;
       operation.add({});
     },
-    label: "".concat(_locale.default.ProForm.formListActions[5]),
-    icon: (0, _jsxRuntime.jsx)(_icons.PlusOutlined, {})
+    label: `${_locale.default.ProForm.formListActions[5]}`,
+    // 新增一行
+    icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.PlusOutlined, {})
   }
 };
 var defaultActionProps = [{
   type: 'add'
 }];
 var filterKeys = ['actionType'];
-var ToolbarButton = function ToolbarButton(props) {
+var ToolbarButton = props => {
   var namePath = props.namePath,
     form = props.form,
     operation = props.operation,
@@ -47,25 +47,24 @@ var ToolbarButton = function ToolbarButton(props) {
     max = props.max,
     disabled = props.disabled,
     isView = props.isView;
+
   // 默认显示一个delete
-  var toolbarProps = (0, _react.useMemo)(function () {
+  var toolbarProps = (0, _react.useMemo)(() => {
     var _props$toolbarProps;
     // 兼容 actionType 和 type
-    var _toolbarProps = (_props$toolbarProps = props.toolbarProps) === null || _props$toolbarProps === void 0 ? void 0 : _props$toolbarProps.map(function (item) {
+    var _toolbarProps = (_props$toolbarProps = props.toolbarProps) === null || _props$toolbarProps === void 0 ? void 0 : _props$toolbarProps.map(item => {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
         // @ts-ignore
         type: item.actionType || item.type
       });
     });
-    if (!(_toolbarProps === null || _toolbarProps === void 0 ? void 0 : _toolbarProps.find(function (item) {
-      return item.type === 'add';
-    }))) {
-      return _toolbarProps ? [].concat((0, _toConsumableArray2.default)(_toolbarProps), defaultActionProps) : defaultActionProps;
+    if (!(_toolbarProps !== null && _toolbarProps !== void 0 && _toolbarProps.find(item => item.type === 'add'))) {
+      return _toolbarProps ? [..._toolbarProps, ...defaultActionProps] : defaultActionProps;
     }
     return _toolbarProps;
   }, [props.toolbarProps]);
   var handleClick = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(defaultCallback, callback, item) {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(defaultCallback, callback, item) {
       var value, data;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -73,9 +72,9 @@ var ToolbarButton = function ToolbarButton(props) {
             value = form.getFieldValue(namePath);
             _context.next = 3;
             return callback === null || callback === void 0 ? void 0 : callback(value, {
-              operation: operation,
-              form: form,
-              namePath: namePath
+              operation,
+              form,
+              namePath
             });
           case 3:
             data = _context.sent;
@@ -83,10 +82,10 @@ var ToolbarButton = function ToolbarButton(props) {
               _context.next = 7;
               break;
             }
-            defaultCallback === null || defaultCallback === void 0 ? void 0 : defaultCallback(value, {
-              operation: operation,
-              form: form,
-              namePath: namePath
+            defaultCallback === null || defaultCallback === void 0 || defaultCallback(value, {
+              operation,
+              form,
+              namePath
             });
             return _context.abrupt("return");
           case 7:
@@ -103,24 +102,24 @@ var ToolbarButton = function ToolbarButton(props) {
       return _ref2.apply(this, arguments);
     };
   }();
-  var customClick = function customClick(callback, item) {
+  var customClick = (callback, item) => {
     var value = form.getFieldValue(namePath);
-    callback === null || callback === void 0 ? void 0 : callback(value, {
-      operation: operation,
-      form: form,
-      namePath: namePath
+    callback === null || callback === void 0 || callback(value, {
+      operation,
+      form,
+      namePath
     });
   };
-  return (0, _jsxRuntime.jsx)(_space.default, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
     align: "start",
     className: "pro-form-list-toolbar",
-    children: toolbarProps === null || toolbarProps === void 0 ? void 0 : toolbarProps.map(function (item, index) {
-      if (item.show === false) return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
-      if ((0, _isFunction2.default)(item.show) && !item.show(form.getFieldValue(namePath), {
-        namePath: namePath,
-        form: form
+    children: toolbarProps === null || toolbarProps === void 0 ? void 0 : toolbarProps.map((item, index) => {
+      if (item.show === false) return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+      if ((0, _lodash.isFunction)(item.show) && !item.show(form.getFieldValue(namePath), {
+        namePath,
+        form
       })) {
-        return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
       }
       var label = item.label,
         _onClick2 = item.onClick,
@@ -129,7 +128,7 @@ var ToolbarButton = function ToolbarButton(props) {
         rest = (0, _objectWithoutProperties2.default)(item, _excluded);
       var _onClick = _onClick2 || onHandle;
       if (type === 'add') {
-        if (disabled || isView) return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+        if (disabled || isView) return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
         var _actions$type = actions[type],
           internalOnClick = _actions$type.onClick,
           defaultLabel = _actions$type.label,
@@ -138,21 +137,17 @@ var ToolbarButton = function ToolbarButton(props) {
         if (max && max <= fields.length && type === 'add') {
           return false;
         }
-        return (0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, actions[type]), (0, _omit2.default)(rest, filterKeys)), {}, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, actions[type]), (0, _lodash.omit)(rest, filterKeys)), {}, {
           type: "link",
-          onClick: function onClick() {
-            return handleClick(internalOnClick, _onClick, item);
-          },
+          onClick: () => handleClick(internalOnClick, _onClick, item),
           children: label || defaultLabel
-        }), "".concat(type).concat(index));
+        }), `${type}${index}`);
       }
-      return (0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(rest, filterKeys)), {}, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(rest, filterKeys)), {}, {
         type: "link",
-        onClick: function onClick() {
-          return customClick(_onClick2, item);
-        },
+        onClick: () => customClick(_onClick2, item),
         children: label
-      }), "".concat(type).concat(index));
+      }), `${type}${index}`);
     })
   });
 };

package/lib/ProForm/components/combination/FormList/index.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -7,12 +8,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 require("antd/es/form/style");
 var _form = _interopRequireDefault(require("antd/es/form"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _get2 = _interopRequireDefault(require("lodash/get"));
-var _jsxRuntime = require("react/jsx-runtime");
-var _react = require("react");
+var _react = _interopRequireWildcard(require("react"));
 var _core = require("@dnd-kit/core");
+var _lodash = require("lodash");
 var _sortable = require("@dnd-kit/sortable");
 var _utils = require("../../../utils");
 var _utils2 = require("./utils");
@@ -22,7 +21,8 @@ var _LineFields = _interopRequireDefault(require("./components/LineFields"));
 var _Empty = _interopRequireDefault(require("./components/Empty"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
-var FormList = function FormList(props, ref) {
+var _jsxRuntime = require("react/jsx-runtime");
+var FormList = (props, ref) => {
   var columns = props.columns,
     min = props.min,
     max = props.max,
@@ -36,11 +36,9 @@ var FormList = function FormList(props, ref) {
     span = _props$span === void 0 ? 8 : _props$span,
     disabled = props.disabled,
     emptyBtnText = props.emptyBtnText;
-  var _fields = fields.map(function (item) {
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
-      key: String(item.key)
-    });
-  });
+  var _fields = fields.map(item => (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+    key: String(item.key)
+  }));
   var _ref = _ProForm.default.useFieldProps() || {},
     form = _ref.form,
     name = _ref.name,
@@ -50,63 +48,57 @@ var FormList = function FormList(props, ref) {
     isDiffAll = _useProConfig.isDiffAll;
   var errors = meta.errors;
   var _namePath = (0, _utils.toArray)(name);
-  var orgValues = (0, _get2.default)(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues, name);
+  var orgValues = (0, _lodash.get)(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues, name);
   var _diffConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, diffConfig), {}, {
-    originalValues: (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues) && isDiffAll ? orgValues || [] : orgValues
+    originalValues: diffConfig !== null && diffConfig !== void 0 && diffConfig.originalValues && isDiffAll ? orgValues || [] : orgValues
   });
-  var processColumns = (0, _react.useCallback)(function (fieldName, namePath) {
-    return columns.map(function (item) {
+  var processColumns = (0, _react.useCallback)((fieldName, namePath) => {
+    return columns.map(item => {
       // names的name处理
       var _name = Array.isArray(item === null || item === void 0 ? void 0 : item.names) ? [fieldName, (0, _utils2.namesPathTransform)({
         names: item === null || item === void 0 ? void 0 : item.names,
         prefixNamePath: namePath,
         type: item.type
-      })] : [fieldName].concat((0, _toConsumableArray2.default)((0, _utils.toArray)(item.name)));
+      })] : [fieldName, ...(0, _utils.toArray)(item.name)];
       var column = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
         name: _name,
-        names: (item === null || item === void 0 ? void 0 : item.names) ? item.names.map(function (nameItem) {
+        names: item !== null && item !== void 0 && item.names ? item.names.map(nameItem => {
           // 传给Group的names会被渲染成真实FormItem 不能传完整name
-          return [].concat((0, _toConsumableArray2.default)(namePath), (0, _toConsumableArray2.default)((0, _utils.toArray)(nameItem)));
+          return [...namePath, ...(0, _utils.toArray)(nameItem)];
         }) : item.names,
         index: fieldName,
-        namePath: namePath,
-        listName: [].concat((0, _toConsumableArray2.default)(namePath), [item.name]),
+        namePath,
+        listName: [...namePath, item.name],
         label: mode === 'less' ? undefined : item.label
       });
       return column;
     });
   }, [columns]);
-  (0, _react.useImperativeHandle)(ref, function () {
+  (0, _react.useImperativeHandle)(ref, () => {
     return {
-      operation: operation
+      operation
     };
   });
-  var handleDragEnd = function handleDragEnd(drag) {
+  var handleDragEnd = drag => {
     var active = drag.active,
       over = drag.over;
     if (_fields.length > 1 && active.id !== over.id) {
-      var activeIndex = _fields.findIndex(function (item) {
-        return item.key === active.id;
-      });
-      var overIndex = _fields.findIndex(function (item) {
-        return item.key === over.id;
-      });
+      var activeIndex = _fields.findIndex(item => item.key === active.id);
+      var overIndex = _fields.findIndex(item => item.key === over.id);
       props.operation.move(activeIndex, overIndex);
     }
   };
-  return (0, _jsxRuntime.jsx)(_core.DndContext, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_core.DndContext, {
     onDragEnd: handleDragEnd,
-    children: (0, _jsxRuntime.jsxs)(_sortable.SortableContext, {
-      items: _fields.map(function (item) {
-        return {
-          id: item.key
-        };
-      }),
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_sortable.SortableContext, {
+      items: _fields.map(item => ({
+        id: item.key
+      })),
       strategy: _sortable.verticalListSortingStrategy,
-      children: [_fields.map(function (field, index) {
-        var namePath = [].concat((0, _toConsumableArray2.default)(_namePath), [field.name]);
+      children: [_fields.map((field, index) => {
+        var namePath = [..._namePath, field.name];
         var _columns = processColumns(index, namePath);
-        return mode === 'block' ? (0, _jsxRuntime.jsx)(_BlockFields.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+        return mode === 'block' ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_BlockFields.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
           columns: _columns,
           disabled: disabled,
           isView: isView,
@@ -114,11 +106,11 @@ var FormList = function FormList(props, ref) {
           index: index,
           field: field,
           colProps: {
-            span: span
+            span
           },
           form: form,
           diffConfig: _diffConfig
-        }), field.key) : (0, _jsxRuntime.jsx)(_LineFields.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        }), field.key) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_LineFields.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
           className: _fields.length === index + 1 ? 'pro-form-list-last' : ''
         }, props), {}, {
           mode: mode,
@@ -134,16 +126,16 @@ var FormList = function FormList(props, ref) {
           form: form,
           diffConfig: _diffConfig
         }), field.key);
-      }), _fields.length === 0 && (0, _jsxRuntime.jsx)(_Empty.default, {
+      }), _fields.length === 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Empty.default, {
         disabled: disabled,
         toolbarProps: toolbarProps,
         operation: operation,
         form: form,
         namePath: _namePath,
         emptyBtnText: emptyBtnText
-      }), (0, _jsxRuntime.jsx)(_form.default.ErrorList, {
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.ErrorList, {
         errors: errors
-      }), toolbarProps !== false && _fields.length > 0 && (0, _jsxRuntime.jsx)(_ToolbarButton.default, {
+      }), toolbarProps !== false && _fields.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToolbarButton.default, {
         disabled: disabled,
         isView: isView,
         min: min,

package/lib/ProForm/components/combination/FormList/utils.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.namesPathTransform = exports.memoWith = void 0;
-var _isEqualWith2 = _interopRequireDefault(require("lodash/isEqualWith"));
+var _lodash = require("lodash");
 var _react = _interopRequireDefault(require("react"));
 /**
  * namesPath生产 [['list', 0, 'min'], ['list', 0, 'max']] => list_0_min-list_0_max
@@ -13,24 +13,24 @@ var _react = _interopRequireDefault(require("react"));
  * @param prefixNamePath formList的name前缀
  * @returns list_0_min-list_0_max
  */
-var namesPathTransform = exports.namesPathTransform = function namesPathTransform(_ref) {
+var namesPathTransform = _ref => {
   var names = _ref.names,
     prefixNamePath = _ref.prefixNamePath,
     type = _ref.type;
   if (!Array.isArray(names) || !Array.isArray(prefixNamePath)) {
     return '';
   }
-  var newNamePath = names.map(function (val) {
-    return prefixNamePath.concat(val);
-  });
-  return newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.map(function (name) {
+  var newNamePath = names.map(val => prefixNamePath.concat(val));
+  return newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.map(name => {
     return Array.isArray(name) ? name.join('_') : name;
   }).join('-');
 };
+
 // 比较memo
-var memoWith = exports.memoWith = function memoWith(pre, next) {
-  return (0, _isEqualWith2.default)(pre, next, function (objValue, othValue) {
-    if (/*#__PURE__*/_react.default.isValidElement(objValue) && /*#__PURE__*/_react.default.isValidElement(othValue)) {
+exports.namesPathTransform = namesPathTransform;
+var memoWith = (pre, next) => {
+  return (0, _lodash.isEqualWith)(pre, next, (objValue, othValue) => {
+    if ( /*#__PURE__*/_react.default.isValidElement(objValue) && /*#__PURE__*/_react.default.isValidElement(othValue)) {
       return true;
     }
     // 移除解决formlist函数里不更新问题
@@ -38,4 +38,5 @@ var memoWith = exports.memoWith = function memoWith(pre, next) {
     //   return true;
     // }
   });
-};
+};
+exports.memoWith = memoWith;

package/lib/ProForm/components/combination/Group/component/AddonWrapper/index.js

@@ -1,21 +1,23 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _jsxRuntime = require("react/jsx-runtime");
+var _react = _interopRequireDefault(require("react"));
 require("./index.less");
-var AddonWrapper = function AddonWrapper(props) {
+var _jsxRuntime = require("react/jsx-runtime");
+var AddonWrapper = props => {
   var before = props.before,
     after = props.after,
     children = props.children;
-  return (0, _jsxRuntime.jsxs)("div", {
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "addon-wrapper",
-    children: [before && (0, _jsxRuntime.jsx)("div", {
+    children: [before && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "before",
       children: before
-    }), children, after && (0, _jsxRuntime.jsx)("div", {
+    }), children, after && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "after",
       children: after
     })]

package/lib/ProForm/components/combination/Group/component/ComRender.js

@@ -7,15 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _omit2 = _interopRequireDefault(require("lodash/omit"));
-var _jsxRuntime = require("react/jsx-runtime");
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _react = _interopRequireDefault(require("react"));
+var _lodash = require("lodash");
 var _ConfirmWrapper = _interopRequireDefault(require("../../../../components/render/ConfirmWrapper"));
 var _useFieldProps = require("../../../../utils/useFieldProps");
 var componentMap = _interopRequireWildcard(require("../../../../../index"));
 var _AddonWrapper = _interopRequireDefault(require("./AddonWrapper"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType", "isView", "viewRender"];
 // 这里的key与组件内参数一致, 决定使用哪个包裹组件
 var wrapperMap = {
@@ -23,24 +22,27 @@ var wrapperMap = {
   before: _AddonWrapper.default,
   after: _AddonWrapper.default
 };
+
 // 增加middleware根据配置增加多层包裹
-var getComRender = function getComRender(component, props, componentProps) {
+var getComRender = (component, props, componentProps) => {
   var wrappers = Object.keys(wrapperMap);
   var renderComponent = component;
-  wrappers.forEach(function (item) {
+  wrappers.forEach(item => {
     if (item in props) {
       var Wrapper = wrapperMap[item];
       // console.log(props[item]);
-      renderComponent = (0, _jsxRuntime.jsx)(Wrapper, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, componentProps), (0, _defineProperty2.default)({}, item, props[item])), {}, {
+      renderComponent = /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapper, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
+        [item]: props[item],
         children: renderComponent
       }));
     }
   });
   return renderComponent;
 };
+
 /** 渲染组件 */
-var ComRender = function ComRender(props) {
-  var _props$component, _props$component$prop;
+var ComRender = props => {
+  var _props$component;
   var type = props.type,
     confirm = props.confirm,
     component = props.component,
@@ -56,35 +58,35 @@ var ComRender = function ComRender(props) {
     viewRender = props.viewRender,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var TypeComponent = componentMap[type];
-  var mergedGetValueProps = getValueProps || function (val) {
-    return (0, _defineProperty2.default)({}, valuePropName, val);
-  };
+  var mergedGetValueProps = getValueProps || (val => ({
+    [valuePropName]: val
+  }));
   var nextProps = mergedGetValueProps(fieldProps.value);
-  var componentProps = (0, _omit2.default)((0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldProps), rest), nextProps), ['onFieldChange']);
-  var isSeparator = (props === null || props === void 0 ? void 0 : (_props$component = props.component) === null || _props$component === void 0 ? void 0 : (_props$component$prop = _props$component.props) === null || _props$component$prop === void 0 ? void 0 : _props$component$prop.className) === 'group-separator';
+  var componentProps = (0, _lodash.omit)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, fieldProps), rest), nextProps), ['onFieldChange']);
+  var isSeparator = (props === null || props === void 0 || (_props$component = props.component) === null || _props$component === void 0 || (_props$component = _props$component.props) === null || _props$component === void 0 ? void 0 : _props$component.className) === 'group-separator';
   if (isSeparator && isView) {
-    var _props$component2, _props$component2$pro;
-    return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-      children: [" ", props === null || props === void 0 ? void 0 : (_props$component2 = props.component) === null || _props$component2 === void 0 ? void 0 : (_props$component2$pro = _props$component2.props) === null || _props$component2$pro === void 0 ? void 0 : _props$component2$pro.children, " "]
+    var _props$component2;
+    return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+      children: [" ", props === null || props === void 0 || (_props$component2 = props.component) === null || _props$component2 === void 0 || (_props$component2 = _props$component2.props) === null || _props$component2 === void 0 ? void 0 : _props$component2.children, " "]
     });
   }
   if (viewRender && isView) {
-    return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
-      value: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, contextProps), {}, {
-        valueType: valueType,
-        type: type,
-        isView: isView
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
+      value: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, contextProps), {}, {
+        valueType,
+        type,
+        isView
       }),
       children: viewRender(componentProps)
     });
   }
-  var Component = component ? (/*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread3.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread3.default)({}, componentProps));
+  var Component = component ? ( /*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread2.default)({}, componentProps))) : /*#__PURE__*/(0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread2.default)({}, componentProps));
   var renderComponent = getComRender(Component, props, componentProps);
-  return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
-    value: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, contextProps), {}, {
-      valueType: valueType,
-      type: type,
-      isView: isView
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
+    value: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, contextProps), {}, {
+      valueType,
+      type,
+      isView
     }),
     children: renderComponent
   });