@zat-design/sisyphus-react 3.4.2 → 3.4.3

package/lib/ProEnum/components/Group.d.ts

@@ -2,6 +2,8 @@ import { ProEnum } from '../propsType';
 interface Props extends Pick<ProEnum, 'value' | 'onChange' | 'dataSource'> {
     fieldValue: string;
     fieldLabel: string;
+    disabled?: boolean;
+    allowClear?: boolean;
 }
 declare const Group: (props: Props) => JSX.Element;
 export default Group;

package/lib/ProEnum/components/Group.js

@@ -15,7 +15,10 @@ var Group = function Group(props) {
     onChange = props.onChange,
     dataSource = props.dataSource,
     fieldValue = props.fieldValue,
-    fieldLabel = props.fieldLabel;
+    fieldLabel = props.fieldLabel,
+    disabled = props.disabled,
+    _props$allowClear = props.allowClear,
+    allowClear = _props$allowClear === void 0 ? true : _props$allowClear;
   var idx = (0, _react.useRef)(-1);
   var _useSetState = (0, _ahooks.useSetState)({
       checked: ''
@@ -27,13 +30,28 @@ var Group = function Group(props) {
     setState({
       checked: value
     });
-  }, [value]);
-  var handleClick = function handleClick(val, index) {
-    setState({
-      checked: val
+    var index = dataSource.findIndex(function (item) {
+      return item[fieldValue] === value;
     });
     idx.current = index;
-    onChange === null || onChange === void 0 ? void 0 : onChange(val);
+  }, [value]);
+  var handleClick = function handleClick(val, index) {
+    if (state.checked === val) {
+      if (!allowClear) {
+        return false;
+      }
+      setState({
+        checked: ''
+      });
+      onChange === null || onChange === void 0 ? void 0 : onChange('');
+      idx.current = -1;
+    } else {
+      setState({
+        checked: val
+      });
+      idx.current = index;
+      onChange === null || onChange === void 0 ? void 0 : onChange(val);
+    }
   };
   if (dataSource.length === 0) {
     return (0, _jsxRuntime.jsx)("span", {
@@ -41,11 +59,11 @@ var Group = function Group(props) {
     });
   }
   return (0, _jsxRuntime.jsx)("div", {
-    className: "pro-enum-group-root",
+    className: (0, _classnames.default)('pro-enum-group-root', disabled ? 'pro-enum-group-root-disabled' : ''),
     children: dataSource.map(function (item, index) {
       return (0, _jsxRuntime.jsx)("div", {
         onClick: function onClick() {
-          if (!item.disabled) {
+          if (!item.disabled && !disabled) {
             handleClick(item[fieldValue], index);
           }
         },

package/lib/ProEnum/index.js

@@ -42,7 +42,8 @@ var ProEnum = function ProEnum(props) {
     enumProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = otherProps || {},
     isView = _ref.isView,
-    viewEmpty = _ref.viewEmpty;
+    viewEmpty = _ref.viewEmpty,
+    disabled = _ref.disabled;
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
@@ -208,13 +209,13 @@ var ProEnum = function ProEnum(props) {
           dataSource: list
         });
       case 'Group':
-        return (0, _jsxRuntime.jsx)(_Group.default, {
+        return (0, _jsxRuntime.jsx)(_Group.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, enumProps), {}, {
           value: value,
           onChange: onChange,
           fieldLabel: label,
           fieldValue: fieldValue,
           dataSource: list
-        });
+        }));
       default:
         return null;
     }

package/lib/ProEnum/style/index.less

@@ -7,12 +7,17 @@
     flex-direction: row;
     flex-wrap: wrap;
   }
+  &-group-root-disabled {
+    color: rgba(0, 0, 0, 0.25);
+    .pro-enum-group-item{
+      cursor: not-allowed !important;
+    }
+  }
   &-tag-item {
     display: flex;
     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));
     padding: var(--zaui-space-size-xs) 10px;
     background-color: #f5f5f5;
     border-radius: var(--zaui-space-size-xs);
@@ -38,8 +43,7 @@
       display: flex;
       align-items: center;
       justify-content: center;
-      margin-bottom: calc(var(--zaui-space-size-sm; 8px) * var(--zaui-size; 1));
-      padding: var(--zaui-space-size-sm) var(--zaui-space-border);
+      padding: 6px var(--zaui-space-border);
       line-height: 18px;
       background-color: #f1f3f6ff;
       border: 1px solid transparent;
@@ -72,6 +76,7 @@
 
     .pro-enum-group-item-selected {
       color: var(--zaui-brand);
+      background: #fff;
       border: 1px solid var(--zaui-brand);
       &::after {
         background: transparent;
@@ -88,4 +93,8 @@
       cursor: not-allowed;
     }
   }
+
+  &-group-root-disabled {
+    opacity: 0.7;
+  }
 }

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

@@ -36,7 +36,7 @@ var DatePicker = function DatePicker(props) {
     var viewChildren = null;
     if (!value) {
       viewChildren = null;
-    } else if (typeof format === 'string' && _moment.default.isMoment(value)) {
+    } else if (typeof format === 'string' && (0, _lodash.isObject)(value)) {
       viewChildren = value.format(format);
     } else if ((0, _lodash.isFunction)(format)) {
       viewChildren = format(value);

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

@@ -47,17 +47,20 @@ var FormList = function FormList(props, ref) {
       // names的name处理
       var _name = Array.isArray(item === null || item === void 0 ? void 0 : item.names) ? [fieldName, (0, _utils2.namesPathTransform)({
         names: item === null || item === void 0 ? void 0 : item.names,
-        prefixNamePath: namePath
+        prefixNamePath: namePath,
+        type: item.type
       })] : [fieldName].concat((0, _toConsumableArray2.default)((0, _utils.toArray)(item.name)));
-      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+      var column = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
         name: _name,
         names: (item === null || item === void 0 ? void 0 : item.names) ? item.names.map(function (nameItem) {
-          return [].concat((0, _toConsumableArray2.default)(namePath), (0, _toConsumableArray2.default)((0, _utils.toArray)(nameItem)));
+          // 传给Group的names会被渲染成真实FormItem 不能传完整name
+          return item.type === 'Group' ? [fieldName].concat((0, _toConsumableArray2.default)((0, _utils.toArray)(nameItem))) : [].concat((0, _toConsumableArray2.default)(namePath), (0, _toConsumableArray2.default)((0, _utils.toArray)(nameItem)));
         }) : item.names,
         index: fieldName,
         namePath: namePath,
         label: mode === 'less' ? undefined : item.label
       });
+      return column;
     });
   }, [columns]);
   (0, _react.useImperativeHandle)(ref, function () {

package/lib/ProForm/components/combination/FormList/utils.d.ts

@@ -4,7 +4,8 @@
  * @param prefixNamePath formList的name前缀
  * @returns list_0_min-list_0_max
  */
-export declare const namesPathTransform: ({ names, prefixNamePath, }: {
+export declare const namesPathTransform: ({ names, prefixNamePath, type, }: {
     names: any[];
     prefixNamePath: any[];
+    type: string;
 }) => string;

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

@@ -12,12 +12,14 @@ exports.namesPathTransform = void 0;
  */
 var namesPathTransform = exports.namesPathTransform = function namesPathTransform(_ref) {
   var names = _ref.names,
-    prefixNamePath = _ref.prefixNamePath;
-  if (!Array.isArray(names) || !Array.isArray(prefixNamePath)) {
+    prefixNamePath = _ref.prefixNamePath,
+    type = _ref.type;
+  if (!Array.isArray(names) || type !== 'Group' && !Array.isArray(prefixNamePath)) {
     return '';
   }
+  var _prefixNamePath = type === 'Group' ? '' : prefixNamePath;
   var newNamePath = names.map(function (val) {
-    return prefixNamePath.concat(val);
+    return _prefixNamePath.concat(val);
   });
   return newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.map(function (name) {
     return Array.isArray(name) ? name.join('_') : name;

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

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _react = require("react");
@@ -27,15 +26,16 @@ var Group = function Group(props) {
     } : _props$space,
     id = props.id,
     value = props.value,
-    onFieldChange = props.onFieldChange;
-  var _useCounter = (0, _ahooks.useCounter)(0),
-    _useCounter2 = (0, _slicedToArray2.default)(_useCounter, 2),
-    num = _useCounter2[0],
-    inc = _useCounter2[1].inc;
+    isView = props.isView,
+    index = props.index,
+    onFieldChange = props.onFieldChange,
+    namePath = props.namePath;
   var _ref = _ProForm.default.useFieldProps() || {},
     names = _ref.names,
     name = _ref.name,
-    form = _ref.form;
+    form = _ref.form,
+    _namePath = _ref.namePath;
+  var newNamePath = namePath || _namePath || [];
   if (!Array.isArray(names)) {
     console.error('Warning: Composite form components whose type is Group must be configured with names');
   }
@@ -45,8 +45,10 @@ var Group = function Group(props) {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({
         disabled: Boolean(props === null || props === void 0 ? void 0 : props.disabled)
       }, item), {}, {
+        isView: isView !== null && isView !== void 0 ? isView : item.isView,
         noStyle: (space === null || space === void 0 ? void 0 : space.compact) || (space === null || space === void 0 ? void 0 : space.separator),
-        parentNames: id
+        parentNames: id,
+        namePath: newNamePath
       });
     });
     var node = (0, _jsxRuntime.jsx)(_antd.Button, {
@@ -68,14 +70,25 @@ var Group = function Group(props) {
       return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
     })
   }, "".concat(className), className));
+  // 用于formList场景下names移除掉了前缀，需要再次合并回来
+  var _names = names.map(function (item) {
+    if ((0, _lodash.isNumber)(item === null || item === void 0 ? void 0 : item[0])) {
+      return (0, _lodash.union)(newNamePath, item);
+    }
+    return item;
+  });
   (0, _ahooks.useDeepCompareEffect)(function () {
+    var _document, _document$activeEleme;
+    // 焦点激活的表单
+    var touchName = ((_document = document) === null || _document === void 0 ? void 0 : (_document$activeEleme = _document.activeElement) === null || _document$activeEleme === void 0 ? void 0 : _document$activeEleme.id) || '';
     // 模拟change,初始化不执行onFieldChange
-    if ((0, _lodash.isFunction)(onFieldChange) && num >= 1) {
-      onFieldChange(value, form.getFieldsValue(), {
-        form: form
+    if ((0, _lodash.isFunction)(onFieldChange) && form.isFieldsTouched(_names) && (0, _utils.transformNamesString)(_names).includes(touchName)) {
+      onFieldChange(value, (newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.length) ? form.getFieldValue(newNamePath, true) : form.getFieldsValue(), {
+        form: form,
+        namePath: newNamePath,
+        index: index
       });
     }
-    inc();
   }, [value]);
   return (0, _jsxRuntime.jsx)("div", {
     className: _className,

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

@@ -1,6 +1,7 @@
 import React from 'react';
 import { RowProps, SpaceProps } from 'antd';
 import { FormInstance } from 'antd/es/form/Form';
+import { NamePath } from 'antd/lib/form/interface';
 import { ProColumnProps, ProFormOtherProps } from '../../../propsType';
 export interface SpaceType extends SpaceProps {
     /**
@@ -23,7 +24,12 @@ export interface GroupProps {
     value?: any;
     id?: string;
     disabled?: boolean | (() => void);
+    isView?: boolean;
+    namePath?: NamePath;
+    index?: number;
     onFieldChange?: (value: any[] | null, record: any, { form, }: {
         form: FormInstance;
+        namePath?: NamePath;
+        index?: number;
     }) => any;
 }

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

@@ -9,13 +9,13 @@
 }
 
 .start-radius() {
-  border-start-start-radius: var(--zaui-border-radius, 4px);
-  border-end-start-radius: var(--zaui-border-radius, 4px);
+  border-start-start-radius: 4px;
+  border-end-start-radius: 4px;
 }
 
 .end-radius() {
-  border-start-end-radius: var(--zaui-border-radius, 4px);
-  border-end-end-radius: var(--zaui-border-radius, 4px);
+  border-start-end-radius: 4px;
+  border-end-end-radius: 4px;
 }
 
 .pro-group {

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

@@ -6,3 +6,5 @@ import { SpaceType } from './propsType';
 * @returns
 */
 export declare const insertSeparator: (columns: any, space?: SpaceType, separatorNode?: ReactNode, otherProps?: any) => any;
+/** 转换names */
+export declare const transformNamesString: (arr: (string | string[])[]) => (string | string[])[];

package/lib/ProForm/components/combination/Group/utils.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.insertSeparator = void 0;
+exports.transformNamesString = exports.insertSeparator = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 /**
 * 插入间隔符
@@ -40,4 +40,14 @@ var insertSeparator = exports.insertSeparator = function insertSeparator(columns
     }
     return result;
   }, []);
+};
+/** 转换names */
+var transformNamesString = exports.transformNamesString = function transformNamesString(arr) {
+  var result = arr.map(function (subArr) {
+    if (Array.isArray(subArr)) {
+      return subArr.join('_');
+    }
+    return subArr;
+  });
+  return result;
 };

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

@@ -55,7 +55,7 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
     onChange = _useControlled2[1];
   var initialConfig = (0, _ProConfigProvider.useProConfig)('ProTimeLimit');
   var isForever = (0, _react.useMemo)(function () {
-    if (_moment.default.isMoment(value)) {
+    if ((0, _lodash.isObject)(value)) {
       return foreverMoment.format(format) === value.format(format);
     }
     return false;
@@ -75,6 +75,12 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
         children: foreverText
       });
     }
+    if ((0, _lodash.isObject)(value)) {
+      return (0, _jsxRuntime.jsx)(_Container.default, {
+        viewEmpty: viewEmpty,
+        children: value.format(format)
+      });
+    }
     return (0, _jsxRuntime.jsx)(_Container.default, {
       viewEmpty: viewEmpty,
       children: props.value

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

@@ -6,7 +6,7 @@
     ~ .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(
       .@{ant-prefix}-input-borderless
     ).@{ant-prefix}-input {
-    background: @zaui-base-bg;
+    // background: @zaui-base-bg;
     border-color: var(--ant-error-color);
   }
   .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(

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

@@ -24,7 +24,6 @@ export { default as Container } from './combination/Container';
 export { default as ProEnum } from '../../ProEnum';
 export { default as ProSelect } from '../../ProSelect';
 export { default as ProUpload } from '../../ProUpload';
-export { default as ProTreeSelect } from '../../ProTreeSelect';
 export { default as ProTreeModal } from '../../ProTreeModal';
 export { default as ProTree } from '../../ProTree';
 export { default as FormFooter } from './FormFooter';

package/lib/ProForm/components/index.js

@@ -167,12 +167,6 @@ Object.defineProperty(exports, "ProTreeModal", {
     return _ProTreeModal.default;
   }
 });
-Object.defineProperty(exports, "ProTreeSelect", {
-  enumerable: true,
-  get: function get() {
-    return _ProTreeSelect.default;
-  }
-});
 Object.defineProperty(exports, "ProUpload", {
   enumerable: true,
   get: function get() {
@@ -252,7 +246,6 @@ var _Container = _interopRequireDefault(require("./combination/Container"));
 var _ProEnum = _interopRequireDefault(require("../../ProEnum"));
 var _ProSelect = _interopRequireDefault(require("../../ProSelect"));
 var _ProUpload = _interopRequireDefault(require("../../ProUpload"));
-var _ProTreeSelect = _interopRequireDefault(require("../../ProTreeSelect"));
 var _ProTreeModal = _interopRequireDefault(require("../../ProTreeModal"));
 var _ProTree = _interopRequireDefault(require("../../ProTree"));
 var _FormFooter = _interopRequireDefault(require("./FormFooter"));

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

@@ -39,7 +39,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
       return;
     }
     if ((0, _lodash.isObject)(confirmProps)) {
-      _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultConfirmProps), confirmProps), {}, {
+      _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
         onOk: function onOk() {
           var _confirmProps$onOk;
           for (var _len2 = arguments.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {

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

@@ -32,7 +32,7 @@ var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className",
 /* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
-  var _ref2, _ref3, _otherProps$names2;
+  var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -50,8 +50,9 @@ var Render = function Render(props) {
     originalValues = props.originalValues,
     equalWith = props.equalWith,
     requiredOnView = props.requiredOnView,
-    originalTip = props.originalTip,
-    confirm = props.confirm;
+    originalDiffTip = props.originalDiffTip,
+    confirm = props.confirm,
+    globalControl = props.globalControl;
   var colProps = props.colProps;
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
@@ -147,7 +148,7 @@ 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) : valueTypeTransform();
+  form, otherProps.names, namesStr, otherProps.type) : valueTypeTransform();
   // ↑↑↑↑↑↑  formItem参数整理  ↑↑↑↑↑↑
   Object.assign(otherFormItemProps, transforms, {
     names: otherProps.names
@@ -167,8 +168,12 @@ var Render = function Render(props) {
   }
   /** 移除多余参数，防止透传给formItem报错 */
   var _otherFormItemProps = (0, _lodash.omit)(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'switchValue', 'precision', 'clearNotShow']);
-  // 优先级 formitem上【column.disabled】 > 组件上【fieldProps.disabled】 > 全局【formDisabled】
-  var lastDisabled = (_ref2 = (_ref3 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref3 !== void 0 ? _ref3 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : formDisabled;
+  /**
+   * 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
    */
@@ -196,8 +201,8 @@ var Render = function Render(props) {
   var functionArgs = function functionArgs(args) {
     var _otherFormItemProps$n;
     var _args = (0, _toConsumableArray2.default)(args);
-    var _ref4 = otherProps || {},
-      valueType = _ref4.valueType;
+    var _ref6 = otherProps || {},
+      valueType = _ref6.valueType;
     _args[1] = form.getFieldsValue();
     _args[2] = {
       form: form
@@ -264,7 +269,7 @@ var Render = function Render(props) {
       }, 60);
     }
     // ProTreeSelect返回option
-    if (['ProTreeSelect', 'ProTree'].includes(type)) {
+    if (['ProTree'].includes(type)) {
       var _args2, _args2$;
       _args[2].option = (0, _index.findOptionByValue)(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0]);
     }
@@ -274,7 +279,7 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _len2,
         args,
         _key2,
@@ -301,7 +306,7 @@ var Render = function Render(props) {
       }, _callee);
     }));
     return function handleBlur() {
-      return _ref5.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
   var renderItem = function renderItem() {
@@ -378,7 +383,7 @@ var Render = function Render(props) {
       };
     }
     // 需要过滤掉的form_item的key
-    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
+    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl'];
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';
@@ -427,7 +432,7 @@ var Render = function Render(props) {
       });
     }
     // 不渲染tooltip
-    if (!originalTip || ['FormList', 'ProEditTable'].includes(type)) {
+    if (!originalDiffTip || ['FormList', 'ProEditTable'].includes(type)) {
       return formItem;
     }
     var title = (0, _jsxRuntime.jsxs)(_antd.Space, {
@@ -440,6 +445,9 @@ var Render = function Render(props) {
     return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: title,
       visible: changed ? undefined : false,
+      getPopupContainer: function getPopupContainer(target) {
+        return target.parentElement;
+      },
       children: formItem
     });
   };

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

@@ -17,7 +17,8 @@ interface Props<T = any> {
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     required?: boolean | (() => boolean);
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
+    globalControl?: boolean;
 }
 declare const RenderFields: React.FC<Props>;
 export default RenderFields;

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

@@ -33,7 +33,8 @@ var RenderFields = function RenderFields(props) {
     outerClearNotShow = props.clearNotShow,
     requiredOnView = props.requiredOnView,
     required = props.required,
-    originalTip = props.originalTip;
+    originalDiffTip = props.originalDiffTip,
+    globalControl = props.globalControl;
   // 是否包含隐藏字段
   var hiddenData = columns.filter(function (item) {
     return Array.isArray(item.hiddenNames);
@@ -183,7 +184,9 @@ var RenderFields = function RenderFields(props) {
       form: form,
       type: _type,
       hiddenNames: column.hiddenNames,
-      colProps: _colProps
+      colProps: _colProps,
+      mode: componentProps.mode,
+      namePath: column.namePath
     };
     if (outerClearNotShow !== false && show === false && (column === null || column === void 0 ? void 0 : column.name) && form.getFieldValue(column === null || column === void 0 ? void 0 : column.name)) {
       setTimeout(function () {
@@ -212,7 +215,8 @@ var RenderFields = function RenderFields(props) {
         originalValues: originalValues,
         equalWith: equalWith,
         requiredOnView: requiredOnView,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip,
+        globalControl: globalControl
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
   });

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

@@ -26,7 +26,6 @@ import { Props as ProRangeLimitProps } from '../combination/ProRangeLimit';
 import { CheckboxPropsMap, ProEnum, PropProSelectsMap, PropRadioPropsMap } from '../../../ProEnum/propsType';
 import { PropSelectProps as ProSelectProps } from '../../../ProSelect/propsType';
 import { ProEditTableProps } from '../../../ProEditTable/propsType';
-import { PropTreeSelectProps } from '../../../ProTreeSelect/propsType';
 import { ProTreeModalProps } from '../../../ProTreeModal/propsType';
 import { ProUploadProps } from '../../../ProUpload/propsType';
 import { ProTreeProps } from '../../../ProTree/propsType';
@@ -150,9 +149,6 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
 } | {
     type?: 'ProEditTable';
     fieldProps?: FieldProps<ProEditTableProps, Values, T>;
-} | {
-    type?: 'ProTreeSelect';
-    fieldProps?: FieldProps<PropTreeSelectProps, Values, T>;
 } | {
     type?: 'ProTreeModal';
     fieldProps?: FieldProps<ProTreeModalProps, Values, T>;
@@ -270,6 +266,7 @@ export interface RenderProps<Values = any> {
     originalValues?: Values;
     requiredOnView?: boolean;
     confirm?: ProFormColumnProps['confirm'];
+    globalControl?: boolean;
     [name: string]: any;
 }
 export {};

package/lib/ProForm/index.js

@@ -25,7 +25,7 @@ var _index = require("./utils/index");
 var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../locale"));
-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", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalTip", "formKey"];
+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", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalDiffTip", "formKey", "globalControl"];
 var ProForm = function ProForm(props, ref) {
   var _forms$formKey, _localStorage;
   var _props$mode = props.mode,
@@ -64,9 +64,10 @@ var ProForm = function ProForm(props, ref) {
     requiredOnView = _props$requiredOnView === void 0 ? true : _props$requiredOnView,
     formId = props.formId,
     required = props.required,
-    _props$originalTip = props.originalTip,
-    originalTip = _props$originalTip === void 0 ? true : _props$originalTip,
+    _props$originalDiffTi = props.originalDiffTip,
+    originalDiffTip = _props$originalDiffTi === void 0 ? true : _props$originalDiffTi,
     formKey = props.formKey,
+    globalControl = props.globalControl,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _useProConfig = (0, _ProConfigProvider.useProConfig)(),
     state = _useProConfig.state,
@@ -254,7 +255,8 @@ var ProForm = function ProForm(props, ref) {
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
         required: required,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip,
+        globalControl: globalControl
       }), children, footerRender()]
     }))
   }));
@@ -319,7 +321,7 @@ ProFormForward.ProNumberRange = _components.ProNumberRange;
 ProFormForward.ProModalSelect = _components.ProModalSelect;
 ProFormForward.ProTimeLimit = _components.ProTimeLimit;
 ProFormForward.ProUpload = _components.ProUpload;
-ProFormForward.ProTreeSelect = _components.ProTreeSelect;
+// ProFormForward.ProTreeSelect = ProTreeSelect;
 ProFormForward.ProTreeModal = _components.ProTreeModal;
 ProFormForward.ProTree = _components.ProTree;
 // 待废弃