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

package/lib/ProForm/components/base/TextArea/index.js

@@ -8,10 +8,9 @@ exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-require("antd/es/input/style");
-var _input = _interopRequireDefault(require("antd/es/input"));
 var _omit2 = _interopRequireDefault(require("lodash/omit"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _classnames2 = _interopRequireDefault(require("classnames"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _locale = _interopRequireDefault(require("../../../../locale"));
@@ -19,7 +18,7 @@ var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _Container = _interopRequireDefault(require("../../Container"));
 require("./index.less");
 var _excluded = ["placeholder", "otherProps", "className", "tooltip"];
-var TextArea = _input.default.TextArea;
+var TextArea = _antd.Input.TextArea;
 var TextAreaDef = function TextAreaDef(props) {
   var _props$style;
   var placeholder = props.placeholder,
@@ -45,7 +44,7 @@ var TextAreaDef = function TextAreaDef(props) {
   var _className = (0, _classnames2.default)((0, _defineProperty2.default)({
     'pro-textarea': true,
     'pro-textarea-view': isView
-  }, className, true));
+  }, className, className));
   return (0, _jsxRuntime.jsx)(TextArea, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     showCount: true,
     autoComplete: "off",

package/lib/ProForm/components/base/TextArea/index.less

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 div.pro-textarea-view {
   .@{ant-prefix}-input-disabled {
@@ -13,7 +13,17 @@ div.pro-textarea-view {
 
 // input-textarea级联选择
 .pro-textarea {
+  position: relative;
   .@{ant-prefix}-input {
     resize: auto !important;
+    padding-bottom: 20px;
+  }
+  .@{ant-prefix}-input-suffix {
+    position: absolute;
+    right: 16px;
+    bottom: 22px;
+    // width: calc(100% - 18px);
+    text-align: right;
+    background: rgba(255, 255, 255, 0.6);
   }
 }

package/lib/ProForm/components/base/TimePicker/index.d.ts

@@ -1,7 +1,6 @@
 import React from 'react';
-import type { TimePickerProps } from 'antd/es/time-picker';
+import type { TimePickerProps } from 'antd';
 import type { ProFormOtherType } from '../../../propsType';
-import './style/index.less';
 export interface Props {
     valueType?: string;
     format?: string;

package/lib/ProForm/components/base/TimePicker/index.js

@@ -6,16 +6,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/time-picker/style");
-var _timePicker = _interopRequireDefault(require("antd/es/time-picker"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _moment = _interopRequireDefault(require("moment"));
+var _antd = require("antd");
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
-require("./style/index.less");
 var _excluded = ["format", "onChange", "value", "otherProps"];
+var AntTimePicker = _antd.DatePicker.TimePicker;
 var TimePicker = function TimePicker(props) {
   var _props$format = props.format,
     format = _props$format === void 0 ? 'HH:mm:ss' : _props$format,
@@ -32,7 +31,7 @@ var TimePicker = function TimePicker(props) {
   var initialConfig = (0, _ProConfigProvider.useProConfig)('AntTimePicker');
   var handleChange = function handleChange(value) {
     if (valueType === 'dateTime') {
-      onChange && onChange(value ? (0, _moment.default)(value).format(format) : undefined);
+      onChange && onChange(value ? (0, _dayjs.default)(value).format(format) : undefined);
     }
   };
   if (isView) {
@@ -41,8 +40,8 @@ var TimePicker = function TimePicker(props) {
       children: value
     });
   }
-  return (0, _jsxRuntime.jsx)(_timePicker.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-    value: value ? (0, _moment.default)(value, format) : undefined
+  return (0, _jsxRuntime.jsx)(AntTimePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+    value: value ? (0, _dayjs.default)(value, format) : undefined
   }, initialConfig), rest), {}, {
     format: format,
     onChange: handleChange

package/lib/ProForm/components/base/TimePicker/style/index.less

@@ -1,6 +1,8 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
-.@{ant-prefix}-picker {
+/* 适配antd 5.x，不再导入antd样式 */
+
+.ant-picker-time {
   display: flex;
 }

package/lib/ProForm/components/combination/Container/style/index.less

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-container {
   &.pro-container-empty{

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

@@ -5,14 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
-require("antd/es/popconfirm/style");
-var _popconfirm = _interopRequireDefault(require("antd/es/popconfirm"));
 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"));
@@ -20,11 +13,15 @@ var _omit2 = _interopRequireDefault(require("lodash/omit"));
 var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _react = require("react");
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _icons = require("@ant-design/icons");
 var _ProIcon = _interopRequireDefault(require("../../../../../ProIcon"));
 var _locale = _interopRequireDefault(require("../../../../../locale"));
 var _excluded = ["label", "onClick", "onHandle", "type", "needConfirm", "confirmProps", "title"],
   _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); }
 var filterKeys = ['actionType'];
 var getDefaultActions = function getDefaultActions(mode) {
   var originActions = {
@@ -143,23 +140,23 @@ var ActionButton = function ActionButton(props) {
     return _actionProps;
   }, [props.actionProps]);
   var handleClick = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(defaultCallback, callback, index, item) {
+    var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee(defaultCallback, callback, index, item) {
       var value, data;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
             value = form.getFieldValue(namePath);
-            _context.next = 3;
+            _context.n = 1;
             return callback === null || callback === void 0 ? void 0 : callback(value, {
               namePath: namePath,
               index: index,
               operation: operation,
               form: form
             });
-          case 3:
-            data = _context.sent;
+          case 1:
+            data = _context.v;
             if (!(!callback || data === true)) {
-              _context.next = 7;
+              _context.n = 2;
               break;
             }
             defaultCallback === null || defaultCallback === void 0 ? void 0 : defaultCallback(value, {
@@ -168,14 +165,13 @@ var ActionButton = function ActionButton(props) {
               operation: operation,
               form: form
             });
-            return _context.abrupt("return");
-          case 7:
+            return _context.a(2);
+          case 2:
             if ((item === null || item === void 0 ? void 0 : item.type) === 'add') {
               operation.add(data, index !== undefined ? index + 1 : undefined);
             }
-          case 8:
-          case "end":
-            return _context.stop();
+          case 3:
+            return _context.a(2);
         }
       }, _callee);
     }));
@@ -195,7 +191,7 @@ var ActionButton = function ActionButton(props) {
   var defaultActions = (0, _react.useMemo)(function () {
     return getDefaultActions(mode);
   }, [mode]);
-  return (0, _jsxRuntime.jsx)(_space.default, {
+  return (0, _jsxRuntime.jsx)(_antd.Space, {
     align: "start",
     className: "pro-form-list-action",
     children: actionProps === null || actionProps === void 0 ? void 0 : actionProps.map(function (item) {
@@ -241,7 +237,7 @@ var ActionButton = function ActionButton(props) {
         if (index + 1 === fields.length && type === 'moveDown') {
           return false;
         }
-        return _needConfirm ? (0, _jsxRuntime.jsx)(_popconfirm.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        return _needConfirm ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, (0, _objectSpread2.default)((0, _objectSpread2.default)({
           title: title !== null && title !== void 0 ? title : "".concat(_locale.default.ProForm.formListConfirmMessage),
           onCancel: function onCancel(e) {
             return e.stopPropagation();
@@ -250,14 +246,20 @@ var ActionButton = function ActionButton(props) {
             handleClick(internalOnClick, _onClick, index, item);
           }
         }, _confirmProps), {}, {
-          children: (0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultRest), (0, _omit2.default)(rest, filterKeys)), {}, {
+          children: (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultRest), (0, _omit2.default)(rest, filterKeys)), {}, {
             type: "text",
             onClick: function onClick(e) {
               return e.stopPropagation();
             },
             children: label || defaultLabel
           }))
-        }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultRest), (0, _omit2.default)(rest, filterKeys)), {}, {
+        }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+          className: (0, _classnames.default)({
+            'pro-form-list-tool-btn': mode === 'line',
+            'pro-form-list-tool-btn-block': mode === 'block',
+            'pro-form-list-tool-btn-less': mode === 'less'
+          })
+        }, defaultRest), (0, _omit2.default)(rest, filterKeys)), {}, {
           type: "text",
           onClick: function onClick(e) {
             e.stopPropagation();
@@ -266,7 +268,7 @@ var ActionButton = function ActionButton(props) {
           children: label || defaultLabel
         }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index));
       }
-      return needConfirm ? (0, _jsxRuntime.jsx)(_popconfirm.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      return needConfirm ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         title: title !== null && title !== void 0 ? title : "".concat(_locale.default.ProForm.formListConfirmMessage),
         onCancel: function onCancel(e) {
           return e.stopPropagation();
@@ -275,14 +277,14 @@ var ActionButton = function ActionButton(props) {
           return customClick(_onClick, index);
         }
       }, _confirmProps), {}, {
-        children: (0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(rest, filterKeys)), {}, {
+        children: (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(rest, filterKeys)), {}, {
           type: "text",
           onClick: function onClick(e) {
             return e.stopPropagation();
           },
           children: label
         }))
-      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (/*#__PURE__*/(0, _react.createElement)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(rest, filterKeys)), {}, {
+      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (/*#__PURE__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(rest, filterKeys)), {}, {
         key: "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index),
         type: "text",
         onClick: function onClick(e) {

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

@@ -6,13 +6,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/row/style");
-var _row = _interopRequireDefault(require("antd/es/row"));
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _ActionButton = _interopRequireDefault(require("./ActionButton"));
@@ -49,7 +46,7 @@ var BlockFields = function BlockFields(props) {
     return title;
   }, [title, index]);
   var cls = (0, _classnames.default)((0, _defineProperty2.default)({}, "pro-form-list-mode-".concat(mode), mode === 'block' || mode === 'line' || mode === 'less'));
-  return (0, _jsxRuntime.jsx)(_space.default, {
+  return (0, _jsxRuntime.jsx)(_antd.Space, {
     direction: "vertical",
     className: cls,
     id: id,
@@ -75,7 +72,7 @@ var BlockFields = function BlockFields(props) {
         disabled: disabled,
         isView: isView
       }),
-      children: (0, _jsxRuntime.jsx)(_row.default, {
+      children: (0, _jsxRuntime.jsx)(_antd.Row, {
         gutter: 24,
         children: (0, _jsxRuntime.jsx)(MemoRenderFields, {
           columns: columns,

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

@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _empty = _interopRequireDefault(require("../../../../../assets/empty.png"));
 var _locale = _interopRequireDefault(require("../../../../../locale"));
+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); }
 // 空列表状态
 var Empty = function Empty(_ref) {
   var disabled = _ref.disabled,
@@ -25,40 +25,39 @@ var Empty = function Empty(_ref) {
     return item.type === 'add';
   }) : null;
   var handleAddClick = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee() {
       var _addConfig$onClick;
       var value, data;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
             if (!(!operation || !form || !namePath)) {
-              _context.next = 2;
+              _context.n = 1;
               break;
             }
-            return _context.abrupt("return");
-          case 2:
+            return _context.a(2);
+          case 1:
             value = form.getFieldValue(namePath);
-            _context.next = 5;
+            _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, {
               operation: operation,
               form: form,
               namePath: namePath
             });
-          case 5:
-            data = _context.sent;
+          case 2:
+            data = _context.v;
             if (!(!(addConfig === null || addConfig === void 0 ? void 0 : addConfig.onClick) || data === true)) {
-              _context.next = 9;
+              _context.n = 3;
               break;
             }
             operation.add({});
-            return _context.abrupt("return");
-          case 9:
+            return _context.a(2);
+          case 3:
             if (data) {
               operation.add(data);
             }
-          case 10:
-          case "end":
-            return _context.stop();
+          case 4:
+            return _context.a(2);
         }
       }, _callee);
     }));
@@ -80,7 +79,7 @@ var Empty = function Empty(_ref) {
       className: "pro-form-list-empty-content",
       children: disabled ? _locale.default.ProForm.noData : (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
         children: [_locale.default.ProForm.noData, !disabled && (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-          children: ["\uFF0C", (0, _jsxRuntime.jsx)(_button.default, {
+          children: ["\uFF0C", (0, _jsxRuntime.jsx)(_antd.Button, {
             type: "link",
             onClick: handleAddClick,
             style: {

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

@@ -5,11 +5,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/row/style");
-var _row = _interopRequireDefault(require("antd/es/row"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _sortable = require("@dnd-kit/sortable");
@@ -72,7 +71,7 @@ var LineFields = function LineFields(props) {
         type: "drag",
         buttonIcon: false
       })
-    })), (0, _jsxRuntime.jsx)(_row.default, {
+    })), (0, _jsxRuntime.jsx)(_antd.Row, {
       gutter: isLess ? 0 : 24,
       children: (0, _jsxRuntime.jsx)(MemoRenderFields, {
         columns: columns,

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

@@ -5,24 +5,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-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 _antd = require("antd");
 var _icons = require("@ant-design/icons");
 var _react = require("react");
 var _locale = _interopRequireDefault(require("../../../../../locale"));
 var _excluded = ["label", "onClick", "onHandle", "type"],
   _excluded2 = ["onClick", "label"];
-/* eslint-disable react/no-array-index-key */
+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); } /* eslint-disable react/no-array-index-key */
 var actions = {
   add: {
     onClick: function onClick(value, _ref) {
@@ -65,22 +62,22 @@ var ToolbarButton = function ToolbarButton(props) {
     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__*/_regenerator().m(function _callee(defaultCallback, callback, item) {
       var value, data;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
             value = form.getFieldValue(namePath);
-            _context.next = 3;
+            _context.n = 1;
             return callback === null || callback === void 0 ? void 0 : callback(value, {
               operation: operation,
               form: form,
               namePath: namePath
             });
-          case 3:
-            data = _context.sent;
+          case 1:
+            data = _context.v;
             if (!(!callback || data === true)) {
-              _context.next = 7;
+              _context.n = 2;
               break;
             }
             defaultCallback === null || defaultCallback === void 0 ? void 0 : defaultCallback(value, {
@@ -88,14 +85,13 @@ var ToolbarButton = function ToolbarButton(props) {
               form: form,
               namePath: namePath
             });
-            return _context.abrupt("return");
-          case 7:
+            return _context.a(2);
+          case 2:
             if ((item === null || item === void 0 ? void 0 : item.type) === 'add' && data) {
               operation.add(data);
             }
-          case 8:
-          case "end":
-            return _context.stop();
+          case 3:
+            return _context.a(2);
         }
       }, _callee);
     }));
@@ -111,7 +107,7 @@ var ToolbarButton = function ToolbarButton(props) {
       namePath: namePath
     });
   };
-  return (0, _jsxRuntime.jsx)(_space.default, {
+  return (0, _jsxRuntime.jsx)(_antd.Space, {
     align: "start",
     className: "pro-form-list-toolbar",
     children: toolbarProps === null || toolbarProps === void 0 ? void 0 : toolbarProps.map(function (item, index) {
@@ -138,7 +134,7 @@ 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 (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, actions[type]), (0, _omit2.default)(rest, filterKeys)), {}, {
           type: "link",
           onClick: function onClick() {
             return handleClick(internalOnClick, _onClick, item);
@@ -146,7 +142,7 @@ var ToolbarButton = function ToolbarButton(props) {
           children: label || defaultLabel
         }), "".concat(type).concat(index));
       }
-      return (0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(rest, filterKeys)), {}, {
+      return (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(rest, filterKeys)), {}, {
         type: "link",
         onClick: function onClick() {
           return customClick(_onClick2, item);

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

@@ -5,13 +5,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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 _antd = require("antd");
 var _core = require("@dnd-kit/core");
 var _sortable = require("@dnd-kit/sortable");
 var _utils = require("../../../utils");
@@ -141,7 +140,7 @@ var FormList = function FormList(props, ref) {
         form: form,
         namePath: _namePath,
         emptyBtnText: emptyBtnText
-      }), (0, _jsxRuntime.jsx)(_form.default.ErrorList, {
+      }), (0, _jsxRuntime.jsx)(_antd.Form.ErrorList, {
         errors: errors
       }), toolbarProps !== false && _fields.length > 0 && (0, _jsxRuntime.jsx)(_ToolbarButton.default, {
         disabled: disabled,

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

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-form-list-block-title {
   height: 14px;
@@ -69,6 +69,42 @@
   .@{ant-prefix}-btn-text:hover {
     background: transparent;
   }
+  .pro-form-list-tool-btn {
+    .@{ant-prefix}-btn-icon {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+
+  .pro-form-list-tool-btn-less{
+    &:hover{
+      background: transparent !important;
+    }
+  }
+}
+
+.pro-form-list-empty {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+
+  .pro-form-list-empty-img {
+    width: 80px;
+    height: 80px;
+  }
+
+  .pro-form-list-empty-content {
+    display: flex;
+    justify-content: center;
+    margin-top: var(--zaui-space-size-md, 16px);
+    color: @zaui-aide-text;
+
+    .@{ant-prefix}-btn-link {
+      padding: 0;
+    }
+  }
 }
 
 .pro-form-list-empty {

package/lib/ProForm/components/combination/Group/component/AddonWrapper/index.d.ts

@@ -3,6 +3,7 @@ import './index.less';
 interface Props {
     before?: React.ReactNode;
     after?: React.ReactNode;
+    children?: React.ReactNode;
 }
 declare const AddonWrapper: React.FC<Props>;
 export default AddonWrapper;

package/lib/ProForm/components/combination/Group/index.d.ts

@@ -1,10 +1,4 @@
 import React from 'react';
 import type { GroupType } from './propsType';
-/**
- * 1. 外层过滤FormItem相关属性, 但是子元素上的 required [disabled] [show] rules [fieldProps] [component] 需要取到并
- * 2.
- *
- * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
- */
-declare const Group: React.FC<GroupType>;
-export default Group;
+declare const _default: React.NamedExoticComponent<GroupType>;
+export default _default;