@zat-design/sisyphus-react 4.5.10-beta.1 → 4.5.10-beta.2

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

@@ -1,30 +1,14 @@
-import React from 'react';
+import { jsx, jsxs } from "react/jsx-runtime";
 import "./index.less";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const AddonWrapper = props => {
-  const {
-    before,
-    after,
-    children
-  } = props;
-  return /*#__PURE__*/_jsxs("div", {
-    className: "addon-wrapper",
-    style: {
-      display: 'flex',
-      alignItems: 'center',
-      gap: '8px'
-    },
-    children: [before && /*#__PURE__*/_jsx("div", {
-      style: {
-        whiteSpace: 'nowrap'
-      },
-      children: before
-    }), children, after && /*#__PURE__*/_jsx("div", {
-      style: {
-        whiteSpace: 'nowrap'
-      },
-      children: after
-    })]
-  });
+const AddonWrapper = (props) => {
+  const { before, after, children } = props;
+  return /* @__PURE__ */ jsxs("div", { className: "addon-wrapper", style: { display: "flex", alignItems: "center", gap: "8px" }, children: [
+    before && /* @__PURE__ */ jsx("div", { style: { whiteSpace: "nowrap" }, children: before }),
+    children,
+    after && /* @__PURE__ */ jsx("div", { style: { whiteSpace: "nowrap" }, children: after })
+  ] });
+};
+var AddonWrapper_default = AddonWrapper;
+export {
+  AddonWrapper_default as default
 };
-export default AddonWrapper;

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

@@ -1,37 +1,29 @@
-import _omit from "lodash/omit";
-import React from 'react';
-import { Form } from 'antd';
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import React from "react";
+import { Form } from "antd";
+import omit from "lodash/omit";
 import ConfirmWrapper from "../../../../components/render/ConfirmWrapper";
 import { FieldProvider } from "../../../../hooks/useFieldProps";
 import * as componentMap from "../../../../../index";
 import AddonWrapper from "./AddonWrapper";
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-// 这里的key与组件内参数一致, 决定使用哪个包裹组件
 const wrapperMap = {
   confirm: ConfirmWrapper,
   before: AddonWrapper,
   after: AddonWrapper
 };
-
-// 增加middleware根据配置增加多层包裹
 const getComRender = (component, props, componentProps) => {
   const wrappers = Object.keys(wrapperMap);
   let renderComponent = component;
-  wrappers.forEach(item => {
+  wrappers.forEach((item) => {
     if (item in props) {
       const Wrapper = wrapperMap[item];
-      renderComponent = /*#__PURE__*/_jsx(Wrapper, {
-        ...componentProps,
-        [item]: props[item],
-        children: renderComponent
-      });
+      renderComponent = /* @__PURE__ */ jsx(Wrapper, { ...componentProps, ...{ [item]: props[item] }, children: renderComponent });
     }
   });
   return renderComponent;
 };
-
-/** 渲染组件 */
-const ComRender = props => {
+const ComRender = (props) => {
+  var _a;
   const {
     type,
     confirm,
@@ -41,7 +33,7 @@ const ComRender = props => {
     before,
     after,
     getValueProps,
-    valuePropName = 'value',
+    valuePropName = "value",
     valueType,
     isView,
     viewRender,
@@ -52,113 +44,60 @@ const ComRender = props => {
     ...rest
   } = props;
   const TypeComponent = componentMap[type];
-  const mergedGetValueProps = getValueProps || (val => ({
-    [valuePropName]: val
-  }));
+  const mergedGetValueProps = getValueProps || ((val) => ({ [valuePropName]: val }));
   const nextProps = mergedGetValueProps(fieldProps.value);
-  const componentProps = _omit({
-    ...fieldProps,
-    ...rest,
-    ...nextProps
-  }, ['onFieldChange']);
-  const componentElementProps = props?.component?.props;
-  const isSeparator = componentElementProps?.className === 'group-separator';
+  const componentProps = omit({ ...fieldProps, ...rest, ...nextProps }, ["onFieldChange"]);
+  const componentElementProps = (_a = props == null ? void 0 : props.component) == null ? void 0 : _a.props;
+  const isSeparator = (componentElementProps == null ? void 0 : componentElementProps.className) === "group-separator";
   if (isSeparator && isView) {
-    return /*#__PURE__*/_jsxs(_Fragment, {
-      children: [" ", componentElementProps?.children, " "]
-    });
+    return /* @__PURE__ */ jsxs(Fragment, { children: [
+      " ",
+      componentElementProps == null ? void 0 : componentElementProps.children,
+      " "
+    ] });
   }
   if (viewRender && isView) {
-    return /*#__PURE__*/_jsx(FieldProvider, {
-      value: {
-        ...contextProps,
-        valueType,
-        type,
-        isView
-      },
-      children: viewRender(componentProps)
-    });
+    return /* @__PURE__ */ jsx(FieldProvider, { value: { ...contextProps, valueType, type, isView }, children: viewRender(componentProps) });
   }
-  const Component = component ? ( /*#__PURE__*/React.cloneElement(component, {
-    ...componentProps
-  })) : /*#__PURE__*/_jsx(TypeComponent, {
-    ...componentProps
-  });
+  const Component = component ? React.cloneElement(component, { ...componentProps }) : /* @__PURE__ */ jsx(TypeComponent, { ...componentProps });
   const renderComponent = getComRender(Component, props, componentProps);
-
-  // 传统模式 compact 模式：需要 Form.Item 包装并应用宽度样式
-  // 通过 formItemClassName 和 formItemStyle 来判断是否需要 Form.Item 包装
   if (formItemClassName && name) {
-    // 从 rest 中提取 required 和 rules，在非编辑态时移除校验
     const formItemProps = {
       name,
       className: formItemClassName,
       style: formItemStyle,
-      ...(isView ? {} : {
-        required: rest?.required,
-        rules: rest?.rules
-      })
+      ...isView ? {} : { required: rest == null ? void 0 : rest.required, rules: rest == null ? void 0 : rest.rules }
     };
-
-    // 如果有依赖字段，使用 shouldUpdate 来实时更新错误状态
     if (dependencies && dependencies.length > 0) {
-      return /*#__PURE__*/_jsx(Form.Item, {
-        shouldUpdate: (prevValues, currentValues) => {
-          // 检查当前字段和依赖字段是否有变化
-          const currentFieldChanged = prevValues?.[name] !== currentValues?.[name];
-          const dependenciesChanged = dependencies.some(dep => {
-            const prevValue = prevValues?.[dep];
-            const currentValue = currentValues?.[dep];
-            return prevValue !== currentValue;
-          });
-          const hasChanged = currentFieldChanged || dependenciesChanged;
-          // 当检测到变化时，触发字段校验以更新错误状态
-          if (hasChanged && contextProps?.form && name && !isView) {
-            setTimeout(() => {
-              contextProps.form.validateFields([name]).catch(() => {});
-            }, 0);
-          }
-          return hasChanged;
-        },
-        noStyle: true,
-        children: () => /*#__PURE__*/_jsx(Form.Item, {
-          ...formItemProps,
-          children: /*#__PURE__*/_jsx(FieldProvider, {
-            value: {
-              ...contextProps,
-              valueType,
-              type,
-              isView
-            },
-            children: renderComponent
-          })
-        })
-      });
+      return /* @__PURE__ */ jsx(
+        Form.Item,
+        {
+          shouldUpdate: (prevValues, currentValues) => {
+            const currentFieldChanged = (prevValues == null ? void 0 : prevValues[name]) !== (currentValues == null ? void 0 : currentValues[name]);
+            const dependenciesChanged = dependencies.some((dep) => {
+              const prevValue = prevValues == null ? void 0 : prevValues[dep];
+              const currentValue = currentValues == null ? void 0 : currentValues[dep];
+              return prevValue !== currentValue;
+            });
+            const hasChanged = currentFieldChanged || dependenciesChanged;
+            if (hasChanged && (contextProps == null ? void 0 : contextProps.form) && name && !isView) {
+              setTimeout(() => {
+                contextProps.form.validateFields([name]).catch(() => {
+                });
+              }, 0);
+            }
+            return hasChanged;
+          },
+          noStyle: true,
+          children: () => /* @__PURE__ */ jsx(Form.Item, { ...formItemProps, children: /* @__PURE__ */ jsx(FieldProvider, { value: { ...contextProps, valueType, type, isView }, children: renderComponent }) })
+        }
+      );
     }
-    // 没有依赖字段，直接渲染 Form.Item
-    return /*#__PURE__*/_jsx(Form.Item, {
-      ...formItemProps,
-      children: /*#__PURE__*/_jsx(FieldProvider, {
-        value: {
-          ...contextProps,
-          valueType,
-          type,
-          isView
-        },
-        children: renderComponent
-      })
-    });
+    return /* @__PURE__ */ jsx(Form.Item, { ...formItemProps, children: /* @__PURE__ */ jsx(FieldProvider, { value: { ...contextProps, valueType, type, isView }, children: renderComponent }) });
   }
-
-  // 非传统模式 compact 模式：直接渲染组件
-  return /*#__PURE__*/_jsx(FieldProvider, {
-    value: {
-      ...contextProps,
-      valueType,
-      type,
-      isView
-    },
-    children: renderComponent
-  });
+  return /* @__PURE__ */ jsx(FieldProvider, { value: { ...contextProps, valueType, type, isView }, children: renderComponent });
+};
+var ComRender_default = ComRender;
+export {
+  ComRender_default as default
 };
-export default ComRender;