@zat-design/sisyphus-react 3.14.4 → 3.14.5

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

@@ -600,6 +600,7 @@ var RenderField = _ref => {
     // 如果处于 shouldUpdate 模式，需要重新获取最新的行数据并重新计算依赖值
     var finalComponentProps = componentProps;
     if (shouldUpdateMode) {
+      var _props;
       // 重新获取最新的行数据
       var latestRowData = form.getFieldValue([...namePath, index]) || record || {};
       var latestCurrentValue = dataIndex ? latestRowData === null || latestRowData === void 0 ? void 0 : latestRowData[dataIndex] : null;
@@ -626,11 +627,16 @@ var RenderField = _ref => {
         columnFieldProps: latestFieldProps,
         params: latestRowParams
       });
-
+      var nextLatestFieldProps = _objectSpread({}, latestFieldProps);
+      var hasTargetChildren = /*#__PURE__*/React.isValidElement(TargetComponent) && ((_props = TargetComponent.props) === null || _props === void 0 ? void 0 : _props.children) !== undefined;
+      var hasLatestChildren = Object.prototype.hasOwnProperty.call(nextLatestFieldProps, 'children');
+      if (isView && hasTargetChildren && hasLatestChildren) {
+        delete nextLatestFieldProps.children;
+      }
       // 更新 componentProps 中的 disabled 和 fieldProps
       finalComponentProps = _objectSpread(_objectSpread({}, componentProps), {}, {
         disabled: latestDisabled
-      }, latestFieldProps);
+      }, nextLatestFieldProps);
     }
     var FormItem = null;
     var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, finalComponentProps)) : /*#__PURE__*/_jsx(TargetComponent, _objectSpread({}, finalComponentProps));

package/es/ProForm/components/Container.js

@@ -9,9 +9,16 @@ var Container = props => {
     tooltip = props.tooltip,
     nowrap = props.nowrap,
     viewEmpty = props.viewEmpty;
+  var hasInvalidChild = Array.isArray(children) && children.some(item => {
+    if (item === null || item === undefined) return false;
+    if ( /*#__PURE__*/React.isValidElement(item)) return false;
+    var itemType = typeof item;
+    return itemType === 'object' || itemType === 'function';
+  });
+  var safeChildren = hasInvalidChild ? null : children;
 
   // 值为false但不为0, 或者值为空数组
-  var nullValue = children !== 0 && !children || isEmptyArray(children);
+  var nullValue = safeChildren !== 0 && !safeChildren || isEmptyArray(safeChildren);
   var _className = classNames({
     'pro-form-view-container': true,
     'pro-form-view-container_nowrap': nowrap !== null && nowrap !== void 0 ? nowrap : tooltip
@@ -19,16 +26,16 @@ var Container = props => {
   if (tooltip && !nullValue) {
     return /*#__PURE__*/_jsx(_Tooltip, {
       placement: "topLeft",
-      title: children,
+      title: safeChildren,
       children: /*#__PURE__*/_jsx("div", {
         className: _className,
-        children: children
+        children: safeChildren
       })
     });
   }
   return /*#__PURE__*/_jsx("div", {
     className: _className,
-    children: nullValue ? viewEmpty : children
+    children: nullValue ? viewEmpty : safeChildren
   });
 };
 export default Container;

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

@@ -607,6 +607,7 @@ var RenderField = _ref => {
     // 如果处于 shouldUpdate 模式，需要重新获取最新的行数据并重新计算依赖值
     var finalComponentProps = componentProps;
     if (shouldUpdateMode) {
+      var _props;
       // 重新获取最新的行数据
       var latestRowData = form.getFieldValue([...namePath, index]) || record || {};
       var latestCurrentValue = dataIndex ? latestRowData === null || latestRowData === void 0 ? void 0 : latestRowData[dataIndex] : null;
@@ -633,11 +634,16 @@ var RenderField = _ref => {
         columnFieldProps: latestFieldProps,
         params: latestRowParams
       });
-
+      var nextLatestFieldProps = (0, _objectSpread2.default)({}, latestFieldProps);
+      var hasTargetChildren = /*#__PURE__*/_react.default.isValidElement(TargetComponent) && ((_props = TargetComponent.props) === null || _props === void 0 ? void 0 : _props.children) !== undefined;
+      var hasLatestChildren = Object.prototype.hasOwnProperty.call(nextLatestFieldProps, 'children');
+      if (isView && hasTargetChildren && hasLatestChildren) {
+        delete nextLatestFieldProps.children;
+      }
       // 更新 componentProps 中的 disabled 和 fieldProps
       finalComponentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
         disabled: latestDisabled
-      }, latestFieldProps);
+      }, nextLatestFieldProps);
     }
     var FormItem = null;
     var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, finalComponentProps)) : /*#__PURE__*/(0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, finalComponentProps));

package/lib/ProForm/components/Container.js

@@ -16,9 +16,16 @@ var Container = props => {
     tooltip = props.tooltip,
     nowrap = props.nowrap,
     viewEmpty = props.viewEmpty;
+  var hasInvalidChild = Array.isArray(children) && children.some(item => {
+    if (item === null || item === undefined) return false;
+    if ( /*#__PURE__*/_react.default.isValidElement(item)) return false;
+    var itemType = typeof item;
+    return itemType === 'object' || itemType === 'function';
+  });
+  var safeChildren = hasInvalidChild ? null : children;
 
   // 值为false但不为0, 或者值为空数组
-  var nullValue = children !== 0 && !children || (0, _utils.isEmptyArray)(children);
+  var nullValue = safeChildren !== 0 && !safeChildren || (0, _utils.isEmptyArray)(safeChildren);
   var _className = (0, _classnames.default)({
     'pro-form-view-container': true,
     'pro-form-view-container_nowrap': nowrap !== null && nowrap !== void 0 ? nowrap : tooltip
@@ -26,16 +33,16 @@ var Container = props => {
   if (tooltip && !nullValue) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.default, {
       placement: "topLeft",
-      title: children,
+      title: safeChildren,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: _className,
-        children: children
+        children: safeChildren
       })
     });
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: _className,
-    children: nullValue ? viewEmpty : children
+    children: nullValue ? viewEmpty : safeChildren
   });
 };
 var _default = exports.default = Container;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.14.4",
+  "version": "3.14.5",
   "license": "MIT",
   "engines": {
     "node": ">=18.19.0"