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

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

@@ -1,14 +1,14 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/modal/style";
-import _Modal from "antd/es/modal";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _isObject from "lodash/isObject";
 import _isFunction from "lodash/isFunction";
 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); }
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
+import { Modal } from 'antd';
 import ProForm from '../../index';
 var defaultConfirmProps = {
   title: '操作提示',
@@ -23,25 +23,26 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
   var _ProForm$useFieldProp = ProForm.useFieldProps(),
     form = _ProForm$useFieldProp.form;
   var handleChange = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value) {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(value) {
       var _len,
         other,
         _key,
         _value,
         confirmProps,
-        _args2 = arguments;
-      return _regeneratorRuntime().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 (!_isFunction(confirm)) {
-              _context2.next = 8;
+              _context2.n = 2;
               break;
             }
-            _context2.next = 5;
+            _context2.n = 1;
             return confirm(value, form.getFieldsValue(), {
               option: other[0],
               form: form,
@@ -50,47 +51,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.confirm(_objectSpread(_objectSpread({}, defaultConfirmProps), {}, {
+              Modal.confirm(_objectSpread(_objectSpread({}, defaultConfirmProps), {}, {
                 onOk: function onOk() {
                   return onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
                 }
               }));
             }
             if (_isObject(confirmProps)) {
-              _Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
+              Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
                 onOk: function () {
-                  var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+                  var _onOk = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
                     var _confirmProps$onOk;
                     var _len2,
                       arg,
                       _key2,
                       _args = arguments;
-                    return _regeneratorRuntime().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);
                   }));
@@ -101,9 +101,8 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
                 }()
               }));
             }
-          case 13:
-          case "end":
-            return _context2.stop();
+          case 4:
+            return _context2.a(2);
         }
       }, _callee2);
     }));

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

@@ -1,14 +1,5 @@
-import "antd/es/col/style";
-import _Col from "antd/es/col";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
-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 "antd/es/input/style";
-import _Input from "antd/es/input";
-import "antd/es/form/style";
-import _Form from "antd/es/form";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
@@ -18,9 +9,11 @@ import _omit from "lodash/omit";
 import _isString from "lodash/isString";
 import _isFunction from "lodash/isFunction";
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip", "validateFirst"];
+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, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /* eslint-disable prefer-destructuring */
-
+import { Col, Form, Input, Space } from 'antd';
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
 import { ReactSVG } from 'react-svg';
@@ -186,7 +179,7 @@ var Render = function Render(props) {
   var _className = classNames(_defineProperty(_defineProperty({}, 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 _jsx(_Form.Item, {
+    return _jsx(Form.Item, {
       name: _otherFormItemProps.name || 'proFormItemHidden',
       shouldUpdate: _otherFormItemProps.shouldUpdate,
       className: _className,
@@ -195,7 +188,7 @@ var Render = function Render(props) {
       rules: [{
         required: false
       }],
-      children: _jsx(_Input, {})
+      children: _jsx(Input, {})
     });
   }
   /**
@@ -305,29 +298,29 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
       var _len3,
         args,
         _key3,
         _args,
-        _args3 = arguments;
-      return _regeneratorRuntime().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, _toConsumableArray(_args));
-          case 6:
-          case "end":
-            return _context.stop();
+          case 1:
+            return _context.a(2);
         }
       }, _callee);
     }));
@@ -352,7 +345,7 @@ var Render = function Render(props) {
       mark: 'pro_table_render',
       render: function render(inputProps, doms) {
         return _jsxs(_Fragment, {
-          children: [_jsx(_Space, {
+          children: [_jsx(Space, {
             size: 0,
             style: {
               marginTop: 8
@@ -374,13 +367,19 @@ var Render = function Render(props) {
               },
               children: formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.after
             }) : null]
-          }), _jsx(_Space, {
+          }), _jsx(Space, {
             size: 0,
             style: {
               marginTop: 8
             },
             children: formItemProps.extra
-          }), doms.errorList]
+          }), doms.errorList ? _jsx("div", {
+            className: "ant-form-item-additional",
+            style: {
+              minHeight: '16px'
+            },
+            children: doms.errorList
+          }) : null]
         });
       }
     };
@@ -422,11 +421,11 @@ var Render = function Render(props) {
       colProps = _objectSpread(_objectSpread({}, colProps), {}, {
         span: lessMode ? colProps.span : 24 // 默认占一行
       });
-      return _jsx(_Form.Item, _objectSpread(_objectSpread({}, _omit(_otherFormItemProps, filterFormItemKey)), {}, {
+      return _jsx(Form.Item, _objectSpread(_objectSpread({}, _omit(_otherFormItemProps, filterFormItemKey)), {}, {
         // @ts-ignore
         _internalItemRender: internalItemRender,
         className: _className,
-        children: _jsx(_Form.List, _objectSpread(_objectSpread({
+        children: _jsx(Form.List, _objectSpread(_objectSpread({
           name: _otherFormItemProps.name
         }, _omit(_otherFormItemProps, ['rules'])), {}, {
           children: function children(fields, operation, meta) {
@@ -464,7 +463,7 @@ var Render = function Render(props) {
         children: child
       });
     }
-    return _jsx(_Form.Item, _objectSpread(_objectSpread({}, _omit(_otherFormItemProps, filterFormItemKey)), {}, {
+    return _jsx(Form.Item, _objectSpread(_objectSpread({}, _omit(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
@@ -474,26 +473,24 @@ var Render = function Render(props) {
   var FormItem = _jsxs(_Fragment, {
     children: [_otherFormItemProps.shouldUpdate ?
     // 空标签防止气泡不显示
-    _jsx(_Fragment, {
-      children: _jsx(_Form.Item, {
-        shouldUpdate: _otherFormItemProps.shouldUpdate,
-        noStyle: true,
-        children: function children() {
-          return renderItem();
-        }
-      })
+    _jsx(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 _jsx(_Form.Item, {
+      return _jsx(Form.Item, {
         hidden: true,
         name: name,
-        children: _jsx(_Input, {})
+        children: _jsx(Input, {})
       }, name);
     }) : null]
   });
   if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
     return FormItem;
   }
-  return _jsx(_Col, _objectSpread(_objectSpread({}, colProps), {}, {
+  return _jsx(Col, _objectSpread(_objectSpread({}, colProps), {}, {
     children: FormItem
   }));
 };

package/es/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/es/ProForm/index.js

@@ -1,14 +1,6 @@
-import "antd/es/row/style";
-import _Row from "antd/es/row";
-import "antd/es/form/style";
-import _Form from "antd/es/form";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/col/style";
-import _Col from "antd/es/col";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _omit from "lodash/omit";
@@ -17,9 +9,10 @@ import _isObject from "lodash/isObject";
 var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize", "desensitizationKey", "stopOnFirstError"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DoubleLeftOutlined } from '@ant-design/icons';
+import { Col, Form, Row, Space } from 'antd';
 import classnames from 'classnames';
 import React, { forwardRef, useImperativeHandle, useMemo, useEffect } from 'react';
-import { FormFooter, InputRange, ProAddress, ProCascader, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeModal, ProTree, EnumSelect } from './components';
+import { FormFooter } from './components';
 import RenderFields from './components/render/RenderFields';
 import { useProConfig } from '../ProConfigProvider';
 import { useProDrawerFormContext } from '../ProDrawerForm';
@@ -133,12 +126,12 @@ var ProForm = function ProForm(props, ref) {
     return !!expand && columns.length > Number(expand) && _jsx("div", {
       className: "expand-button",
       onClick: expandHandle,
-      children: !openState ? _jsxs(_Space, {
+      children: !openState ? _jsxs(Space, {
         align: "center",
         children: [locale.ProForm.unfold, _jsx(DoubleLeftOutlined, {
           className: "rotate-to-bottom"
         })]
-      }) : _jsxs(_Space, {
+      }) : _jsxs(Space, {
         align: "center",
         children: [locale.ProForm.packUp, _jsx(DoubleLeftOutlined, {
           className: "rotate-to-top"
@@ -209,9 +202,9 @@ var ProForm = function ProForm(props, ref) {
     // 展开折叠按钮
     var expandEle = expandRender();
     var hasElement = footerEle || expandEle;
-    return hasElement ? _jsx(_Col, _objectSpread(_objectSpread({}, colProps), {}, {
+    return hasElement ? _jsx(Col, _objectSpread(_objectSpread({}, colProps), {}, {
       className: footerCls,
-      children: _jsxs(_Space, {
+      children: _jsxs(Space, {
         align: "center",
         children: [footerEle, expandEle]
       })
@@ -227,7 +220,7 @@ var ProForm = function ProForm(props, ref) {
       otherProps.layout = otherProps.layout || 'vertical';
     }
   }
-  return _jsxs(_Form, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+  return _jsxs(Form, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
     onKeyPress: function onKeyPress(event) {
       if (!submitOnEnter) return;
       if (event.key === 'Enter') {
@@ -241,11 +234,7 @@ var ProForm = function ProForm(props, ref) {
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,
     initialValues: _initialValues,
-    scrollToFirstError: {
-      block: 'center',
-      behavior: 'smooth'
-    },
-    children: [_jsxs(_Row, _objectSpread(_objectSpread({
+    children: [_jsxs(Row, _objectSpread(_objectSpread({
       gutter: 24
     }, rowProps), {}, {
       children: [_jsx(RenderFields, {
@@ -299,7 +288,7 @@ export var ProFormProvider = function ProFormProvider(props) {
     // @ts-ignore
     onFormChange(formName, info);
   };
-  return _jsx(_Form.Provider, {
+  return _jsx(Form.Provider, {
     onFormChange: onFormChange ? handleFormChange : undefined,
     onFormFinish: onFormFinish,
     children: children
@@ -310,24 +299,5 @@ ProFormForward.useFieldProps = useFieldProps; // 获取每个字段的其他参
 // 表单实例共享
 ProFormForward.FormsProvider = FormsProvider; // 表单实例共享Provider
 ProFormForward.useForms = useForms; // 获取上下文中的共享的表单实例map
-ProFormForward.useFormInstances = useForms; // 获取上下文中的共享的表单实例map
 ProFormForward.useContextForms = useContextForms; // 获取上下文中的共享的表单实例map
-// 内置组合
-ProFormForward.ProCascader = ProCascader;
-ProFormForward.ProCombination = ProCombination;
-ProFormForward.ProNumberRange = ProNumberRange;
-ProFormForward.ProModalSelect = ProModalSelect;
-ProFormForward.ProTimeLimit = ProTimeLimit;
-ProFormForward.ProUpload = ProUpload;
-// ProFormForward.ProTreeSelect = ProTreeSelect;
-ProFormForward.ProTreeModal = ProTreeModal;
-ProFormForward.ProTree = ProTree;
-// 待废弃
-ProFormForward.EnumSelect = EnumSelect;
-ProFormForward.ProAddress = ProAddress;
-ProFormForward.InputRange = InputRange;
-ProFormForward.ProRangeBox = ProRangeBox;
-ProFormForward.ProCertValidity = ProCertValidity;
-ProFormForward.ProCertNo = ProCertNo;
-ProFormForward.transferAddressInfoToRegion = transferAddressInfoToRegion;
 export default ProFormForward;

package/es/ProForm/style/index.less

@@ -1,6 +1,7 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 @import '../components/base/SwitchCheckbox/style/index.less';
+@import '../components/base/TimePicker/style/index.less';
 @import '../components/base/TextArea/index.less';
 @import '../components/combination/FormList/style/index.less';
 @import '../components/combination/ProTimeLimit/style/index.less';
@@ -9,8 +10,6 @@
 @import '../components/combination/ProModalSelect/style/index.less';
 @import '../components/combination/Group/style/index.less';
 @import '../components/combination/Container/style/index.less';
-@import '../components/old/EnumSelect/style/index.less';
-@import '../components/old/EnumSelect/style/index.less';
 
 .pro-form {
   &.@{ant-prefix}-form-vertical {
@@ -106,7 +105,6 @@
   }
 
   .@{ant-prefix}-form-item {
-    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1)) !important;
 
     &.pro-form-item-width-auto {
       .@{ant-prefix}-form-item-control-input {
@@ -137,13 +135,6 @@
       display: none;
     }
 
-    .@{ant-prefix}-form-item-explain {
-      height: auto;
-
-      .@{ant-prefix}-form-item-explain-error {
-        font-size: var(--zaui-font-size, 14px);
-      }
-    }
 
     .@{ant-prefix}-input-number {
       width: 100%;
@@ -186,8 +177,8 @@
 
   .@{ant-prefix}-form-item-has-error {
     .group-separator {
-      color: var(--ant-error-color);
-      border-color: var(--ant-error-color);
+      color: #ff4d4f;
+      border-color: #ff4d4f;
     }
 
     .site-input-split {
@@ -318,8 +309,7 @@
     width: 18px;
   }
   .pro-form-list-tool-btn {
-    margin-left: 8px;
-    padding: 0;
+    padding: 0 4px;
     cursor: pointer;
     .anticon {
       color: var(--zaui-text-weak, #a0a0a0);

package/es/ProForm/utils/index.d.ts

@@ -61,7 +61,6 @@ export declare function initialValuesToNames(values: AnyObject, columns: AnyObje
  * @returns ['group-7x19no', 0, 'abc'] =>['group-7x19no', 0]
  */
 export declare function getArrayBeforeNumber(arr: (string | number)[]): (string | number)[];
-export declare const customEqualForFun: (value: any, other: any) => boolean;
 /**
  * 查询数据中是否包含rowKey
  */
@@ -102,4 +101,19 @@ export declare const parseNamePath: (input: string) => any;
  */
 export declare const getFormFieldPaths: (form: FormInstance) => any[];
 export declare function findNamesKeyInArray(arr: string[], key: string): string | null;
+type DataItem = (string | number)[];
+/**
+ * 根据特定规则合并两个数据源 (TypeScript 版本)
+ * @param data1 第一个数据源
+ * @param data2 第二个数据源
+ * @returns 合并后的结果数组
+ */
+export declare const mergeNames: (data1: DataItem[], data2: DataItem[]) => DataItem[];
+/**
+ * 是否 formlist或者pro-edit-table 场景
+ * 使用正则表达式判断一个由逗号分隔的字符串中，是否包含一个纯数字的片段。
+ * @param {string} str - 输入的字符串。
+ * @returns {boolean} - 如果匹配成功，返回 true；否则返回 false。
+ */
+export declare const isListForm: (str: string) => boolean;
 export {};

package/es/ProForm/utils/index.js

@@ -6,10 +6,9 @@ import _isNaN from "lodash/isNaN";
 import _omit from "lodash/omit";
 import _set from "lodash/set";
 import _get from "lodash/get";
-import _isFunction from "lodash/isFunction";
 import _isObject from "lodash/isObject";
-import React, { useState } from 'react';
-import moment from 'moment';
+import dayjs from 'dayjs';
+import { useState } from 'react';
 export var getLayout = function getLayout(params) {
   var _params$span = params.span,
     span = _params$span === void 0 ? 8 : _params$span,
@@ -62,7 +61,7 @@ export var isTrim = function isTrim(type, trim, configData) {
     _ref$state = _ref.state,
     state = _ref$state === void 0 ? {} : _ref$state;
   var _trim = trim || (state === null || state === void 0 ? void 0 : (_state$type = state[type]) === null || _state$type === void 0 ? void 0 : _state$type.trim);
-  if (['Input', 'ProCombination'].includes(type) && _trim) {
+  if (['Input'].includes(type) && _trim) {
     result.getValueFromEvent = function (event) {
       var _event$target$value;
       if (Array.isArray(event)) {
@@ -83,7 +82,7 @@ export var isTrim = function isTrim(type, trim, configData) {
  */
 export var isUpperCase = function isUpperCase(type, upperCase) {
   var result = {};
-  if (['Input', 'ProCombination'].includes(type) && upperCase) {
+  if (['Input'].includes(type) && upperCase) {
     result.getValueFromEvent = function (event) {
       var _event$target, _event$target$value2;
       if (Array.isArray(event)) {
@@ -130,8 +129,8 @@ var _filterInternalFields = function filterInternalFields(values, optimize) {
     return values;
   }
   var nextValues = values;
-  // fix: braft-editor对象不可遍历 Moment不过滤
-  if ((values === null || values === void 0 ? void 0 : values._immutable) || moment.isMoment(values)) {
+  // fix: braft-editor对象不可遍历 Dayjs不过滤
+  if ((values === null || values === void 0 ? void 0 : values._immutable) || dayjs.isDayjs(values)) {
     return nextValues;
   }
   if (values instanceof File) {
@@ -298,12 +297,6 @@ export function getArrayBeforeNumber(arr) {
   });
   return index !== -1 ? arr.slice(0, index + 1) : arr;
 }
-// 自定义深比对 如果两边都是函数类型则认为相等
-export var customEqualForFun = function customEqualForFun(value, other) {
-  if (_isFunction(value) && _isFunction(other) || /*#__PURE__*/React.isValidElement(value) && /*#__PURE__*/React.isValidElement(other)) {
-    return true;
-  }
-};
 /**
  * 查询数据中是否包含rowKey
  */
@@ -452,4 +445,60 @@ export function findNamesKeyInArray(arr, key) {
     _iterator.f();
   }
   return null;
-}
+}
+/**
+ * 根据特定规则合并两个数据源 (TypeScript 版本)
+ * @param data1 第一个数据源
+ * @param data2 第二个数据源
+ * @returns 合并后的结果数组
+ */
+export var mergeNames = function mergeNames(data1, data2) {
+  // 步骤 1: 将 data1 的最后一个元素存入 Set 以便快速查找
+  var baseFields = new Set(data1.map(function (item) {
+    return item[item.length - 1];
+  }));
+  var finalResult = [];
+  var coveredFields = new Set();
+  // 步骤 2 & 3: 处理 data2，找出有效的合并项
+  data2.forEach(function (item) {
+    // 确保数组有可处理的合并字段，并且该字段是字符串类型
+    var combinedField = item[item.length - 1];
+    if (item.length < 3 || typeof combinedField !== 'string') {
+      return;
+    }
+    var subFields = combinedField.split('-');
+    // 检查所有子字段是否都存在于 baseFields 中
+    var allFieldsValid = subFields.every(function (field) {
+      return baseFields.has(field);
+    });
+    // 步骤 4: 如果有效，则添加到结果中，并记录已覆盖的字段
+    if (allFieldsValid) {
+      finalResult.push(item);
+      subFields.forEach(function (field) {
+        return coveredFields.add(field);
+      });
+    }
+  });
+  // 步骤 5: 处理 data1，添加未被覆盖的字段
+  data1.forEach(function (item) {
+    var field = item[item.length - 1];
+    if (!coveredFields.has(field)) {
+      finalResult.push(item);
+    }
+  });
+  return finalResult;
+};
+/**
+ * 是否 formlist或者pro-edit-table 场景
+ * 使用正则表达式判断一个由逗号分隔的字符串中，是否包含一个纯数字的片段。
+ * @param {string} str - 输入的字符串。
+ * @returns {boolean} - 如果匹配成功，返回 true；否则返回 false。
+ */
+export var isListForm = function isListForm(str) {
+  if (!str) {
+    return false;
+  }
+  // 正则表达式：查找被逗号或字符串边界包围的数字
+  var regex = /(?:^|,)\s*\d+\s*(?:,|$)/;
+  return regex.test(str);
+};