@zat-design/sisyphus-react 4.0.0-beta.2 → 4.0.0-beta.4

package/es/ProForm/components/combination/FormList/components/Empty.js

@@ -1,10 +1,11 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
-function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { Button } from 'antd';
-import EmptyImg from '../../../../../assets/empty.png';
-import locale from '../../../../../locale';
+import EmptyImg from "../../../../../assets/empty.png";
+import locale from "../../../../../locale";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 // 空列表状态
 var Empty = function Empty(_ref) {
   var disabled = _ref.disabled,
@@ -18,39 +19,40 @@ var Empty = function Empty(_ref) {
     return item.type === 'add';
   }) : null;
   var handleAddClick = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _addConfig$onClick;
       var value, data;
-      return _regenerator().w(function (_context) {
-        while (1) switch (_context.n) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!(!operation || !form || !namePath)) {
-              _context.n = 1;
+              _context.next = 2;
               break;
             }
-            return _context.a(2);
-          case 1:
+            return _context.abrupt("return");
+          case 2:
             value = form.getFieldValue(namePath);
-            _context.n = 2;
-            return addConfig === null || addConfig === void 0 ? void 0 : (_addConfig$onClick = addConfig.onClick) === null || _addConfig$onClick === void 0 ? void 0 : _addConfig$onClick.call(addConfig, value, {
+            _context.next = 5;
+            return addConfig === null || addConfig === void 0 || (_addConfig$onClick = addConfig.onClick) === null || _addConfig$onClick === void 0 ? void 0 : _addConfig$onClick.call(addConfig, value, {
               operation: operation,
               form: form,
               namePath: namePath
             });
-          case 2:
-            data = _context.v;
-            if (!(!(addConfig === null || addConfig === void 0 ? void 0 : addConfig.onClick) || data === true)) {
-              _context.n = 3;
+          case 5:
+            data = _context.sent;
+            if (!(!(addConfig !== null && addConfig !== void 0 && addConfig.onClick) || data === true)) {
+              _context.next = 9;
               break;
             }
             operation.add({});
-            return _context.a(2);
-          case 3:
+            return _context.abrupt("return");
+          case 9:
             if (data) {
               operation.add(data);
             }
-          case 4:
-            return _context.a(2);
+          case 10:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
@@ -58,21 +60,22 @@ var Empty = function Empty(_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
+
   // 获取按钮文案
   var getBtnText = function getBtnText() {
     return emptyBtnText || (addConfig === null || addConfig === void 0 ? void 0 : addConfig.label) || locale.ProForm.formListActions[6];
   };
-  return _jsxs("div", {
+  return /*#__PURE__*/_jsxs("div", {
     className: "pro-form-list-empty",
-    children: [_jsx("img", {
+    children: [/*#__PURE__*/_jsx("img", {
       className: "pro-form-list-empty-img",
       src: EmptyImg,
       alt: "Empty"
-    }), _jsx("div", {
+    }), /*#__PURE__*/_jsx("div", {
       className: "pro-form-list-empty-content",
-      children: disabled ? locale.ProForm.noData : _jsxs(_Fragment, {
-        children: [locale.ProForm.noData, !disabled && _jsxs(_Fragment, {
-          children: ["\uFF0C", _jsx(Button, {
+      children: disabled ? locale.ProForm.noData : /*#__PURE__*/_jsxs(_Fragment, {
+        children: [locale.ProForm.noData, !disabled && /*#__PURE__*/_jsxs(_Fragment, {
+          children: ["\uFF0C", /*#__PURE__*/_jsx(Button, {
             type: "link",
             onClick: handleAddClick,
             style: {

package/es/ProForm/components/combination/FormList/components/LineFields.js

@@ -1,15 +1,16 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Row } from 'antd';
 import React from 'react';
 import classNames from 'classnames';
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
-import ProIcon from '../../../../../ProIcon';
-import ActionButton from './ActionButton';
-import RenderFields from '../../../render/RenderFields';
-import { memoWith } from '../utils';
+import ProIcon from "../../../../../ProIcon";
+import ActionButton from "./ActionButton";
+import RenderFields from "../../../render/RenderFields";
+import { memoWith } from "../utils";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var MemoRenderFields = /*#__PURE__*/React.memo(RenderFields, memoWith);
 var LineFields = function LineFields(props) {
   var mode = props.mode,
@@ -51,22 +52,22 @@ var LineFields = function LineFields(props) {
     transform: CSS.Translate.toString(transform),
     transition: transition
   };
-  return _jsxs("div", {
+  return /*#__PURE__*/_jsxs("div", {
     className: classnames,
     ref: setNodeRef,
     style: style,
     id: id,
-    children: [!disabled && draggable && _jsx("div", _objectSpread(_objectSpread(_objectSpread({}, attributes), listeners), {}, {
+    children: [!disabled && draggable && /*#__PURE__*/_jsx("div", _objectSpread(_objectSpread(_objectSpread({}, attributes), listeners), {}, {
       className: "pro-form-list-drag-handle",
       ref: setActivatorNodeRef,
-      children: _jsx(ProIcon, {
+      children: /*#__PURE__*/_jsx(ProIcon, {
         className: "drag-icon",
         type: "drag",
         buttonIcon: false
       })
-    })), _jsx(Row, {
+    })), /*#__PURE__*/_jsx(Row, {
       gutter: isLess ? 0 : 24,
-      children: _jsx(MemoRenderFields, {
+      children: /*#__PURE__*/_jsx(MemoRenderFields, {
         columns: columns,
         form: form,
         colProps: colProps,
@@ -74,7 +75,7 @@ var LineFields = function LineFields(props) {
         isView: isView,
         diffConfig: diffConfig
       })
-    }), actionProps !== false && _jsx(ActionButton, {
+    }), actionProps !== false && /*#__PURE__*/_jsx(ActionButton, {
       min: min,
       max: max,
       index: index,

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

@@ -1,19 +1,18 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _omit from "lodash/omit";
-import _isFunction from "lodash/isFunction";
 var _excluded = ["label", "onClick", "onHandle", "type"],
   _excluded2 = ["onClick", "label"];
-function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
-function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 /* eslint-disable react/no-array-index-key */
 import { Space, Button } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
-import { useMemo } from 'react';
-import locale from '../../../../../locale';
+import { isFunction, omit } from 'lodash';
+import React, { useMemo } from 'react';
+import locale from "../../../../../locale";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 var actions = {
   add: {
     onClick: function onClick(value, _ref) {
@@ -21,7 +20,8 @@ var actions = {
       operation.add({});
     },
     label: "".concat(locale.ProForm.formListActions[5]),
-    icon: _jsx(PlusOutlined, {})
+    // 新增一行
+    icon: /*#__PURE__*/_jsx(PlusOutlined, {})
   }
 };
 var defaultActionProps = [{
@@ -38,6 +38,7 @@ var ToolbarButton = function ToolbarButton(props) {
     max = props.max,
     disabled = props.disabled,
     isView = props.isView;
+
   // 默认显示一个delete
   var toolbarProps = useMemo(function () {
     var _props$toolbarProps;
@@ -48,7 +49,7 @@ var ToolbarButton = function ToolbarButton(props) {
         type: item.actionType || item.type
       });
     });
-    if (!(_toolbarProps === null || _toolbarProps === void 0 ? void 0 : _toolbarProps.find(function (item) {
+    if (!(_toolbarProps !== null && _toolbarProps !== void 0 && _toolbarProps.find(function (item) {
       return item.type === 'add';
     }))) {
       return _toolbarProps ? [].concat(_toConsumableArray(_toolbarProps), defaultActionProps) : defaultActionProps;
@@ -56,36 +57,37 @@ var ToolbarButton = function ToolbarButton(props) {
     return _toolbarProps;
   }, [props.toolbarProps]);
   var handleClick = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(defaultCallback, callback, item) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, item) {
       var value, data;
-      return _regenerator().w(function (_context) {
-        while (1) switch (_context.n) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
           case 0:
             value = form.getFieldValue(namePath);
-            _context.n = 1;
+            _context.next = 3;
             return callback === null || callback === void 0 ? void 0 : callback(value, {
               operation: operation,
               form: form,
               namePath: namePath
             });
-          case 1:
-            data = _context.v;
+          case 3:
+            data = _context.sent;
             if (!(!callback || data === true)) {
-              _context.n = 2;
+              _context.next = 7;
               break;
             }
-            defaultCallback === null || defaultCallback === void 0 ? void 0 : defaultCallback(value, {
+            defaultCallback === null || defaultCallback === void 0 || defaultCallback(value, {
               operation: operation,
               form: form,
               namePath: namePath
             });
-            return _context.a(2);
-          case 2:
+            return _context.abrupt("return");
+          case 7:
             if ((item === null || item === void 0 ? void 0 : item.type) === 'add' && data) {
               operation.add(data);
             }
-          case 3:
-            return _context.a(2);
+          case 8:
+          case "end":
+            return _context.stop();
         }
       }, _callee);
     }));
@@ -95,22 +97,22 @@ var ToolbarButton = function ToolbarButton(props) {
   }();
   var customClick = function customClick(callback, item) {
     var value = form.getFieldValue(namePath);
-    callback === null || callback === void 0 ? void 0 : callback(value, {
+    callback === null || callback === void 0 || callback(value, {
       operation: operation,
       form: form,
       namePath: namePath
     });
   };
-  return _jsx(Space, {
+  return /*#__PURE__*/_jsx(Space, {
     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 _jsx(_Fragment, {});
-      if (_isFunction(item.show) && !item.show(form.getFieldValue(namePath), {
+      if (item.show === false) return /*#__PURE__*/_jsx(_Fragment, {});
+      if (isFunction(item.show) && !item.show(form.getFieldValue(namePath), {
         namePath: namePath,
         form: form
       })) {
-        return _jsx(_Fragment, {});
+        return /*#__PURE__*/_jsx(_Fragment, {});
       }
       var label = item.label,
         _onClick2 = item.onClick,
@@ -119,7 +121,7 @@ var ToolbarButton = function ToolbarButton(props) {
         rest = _objectWithoutProperties(item, _excluded);
       var _onClick = _onClick2 || onHandle;
       if (type === 'add') {
-        if (disabled || isView) return _jsx(_Fragment, {});
+        if (disabled || isView) return /*#__PURE__*/_jsx(_Fragment, {});
         var _actions$type = actions[type],
           internalOnClick = _actions$type.onClick,
           defaultLabel = _actions$type.label,
@@ -128,7 +130,7 @@ var ToolbarButton = function ToolbarButton(props) {
         if (max && max <= fields.length && type === 'add') {
           return false;
         }
-        return _jsx(Button, _objectSpread(_objectSpread(_objectSpread({}, actions[type]), _omit(rest, filterKeys)), {}, {
+        return /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread(_objectSpread({}, actions[type]), omit(rest, filterKeys)), {}, {
           type: "link",
           onClick: function onClick() {
             return handleClick(internalOnClick, _onClick, item);
@@ -136,7 +138,7 @@ var ToolbarButton = function ToolbarButton(props) {
           children: label || defaultLabel
         }), "".concat(type).concat(index));
       }
-      return _jsx(Button, _objectSpread(_objectSpread({}, _omit(rest, filterKeys)), {}, {
+      return /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({}, omit(rest, filterKeys)), {}, {
         type: "link",
         onClick: function onClick() {
           return customClick(_onClick2, item);

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

@@ -1,19 +1,20 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _get from "lodash/get";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { forwardRef, useCallback, useImperativeHandle } from 'react';
+import React, { forwardRef, useCallback, useImperativeHandle } from 'react';
 import { Form } from 'antd';
 import { DndContext } from '@dnd-kit/core';
+import { get } from 'lodash';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
-import { toArray } from '../../../utils';
-import { namesPathTransform } from './utils';
-import ToolbarButton from './components/ToolbarButton';
-import BlockFields from './components/BlockFields';
-import LineFields from './components/LineFields';
-import Empty from './components/Empty';
-import ProForm from '../../../../ProForm';
-import { useProConfig } from '../../../../ProConfigProvider';
+import { toArray } from "../../../utils";
+import { namesPathTransform } from "./utils";
+import ToolbarButton from "./components/ToolbarButton";
+import BlockFields from "./components/BlockFields";
+import LineFields from "./components/LineFields";
+import Empty from "./components/Empty";
+import ProForm from "../../../../ProForm";
+import { useProConfig } from "../../../../ProConfigProvider";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var FormList = function FormList(props, ref) {
   var columns = props.columns,
     min = props.min,
@@ -42,9 +43,9 @@ var FormList = function FormList(props, ref) {
     isDiffAll = _useProConfig.isDiffAll;
   var errors = meta.errors;
   var _namePath = toArray(name);
-  var orgValues = _get(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues, name);
+  var orgValues = get(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues, name);
   var _diffConfig = _objectSpread(_objectSpread({}, 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 = useCallback(function (fieldName, namePath) {
     return columns.map(function (item) {
@@ -56,7 +57,7 @@ var FormList = function FormList(props, ref) {
       })] : [fieldName].concat(_toConsumableArray(toArray(item.name)));
       var column = _objectSpread(_objectSpread({}, 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(function (nameItem) {
           // 传给Group的names会被渲染成真实FormItem 不能传完整name
           return [].concat(_toConsumableArray(namePath), _toConsumableArray(toArray(nameItem)));
         }) : item.names,
@@ -86,9 +87,9 @@ var FormList = function FormList(props, ref) {
       props.operation.move(activeIndex, overIndex);
     }
   };
-  return _jsx(DndContext, {
+  return /*#__PURE__*/_jsx(DndContext, {
     onDragEnd: handleDragEnd,
-    children: _jsxs(SortableContext, {
+    children: /*#__PURE__*/_jsxs(SortableContext, {
       items: _fields.map(function (item) {
         return {
           id: item.key
@@ -98,7 +99,7 @@ var FormList = function FormList(props, ref) {
       children: [_fields.map(function (field, index) {
         var namePath = [].concat(_toConsumableArray(_namePath), [field.name]);
         var _columns = processColumns(index, namePath);
-        return mode === 'block' ? _jsx(BlockFields, _objectSpread(_objectSpread({}, props), {}, {
+        return mode === 'block' ? /*#__PURE__*/_jsx(BlockFields, _objectSpread(_objectSpread({}, props), {}, {
           columns: _columns,
           disabled: disabled,
           isView: isView,
@@ -110,7 +111,7 @@ var FormList = function FormList(props, ref) {
           },
           form: form,
           diffConfig: _diffConfig
-        }), field.key) : _jsx(LineFields, _objectSpread(_objectSpread({
+        }), field.key) : /*#__PURE__*/_jsx(LineFields, _objectSpread(_objectSpread({
           className: _fields.length === index + 1 ? 'pro-form-list-last' : ''
         }, props), {}, {
           mode: mode,
@@ -126,16 +127,16 @@ var FormList = function FormList(props, ref) {
           form: form,
           diffConfig: _diffConfig
         }), field.key);
-      }), _fields.length === 0 && _jsx(Empty, {
+      }), _fields.length === 0 && /*#__PURE__*/_jsx(Empty, {
         disabled: disabled,
         toolbarProps: toolbarProps,
         operation: operation,
         form: form,
         namePath: _namePath,
         emptyBtnText: emptyBtnText
-      }), _jsx(Form.ErrorList, {
+      }), /*#__PURE__*/_jsx(Form.ErrorList, {
         errors: errors
-      }), toolbarProps !== false && _fields.length > 0 && _jsx(ToolbarButton, {
+      }), toolbarProps !== false && _fields.length > 0 && /*#__PURE__*/_jsx(ToolbarButton, {
         disabled: disabled,
         isView: isView,
         min: min,

package/es/ProForm/components/combination/FormList/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-form-list-block-title {
   height: 14px;

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

@@ -1,5 +1,6 @@
-import _isEqualWith from "lodash/isEqualWith";
+import { isEqualWith } from 'lodash';
 import React from 'react';
+
 /**
  * namesPath生产 [['list', 0, 'min'], ['list', 0, 'max']] => list_0_min-list_0_max
  * @param names  name的集合
@@ -20,10 +21,11 @@ export var namesPathTransform = function namesPathTransform(_ref) {
     return Array.isArray(name) ? name.join('_') : name;
   }).join('-');
 };
+
 // 比较memo
 export var memoWith = function memoWith(pre, next) {
-  return _isEqualWith(pre, next, function (objValue, othValue) {
-    if (/*#__PURE__*/React.isValidElement(objValue) && /*#__PURE__*/React.isValidElement(othValue)) {
+  return isEqualWith(pre, next, function (objValue, othValue) {
+    if ( /*#__PURE__*/React.isValidElement(objValue) && /*#__PURE__*/React.isValidElement(othValue)) {
       return true;
     }
     // 移除解决formlist函数里不更新问题

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

@@ -1,15 +1,17 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import './index.less';
+import React from 'react';
+import "./index.less";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var AddonWrapper = function AddonWrapper(props) {
   var before = props.before,
     after = props.after,
     children = props.children;
-  return _jsxs("div", {
+  return /*#__PURE__*/_jsxs("div", {
     className: "addon-wrapper",
-    children: [before && _jsx("div", {
+    children: [before && /*#__PURE__*/_jsx("div", {
       className: "before",
       children: before
-    }), children, after && _jsx("div", {
+    }), children, after && /*#__PURE__*/_jsx("div", {
       className: "after",
       children: after
     })]

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

@@ -1,36 +1,41 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType", "isView", "viewRender"];
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
-import ConfirmWrapper from '../../../../components/render/ConfirmWrapper';
-import { FieldProvider } from '../../../../utils/useFieldProps';
-import * as componentMap from '../../../../../index';
-import AddonWrapper from './AddonWrapper';
+import { omit } from 'lodash';
+import ConfirmWrapper from "../../../../components/render/ConfirmWrapper";
+import { FieldProvider } from "../../../../utils/useFieldProps";
+import * as componentMap from "../../../../../index";
+import AddonWrapper from "./AddonWrapper";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 // 这里的key与组件内参数一致, 决定使用哪个包裹组件
 var wrapperMap = {
   confirm: ConfirmWrapper,
   before: AddonWrapper,
   after: AddonWrapper
 };
+
 // 增加middleware根据配置增加多层包裹
 var getComRender = function getComRender(component, props, componentProps) {
   var wrappers = Object.keys(wrapperMap);
-  var Com = component;
+  var renderComponent = component;
   wrappers.forEach(function (item) {
     if (item in props) {
       var Wrapper = wrapperMap[item];
-      Com = _jsx(Wrapper, _objectSpread(_objectSpread(_objectSpread({}, componentProps), _defineProperty({}, item, props[item])), {}, {
-        children: Com
+      renderComponent = /*#__PURE__*/_jsx(Wrapper, _objectSpread(_objectSpread(_objectSpread({}, componentProps), _defineProperty({}, item, props[item])), {}, {
+        children: renderComponent
       }));
     }
   });
-  return Com;
+  return renderComponent;
 };
+
 /** 渲染组件 */
 var ComRender = function ComRender(props) {
-  var _props$component, _props$component$prop;
+  var _props$component;
   var type = props.type,
     confirm = props.confirm,
     component = props.component,
@@ -49,17 +54,17 @@ var ComRender = function ComRender(props) {
   var mergedGetValueProps = getValueProps || function (val) {
     return _defineProperty({}, valuePropName, val);
   };
-  var _props = mergedGetValueProps(fieldProps.value);
-  var componentProps = _objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), _props);
-  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 nextProps = mergedGetValueProps(fieldProps.value);
+  var componentProps = omit(_objectSpread(_objectSpread(_objectSpread({}, 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 _jsxs(_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__*/_jsxs(_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 _jsx(FieldProvider, {
+    return /*#__PURE__*/_jsx(FieldProvider, {
       value: _objectSpread(_objectSpread({}, contextProps), {}, {
         valueType: valueType,
         type: type,
@@ -68,15 +73,15 @@ var ComRender = function ComRender(props) {
       children: viewRender(componentProps)
     });
   }
-  var Component = component ? (/*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
-  var Com = getComRender(Component, props, componentProps);
-  return _jsx(FieldProvider, {
+  var Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : /*#__PURE__*/_jsx(TypeComponent, _objectSpread({}, componentProps));
+  var renderComponent = getComRender(Component, props, componentProps);
+  return /*#__PURE__*/_jsx(FieldProvider, {
     value: _objectSpread(_objectSpread({}, contextProps), {}, {
       valueType: valueType,
       type: type,
       isView: isView
     }),
-    children: Com
+    children: renderComponent
   });
 };
 export default ComRender;