@zat-design/sisyphus-react 3.9.2-beta.8 → 3.9.2-beta.9

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

@@ -68,7 +68,7 @@ var ComRender = function ComRender(props) {
       children: viewRender(componentProps)
     });
   }
-  var Component = component ? ( /*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread3.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread3.default)({}, componentProps));
+  var Component = component ? (/*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread3.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread3.default)({}, componentProps));
   var Com = getComRender(Component, props, componentProps);
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
     value: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, contextProps), {}, {

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

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { ProCascaderProps } from './propsType';
-declare const _default: import("react").MemoExoticComponent<(props: ProCascaderProps) => JSX.Element>;
+declare const _default: import("react").MemoExoticComponent<(props: ProCascaderProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

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

@@ -22,16 +22,16 @@ var _useEnum = _interopRequireDefault(require("../../../../ProEnum/hooks/useEnum
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ = _interopRequireDefault(require("../../.."));
 var _Container = _interopRequireDefault(require("../../Container"));
-var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder"];
+var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder", "scrollFollowParent"];
 var Text = _antd.Typography.Text;
 var defaultFieldNames = {
   label: 'name',
   value: 'code',
   children: 'children'
 };
-var filterDataSource = function filterDataSource(dataSource, level, fieldNames) {
+var _filterDataSource = function filterDataSource(dataSource, level, fieldNames) {
   return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
-    return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, item), {}, (0, _defineProperty2.default)({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] : filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)));
+    return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, item), {}, (0, _defineProperty2.default)({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] : _filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)));
   });
 };
 var getViewLabel = function getViewLabel(_ref) {
@@ -87,6 +87,7 @@ var ProCascader = function ProCascader(props) {
     _props$separator = props.separator,
     separator = _props$separator === void 0 ? '/' : _props$separator,
     detailPlaceholder = props.detailPlaceholder,
+    scrollFollowParent = props.scrollFollowParent,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref3 = _.default.useFieldProps() || {},
     isViewCon = _ref3.isView,
@@ -107,7 +108,7 @@ var ProCascader = function ProCascader(props) {
   }, [dics === null || dics === void 0 ? void 0 : dics[addressCode], enumData]);
   var realDataSource = (0, _react.useMemo)(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    var result = (0, _index.transformDataName)(isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
+    var result = (0, _index.transformDataName)(isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
     return result;
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var _useRequest = (0, _objectSpread3.default)({}, useRequest),
@@ -123,7 +124,7 @@ var ProCascader = function ProCascader(props) {
     defaultLabel = _useState4[0],
     setDefaultLabel = _useState4[1];
   var getFirstLevelOptions = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _yield$service, data, newData, transFormData, serviceData;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -142,7 +143,7 @@ var ProCascader = function ProCascader(props) {
               value: fieldNames.value,
               children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
             });
-            serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
+            serviceData = isAddressMode && realLevel === 2 ? _filterDataSource(transFormData, level, fieldNames) : transFormData;
             setServiceData(serviceData);
           case 9:
           case "end":
@@ -212,7 +213,7 @@ var ProCascader = function ProCascader(props) {
   })) === null || _ref5$filter === void 0 ? void 0 : _ref5$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
     return !!item;
   })) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
-  var findSelectedOptions = function findSelectedOptions(options, value) {
+  var _findSelectedOptions = function findSelectedOptions(options, value) {
     var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     var _value = value !== null && value !== void 0 ? value : [];
     // 基准情况：如果 value 数组为空，且 path 不为空，说明找到了完整的路径
@@ -231,7 +232,7 @@ var ProCascader = function ProCascader(props) {
     if (foundOption) {
       // 如果找到了匹配的选项，并且还有更多的 value 需要匹配，递归地在子选项中查找
       if (_value.length > 1 && foundOption.children) {
-        return findSelectedOptions(foundOption.children, _value.slice(1), [].concat((0, _toConsumableArray2.default)(path), [foundOption]));
+        return _findSelectedOptions(foundOption.children, _value.slice(1), [].concat((0, _toConsumableArray2.default)(path), [foundOption]));
       }
       // 如果没有更多的 value 需要匹配，返回当前选项（以及之前的路径）
       return [].concat((0, _toConsumableArray2.default)(path), [foundOption]);
@@ -240,7 +241,7 @@ var ProCascader = function ProCascader(props) {
     return null;
   };
   var _selectedOptions = (0, _react.useMemo)(function () {
-    return findSelectedOptions(service ? serviceData : realDataSource, addressValue);
+    return _findSelectedOptions(service ? serviceData : realDataSource, addressValue);
   }, [service, serviceData, realDataSource, addressValue]);
   var handleAddressChange = function handleAddressChange(e) {
     var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);
@@ -273,8 +274,11 @@ var ProCascader = function ProCascader(props) {
         filter: handlefilter,
         limit: 1000
       },
-      onChange: handleChange
-    }, (0, _lodash.omit)(otherProps, 'otherProps'))), hasDetail && (tooltip && disabled && detail ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+      onChange: handleChange,
+      getPopupContainer: function getPopupContainer(trigger) {
+        return scrollFollowParent ? trigger.parentElement : document.body;
+      }
+    }, (0, _lodash.omit)(otherProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && disabled && detail ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: detail,
       children: (0, _jsxRuntime.jsx)("span", {
         className: "pro-address-detail",

package/lib/ProForm/components/combination/ProCascader/propsType.d.ts

@@ -34,4 +34,6 @@ export interface ProCascaderProps {
     separator?: string;
     /** 详情框占位符 */
     detailPlaceholder?: string;
+    /** 浮窗是否跟随父级 */
+    scrollFollowParent?: boolean;
 }

package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -33,7 +33,7 @@ var useDefaultOptions = function useDefaultOptions(options) {
   });
 };
 var defaultService = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+  var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:

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

@@ -255,7 +255,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     onChange(val, option);
   };
   var handleClick = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref7 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _yield$beforeOpen, res;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -322,7 +322,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
   };
   var handleFinish = /*#__PURE__*/function () {
-    var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+    var _ref8 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
       var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -387,7 +387,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     };
   }();
   var handleSearch = /*#__PURE__*/function () {
-    var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
+    var _ref9 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
       var values;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -460,7 +460,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
-    var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
+    var _ref10 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
       var _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -520,7 +520,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   }();
   // 初始化回显，当传入initParams时，前端用来回险
   var getDefaultOneValues = /*#__PURE__*/function () {
-    var _ref11 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
+    var _ref11 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
       var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {

package/lib/ProForm/components/old/InputRange/index.d.ts

@@ -12,5 +12,5 @@ export interface InputRangeProps {
     isPositiveInteger?: boolean;
     precision?: number;
 }
-declare const InputRange: ({ value, onChange, min, max, group, disabled, precision, isPositiveInteger, }: InputRangeProps) => JSX.Element;
+declare const InputRange: ({ value, onChange, min, max, group, disabled, precision, isPositiveInteger, }: InputRangeProps) => import("react/jsx-runtime").JSX.Element;
 export default InputRange;

package/lib/ProForm/components/old/InputWithSuffix/index.d.ts

@@ -1,3 +1,3 @@
 import { comPropsType } from './propsTypes';
-declare const InputWithSuffix: (props: comPropsType) => JSX.Element;
+declare const InputWithSuffix: (props: comPropsType) => import("react/jsx-runtime").JSX.Element;
 export default InputWithSuffix;

package/lib/ProForm/components/old/ProAddress/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ProAddressPropsType } from './propsTypes';
 export declare const transferAddressInfoToRegion: () => {
     normalize: (value: any) => {
@@ -24,5 +23,5 @@ export declare const transferAddressInfoToRegion: () => {
         };
     };
 };
-export declare function ProAddress({ ...props }: ProAddressPropsType): JSX.Element;
+export declare function ProAddress({ ...props }: ProAddressPropsType): import("react/jsx-runtime").JSX.Element;
 export default ProAddress;

package/lib/ProForm/components/old/ProAddress/index.js

@@ -93,7 +93,7 @@ function ProAddress(_ref3) {
     secondCitys = _useState6[0],
     setSecondCitys = _useState6[1];
   var queryCity = /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(code, type) {
+    var _ref5 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(code, type) {
       var cityList, _cityList, newList, _secondCitys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {

package/lib/ProForm/components/old/ProRangeBox/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import { ProRangeBoxPropsType } from './propsType';
-export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): JSX.Element;
+export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): import("react/jsx-runtime").JSX.Element;

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

@@ -18,6 +18,7 @@ var _diffOriginal = require("../../utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
 var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps", "viewRender"];
+var componentsWithFloatWindow = ['Select', 'ProSelect', 'ProEnum', 'ProTimeLimit', 'ProModalSelect', 'ProCascader', 'DataPicker', 'RangePicker', 'TimePicker'];
 var ChangedWrapper = function ChangedWrapper(props) {
   var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
   var name = props.name,
@@ -103,6 +104,9 @@ var ChangedWrapper = function ChangedWrapper(props) {
     'pro-form-item-add': isAdd
   });
   var open = tipOpenCalc();
+  var scrollFollowParentConfig = componentsWithFloatWindow.includes(type) ? {
+    scrollFollowParent: scrollFollowParent
+  } : {};
   return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
     open: open,
     getPopupContainer: function getPopupContainer(trigger) {
@@ -120,8 +124,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
       }), _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)({}, children.props), rest), {}, {
-          scrollFollowParent: scrollFollowParent,
+        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
         })) : undefined]
       })]
@@ -129,8 +132,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
     children: (0, _jsxRuntime.jsx)("div", {
       className: diffClassName,
       style: style,
-      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), {}, {
-        scrollFollowParent: scrollFollowParent,
+      children: /*#__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), {}, {
         otherProps: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
           isDiffChange: isChanged
         })

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

@@ -28,7 +28,7 @@ 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 _callee(value) {
+    var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(value) {
       var _len,
         other,
         _key,

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

@@ -136,6 +136,12 @@ var Render = function Render(props) {
   var transforms = Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.names) ? (0, _transformNames.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherFormItemProps), valueTypeTransform()),
   // 合并valueType的transform
   form, otherProps.names, namesStr, otherProps.type) : valueTypeTransform();
+  /**
+   * globalControl 全局控制优先
+   * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】
+   * globalControl false时，优先级 组件上【fieldProps.disabled】 > formitem上【column.disabled】 >  全局【formDisabled】
+   */
+  var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
   // ↑↑↑↑↑↑  formItem参数整理  ↑↑↑↑↑↑
   Object.assign(otherFormItemProps, transforms, {
     names: otherProps.names
@@ -148,6 +154,10 @@ var Render = function Render(props) {
   } : null, (0, _objectSpread2.default)({}, (0, _index.isTrim)(type, trim, (0, _ProConfigProvider.useProConfig)())), // 优先取传进来的，其次取ProConfigProvider配置的
   (0, _objectSpread2.default)({}, (0, _index.isUpperCase)(type, upperCase)), {
     validateFirst: true
+  },
+  // 当某一规则校验不通过时，是否停止剩下的规则的校验
+  {
+    disabled: lastDisabled
   });
   // 添加label宽度
   if (labelWidth) {
@@ -157,12 +167,6 @@ var Render = function Render(props) {
   }
   /** 移除多余参数，防止透传给formItem报错 */
   var _otherFormItemProps = (0, _lodash.omit)(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames']);
-  /**
-   * globalControl 全局控制优先
-   * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】
-   * globalControl false时，优先级 组件上【fieldProps.disabled】 > formitem上【column.disabled】 >  全局【formDisabled】
-   */
-  var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
   /**
    * 最新fieldProps: 更新后的组件Props
    */
@@ -241,7 +245,7 @@ var Render = function Render(props) {
       _args = functionArgs([].concat(args));
     }
     var inList = _otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n3 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n3 === void 0 ? void 0 : _otherFormItemProps$n3.length;
-    if ( /*#__PURE__*/_react.default.isValidElement(AutoComponent)) {
+    if (/*#__PURE__*/_react.default.isValidElement(AutoComponent)) {
       var _AutoComponent$props$, _AutoComponent$props, _lastComponentProps$c;
       ((_AutoComponent$props$ = (_AutoComponent$props = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _AutoComponent$props$ === void 0 ? void 0 : _AutoComponent$props$.call.apply(_AutoComponent$props$, [_AutoComponent$props].concat((0, _toConsumableArray2.default)(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat((0, _toConsumableArray2.default)(_args))));
       return false;
@@ -291,7 +295,7 @@ 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__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _len3,
         args,
         _key3,
@@ -374,7 +378,7 @@ var Render = function Render(props) {
     if (originComponent) {
       delete childProps.otherProps;
     }
-    var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? ( /*#__PURE__*/_react.default.cloneElement(AutoComponent, childProps)) : (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
+    var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? (/*#__PURE__*/_react.default.cloneElement(AutoComponent, childProps)) : (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
       otherProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
         show: show,
         disabled: lastDisabled,
@@ -401,7 +405,7 @@ var Render = function Render(props) {
       };
     }
     // 需要过滤掉的form_item的key
-    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl', 'listName'];
+    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl', 'listName', 'fixed'];
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';

package/lib/ProForm/index.js

@@ -92,12 +92,15 @@ var ProForm = function ProForm(props, ref) {
   (0, _react.useMemo)(function () {
     if (formKey && forms[formKey] !== form) {
       forms[formKey] = form;
-      dispatch({
-        type: 'set',
-        payload: {
-          forms: (0, _objectSpread2.default)({}, forms)
-        }
-      });
+      // fix:  Cannot update a component (`ProConfigProvider`) while rendering a different component (`ForwardRef(ProForm)`).
+      setTimeout(function () {
+        dispatch({
+          type: 'set',
+          payload: {
+            forms: (0, _objectSpread2.default)({}, forms)
+          }
+        });
+      }, 300);
     }
     // 销毁
     return function () {
@@ -201,7 +204,7 @@ var ProForm = function ProForm(props, ref) {
     if (isView || disabled) {
       // 查看或禁用模式
       footerEle = null;
-    } else if ( /*#__PURE__*/_react.default.isValidElement(footer)) {
+    } else if (/*#__PURE__*/_react.default.isValidElement(footer)) {
       // 传入组件渲染组件
       footerEle = footer;
     } else if (footer === undefined || footer || (0, _lodash.isObject)(footer)) {
@@ -238,7 +241,7 @@ var ProForm = function ProForm(props, ref) {
     },
     className: cls,
     form: form
-  }, formProps), config), otherProps), {}, {
+  }, formProps), (0, _lodash.omit)(config, ['isDiffAll'])), otherProps), {}, {
     labelAlign: (_ref = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref !== void 0 ? _ref : 'left',
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,

package/lib/ProForm/utils/index.js

@@ -136,7 +136,7 @@ var splitNameStr = exports.splitNameStr = function splitNameStr(name) {
   });
 };
 // 过滤掉字段名中包含 '-' 的字段
-var filterInternalFields = exports.filterInternalFields = function filterInternalFields(values, optimize) {
+var _filterInternalFields = exports.filterInternalFields = function filterInternalFields(values, optimize) {
   if (optimize) {
     return values;
   }
@@ -150,20 +150,20 @@ var filterInternalFields = exports.filterInternalFields = function filterInterna
   }
   if (Array.isArray(nextValues)) {
     return nextValues.map(function (item) {
-      return filterInternalFields(item);
+      return _filterInternalFields(item);
     });
   }
   if ((0, _lodash.isObject)(nextValues)) {
     var result = {};
     Object.keys(nextValues).forEach(function (key) {
       if (key.includes('-')) return;
-      result[key] = filterInternalFields(nextValues[key]);
+      result[key] = _filterInternalFields(nextValues[key]);
     });
     return result;
   }
   return nextValues;
 };
-var getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
+var _getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
   var currentPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var keys = Object.keys(object);
   var resultKeys = [];
@@ -177,7 +177,7 @@ var getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
     }
     // 深度获取对象key
     if ((0, _lodash.isObject)(value)) {
-      resultKeys.concat(getAllNamePath(value, [].concat((0, _toConsumableArray2.default)(currentPath), [key])));
+      resultKeys.concat(_getAllNamePath(value, [].concat((0, _toConsumableArray2.default)(currentPath), [key])));
     }
     resultKeys.push([].concat((0, _toConsumableArray2.default)(currentPath), [key]));
   });
@@ -320,7 +320,7 @@ var customEqualForFun = exports.customEqualForFun = function customEqualForFun(v
 /**
  * 查询数据中是否包含rowKey
  */
-var hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
+var _hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
   if ((0, _typeof2.default)(obj) !== 'object' || obj === null) {
     return false;
   }
@@ -330,7 +330,7 @@ var hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return hasRowKey(obj[key]);
+    return _hasRowKey(obj[key]);
   });
 };
 /**
@@ -346,7 +346,7 @@ var view = exports.view = function view(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return hasRowKey(obj[key]);
+    return _hasRowKey(obj[key]);
   });
 };
 /**
@@ -382,7 +382,7 @@ var deleteForPath = exports.deleteForPath = function deleteForPath(values, nameP
  * @param value 选中值
  * @returns {}
  */
-var findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
+var _findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
   if ((0, _lodash.isObject)(value)) {
     return value;
   }
@@ -392,7 +392,7 @@ var findOptionByValue = exports.findOptionByValue = function findOptionByValue(t
       return (0, _lodash.omit)(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
     }
     if (node.children) {
-      var foundNode = findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
+      var foundNode = _findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
       if (foundNode) {
         return (0, _lodash.omit)(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }

package/lib/ProForm/utils/useForm.js

@@ -44,7 +44,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
     return getFieldsValue(nameList, filterFunc);
   };
   var _validateFields = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
+    var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
       var _rest$,
         _len,
         rest,

package/lib/ProIcon/index.js

@@ -20,7 +20,7 @@ var _config2 = require("./config");
 var _utils = require("./utils");
 var _locale = _interopRequireDefault(require("../locale"));
 require("./symbolIcon.js");
-var _excluded = ["type", "onClick", "size", "color", "className", "style", "spin", "rotate", "theme", "disabled", "mode", "buttonProps", "children", "mapList", "src", "actionMap", "tooltip"];
+var _excluded = ["type", "onClick", "size", "color", "className", "style", "spin", "rotate", "theme", "disabled", "mode", "buttonProps", "children", "mapList", "src", "actionMap", "tooltip", "buttonIcon"];
 var ProIcon = function ProIcon(props) {
   var _window, _window2;
   var _useProConfig = (0, _ProConfigProvider.useProConfig)(),
@@ -54,6 +54,8 @@ var ProIcon = function ProIcon(props) {
     src = _config.src,
     actionMap = _config.actionMap,
     tooltip = _config.tooltip,
+    _config$buttonIcon = _config.buttonIcon,
+    buttonIcon = _config$buttonIcon === void 0 ? true : _config$buttonIcon,
     reset = (0, _objectWithoutProperties2.default)(_config, _excluded);
   var _useSetState = (0, _ahooks.useSetState)({
       IconInstance: (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {})
@@ -134,6 +136,25 @@ var ProIcon = function ProIcon(props) {
       height: size
     }, rotateStyle), style)
   };
+  var icon = !src ? (0, _jsxRuntime.jsx)("svg", (0, _objectSpread2.default)((0, _objectSpread2.default)({}, svgProps), {}, {
+    onClick: onClick,
+    "aria-hidden": "true",
+    children: (0, _jsxRuntime.jsx)("use", {
+      xlinkHref: "#icon-".concat(_type)
+    })
+  })) : (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, svgProps), {}, {
+    // @ts-ignore
+    onClick: onClick,
+    "aria-hidden": "true",
+    src: src,
+    beforeInjection: function beforeInjection(svg) {
+      (0, _utils.onBeforeInjection)({
+        svg: svg,
+        actionMap: actionMap,
+        primaryColor: isQiankun ? qiankunPrimaryColor : primaryColor
+      });
+    }
+  }));
   var RenderIcon = (0, _jsxRuntime.jsx)("span", (0, _objectSpread2.default)((0, _objectSpread2.default)({
     className: "anticon",
     style: {
@@ -142,7 +163,7 @@ var ProIcon = function ProIcon(props) {
   }, reset), {}, {
     children: (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: iconText,
-      children: (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)({
+      children: buttonIcon ? (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)({
         style: {
           width: size,
           height: size,
@@ -152,26 +173,20 @@ var ProIcon = function ProIcon(props) {
           verticalAlign: 'baseline'
         },
         type: "text",
-        icon: !src ? (0, _jsxRuntime.jsx)("svg", (0, _objectSpread2.default)((0, _objectSpread2.default)({}, svgProps), {}, {
-          onClick: onClick,
-          "aria-hidden": "true",
-          children: (0, _jsxRuntime.jsx)("use", {
-            xlinkHref: "#icon-".concat(_type)
-          })
-        })) : (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, svgProps), {}, {
-          // @ts-ignore
-          onClick: onClick,
-          "aria-hidden": "true",
-          src: src,
-          beforeInjection: function beforeInjection(svg) {
-            (0, _utils.onBeforeInjection)({
-              svg: svg,
-              actionMap: actionMap,
-              primaryColor: isQiankun ? qiankunPrimaryColor : primaryColor
-            });
-          }
-        }))
-      }, buttonProps))
+        icon: icon
+      }, buttonProps)) : (0, _jsxRuntime.jsx)(_antd.Space, {
+        children: (0, _jsxRuntime.jsx)("span", {
+          style: {
+            width: size,
+            height: size,
+            border: 'none',
+            borderRadius: 0,
+            padding: 0,
+            verticalAlign: 'baseline'
+          },
+          children: icon
+        })
+      })
     })
   }));
   (0, _react.useEffect)(function () {

package/lib/ProIcon/propsTypes.d.ts

@@ -99,5 +99,7 @@ export interface ProIconProps {
      * @default
      */
     actionMap?: actionMap;
+    /** 内部使用 */
+    buttonIcon?: boolean;
 }
 export {};

package/lib/ProIcon/utils/index.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.recurseGetNodes = exports.onBeforeInjection = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _config = require("../config");
-var recurseGetNodes = exports.recurseGetNodes = function recurseGetNodes(type, node, queue) {
+var _recurseGetNodes = exports.recurseGetNodes = function recurseGetNodes(type, node, queue) {
   switch (type) {
     // 渐变
     case 'gradation':
@@ -26,7 +26,7 @@ var recurseGetNodes = exports.recurseGetNodes = function recurseGetNodes(type, n
   }
   if (node.childNodes) {
     for (var i = 0; i < node.childNodes.length; i++) {
-      recurseGetNodes(type, node.childNodes[i], queue);
+      _recurseGetNodes(type, node.childNodes[i], queue);
     }
   }
 };
@@ -56,7 +56,7 @@ var onBeforeInjection = exports.onBeforeInjection = function onBeforeInjection(_
     // 目前只支持处理渐变及fill填充
     var types = Reflect.ownKeys(nodeMap !== null && nodeMap !== void 0 ? nodeMap : {});
     types.forEach(function (typeKey) {
-      recurseGetNodes(typeKey, svg, nodeMap[typeKey]);
+      _recurseGetNodes(typeKey, svg, nodeMap[typeKey]);
     });
     if ((gradList === null || gradList === void 0 ? void 0 : gradList.length) > 0) {
       nodeMap.gradation.forEach(function (item, index) {

package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.d.ts

@@ -1,3 +1,3 @@
 import type { OpenMenuPropsType } from './propsType';
-declare const OpenMenu: (props: OpenMenuPropsType) => JSX.Element;
+declare const OpenMenu: (props: OpenMenuPropsType) => import("react/jsx-runtime").JSX.Element;
 export default OpenMenu;