@zat-design/sisyphus-react 3.3.3 → 3.4.0-beta.1

package/dist/index.esm.css

@@ -1941,6 +1941,9 @@ div.pro-textarea-view::after {
   display: none;
   padding-bottom: 12px;
 }
+.pro-textarea .ant-input {
+  resize: auto !important;
+}
 .pro-form-list-block-title {
   height: 14px;
   margin: calc(var(--zaui-space-size-xs, 4px) * var(--zaui-size, 1)) 0;
@@ -2233,10 +2236,12 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-group {
   width: unset !important;
 }
-.pro-group.pro-group-diy-width .ant-space .ant-space-item {
+.pro-group.pro-group-diy-width .ant-space .ant-space-item,
+.pro-group.pro-group-width-auto .ant-space .ant-space-item {
   width: auto;
 }
-.pro-group.pro-group-diy-width .ant-space .ant-space-item .ant-space-item {
+.pro-group.pro-group-diy-width .ant-space .ant-space-item .ant-space-item,
+.pro-group.pro-group-width-auto .ant-space .ant-space-item .ant-space-item {
   width: auto;
 }
 .pro-group .ant-space {
@@ -4220,9 +4225,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   position: absolute;
   bottom: var(--zaui-space-size-md, 16px);
 }
-.pro-edit-table-toolbar {
-  margin-top: var(--zaui-space-size-md, 16px);
-}
 .pro-edit-table-toolbar .ant-space {
   gap: var(--zaui-space-size-sm, 8px);
 }
@@ -5508,3 +5510,28 @@ input[type='button'] {
   width: -moz-max-content;
   width: max-content;
 }
+.ant-tooltip > .ant-tooltip-content > .ant-tooltip-inner {
+  color: #1d2129;
+  background-color: #fff;
+  -webkit-box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
+          box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
+}
+.ant-tooltip > .ant-tooltip-content > .ant-tooltip-inner::-moz-selection {
+  color: inherit !important;
+  background: rgba(24, 144, 255, 0.3) !important;
+}
+.ant-tooltip > .ant-tooltip-content > .ant-tooltip-inner::selection {
+  color: inherit !important;
+  background: rgba(24, 144, 255, 0.3) !important;
+}
+.ant-tooltip > .ant-tooltip-content > .ant-tooltip-inner > div::-moz-selection {
+  color: inherit !important;
+  background: rgba(24, 144, 255, 0.3) !important;
+}
+.ant-tooltip > .ant-tooltip-content > .ant-tooltip-inner > div::selection {
+  color: inherit !important;
+  background: rgba(24, 144, 255, 0.3) !important;
+}
+.ant-tooltip > .ant-tooltip-content > .ant-tooltip-arrow > .ant-tooltip-arrow-content {
+  --antd-arrow-background-color: linear-gradient(to right bottom, rgba(255, 255, 255, 0.95), #ffffff);
+}

package/es/ProConfigProvider/index.d.ts

@@ -1,4 +1,5 @@
 import React, { FC } from 'react';
+import { FormInstance } from 'antd';
 import { PropSelectProps } from '../ProSelect/propsType';
 import { ProModalSelectPropsType } from '../ProForm/components/combination/ProModalSelect/propsType';
 import { AddressProps } from '../ProForm/components/combination/ProAddressBar/propsType';
@@ -9,17 +10,24 @@ export interface ProConfigState {
     ProSelect?: Partial<PropSelectProps> & Record<string, any>;
     ProModalSelect?: Partial<ProModalSelectPropsType> & Record<string, any>;
     ProAddressBar?: Partial<AddressProps> & Record<string, any>;
+    forms: Record<string, FormInstance | undefined>;
     [key: string]: any;
 }
 interface ConfigContext {
     state: ProConfigState;
-    dispatch: React.Dispatch<ProConfigState>;
+    dispatch: React.Dispatch<Actions>;
 }
 export declare const ProConfigContext: React.Context<ConfigContext>;
 export declare function useProConfig(): ConfigContext;
 export declare function useProConfig(name: keyof ConfigContext['state']): ConfigContext['state'][keyof ConfigContext['state']];
+export declare function useContextForms(): Record<string, FormInstance<any>>;
+type ActionsType = 'set' | 'setProEnum' | 'setProEnumDic';
+interface Actions {
+    type: ActionsType;
+    payload: any;
+}
 export declare const ProConfigProvider: FC<{
-    value: ProConfigState;
+    value?: ProConfigState;
     locale?: string;
 }>;
 export default ProConfigProvider;

package/es/ProConfigProvider/index.js

@@ -9,12 +9,14 @@ import enUS from 'antd/es/locale/en_US';
 import merge from 'lodash/merge';
 import useEnumRequest from '../ProEnum/hooks/useEnumRequest';
 import { setLanguage } from '../locale';
-export var ProConfigContext = /*#__PURE__*/React.createContext({
-  state: {
-    ProEnum: {
-      dics: {}
-    }
+var initialState = {
+  ProEnum: {
+    dics: {}
   },
+  forms: {}
+};
+export var ProConfigContext = /*#__PURE__*/React.createContext({
+  state: initialState,
   dispatch: function dispatch() {}
 });
 // eslint-disable-next-line no-redeclare
@@ -22,11 +24,15 @@ export function useProConfig(name) {
   var config = useContext(ProConfigContext);
   return name ? config.state[name] : config;
 }
+export function useContextForms() {
+  var _config$state;
+  var config = useContext(ProConfigContext);
+  return (_config$state = config.state) === null || _config$state === void 0 ? void 0 : _config$state.forms;
+}
 var antdLangMap = {
   'zh-CN': zhCN,
   'en-US': enUS // en-US
 };
-
 var reducer = function reducer(state, action) {
   var _state$ProEnum;
   switch (action.type) {
@@ -48,7 +54,7 @@ var reducer = function reducer(state, action) {
 };
 export var ProConfigProvider = function ProConfigProvider(props) {
   var _props$value, _props$value2;
-  var _useReducer = useReducer(reducer, {}),
+  var _useReducer = useReducer(reducer, initialState),
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];

package/es/ProEditLabel/index.js

@@ -22,7 +22,6 @@ import { omit } from 'lodash';
 import RenderProForm from './components/RenderProForm';
 import { matchFormValue } from './utils';
 var ProEditLabel = function ProEditLabel(_ref) {
-  var _classnames;
   var _ref$open = _ref.open,
     open = _ref$open === void 0 ? false : _ref$open,
     _ref$disabled = _ref.disabled,
@@ -128,9 +127,9 @@ var ProEditLabel = function ProEditLabel(_ref) {
       }
     }
   }, [confirmValue, mode]);
-  var cls = classnames((_classnames = {
+  var cls = classnames(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
     'pro-edit-label': true
-  }, _defineProperty(_classnames, "trigger-".concat(trigger), trigger), _defineProperty(_classnames, 'pro-edit-label-small', size === 'small'), _defineProperty(_classnames, 'pro-edit-label-middle', size === 'middle'), _defineProperty(_classnames, 'pro-edit-label-large', size === 'large'), _defineProperty(_classnames, "".concat(className), className), _classnames));
+  }, "trigger-".concat(trigger), trigger), 'pro-edit-label-small', size === 'small'), 'pro-edit-label-middle', size === 'middle'), 'pro-edit-label-large', size === 'large'), "".concat(className), className));
   /**
    * pop确认回调
    */

package/es/ProEditTable/components/ActionButton/index.js

@@ -82,24 +82,24 @@ var ActionButton = function ActionButton(_ref) {
         disabled: isDisabled,
         okText: locale.ProEditTable.confirm,
         cancelText: locale.ProEditTable.cancel,
-        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled
-        })) : _jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        }))) : _jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
           disabled: isDisabled,
           type: "link",
           children: btnConfig.label
         }))
       }) : _jsx(_Fragment, {
-        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled,
           onClick: function onClick() {
             btnConfig.onEvent(record, index);
           }
-        })) : _jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        }))) : _jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
           disabled: isDisabled,
           type: "link",
           onClick: function onClick() {
@@ -109,10 +109,10 @@ var ActionButton = function ActionButton(_ref) {
         }))
       })
     }) : _jsx(_Fragment, {
-      children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
+      children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
         record: record,
         index: index
-      })) : _jsx(_Button, _objectSpread(_objectSpread({
+      }))) : _jsx(_Button, _objectSpread(_objectSpread({
         className: "action-button"
       }, omit(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
         type: "link",

package/es/ProEditTable/components/RenderField/index.js

@@ -30,7 +30,7 @@ import useRules from '../../../ProForm/utils/useRules';
 import { isSelect } from '../../../ProForm/utils';
 import locale from '../../../locale';
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _formItemChildProps$p, _TargetComponent4, _classNames;
+  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _formItemChildProps$p, _TargetComponent4;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -506,13 +506,13 @@ var RenderField = function RenderField(_ref) {
   if (!isEditing) {
     delete _formItemProps.rules;
   }
-  var _className = classNames((_classNames = {}, _defineProperty(_classNames, className, className), _defineProperty(_classNames, 'pro-form-item-changed', changed), _classNames));
+  var _className = classNames(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-changed', changed));
   var originalTitle = originalTip ? _jsxs(_Space, {
-    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
+    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
-    })) : _jsx(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
+    }))) : _jsx(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
@@ -523,7 +523,7 @@ var RenderField = function RenderField(_ref) {
   }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
     name: cellName,
-    children: /*#__PURE__*/React.isValidElement(TargetComponent) ? /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange']))) : _jsx(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange'])))
+    children: /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange'])))) : _jsx(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange'])))
   })) : _jsx(Container, {
     viewEmpty: viewEmpty
   });

package/es/ProEditTable/style/index.less

@@ -313,7 +313,6 @@
 }
 
 .pro-edit-table-toolbar {
-  margin-top: var(--zaui-space-size-md, 16px);
   .@{ant-prefix}-space {
     gap: var(--zaui-space-size-sm, 8px);
 

package/es/ProEditTable/utils/index.js

@@ -217,9 +217,9 @@ export var transformColumns = function transformColumns() {
           children: [columnTitle, _jsx(_Tooltip, _objectSpread(_objectSpread({
             title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip
           }, resetProps), {}, {
-            children: icon ? /*#__PURE__*/React.cloneElement(icon, {
+            children: icon ? ( /*#__PURE__*/React.cloneElement(icon, {
               className: 'icon-tip'
-            }) : _jsx(ReactSVG, {
+            })) : _jsx(ReactSVG, {
               className: "icon-tip",
               src: tipSvg
             })
@@ -336,7 +336,6 @@ export var transformColumns = function transformColumns() {
         })
       });
     };
-
     item.render = _render;
   });
   if (disabled || isView) {
@@ -359,7 +358,6 @@ export var transformColumns = function transformColumns() {
     var actionColumn = getActionColumn(_objectSpread(_objectSpread({}, config), {}, {
       validateKeys: validateKeys // 需要校验的单元格的formItem的name
     }));
-
     actionColumn && _columns.push(actionColumn);
   }
   // cacheMap 用来存储缓存值，若有值后不再请求

package/es/ProEnum/index.js

@@ -175,13 +175,27 @@ var ProEnum = function ProEnum(props) {
         return _jsx(_Radio.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames'])), {}, {
           options: list,
           value: value,
-          onChange: onChange
+          onChange: onChange,
+          children: list.map(function (item) {
+            return _jsx(_Radio, {
+              value: item[fieldValue],
+              disabled: !!item.disabled,
+              children: item[label]
+            }, item[fieldValue]);
+          })
         }));
       case 'Checkbox':
         return _jsx(_Checkbox.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames'])), {}, {
           options: list,
           value: value,
-          onChange: onChange
+          onChange: onChange,
+          children: list.map(function (item) {
+            return _jsx(_Checkbox, {
+              value: item[fieldValue],
+              disabled: !!item.disabled,
+              children: item[label]
+            }, item[fieldValue]);
+          })
         }));
       case 'Tag':
         return _jsx(ProEnumTag, {

package/es/ProEnum/style/index.less

@@ -12,7 +12,7 @@
     align-items: center;
     justify-content: center;
     margin-right: var(--zaui-space-size-sm);
-     margin-bottom: calc(var(--zaui-space-size-sm; 8px) * var(--zaui-size; 1));
+    margin-bottom: calc(var(--zaui-space-size-sm; 8px) * var(--zaui-size; 1));
     padding: var(--zaui-space-size-xs) 10px;
     background-color: #f5f5f5;
     border-radius: var(--zaui-space-size-xs);
@@ -23,4 +23,8 @@
     color: #fff;
     background-color: var(--zaui-brand);
   }
+  &-tag-item-disabled {
+    background-color: #f5f5f5;
+    pointer-events: none;
+  }
 }

package/es/ProForm/components/base/Switch/index.js

@@ -38,5 +38,4 @@ var Switch = function Switch(props) {
     id: "switch_only" // 解决点击label联动的问题
   }));
 };
-
 export default Switch;

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

@@ -40,9 +40,7 @@ var TextAreaDef = function TextAreaDef(props) {
     showCount: true,
     autoComplete: "off",
     placeholder: placeholder || "".concat(locale.ProForm.inputPlaceholder).concat(label || ''),
-    autoSize: {
-      minRows: 4
-    }
+    autoSize: true
   }, omit(initialConfig, ['trim'])), rest), {}, {
     className: _className
   }));

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

@@ -10,3 +10,10 @@ div.pro-textarea-view {
     padding-bottom: 12px;
   }
 }
+
+// input-textarea级联选择
+.pro-textarea {
+  .@{ant-prefix}-input {
+    resize: auto !important;
+  }
+}

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

@@ -225,13 +225,13 @@ var ActionButton = function ActionButton(props) {
           },
           children: label
         }))
-      }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index)) : /*#__PURE__*/_createElement(_Button, _objectSpread(_objectSpread({}, rest), {}, {
+      }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index)) : ( /*#__PURE__*/_createElement(_Button, _objectSpread(_objectSpread({}, rest), {}, {
         key: "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index),
         onClick: function onClick(e) {
           e.stopPropagation();
           handleClick(_onClick, index);
         }
-      }), label);
+      }), label));
     })
   });
 };

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

@@ -51,6 +51,9 @@ var Group = function Group(props) {
     'pro-group-diy-width': columns.some(function (item) {
       var _item$fieldProps, _item$fieldProps$styl;
       return item === null || item === void 0 ? void 0 : (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : (_item$fieldProps$styl = _item$fieldProps.style) === null || _item$fieldProps$styl === void 0 ? void 0 : _item$fieldProps$styl.width;
+    }),
+    'pro-group-width-auto': columns.some(function (item) {
+      return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
     })
   }, "".concat(className), className));
   return _jsx("div", {
@@ -60,7 +63,9 @@ var Group = function Group(props) {
         columns: data.columns,
         form: form
       }, omit(otherProps, ['colProps'])))
-    }) : _jsx(_Space, _objectSpread(_objectSpread({}, omit(space, ['separator', 'compact'])), {}, {
+    }) : _jsx(_Space, _objectSpread(_objectSpread({
+      align: "start"
+    }, omit(space, ['separator', 'compact'])), {}, {
       children: data.columns.map(function (column, index) {
         return _jsx(RenderFields, _objectSpread({
           columns: [column],

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

@@ -20,8 +20,9 @@
 
 .pro-group {
   width: unset !important;
+  
 
-  &.pro-group-diy-width {
+  &.pro-group-diy-width, &.pro-group-width-auto {
     .@{ant-prefix}-space .@{ant-prefix}-space-item {
       width: auto;
 

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

@@ -83,7 +83,6 @@ export var ProCombination = function ProCombination(props) {
     _handleChange(_values, rest === null || rest === void 0 ? void 0 : rest[0], form);
     (_childProps$index = childProps[index]) === null || _childProps$index === void 0 ? void 0 : (_childProps$index$onC = _childProps$index.onChange) === null || _childProps$index$onC === void 0 ? void 0 : _childProps$index$onC.call(_childProps$index, value, rest === null || rest === void 0 ? void 0 : rest[0], form); // 支持子组件分别传入onChange
   };
-
   var className = classNames({
     'pro-combination': true,
     'pro-combination-view': isView

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

@@ -548,8 +548,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         _value: value
       });
     } else if (Object.prototype.toString.call(value) === '[object Object]') {
-      var _initialValue;
-      var initialValue = (_initialValue = {}, _defineProperty(_initialValue, valueKey, value[valueKey]), _defineProperty(_initialValue, labelKey, value[labelKey]), _initialValue);
+      var initialValue = _defineProperty(_defineProperty({}, valueKey, value[valueKey]), labelKey, value[labelKey]);
       setState({
         selectedRowKeys: [value],
         selectedRows: [initialValue],
@@ -740,6 +739,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       visible: visible
     }, restModalProps), {}, {
       children: [_jsx(ProForm, {
+        submitOnEnter: true,
         form: form,
         columns: formColumns,
         onFinish: handleSearch,

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

@@ -33,7 +33,7 @@ import tipSvg from '../../../assets/tip.svg';
 import useRules from '../../utils/useRules';
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
-  var _ref2, _classNames, _otherProps$names2;
+  var _ref2, _otherProps$names2;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -44,7 +44,8 @@ var Render = function Render(props) {
     show = _props$show === void 0 ? true : _props$show,
     fieldProps = props.fieldProps,
     form = props.form,
-    formDisabled = props.disabled,
+    disabled = props.disabled,
+    formDisabled = props.formDisabled,
     type = props.type,
     isSelect = props.isSelect,
     originalValues = props.originalValues,
@@ -68,7 +69,7 @@ var Render = function Render(props) {
       show: show,
       formItemProps: formItemProps,
       form: form,
-      disabled: componentProps.disabled,
+      disabled: disabled,
       rules: rules,
       required: required,
       fieldProps: fieldProps,
@@ -163,15 +164,15 @@ var Render = function Render(props) {
   }
   /** 移除多余参数，防止透传给formItem报错 */
   var _otherFormItemProps = omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'switchValue', 'precision', 'clearNotShow']);
-  // 优先取组件上的disabled, 最后取formDisabled（全局
-  var lastDisabled = componentProps.disabledStrictly ? (_ref2 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : formDisabled : false;
+  // 优先级 column.disabled > fieldProps.disabled > formDisabled
+  var lastDisabled = (_ref2 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : formDisabled;
   /**
    * 最新fieldProps: 更新后的组件Props
    */
   var lastComponentProps = _objectSpread(_objectSpread(_objectSpread({}, componentProps), _fieldProps), {}, {
     disabled: lastDisabled
   });
-  var _className = classNames((_classNames = {}, _defineProperty(_classNames, className, className), _defineProperty(_classNames, 'pro-form-item-changed', changed), _defineProperty(_classNames, 'pro-form-item-width-auto', ['Switch'].includes(type)), _classNames));
+  var _className = classNames(_defineProperty(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-changed', changed), '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, {
@@ -255,7 +256,7 @@ var Render = function Render(props) {
     if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
       setTimeout(function () {
         form.setFieldValue(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames, form.getFieldValue(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames));
-        form.validateFields([formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames]);
+        form.validateFields();
       }, 60);
     }
     // ProTreeSelect返回option
@@ -344,7 +345,7 @@ var Render = function Render(props) {
     if (originComponent) {
       delete childProps.otherProps;
     }
-    var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? /*#__PURE__*/React.cloneElement(AutoComponent, childProps) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
+    var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? ( /*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
       otherProps: _objectSpread(_objectSpread({}, otherProps), {}, {
         show: show,
         disabled: lastDisabled,
@@ -390,7 +391,6 @@ var Render = function Render(props) {
         span: 24 // 默认占一行
       });
     }
-
     var orgFormItem = _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,

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

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "disabled", "equalWith", "clearNotShow", "required"];
+var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "equalWith", "clearNotShow", "required"];
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from 'react';
 import { isBoolean, isFunction, union, isString } from 'lodash';
@@ -44,7 +44,7 @@ var RenderFields = function RenderFields(props) {
     });
   }
   var comList = columns.flatMap(function (column, index) {
-    var _ref, _formItemProps$disabl;
+    var _formItemProps$disabl;
     if (!!expand && !openState) {
       // expand为Number时 过滤掉大于expand 且 非fixed的column
       if (typeof expand === 'number') {
@@ -67,7 +67,6 @@ var RenderFields = function RenderFields(props) {
       formItemChildProps = _column$formItemChild === void 0 ? {} : _column$formItemChild,
       _column$fieldProps = column.fieldProps,
       fieldProps = _column$fieldProps === void 0 ? {} : _column$fieldProps,
-      disabled = column.disabled,
       equalWith = column.equalWith,
       _column$clearNotShow = column.clearNotShow,
       clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,
@@ -123,8 +122,7 @@ var RenderFields = function RenderFields(props) {
       placeholder = formItemChildProps.placeholder,
       dataSource = formItemChildProps.dataSource;
     var formLabel = _formItemProps.label;
-    var comDisabled = (_ref = (_formItemProps$disabl = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled) !== null && _formItemProps$disabl !== void 0 ? _formItemProps$disabl : fieldProps.disabled) !== null && _ref !== void 0 ? _ref : disabled;
-    var _disabled = comDisabled === undefined ? formDisabled : comDisabled;
+    var comDisabled = (_formItemProps$disabl = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled) !== null && _formItemProps$disabl !== void 0 ? _formItemProps$disabl : fieldProps.disabled; // 组件属性层disabled fieldProps可能为函数
     // 当前组件是不是一个选择组件
     var _isSelect = isSelect({
       dataSource: dataSource,
@@ -141,10 +139,9 @@ var RenderFields = function RenderFields(props) {
       _fieldProps.disabled = formDisabled;
     }
     var componentProps = _objectSpread(_objectSpread({
-      disabledStrictly: true,
       placeholder: placeholderHandle()
     }, _fieldProps), {}, {
-      disabled: _disabled
+      disabled: comDisabled
     });
     // 容器组件，额外处理show的问题
     if (['ProCollapse', 'Container'].includes(_type)) {
@@ -168,7 +165,7 @@ var RenderFields = function RenderFields(props) {
     var otherProps = {
       label: _formItemProps.label,
       name: _formItemProps.name,
-      disabled: _disabled,
+      disabled: comDisabled,
       isView: _isView,
       viewEmpty: viewEmpty,
       valueType: valueType,
@@ -189,8 +186,9 @@ var RenderFields = function RenderFields(props) {
       value: otherProps,
       children: _jsx(Render, {
         show: show,
-        disabled: Boolean(formDisabled),
         form: form,
+        disabled: column.disabled,
+        formDisabled: formDisabled,
         type: _type,
         originComponent: component,
         component: TargetComponent,

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

@@ -230,6 +230,7 @@ export type ProColumnProps<T = any> = ProFormColumnProps<T> & ColumnPropsMap<T,
  * 表单渲染类型
  */
 export interface RenderProps<Values = any> {
+    formDisabled?: boolean;
     component: any;
     formItemProps: FormItemProps<Values> & {
         labelWidth?: string | number;