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

package/lib/ProForm/components/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -23,12 +22,6 @@ Object.defineProperty(exports, "DatePicker", {
     return _DatePicker.default;
   }
 });
-Object.defineProperty(exports, "EnumSelect", {
-  enumerable: true,
-  get: function get() {
-    return _EnumSelect.default;
-  }
-});
 Object.defineProperty(exports, "FormFooter", {
   enumerable: true,
   get: function get() {
@@ -59,54 +52,18 @@ Object.defineProperty(exports, "InputNumber", {
     return _InputNumber.default;
   }
 });
-Object.defineProperty(exports, "InputRange", {
-  enumerable: true,
-  get: function get() {
-    return _InputRange.default;
-  }
-});
-Object.defineProperty(exports, "ProAddress", {
-  enumerable: true,
-  get: function get() {
-    return _ProAddress.default;
-  }
-});
-Object.defineProperty(exports, "ProAddressBar", {
-  enumerable: true,
-  get: function get() {
-    return _ProCascader.default;
-  }
-});
 Object.defineProperty(exports, "ProCascader", {
   enumerable: true,
   get: function get() {
     return _ProCascader.default;
   }
 });
-Object.defineProperty(exports, "ProCertNo", {
-  enumerable: true,
-  get: function get() {
-    return _ProCertNo.default;
-  }
-});
-Object.defineProperty(exports, "ProCertValidity", {
-  enumerable: true,
-  get: function get() {
-    return _ProCertValidity.default;
-  }
-});
 Object.defineProperty(exports, "ProCollapse", {
   enumerable: true,
   get: function get() {
     return _Container.default;
   }
 });
-Object.defineProperty(exports, "ProCombination", {
-  enumerable: true,
-  get: function get() {
-    return _ProCombination.default;
-  }
-});
 Object.defineProperty(exports, "ProEditTable", {
   enumerable: true,
   get: function get() {
@@ -131,12 +88,6 @@ Object.defineProperty(exports, "ProNumberRange", {
     return _ProNumberRange.default;
   }
 });
-Object.defineProperty(exports, "ProRangeBox", {
-  enumerable: true,
-  get: function get() {
-    return _ProRangeBox.default;
-  }
-});
 Object.defineProperty(exports, "ProRangeLimit", {
   enumerable: true,
   get: function get() {
@@ -215,12 +166,6 @@ Object.defineProperty(exports, "TimePicker", {
     return _TimePicker.default;
   }
 });
-Object.defineProperty(exports, "transferAddressInfoToRegion", {
-  enumerable: true,
-  get: function get() {
-    return _ProAddress.transferAddressInfoToRegion;
-  }
-});
 var _Select = _interopRequireDefault(require("./base/Select"));
 var _DatePicker = _interopRequireDefault(require("./base/DatePicker"));
 var _RangePicker = _interopRequireDefault(require("./base/RangePicker"));
@@ -235,7 +180,6 @@ var _TimePicker = _interopRequireDefault(require("./base/TimePicker"));
 var _FormList = _interopRequireDefault(require("./combination/FormList"));
 var _ProEditTable = _interopRequireDefault(require("../../ProEditTable"));
 var _ProCascader = _interopRequireDefault(require("./combination/ProCascader"));
-var _ProCombination = _interopRequireDefault(require("./combination/ProCombination"));
 var _ProNumberRange = _interopRequireDefault(require("./combination/ProNumberRange"));
 var _ProModalSelect = _interopRequireDefault(require("./combination/ProModalSelect"));
 var _ProTimeLimit = _interopRequireDefault(require("./combination/ProTimeLimit"));
@@ -247,10 +191,4 @@ var _ProSelect = _interopRequireDefault(require("../../ProSelect"));
 var _ProUpload = _interopRequireDefault(require("../../ProUpload"));
 var _ProTreeModal = _interopRequireDefault(require("../../ProTreeModal"));
 var _ProTree = _interopRequireDefault(require("../../ProTree"));
-var _FormFooter = _interopRequireDefault(require("./FormFooter"));
-var _ProAddress = _interopRequireWildcard(require("./old/ProAddress"));
-var _EnumSelect = _interopRequireDefault(require("./old/EnumSelect"));
-var _InputRange = _interopRequireDefault(require("./old/InputRange"));
-var _ProRangeBox = _interopRequireDefault(require("./old/ProRangeBox"));
-var _ProCertValidity = _interopRequireDefault(require("./old/ProCertValidity"));
-var _ProCertNo = _interopRequireDefault(require("./old/ProCertNo"));
+var _FormFooter = _interopRequireDefault(require("./FormFooter"));

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

@@ -6,16 +6,13 @@ 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/tooltip/style");
-var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _get2 = _interopRequireDefault(require("lodash/get"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireWildcard(require("react"));
 var _diffOriginal = require("../../utils/diffOriginal");
@@ -113,22 +110,24 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var scrollFollowParentConfig = componentsWithFloatWindow.includes(type) ? {
     scrollFollowParent: scrollFollowParent
   } : {};
-  return (0, _jsxRuntime.jsx)(_tooltip.default, {
+  return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
     open: open,
     getPopupContainer: function getPopupContainer(trigger) {
       return scrollFollowParent ? trigger.parentElement : document.body;
     },
-    overlayClassName: "original-value-tooltip",
+    classNames: {
+      root: 'original-value-tooltip'
+    },
     placement: "topLeft",
     autoAdjustOverflow: false,
-    title: (0, _jsxRuntime.jsxs)(_space.default, {
+    title: (0, _jsxRuntime.jsxs)(_antd.Space, {
       direction: "vertical",
       className: "changed-tooltip",
-      children: [(0, _jsxRuntime.jsxs)(_space.default, {
+      children: [(0, _jsxRuntime.jsxs)(_antd.Space, {
         align: "start",
         className: "original-value-container",
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
-      }), _showEllipse && (0, _jsxRuntime.jsxs)(_space.default, {
+      }), _showEllipse && (0, _jsxRuntime.jsxs)(_antd.Space, {
         className: "current-value-container",
         children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), scrollFollowParentConfig), {}, {
           isView: true

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

@@ -5,18 +5,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/modal/style");
-var _modal = _interopRequireDefault(require("antd/es/modal"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
 var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireDefault(require("react"));
+var _antd = require("antd");
 var _index = _interopRequireDefault(require("../../index"));
 var _excluded = ["onChange", "children", "confirm", "otherProps"];
+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 defaultConfirmProps = {
   title: '操作提示',
   content: '确定要修改该字段吗？'
@@ -30,25 +30,26 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
   var _ProForm$useFieldProp = _index.default.useFieldProps(),
     form = _ProForm$useFieldProp.form;
   var handleChange = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(value) {
+    var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee2(value) {
       var _len,
         other,
         _key,
         _value,
         confirmProps,
-        _args2 = arguments;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+        _args2 = arguments,
+        _t;
+      return _regenerator().w(function (_context2) {
+        while (1) switch (_context2.n) {
           case 0:
             for (_len = _args2.length, other = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
               other[_key - 1] = _args2[_key];
             }
             _value = (value === null || value === void 0 ? void 0 : value.target) ? value.target.value : value;
             if (!(0, _isFunction2.default)(confirm)) {
-              _context2.next = 8;
+              _context2.n = 2;
               break;
             }
-            _context2.next = 5;
+            _context2.n = 1;
             return confirm(value, form.getFieldsValue(), {
               option: other[0],
               form: form,
@@ -57,47 +58,46 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
               index: otherProps.index,
               preValue: form.getFieldValue(otherProps.listName || otherProps.name)
             });
-          case 5:
-            _context2.t0 = _context2.sent;
-            _context2.next = 9;
+          case 1:
+            _t = _context2.v;
+            _context2.n = 3;
             break;
-          case 8:
-            _context2.t0 = confirm;
-          case 9:
-            confirmProps = _context2.t0;
+          case 2:
+            _t = confirm;
+          case 3:
+            confirmProps = _t;
             // 只处理 false, true 和 对象的情况
             if (confirmProps === false) {
               onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
             }
             if (confirmProps === true) {
-              _modal.default.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultConfirmProps), {}, {
+              _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultConfirmProps), {}, {
                 onOk: function onOk() {
                   return onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
                 }
               }));
             }
             if ((0, _isObject2.default)(confirmProps)) {
-              _modal.default.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
+              _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
                 onOk: function () {
-                  var _onOk = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+                  var _onOk = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee() {
                     var _confirmProps$onOk;
                     var _len2,
                       arg,
                       _key2,
                       _args = arguments;
-                    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:
                           for (_len2 = _args.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
                             arg[_key2] = _args[_key2];
                           }
-                          _context.next = 3;
+                          _context.n = 1;
                           return (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call.apply(_confirmProps$onOk, [confirmProps].concat(arg));
-                        case 3:
+                        case 1:
                           onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
-                        case 4:
-                        case "end":
-                          return _context.stop();
+                        case 2:
+                          return _context.a(2);
                       }
                     }, _callee);
                   }));
@@ -108,9 +108,8 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
                 }()
               }));
             }
-          case 13:
-          case "end":
-            return _context2.stop();
+          case 4:
+            return _context2.a(2);
         }
       }, _callee2);
     }));

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

@@ -6,17 +6,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/col/style");
-var _col = _interopRequireDefault(require("antd/es/col"));
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-require("antd/es/input/style");
-var _input = _interopRequireDefault(require("antd/es/input"));
-require("antd/es/form/style");
-var _form = _interopRequireDefault(require("antd/es/form"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -26,6 +17,7 @@ var _omit2 = _interopRequireDefault(require("lodash/omit"));
 var _isString2 = _interopRequireDefault(require("lodash/isString"));
 var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reactSvg = require("react-svg");
@@ -40,6 +32,8 @@ var _ConfirmWrapper = _interopRequireDefault(require("./ConfirmWrapper"));
 var _ChangedWrapper = _interopRequireDefault(require("./ChangedWrapper"));
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip", "validateFirst"];
 /* eslint-disable prefer-destructuring */
+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 Render = function Render(props) {
   var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
@@ -193,7 +187,7 @@ var Render = function Render(props) {
   var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-width-auto', ['Switch'].includes(type)));
   if (formItemProps.hidden === true || _show === false) {
     // 为了监听shouldUpdate  必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
-    return (0, _jsxRuntime.jsx)(_form.default.Item, {
+    return (0, _jsxRuntime.jsx)(_antd.Form.Item, {
       name: _otherFormItemProps.name || 'proFormItemHidden',
       shouldUpdate: _otherFormItemProps.shouldUpdate,
       className: _className,
@@ -202,7 +196,7 @@ var Render = function Render(props) {
       rules: [{
         required: false
       }],
-      children: (0, _jsxRuntime.jsx)(_input.default, {})
+      children: (0, _jsxRuntime.jsx)(_antd.Input, {})
     });
   }
   /**
@@ -312,29 +306,29 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref7 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee() {
       var _len3,
         args,
         _key3,
         _args,
-        _args3 = arguments;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+        _args3 = arguments,
+        _t;
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
             for (_len3 = _args3.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
               args[_key3] = _args3[_key3];
             }
             _args = functionArgs([].concat(args));
-            _context.t0 = lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.onBlur;
-            if (!_context.t0) {
-              _context.next = 6;
+            _t = lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.onBlur;
+            if (!_t) {
+              _context.n = 1;
               break;
             }
-            _context.next = 6;
+            _context.n = 1;
             return lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.onBlur.apply(lastComponentProps, (0, _toConsumableArray2.default)(_args));
-          case 6:
-          case "end":
-            return _context.stop();
+          case 1:
+            return _context.a(2);
         }
       }, _callee);
     }));
@@ -359,7 +353,7 @@ var Render = function Render(props) {
       mark: 'pro_table_render',
       render: function render(inputProps, doms) {
         return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-          children: [(0, _jsxRuntime.jsx)(_space.default, {
+          children: [(0, _jsxRuntime.jsx)(_antd.Space, {
             size: 0,
             style: {
               marginTop: 8
@@ -381,13 +375,19 @@ var Render = function Render(props) {
               },
               children: formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.after
             }) : null]
-          }), (0, _jsxRuntime.jsx)(_space.default, {
+          }), (0, _jsxRuntime.jsx)(_antd.Space, {
             size: 0,
             style: {
               marginTop: 8
             },
             children: formItemProps.extra
-          }), doms.errorList]
+          }), doms.errorList ? (0, _jsxRuntime.jsx)("div", {
+            className: "ant-form-item-additional",
+            style: {
+              minHeight: '16px'
+            },
+            children: doms.errorList
+          }) : null]
         });
       }
     };
@@ -429,11 +429,11 @@ var Render = function Render(props) {
       colProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
         span: lessMode ? colProps.span : 24 // 默认占一行
       });
-      return (0, _jsxRuntime.jsx)(_form.default.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(_otherFormItemProps, filterFormItemKey)), {}, {
+      return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(_otherFormItemProps, filterFormItemKey)), {}, {
         // @ts-ignore
         _internalItemRender: internalItemRender,
         className: _className,
-        children: (0, _jsxRuntime.jsx)(_form.default.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        children: (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
           name: _otherFormItemProps.name
         }, (0, _omit2.default)(_otherFormItemProps, ['rules'])), {}, {
           children: function children(fields, operation, meta) {
@@ -471,7 +471,7 @@ var Render = function Render(props) {
         children: child
       });
     }
-    return (0, _jsxRuntime.jsx)(_form.default.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(_otherFormItemProps, filterFormItemKey)), {}, {
+    return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
@@ -481,26 +481,24 @@ var Render = function Render(props) {
   var FormItem = (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [_otherFormItemProps.shouldUpdate ?
     // 空标签防止气泡不显示
-    (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-      children: (0, _jsxRuntime.jsx)(_form.default.Item, {
-        shouldUpdate: _otherFormItemProps.shouldUpdate,
-        noStyle: true,
-        children: function children() {
-          return renderItem();
-        }
-      })
+    (0, _jsxRuntime.jsx)(_antd.Form.Item, {
+      shouldUpdate: _otherFormItemProps.shouldUpdate,
+      noStyle: true,
+      children: function children() {
+        return renderItem();
+      }
     }) : renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {
-      return (0, _jsxRuntime.jsx)(_form.default.Item, {
+      return (0, _jsxRuntime.jsx)(_antd.Form.Item, {
         hidden: true,
         name: name,
-        children: (0, _jsxRuntime.jsx)(_input.default, {})
+        children: (0, _jsxRuntime.jsx)(_antd.Input, {})
       }, name);
     }) : null]
   });
   if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
     return FormItem;
   }
-  return (0, _jsxRuntime.jsx)(_col.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
+  return (0, _jsxRuntime.jsx)(_antd.Col, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
     children: FormItem
   }));
 };

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

@@ -16,11 +16,10 @@ import type { Props as SwitchProps } from '../base/Switch';
 import type { Props as SwitchCheckboxProps } from '../base/SwitchCheckbox';
 import type { Props as TextAreaProps } from '../base/TextArea';
 import type { ProCascaderType } from '../combination/ProCascader/propsType';
-import type { ProCombinationType } from '../combination/ProCombination/propsType';
 import type { ProModalSelectType } from '../combination/ProModalSelect/propsType';
 import type { ProNumberRangeType } from '../combination/ProNumberRange/propsType';
 import type { ProLimitProps } from '../combination/ProTimeLimit';
-import type { Props as ProRangeLimitProps } from '../combination/ProRangeLimit';
+import type { ProRangeLimitType } from '../combination/ProRangeLimit/propsType';
 import type { CheckboxPropsMap, ProEnum, PropProSelectsMap, PropRadioPropsMap } from '../../../ProEnum/propsType';
 import type { PropSelectProps as ProSelectProps } from '../../../ProSelect/propsType';
 import type { ProEditTableType } from '../../../ProEditTable/propsType';
@@ -123,9 +122,6 @@ export type ColumnTypeMap<Values = any, T = 'ProForm'> = {
 } | {
     type?: 'ProCascader';
     fieldProps?: FieldType<ProCascaderType, Values, T>;
-} | {
-    type?: 'ProCombination';
-    fieldProps?: FieldType<ProCombinationType, Values, T>;
 } | {
     type?: 'ProModalSelect';
     fieldProps?: FieldType<ProModalSelectType, Values, T>;
@@ -134,7 +130,7 @@ export type ColumnTypeMap<Values = any, T = 'ProForm'> = {
     fieldProps?: FieldType<ProNumberRangeType, Values, T>;
 } | {
     type?: 'ProRangeLimit';
-    fieldProps?: FieldType<ProRangeLimitProps, Values, T>;
+    fieldProps?: FieldType<ProRangeLimitType, Values, T>;
 } | {
     type?: 'ProTimeLimit';
     fieldProps?: FieldType<ProLimitProps, Values, T>;

package/lib/ProForm/index.js

@@ -6,17 +6,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ProFormProvider = void 0;
-require("antd/es/row/style");
-var _row = _interopRequireDefault(require("antd/es/row"));
-require("antd/es/form/style");
-var _form = _interopRequireDefault(require("antd/es/form"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/col/style");
-var _col = _interopRequireDefault(require("antd/es/col"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _omit2 = _interopRequireDefault(require("lodash/omit"));
@@ -24,6 +16,7 @@ var _merge2 = _interopRequireDefault(require("lodash/merge"));
 var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _icons = require("@ant-design/icons");
+var _antd = require("antd");
 var _classnames2 = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireWildcard(require("react"));
 var _components = require("./components");
@@ -141,12 +134,12 @@ var ProForm = function ProForm(props, ref) {
     return !!expand && columns.length > Number(expand) && (0, _jsxRuntime.jsx)("div", {
       className: "expand-button",
       onClick: expandHandle,
-      children: !openState ? (0, _jsxRuntime.jsxs)(_space.default, {
+      children: !openState ? (0, _jsxRuntime.jsxs)(_antd.Space, {
         align: "center",
         children: [_locale.default.ProForm.unfold, (0, _jsxRuntime.jsx)(_icons.DoubleLeftOutlined, {
           className: "rotate-to-bottom"
         })]
-      }) : (0, _jsxRuntime.jsxs)(_space.default, {
+      }) : (0, _jsxRuntime.jsxs)(_antd.Space, {
         align: "center",
         children: [_locale.default.ProForm.packUp, (0, _jsxRuntime.jsx)(_icons.DoubleLeftOutlined, {
           className: "rotate-to-top"
@@ -217,9 +210,9 @@ var ProForm = function ProForm(props, ref) {
     // 展开折叠按钮
     var expandEle = expandRender();
     var hasElement = footerEle || expandEle;
-    return hasElement ? (0, _jsxRuntime.jsx)(_col.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
+    return hasElement ? (0, _jsxRuntime.jsx)(_antd.Col, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
       className: footerCls,
-      children: (0, _jsxRuntime.jsxs)(_space.default, {
+      children: (0, _jsxRuntime.jsxs)(_antd.Space, {
         align: "center",
         children: [footerEle, expandEle]
       })
@@ -235,7 +228,7 @@ var ProForm = function ProForm(props, ref) {
       otherProps.layout = otherProps.layout || 'vertical';
     }
   }
-  return (0, _jsxRuntime.jsxs)(_form.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return (0, _jsxRuntime.jsxs)(_antd.Form, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     onKeyPress: function onKeyPress(event) {
       if (!submitOnEnter) return;
       if (event.key === 'Enter') {
@@ -249,11 +242,7 @@ var ProForm = function ProForm(props, ref) {
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,
     initialValues: _initialValues,
-    scrollToFirstError: {
-      block: 'center',
-      behavior: 'smooth'
-    },
-    children: [(0, _jsxRuntime.jsxs)(_row.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    children: [(0, _jsxRuntime.jsxs)(_antd.Row, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       gutter: 24
     }, rowProps), {}, {
       children: [(0, _jsxRuntime.jsx)(_RenderFields.default, {
@@ -307,7 +296,7 @@ var ProFormProvider = exports.ProFormProvider = function ProFormProvider(props)
     // @ts-ignore
     onFormChange(formName, info);
   };
-  return (0, _jsxRuntime.jsx)(_form.default.Provider, {
+  return (0, _jsxRuntime.jsx)(_antd.Form.Provider, {
     onFormChange: onFormChange ? handleFormChange : undefined,
     onFormFinish: onFormFinish,
     children: children
@@ -318,24 +307,5 @@ ProFormForward.useFieldProps = _useFieldProps.useFieldProps; // 获取每个字
 // 表单实例共享
 ProFormForward.FormsProvider = _FormsProvider.default; // 表单实例共享Provider
 ProFormForward.useForms = _FormsProvider.useForms; // 获取上下文中的共享的表单实例map
-ProFormForward.useFormInstances = _FormsProvider.useForms; // 获取上下文中的共享的表单实例map
 ProFormForward.useContextForms = _FormsProvider.useContextForms; // 获取上下文中的共享的表单实例map
-// 内置组合
-ProFormForward.ProCascader = _components.ProCascader;
-ProFormForward.ProCombination = _components.ProCombination;
-ProFormForward.ProNumberRange = _components.ProNumberRange;
-ProFormForward.ProModalSelect = _components.ProModalSelect;
-ProFormForward.ProTimeLimit = _components.ProTimeLimit;
-ProFormForward.ProUpload = _components.ProUpload;
-// ProFormForward.ProTreeSelect = ProTreeSelect;
-ProFormForward.ProTreeModal = _components.ProTreeModal;
-ProFormForward.ProTree = _components.ProTree;
-// 待废弃
-ProFormForward.EnumSelect = _components.EnumSelect;
-ProFormForward.ProAddress = _components.ProAddress;
-ProFormForward.InputRange = _components.InputRange;
-ProFormForward.ProRangeBox = _components.ProRangeBox;
-ProFormForward.ProCertValidity = _components.ProCertValidity;
-ProFormForward.ProCertNo = _components.ProCertNo;
-ProFormForward.transferAddressInfoToRegion = _components.transferAddressInfoToRegion;
 var _default = exports.default = ProFormForward;