@zat-design/sisyphus-react 3.4.9 → 3.4.10

package/dist/index.esm.css

@@ -682,7 +682,7 @@
 .pro-collapse .pro-collapse-icon img {
   vertical-align: sub;
 }
-.pro-collapse.pro-collapse-no-title .ant-collapse-header {
+.pro-collapse.pro-collapse-no-title > .pro-collapse-panel > .ant-collapse-header {
   display: none !important;
 }
 .pro-collapse.pro-collapse-no-title .pro-collapse-level2 .ant-collapse-header {
@@ -1226,7 +1226,7 @@
 .pro-layout.pro-layout-light .pro-collapse.pro-collapse-no-title .pro-header-no-describe {
   padding: 0 !important;
 }
-.pro-layout.pro-layout-light .pro-collapse .ant-collapse-item-active.pro-collapse-panel .ant-collapse-header {
+.pro-layout.pro-layout-light .pro-collapse .ant-collapse-item-active.pro-collapse-panel > .ant-collapse-header {
   border-radius: var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px) 0 0 !important;
 }
 .pro-layout.pro-layout-light .pro-collapse .pro-collapse-content {

package/dist/less.esm.css

@@ -682,7 +682,7 @@
 .pro-collapse .pro-collapse-icon img {
   vertical-align: sub;
 }
-.pro-collapse.pro-collapse-no-title .ant-collapse-header {
+.pro-collapse.pro-collapse-no-title > .pro-collapse-panel > .ant-collapse-header {
   display: none !important;
 }
 .pro-collapse.pro-collapse-no-title .pro-collapse-level2 .ant-collapse-header {
@@ -1226,7 +1226,7 @@
 .pro-layout.pro-layout-light .pro-collapse.pro-collapse-no-title .pro-header-no-describe {
   padding: 0 !important;
 }
-.pro-layout.pro-layout-light .pro-collapse .ant-collapse-item-active.pro-collapse-panel .ant-collapse-header {
+.pro-layout.pro-layout-light .pro-collapse .ant-collapse-item-active.pro-collapse-panel > .ant-collapse-header {
   border-radius: var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px) 0 0 !important;
 }
 .pro-layout.pro-layout-light .pro-collapse .pro-collapse-content {

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

@@ -89,6 +89,10 @@ var RenderField = function RenderField(_ref) {
   }
   // type类型 首字母转大写
   type = ((_type = type) === null || _type === void 0 ? void 0 : (_type$replace = _type.replace) === null || _type$replace === void 0 ? void 0 : _type$replace.call(_type, type[0], type[0].toUpperCase())) || 'Input';
+  // 自定义组件时 防止默认值影像后续判断
+  if ('component' in column) {
+    type = null;
+  }
   // 单行正在编辑时，临时生成一套formItem用来存储中间值，点击取消时候重置回上一次状态
   var namePath = getNamePath(name, virtualKey);
   var rowData = form.getFieldValue([].concat(_toConsumableArray(namePath), [index])) || record || {};
@@ -522,7 +526,8 @@ var RenderField = function RenderField(_ref) {
     delete _formItemProps.rules;
   }
   var _className = classNames(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-changed', changed));
-  var FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
+  var FormItem = null;
+  FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
     validateFirst: true
   }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
@@ -531,6 +536,20 @@ var RenderField = function RenderField(_ref) {
   })) : _jsx(Container, {
     viewEmpty: viewEmpty
   });
+  if (type === 'FormList') {
+    FormItem = _jsx(_Form.List, _objectSpread(_objectSpread({
+      name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
+    }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+      children: function children(fields, operation, meta) {
+        return _jsx(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
+          otherProps: otherProps,
+          fields: fields,
+          operation: operation,
+          meta: meta
+        }));
+      }
+    }));
+  }
   var originalTitle = originalDiffTip && originalValues ? _jsxs(_Space, {
     children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
       isView: true,

package/es/ProEditTable/propsType.d.ts

@@ -66,12 +66,12 @@ export interface BaseActionProps<T = any> {
      * @description       按钮前置校验事件
      * @default           -
      */
-    onClick?: ShowFunction<T>;
+    onClick?: (record?: any, index?: number) => any;
     /**
      * @description       按钮前置校验事件
      * @default           -
      */
-    onHandle?: ShowFunction<T>;
+    onHandle?: (record?: any, index?: number) => any;
     /**
      * @description       支持antd的Button属性
      * @default           -

package/es/ProEditTable/utils/index.js

@@ -250,6 +250,7 @@ export var transformColumns = function transformColumns() {
       after = item.after;
     // column设置label时，权重最高
     var columnTitle = label || title;
+    item.title = columnTitle;
     if (typeof columnTitle === 'string') {
       item.originTitle = columnTitle;
       if (tooltip) {

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

@@ -4,6 +4,7 @@ interface Props extends Pick<ProEnum, 'value' | 'onChange' | 'dataSource'> {
     fieldLabel: string;
     disabled?: boolean;
     allowClear?: boolean;
+    button?: boolean;
 }
 declare const Group: (props: Props) => JSX.Element;
 export default Group;

package/es/ProEnum/index.js

@@ -12,7 +12,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component", "onChange", "transformResponse", "otherProps"],
-  _excluded2 = ["fieldNames", "clear", "cacheKey"];
+  _excluded2 = ["fieldNames", "clear", "cacheKey", "showCodeName"];
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
 import React, { useState, useEffect, useMemo } from 'react';
@@ -28,6 +28,7 @@ import useEnum from './hooks/useEnum';
 import locale from '../locale';
 import './style/index.less';
 var ProEnum = function ProEnum(props) {
+  var _enumProps$showCodeNa;
   var code = props.code,
     _props$type = props.type,
     type = _props$type === void 0 ? 'ProSelect' : _props$type,
@@ -41,15 +42,16 @@ var ProEnum = function ProEnum(props) {
     enumProps = _objectWithoutProperties(props, _excluded);
   var _ref = otherProps || {},
     isView = _ref.isView,
-    viewEmpty = _ref.viewEmpty,
-    disabled = _ref.disabled;
+    viewEmpty = _ref.viewEmpty;
   var _ref2 = useProConfig('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
     clear = _ref2$clear === void 0 ? true : _ref2$clear,
     _ref2$cacheKey = _ref2.cacheKey,
     cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref2$cacheKey,
+    showCodeName = _ref2.showCodeName,
     resProps = _objectWithoutProperties(_ref2, _excluded2);
+  enumProps.showCodeName = (_enumProps$showCodeNa = enumProps.showCodeName) !== null && _enumProps$showCodeNa !== void 0 ? _enumProps$showCodeNa : showCodeName;
   var label = '';
   var fieldValue = '';
   var _useState = useState(dataSource || []),
@@ -165,6 +167,7 @@ var ProEnum = function ProEnum(props) {
     switch (type) {
       case 'ProSelect':
         return _jsx(ProSelect, _objectSpread(_objectSpread({}, enumProps), {}, {
+          otherProps: otherProps,
           dataSource: list,
           fieldNames: {
             label: label,
@@ -235,8 +238,11 @@ var ProEnum = function ProEnum(props) {
           return item[fieldValue] === (v === null || v === void 0 ? void 0 : v[fieldValue]);
         }
         return item[fieldValue] === v;
-      });
-      return enumProps.showCodeName ? "".concat(option[fieldValue], "-").concat(option[label]) : option === null || option === void 0 ? void 0 : option[label];
+      }) || {};
+      if (!option) {
+        return '';
+      }
+      return enumProps.showCodeName ? "".concat(option === null || option === void 0 ? void 0 : option[fieldValue], "-").concat(option === null || option === void 0 ? void 0 : option[label]) : option === null || option === void 0 ? void 0 : option[label];
     });
     var record = value.map(function (v) {
       return list.find(function (item) {

package/es/ProEnum/style/index.less

@@ -76,8 +76,8 @@
     }
 
     .pro-enum-group-item-selected {
-      color: var(--zaui-brand);
-      background: #fff;
+      background: var(--zaui-brand);
+      color: #fff;
       border: 1px solid var(--zaui-brand);
       &::after {
         background: transparent;

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

@@ -227,6 +227,10 @@ var InputNumber = function InputNumber(props) {
       min: Number(_min),
       max: Number(_max)
     };
+    // 截取数字指定精度
+    if (props.precision !== undefined) {
+      value = Number(value.toFixed(props.precision));
+    }
     switch (valueType || viewType) {
       // 百分比
       case 'percent':
@@ -241,7 +245,6 @@ var InputNumber = function InputNumber(props) {
         value = limitNumber(value, limit);
         break;
     }
-    // 第一个类型转换值，第二个原始值
     onBlur(value, Number(e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.value));
   };
   return _jsx(_InputNumber, _objectSpread(_objectSpread(_objectSpread(_objectSpread({

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

@@ -6,6 +6,8 @@ import _Popconfirm from "antd/es/popconfirm";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 var _excluded = ["label", "onClick", "onHandle", "actionType", "needConfirm", "confirmProps", "title"],
   _excluded2 = ["onClick", "label"];
@@ -128,17 +130,55 @@ var ActionButton = function ActionButton(props) {
     }
     return props.actionProps;
   }, [props.actionProps]);
-  var handleClick = function handleClick(callback, index, item) {
+  var handleClick = /*#__PURE__*/function () {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, index, item) {
+      var value, data;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            value = form.getFieldValue(namePath);
+            _context.next = 3;
+            return callback === null || callback === void 0 ? void 0 : callback(value, {
+              namePath: namePath,
+              index: index,
+              operation: operation,
+              form: form
+            });
+          case 3:
+            data = _context.sent;
+            if (!(!callback || data === true)) {
+              _context.next = 7;
+              break;
+            }
+            defaultCallback === null || defaultCallback === void 0 ? void 0 : defaultCallback(value, {
+              namePath: namePath,
+              index: index,
+              operation: operation,
+              form: form
+            });
+            return _context.abrupt("return");
+          case 7:
+            if ((item === null || item === void 0 ? void 0 : item.actionType) === 'add') {
+              operation.add(data, index !== undefined ? index + 1 : undefined);
+            }
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleClick(_x, _x2, _x3, _x4) {
+      return _ref6.apply(this, arguments);
+    };
+  }();
+  var customClick = function customClick(callback, index) {
     var value = form.getFieldValue(namePath);
-    var data = callback === null || callback === void 0 ? void 0 : callback(value, {
+    callback === null || callback === void 0 ? void 0 : callback(value, {
       namePath: namePath,
       index: index,
       operation: operation,
       form: form
     });
-    if ((item === null || item === void 0 ? void 0 : item.actionType) === 'add') {
-      operation.add(data, index !== undefined ? index + 1 : undefined);
-    }
   };
   var defaultActions = useMemo(function () {
     return getDefaultActions(mode);
@@ -195,7 +235,7 @@ var ActionButton = function ActionButton(props) {
             return e.stopPropagation();
           },
           onConfirm: function onConfirm(e) {
-            handleClick(_onClick || internalOnClick, index, item);
+            handleClick(internalOnClick, _onClick, index, item);
           }
         }, _confirmProps), {}, {
           children: _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, defaultRest), rest), {}, {
@@ -207,7 +247,7 @@ var ActionButton = function ActionButton(props) {
         }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index)) : _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, defaultRest), rest), {}, {
           onClick: function onClick(e) {
             e.stopPropagation();
-            handleClick(_onClick || internalOnClick, index, item);
+            handleClick(internalOnClick, _onClick, index, item);
           },
           children: label || defaultLabel
         }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
@@ -218,7 +258,7 @@ var ActionButton = function ActionButton(props) {
           return e.stopPropagation();
         },
         onConfirm: function onConfirm() {
-          return handleClick(_onClick, index);
+          return customClick(_onClick, index);
         }
       }, _confirmProps), {}, {
         children: _jsx(_Button, _objectSpread(_objectSpread({}, rest), {}, {
@@ -231,7 +271,7 @@ var ActionButton = function ActionButton(props) {
         key: "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index),
         onClick: function onClick(e) {
           e.stopPropagation();
-          handleClick(_onClick, index);
+          customClick(_onClick, index);
         }
       }), label));
     })

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

@@ -4,6 +4,8 @@ import _Button from "antd/es/button";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 var _excluded = ["label", "onClick", "onHandle", "actionType"],
   _excluded2 = ["onClick", "label"];
@@ -48,16 +50,52 @@ var ToolbarButton = function ToolbarButton(props) {
     }
     return props.toolbarProps;
   }, [props.toolbarProps]);
-  var handleClick = function handleClick(callback, item) {
+  var handleClick = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, item) {
+      var value, data;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            value = form.getFieldValue(namePath);
+            _context.next = 3;
+            return callback === null || callback === void 0 ? void 0 : callback(value, {
+              operation: operation,
+              form: form,
+              namePath: namePath
+            });
+          case 3:
+            data = _context.sent;
+            if (!(!callback || data === true)) {
+              _context.next = 7;
+              break;
+            }
+            defaultCallback === null || defaultCallback === void 0 ? void 0 : defaultCallback(value, {
+              operation: operation,
+              form: form,
+              namePath: namePath
+            });
+            return _context.abrupt("return");
+          case 7:
+            if ((item === null || item === void 0 ? void 0 : item.actionType) === 'add' && data) {
+              operation.add(data);
+            }
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleClick(_x, _x2, _x3) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var customClick = function customClick(callback, item) {
     var value = form.getFieldValue(namePath);
-    var data = callback === null || callback === void 0 ? void 0 : callback(value, {
+    callback === null || callback === void 0 ? void 0 : callback(value, {
       operation: operation,
       form: form,
       namePath: namePath
     });
-    if ((item === null || item === void 0 ? void 0 : item.actionType) === 'add' && data) {
-      operation.add(data);
-    }
   };
   return _jsx(_Space, {
     align: "start",
@@ -88,14 +126,14 @@ var ToolbarButton = function ToolbarButton(props) {
         }
         return _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, actions[actionType]), rest), {}, {
           onClick: function onClick() {
-            return handleClick(_onClick || internalOnClick, item);
+            return handleClick(internalOnClick, _onClick, item);
           },
           children: label || defaultLabel
         }), actionType);
       }
       return _jsx(_Button, _objectSpread(_objectSpread({}, rest), {}, {
         onClick: function onClick() {
-          return handleClick(_onClick2, item);
+          return customClick(_onClick2, item);
         },
         children: label
       }), actionType);

package/es/ProForm/components/combination/Group/component/AddonWrapper/index.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import './index.less';
+interface Props {
+    before?: React.ReactNode;
+    after?: React.ReactNode;
+}
+declare const AddonWrapper: React.FC<Props>;
+export default AddonWrapper;

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

@@ -0,0 +1,18 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import './index.less';
+var AddonWrapper = function AddonWrapper(props) {
+  var before = props.before,
+    after = props.after,
+    children = props.children;
+  return _jsxs("div", {
+    className: "addon-wrapper",
+    children: [before && _jsx("div", {
+      className: "before",
+      children: before
+    }), children, after && _jsx("div", {
+      className: "after",
+      children: after
+    })]
+  });
+};
+export default AddonWrapper;

package/es/ProForm/components/combination/Group/component/AddonWrapper/index.less

@@ -0,0 +1,10 @@
+.addon-wrapper {
+  display: flex;
+  gap: 16px;
+  align-items: center;
+
+  .before,
+  .after {
+    white-space: nowrap;
+  }
+}

package/es/ProForm/components/combination/Group/component/ComRender.d.ts

@@ -8,6 +8,8 @@ interface Props {
     confirm: any;
     fieldProps: any;
     contextProps: any;
+    before?: React.ReactNode;
+    after?: React.ReactNode;
 }
 /** 渲染组件 */
 declare const ComRender: React.FC<Props>;

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

@@ -1,11 +1,33 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps"];
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import ConfirmWrapper from '../../../../components/render/ConfirmWrapper';
 import { FieldProvider } from '../../../../utils/useFieldProps';
 import * as componentMap from '../../../../../index';
+import AddonWrapper from './AddonWrapper';
+// 这里的key与组件内参数一致, 决定使用哪个包裹组件
+var wrapperMap = {
+  confirm: ConfirmWrapper,
+  before: AddonWrapper,
+  after: AddonWrapper
+};
+// 增加middleware根据配置增加多层包裹
+var getComRender = function getComRender(component, props, componentProps) {
+  var wrappers = Object.keys(wrapperMap);
+  var Com = component;
+  wrappers.forEach(function (item) {
+    if (item in props) {
+      var Wrapper = wrapperMap[item];
+      Com = _jsx(Wrapper, _objectSpread(_objectSpread(_objectSpread({}, componentProps), _defineProperty({}, item, props[item])), {}, {
+        children: Com
+      }));
+    }
+  });
+  return Com;
+};
 /** 渲染组件 */
 var ComRender = function ComRender(props) {
   var type = props.type,
@@ -13,24 +35,18 @@ var ComRender = function ComRender(props) {
     component = props.component,
     fieldProps = props.fieldProps,
     contextProps = props.contextProps,
+    before = props.before,
+    after = props.after,
     rest = _objectWithoutProperties(props, _excluded);
   var TypeComponent = componentMap[type];
   var componentProps = _objectSpread(_objectSpread({}, fieldProps), rest);
-  var Component;
-  if (confirm) {
-    Component = _jsx(ConfirmWrapper, _objectSpread(_objectSpread({
-      confirm: confirm
-    }, componentProps), {}, {
-      children: component || _jsx(TypeComponent, _objectSpread({}, componentProps))
-    }));
-  } else {
-    Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
-  }
+  var Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
+  var Com = getComRender(Component, props, componentProps);
   return _jsx(FieldProvider, {
     value: _objectSpread(_objectSpread({}, contextProps), {}, {
       type: type
     }),
-    children: Component
+    children: Com
   });
 };
 export default ComRender;

package/es/ProForm/components/combination/Group/index.d.ts

@@ -6,5 +6,5 @@ import { GroupProps } from './propsType';
  *
  * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
  */
-declare const GroupCopy: React.FC<GroupProps>;
-export default GroupCopy;
+declare const Group: React.FC<GroupProps>;
+export default Group;

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

@@ -16,7 +16,7 @@ import ComRender from './component/ComRender';
  *
  * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
  */
-var GroupCopy = function GroupCopy(props) {
+var Group = function Group(props) {
   var children = props.children,
     className = props.className,
     _props$space = props.space,
@@ -66,12 +66,12 @@ var GroupCopy = function GroupCopy(props) {
   return _jsx("div", {
     className: _className,
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {
-      children: columns.map(function (column) {
+      children: columns.map(function (column, index) {
         return _jsx(ComRender, _objectSpread(_objectSpread({
           contextProps: contextProps
         }, column), {}, {
           otherProps: otherProps
-        }));
+        }), column.name);
       })
     }) : _jsx(_Space, _objectSpread(_objectSpread({
       align: "start"
@@ -81,9 +81,9 @@ var GroupCopy = function GroupCopy(props) {
           contextProps: contextProps
         }, column), {}, {
           otherProps: otherProps
-        }));
+        }), column.name);
       })
     }))
   });
 };
-export default GroupCopy;
+export default Group;

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

@@ -193,7 +193,7 @@ export var transformColumns = function transformColumns(params) {
         fieldProps: fieldProps,
         name: columnName
       });
-    }, [value, show, fieldProps, columnName, type]);
+    }, [value, show, fieldProps, _disabled, columnName, type]);
     if (reactiveProps.show === false) {
       return [];
     }
@@ -220,7 +220,8 @@ export var transformColumns = function transformColumns(params) {
       onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, form.getFieldValue(namePath), {
         index: outerIndex,
         namePath: namePath,
-        form: form
+        form: form,
+        option: args === null || args === void 0 ? void 0 : args[1]
       });
     };
     return _objectSpread(_objectSpread(_objectSpread({}, column), {}, {

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

@@ -15,7 +15,7 @@ import _Typography from "antd/es/typography";
 var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState, memo, useMemo } from 'react';
-import { isEqual, omit } from 'lodash';
+import { omit } from 'lodash';
 import { transformDataName } from './utils/index';
 import { useProConfig } from '../../../../ProConfigProvider';
 import useEnum from '../../../../ProEnum/hooks/useEnum';
@@ -95,7 +95,7 @@ var ProCascader = function ProCascader(props) {
   var realDataSource = useMemo(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
     var result = isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level) : innerDataSource;
-    return isEqual(fieldNames, defaultFieldNames) ? result : transformDataName(result, fieldNames);
+    return transformDataName(result, fieldNames);
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var _useRequest = _objectSpread({}, useRequest),
     service = _useRequest.service,

package/es/ProForm/components/combination/ProCascader/utils/index.js

@@ -5,6 +5,9 @@ export var transformDataName = function transformDataName(dataSource, fieldNames
     value = fieldNames.value,
     children = fieldNames.children,
     extraFields = _objectWithoutProperties(fieldNames, _excluded);
+  if (!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || 'label' in dataSource[0] && 'value' in dataSource[0] && 'children' in dataSource[0]) {
+    return dataSource;
+  }
   function transformNode(node) {
     var newNode = {
       label: node[label],

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

@@ -703,7 +703,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           queryBean: queryBean
         } : queryBean;
         run(params);
-      }, 800),
+      }, 2000),
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }

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

@@ -122,8 +122,12 @@ var ProRangeLimit = function ProRangeLimit(props) {
       start = _ref9[0],
       end = _ref9[1];
     if (e.target.checked) {
-      var _start, _end;
-      start = start || moment().startOf('day');
+      var _rest$allowEmpty, _start, _end;
+      if (((_rest$allowEmpty = rest.allowEmpty) === null || _rest$allowEmpty === void 0 ? void 0 : _rest$allowEmpty[0]) === true) {
+        start = null;
+      } else {
+        start = start || moment().startOf('day');
+      }
       end = foreverMoment;
       onChange([start, end, e.target.checked], [(_start = start) === null || _start === void 0 ? void 0 : _start.format(format), (_end = end) === null || _end === void 0 ? void 0 : _end.format(format), foreverStr]);
     } else {

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

@@ -109,9 +109,12 @@ var RenderFields = function RenderFields(props) {
     if (typeof _type === 'string') {
       TargetComponent = _isView && viewRender ? viewRenderHandle : componentMap[_type];
     }
+    // 自定义组件时 防止默认值影像后续判断
+    if ('component' in column) {
+      _type = null;
+    }
     if (component && /*#__PURE__*/React.isValidElement(component)) {
       var _newComponent$props;
-      _type = null;
       var newComponent = component;
       var isProEditTable = (newComponent === null || newComponent === void 0 ? void 0 : (_newComponent$props = newComponent.props) === null || _newComponent$props === void 0 ? void 0 : _newComponent$props.onlyOneLineMsg) === '请先保存数据';
       TargetComponent = _isView ? viewRenderHandle || '' : component;