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

package/es/ProForm/components/index.js

@@ -1,34 +1,56 @@
-// base 基于antd基础组件
-export { default as Select } from "./base/Select";
-export { default as DatePicker } from "./base/DatePicker";
-export { default as RangePicker } from "./base/RangePicker";
-export { default as TextArea } from "./base/TextArea";
-export { default as Switch } from "./base/Switch";
-export { default as Radio } from "./base/Radio";
-export { default as Checkbox } from "./base/Checkbox";
-export { default as Input } from "./base/Input";
-export { default as InputNumber } from "./base/InputNumber";
-export { default as SwitchCheckbox } from "./base/SwitchCheckbox";
-export { default as TimePicker } from "./base/TimePicker";
-export { default as FormList } from "./combination/FormList";
-export { default as ProEditTable } from "../../ProEditTable";
-
-// combination 组合组件
-export { default as ProCascader } from "./combination/ProCascader";
-export { default as ProNumberRange } from "./combination/ProNumberRange";
-export { default as ProModalSelect } from "./combination/ProModalSelect";
-export { default as ProTimeLimit } from "./combination/ProTimeLimit";
-export { default as ProRangeLimit } from "./combination/ProRangeLimit";
-export { default as Group } from "./combination/Group";
-export { default as ProCollapse } from "./combination/Container";
-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 ProTreeModal } from "../../ProTreeModal";
-export { default as ProTree } from "../../ProTree";
-
-// footer组件
-export { default as FormFooter } from "./FormFooter";
-
-// 类型定义
+import { default as default2 } from "./base/Select";
+import { default as default3 } from "./base/DatePicker";
+import { default as default4 } from "./base/RangePicker";
+import { default as default5 } from "./base/TextArea";
+import { default as default6 } from "./base/Switch";
+import { default as default7 } from "./base/Radio";
+import { default as default8 } from "./base/Checkbox";
+import { default as default9 } from "./base/Input";
+import { default as default10 } from "./base/InputNumber";
+import { default as default11 } from "./base/SwitchCheckbox";
+import { default as default12 } from "./base/TimePicker";
+import { default as default13 } from "./combination/FormList";
+import { default as default14 } from "../../ProEditTable";
+import { default as default15 } from "./combination/ProCascader";
+import { default as default16 } from "./combination/ProNumberRange";
+import { default as default17 } from "./combination/ProModalSelect";
+import { default as default18 } from "./combination/ProTimeLimit";
+import { default as default19 } from "./combination/ProRangeLimit";
+import { default as default20 } from "./combination/Group";
+import { default as default21 } from "./combination/Container";
+import { default as default22 } from "./combination/Container";
+import { default as default23 } from "../../ProEnum";
+import { default as default24 } from "../../ProSelect";
+import { default as default25 } from "../../ProUpload";
+import { default as default26 } from "../../ProTreeModal";
+import { default as default27 } from "../../ProTree";
+import { default as default28 } from "./FormFooter";
+export {
+  default8 as Checkbox,
+  default22 as Container,
+  default3 as DatePicker,
+  default28 as FormFooter,
+  default13 as FormList,
+  default20 as Group,
+  default9 as Input,
+  default10 as InputNumber,
+  default15 as ProCascader,
+  default21 as ProCollapse,
+  default14 as ProEditTable,
+  default23 as ProEnum,
+  default17 as ProModalSelect,
+  default16 as ProNumberRange,
+  default19 as ProRangeLimit,
+  default24 as ProSelect,
+  default18 as ProTimeLimit,
+  default27 as ProTree,
+  default26 as ProTreeModal,
+  default25 as ProUpload,
+  default7 as Radio,
+  default4 as RangePicker,
+  default2 as Select,
+  default6 as Switch,
+  default11 as SwitchCheckbox,
+  default5 as TextArea,
+  default12 as TimePicker
+};

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

@@ -1,13 +1,24 @@
-import _get from "lodash/get";
-import { Space, Tooltip } from 'antd';
-import classNames from 'classnames';
-import React, { useMemo } from 'react';
+import { jsx, jsxs } from "react/jsx-runtime";
+import { Space, Tooltip } from "antd";
+import classNames from "classnames";
+import get from "lodash/get";
+import React, { useMemo } from "react";
 import { diffOriginal } from "../../utils/diffOriginal";
 import { useProConfig } from "../../../ProConfigProvider";
 import { isEmpty } from "../../../utils";
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-const componentsWithFloatWindow = ['Select', 'ProSelect', 'ProEnum', 'ProTimeLimit', 'ProModalSelect', 'ProCascader', 'DataPicker', 'RangePicker', 'TimePicker'];
-const ChangedWrapper = props => {
+const componentsWithFloatWindow = [
+  "Select",
+  "ProSelect",
+  "ProEnum",
+  "ProTimeLimit",
+  "ProModalSelect",
+  "ProCascader",
+  "DataPicker",
+  "RangePicker",
+  "TimePicker"
+];
+const ChangedWrapper = (props) => {
+  var _a, _b, _c;
   const {
     name,
     names,
@@ -17,36 +28,25 @@ const ChangedWrapper = props => {
     children,
     type,
     diffConfig,
-    valuePropName = 'value',
+    valuePropName = "value",
     normalize,
     getValueProps,
     viewRender,
     ...rest
   } = props;
-  const {
-    isDiffAll
-  } = useProConfig('ProForm');
-  const {
-    originalValues,
-    changeTipColor,
-    addTipColor,
-    scrollFollowParent = true
-  } = diffConfig;
+  const { isDiffAll } = useProConfig("ProForm");
+  const { originalValues, changeTipColor, addTipColor, scrollFollowParent = true } = diffConfig;
   const toolTip = diffConfig.toolTip ?? true;
-  const isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
-  const originalValue = names?.length ? names.map(name => _get(originalValues, name)) : _get(originalValues, name);
+  const isWatch = toolTip && !["FormList", "ProEditTable"].includes(type);
+  const originalValue = (names == null ? void 0 : names.length) ? names.map((name2) => get(originalValues, name2)) : get(originalValues, name);
   const noChange = !onDiff && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
   const diffType = useMemo(() => {
-    if (!isWatch || noChange) return 'same';
-    const _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
-    : props[valuePropName];
-
-    // fix:修复 DatePicker时，originalValue与最新值一致时，显示为 changed的问题
-    const _originalValue = normalize && ['DatePicker'].includes(props.type) ? normalize(originalValue, undefined, undefined, true) : originalValue;
-
-    // fix:修复 InputNumber 时，originalValue与最新值一致都为'0'时，显示为 changed的问题
-    if (['InputNumber'].includes(props.type) && normalize && _value === Number(originalValue)) {
-      return 'same';
+    if (!isWatch || noChange)
+      return "same";
+    const _value = normalize ? normalize(props[valuePropName], void 0, void 0, true) : props[valuePropName];
+    const _originalValue = normalize && ["DatePicker"].includes(props.type) ? normalize(originalValue, void 0, void 0, true) : originalValue;
+    if (["InputNumber"].includes(props.type) && normalize && _value === Number(originalValue)) {
+      return "same";
     }
     return diffOriginal({
       value: _value,
@@ -56,95 +56,86 @@ const ChangedWrapper = props => {
       type: props.type
     });
   }, [isWatch, noChange, props[valuePropName], originalValue, typeof onDiff]);
-  const isAdd = diffType === 'add';
-  const isChanged = diffType === 'changed';
+  const isAdd = diffType === "add";
+  const isChanged = diffType === "changed";
   const tipContent = useMemo(() => {
-    if (!isWatch || noChange) return undefined;
-    const valueProps = getValueProps ? getValueProps(originalValue, true) : {
-      value: originalValue
-    };
+    if (!isWatch || noChange)
+      return void 0;
+    const valueProps = getValueProps ? getValueProps(originalValue, true) : { value: originalValue };
     if (viewRender) {
-      return viewRender(valueProps?.value, originalValues, {
-        form
-      });
+      return viewRender(valueProps == null ? void 0 : valueProps.value, originalValues, { form });
     }
-    return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, {
+    return React.isValidElement(children) ? React.cloneElement(children, {
       ...children.props,
       isView: true,
-      [valuePropName]: valueProps?.value
-    }) : undefined;
+      [valuePropName]: valueProps == null ? void 0 : valueProps.value
+    }) : void 0;
   }, [typeof viewRender, originalValue, children]);
   if (!isWatch || noChange) {
-    // 嵌套子组件
-    const isNestedField = ['ProEditTable'].includes(type);
-    return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, {
-      originalValues: isNestedField ? originalValues : undefined,
+    const isNestedField = ["ProEditTable"].includes(type);
+    return React.isValidElement(children) && React.cloneElement(children, {
+      originalValues: isNestedField ? originalValues : void 0,
       ...children.props,
       ...rest
     });
   }
   const tipOpenCalc = () => {
-    if (!toolTip) return false;
-
-    // 传入undefined 鼠标移入显示移出隐藏 获得焦点时不显示气泡
-    return isChanged ? undefined : false;
+    if (!toolTip)
+      return false;
+    return isChanged ? void 0 : false;
   };
   const style = {
-    '--zaui-contract-bg': changeTipColor,
-    '--zaui-contract-bg-add': addTipColor
+    "--zaui-contract-bg": changeTipColor,
+    "--zaui-contract-bg-add": addTipColor
   };
-
-  // @ts-ignore
-  const _showEllipse = children.props?.showEllipse || children.props?.tooltip;
+  const _showEllipse = ((_a = children.props) == null ? void 0 : _a.showEllipse) || ((_b = children.props) == null ? void 0 : _b.tooltip);
   const diffClassName = classNames({
-    'pro-form-item-changed': isChanged,
-    'pro-form-item-add': isAdd
+    "pro-form-item-changed": isChanged,
+    "pro-form-item-add": isAdd
   });
   const open = tipOpenCalc();
-  const scrollFollowParentConfig = componentsWithFloatWindow.includes(type) ? {
-    scrollFollowParent
-  } : {};
-  return /*#__PURE__*/_jsx(Tooltip, {
-    open: open,
-    getPopupContainer: trigger => scrollFollowParent ? trigger.parentElement : document.body,
-    classNames: {
-      root: 'original-value-tooltip'
-    },
-    placement: "topLeft",
-    autoAdjustOverflow: false,
-    title: /*#__PURE__*/_jsxs(Space, {
-      orientation: "vertical",
-      className: "changed-tooltip",
-      children: [/*#__PURE__*/_jsxs(Space, {
-        align: "start",
-        className: "original-value-container",
-        children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
-      }), _showEllipse && /*#__PURE__*/_jsxs(Space, {
-        className: "current-value-container",
-        children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, {
-          // @ts-ignore
-          ...children.props,
-          ...rest,
-          ...scrollFollowParentConfig,
-          isView: true
-        }) : undefined]
-      })]
-    }),
-    children: /*#__PURE__*/_jsx("div", {
-      className: diffClassName,
-      style: style,
-      children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, {
+  const scrollFollowParentConfig = componentsWithFloatWindow.includes(type) ? { scrollFollowParent } : {};
+  return /* @__PURE__ */ jsx(
+    Tooltip,
+    {
+      open,
+      getPopupContainer: (trigger) => scrollFollowParent ? trigger.parentElement : document.body,
+      classNames: {
+        root: "original-value-tooltip"
+      },
+      placement: "topLeft",
+      autoAdjustOverflow: false,
+      title: /* @__PURE__ */ jsxs(Space, { orientation: "vertical", className: "changed-tooltip", children: [
+        /* @__PURE__ */ jsxs(Space, { align: "start", className: "original-value-container", children: [
+          "初始值：",
+          tipContent
+        ] }),
+        _showEllipse && /* @__PURE__ */ jsxs(Space, { className: "current-value-container", children: [
+          "当前值：",
+          React.isValidElement(children) ? React.cloneElement(children, {
+            // @ts-ignore
+            ...children.props,
+            ...rest,
+            ...scrollFollowParentConfig,
+            isView: true
+          }) : void 0
+        ] })
+      ] }),
+      children: /* @__PURE__ */ jsx("div", { className: diffClassName, style, children: React.isValidElement(children) ? React.cloneElement(children, {
         // @ts-ignore
         ...children.props,
         ...rest,
         ...scrollFollowParentConfig,
         otherProps: {
           // @ts-ignore
-          ...children.props?.otherProps,
+          ...(_c = children.props) == null ? void 0 : _c.otherProps,
           isDiffChange: isChanged
         }
-      }) : undefined
-    })
-  });
+      }) : void 0 })
+    }
+  );
+};
+var ChangedWrapper_default = ChangedWrapper;
+export {
+  ChangedWrapper_default as default
 };
-export default ChangedWrapper;

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

@@ -1,32 +1,20 @@
-import _isObject from "lodash/isObject";
-import _isFunction from "lodash/isFunction";
-import React from 'react';
-import { Modal } from 'antd';
+import { Fragment, jsx } from "react/jsx-runtime";
+import isFunction from "lodash/isFunction";
+import isObject from "lodash/isObject";
+import React from "react";
+import { Modal } from "antd";
 import ProForm from "../../index";
 import locale from "../../../locale";
-import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 const defaultConfirmProps = {
   title: locale.ProForm.confirmTitle,
   content: locale.ProForm.confirmContent
 };
-const ConfirmWrapper = props => {
-  const {
-    onChange,
-    children,
-    confirm,
-    otherProps,
-    ...rest
-  } = props;
-  const {
-    form,
-    namePath,
-    name,
-    index,
-    listName
-  } = ProForm.useFieldProps() || {};
+const ConfirmWrapper = (props) => {
+  const { onChange, children, confirm, otherProps, ...rest } = props;
+  const { form, namePath, name, index, listName } = ProForm.useFieldProps() || {};
   const handleChange = async (value, ...other) => {
-    const _value = value?.target ? value.target.value : value;
-    const confirmProps = _isFunction(confirm) ? await confirm(value, form.getFieldsValue(), {
+    const _value = (value == null ? void 0 : value.target) ? value.target.value : value;
+    const confirmProps = isFunction(confirm) ? await confirm(value, form.getFieldsValue(), {
       option: other[0],
       form,
       namePath,
@@ -34,35 +22,35 @@ const ConfirmWrapper = props => {
       index,
       preValue: form.getFieldValue(listName || name)
     }) : confirm;
-
-    // 只处理 false, true 和 对象的情况
     if (confirmProps === false) {
-      onChange?.(_value, ...other);
+      onChange == null ? void 0 : onChange(_value, ...other);
     }
     if (confirmProps === true) {
       Modal.confirm({
         ...defaultConfirmProps,
-        onOk: () => onChange?.(_value, ...other)
+        onOk: () => onChange == null ? void 0 : onChange(_value, ...other)
       });
     }
-    if (_isObject(confirmProps)) {
+    if (isObject(confirmProps)) {
       Modal.confirm({
-        ...('title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps),
+        ..."title" in confirmProps || "content" in confirmProps ? {} : defaultConfirmProps,
         ...confirmProps,
         onOk: async (...arg) => {
-          await confirmProps.onOk?.(...arg);
-          onChange?.(_value, ...other);
+          var _a;
+          await ((_a = confirmProps.onOk) == null ? void 0 : _a.call(confirmProps, ...arg));
+          onChange == null ? void 0 : onChange(_value, ...other);
         }
       });
     }
   };
-  return /*#__PURE__*/_jsx(_Fragment, {
-    children: /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, {
-      ...rest,
-      // @ts-ignore
-      value: rest.value === undefined ? null : rest.value,
-      onChange: handleChange
-    })
-  });
+  return /* @__PURE__ */ jsx(Fragment, { children: React.isValidElement(children) && React.cloneElement(children, {
+    ...rest,
+    // @ts-ignore
+    value: rest.value === void 0 ? null : rest.value,
+    onChange: handleChange
+  }) });
+};
+var ConfirmWrapper_default = ConfirmWrapper;
+export {
+  ConfirmWrapper_default as default
 };
-export default ConfirmWrapper;

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

@@ -1,13 +1,9 @@
-import _omit from "lodash/omit";
-import React from 'react';
-import { Form } from 'antd';
+import { jsx } from "react/jsx-runtime";
+import React from "react";
+import { Form } from "antd";
+import omit from "lodash/omit";
 import Container from "../Container";
-import { jsx as _jsx } from "react/jsx-runtime";
-/**
- * 自定义组件视图模式包装器
- * 用于处理自定义组件在 isView 模式下的渲染逻辑
- */
-const CustomComponentViewWrapper = props => {
+const CustomComponentViewWrapper = (props) => {
   const {
     formItemProps,
     internalItemRender,
@@ -25,93 +21,80 @@ const CustomComponentViewWrapper = props => {
     AutoComponent,
     children
   } = props;
-
-  // 判断是否应该使用自定义组件视图渲染
-  const shouldUseViewRender = isView && viewRender && originComponent && (typeof component === 'function' && ! /*#__PURE__*/React.isValidElement(component) || typeof AutoComponent === 'function' && ! /*#__PURE__*/React.isValidElement(AutoComponent));
-
-  // 如果不满足条件，直接返回 children 包装在 Form.Item 中
+  const shouldUseViewRender = isView && viewRender && originComponent && (typeof component === "function" && !React.isValidElement(component) || typeof AutoComponent === "function" && !React.isValidElement(AutoComponent));
   if (!shouldUseViewRender) {
-    return /*#__PURE__*/_jsx(Form.Item, {
-      ..._omit(formItemProps, filterFormItemKey),
-      // @ts-ignore
-      _internalItemRender: internalItemRender,
-      className: className,
-      style: style,
-      children: children
-    });
+    return /* @__PURE__ */ jsx(
+      Form.Item,
+      {
+        ...omit(formItemProps, filterFormItemKey),
+        _internalItemRender: internalItemRender,
+        className,
+        style,
+        children
+      }
+    );
   }
-
-  // 满足条件时，创建 child 函数用于视图渲染
-  const createViewRenderChild = formItemValue => {
-    // 在 Form.Item 的 children 函数中获取值
-    const value = formItemValue !== undefined ? formItemValue : form.getFieldValue(name);
+  const createViewRenderChild = (formItemValue) => {
+    var _a, _b;
+    const value = formItemValue !== void 0 ? formItemValue : form.getFieldValue(name);
     const record = form.getFieldsValue();
     let index;
-    // FormList场景
-    if (Array.isArray(otherProps?.namePath) && otherProps?.namePath?.length) {
-      index = otherProps?.namePath[otherProps?.namePath?.length - 1];
+    if (Array.isArray(otherProps == null ? void 0 : otherProps.namePath) && ((_a = otherProps == null ? void 0 : otherProps.namePath) == null ? void 0 : _a.length)) {
+      index = otherProps == null ? void 0 : otherProps.namePath[((_b = otherProps == null ? void 0 : otherProps.namePath) == null ? void 0 : _b.length) - 1];
     }
-    const viewRenderResult = viewRender?.(value, record, {
+    const viewRenderResult = viewRender == null ? void 0 : viewRender(value, record, {
       form,
       index,
-      namePath: otherProps?.namePath
+      namePath: otherProps == null ? void 0 : otherProps.namePath
     });
-
-    // 如果 viewRender 返回的是 React 元素，直接使用
-    if ( /*#__PURE__*/React.isValidElement(viewRenderResult)) {
+    if (React.isValidElement(viewRenderResult)) {
       return viewRenderResult;
     }
-    if ( /*#__PURE__*/React.isValidElement(originComponent)) {
-      // 如果 viewRender 返回的不是 React 元素（如字符串、数字），但有 originComponent
-      // 使用 Container 组件来显示值，与标准 Input 组件在 isView 模式下的行为一致
-      const viewValue = viewRenderResult !== undefined && viewRenderResult !== null ? viewRenderResult : value;
-      // 使用 Container 组件显示值，这是标准组件在 isView 模式下的做法
-      return /*#__PURE__*/_jsx(Container, {
-        viewEmpty: viewEmpty || '-',
-        children: viewValue
-      });
+    if (React.isValidElement(originComponent)) {
+      const viewValue = viewRenderResult !== void 0 && viewRenderResult !== null ? viewRenderResult : value;
+      return /* @__PURE__ */ jsx(Container, { viewEmpty: viewEmpty || "-", children: viewValue });
     }
-    // 如果都不是，显示 viewRender 的结果（可能是字符串、数字等）
     return viewRenderResult;
   };
-
-  // 当 child 是函数且 Form.Item 有 name 时，使用 shouldUpdate 来监听字段值变化
   if (!name) {
-    // 如果没有 name，直接渲染 child
-    return /*#__PURE__*/_jsx(Form.Item, {
-      ..._omit(formItemProps, filterFormItemKey),
-      // @ts-ignore
-      _internalItemRender: internalItemRender,
-      className: className,
-      style: style,
-      children: createViewRenderChild(undefined)
-    });
-  }
-
-  // 外层 Form.Item 用于监听字段值变化
-  return /*#__PURE__*/_jsx(Form.Item, {
-    shouldUpdate: (prevValues, currentValues) => {
-      // 监听当前字段的值变化
-      const prevValue = prevValues?.[name];
-      const currentValue = currentValues?.[name];
-      return prevValue !== currentValue;
-    },
-    noStyle: true,
-    children: () => {
-      // 在 shouldUpdate 的 children 函数中获取表单值
-      const value = form.getFieldValue(name);
-      // 调用 child 函数获取渲染结果
-      const renderResult = createViewRenderChild(value);
-      // 返回实际的 Form.Item，包含 name 和其他属性
-      return /*#__PURE__*/_jsx(Form.Item, {
-        ..._omit(formItemProps, filterFormItemKey),
-        // @ts-ignore
+    return /* @__PURE__ */ jsx(
+      Form.Item,
+      {
+        ...omit(formItemProps, filterFormItemKey),
         _internalItemRender: internalItemRender,
-        className: className,
-        style: style,
-        children: renderResult
-      });
+        className,
+        style,
+        children: createViewRenderChild(void 0)
+      }
+    );
+  }
+  return /* @__PURE__ */ jsx(
+    Form.Item,
+    {
+      shouldUpdate: (prevValues, currentValues) => {
+        const prevValue = prevValues == null ? void 0 : prevValues[name];
+        const currentValue = currentValues == null ? void 0 : currentValues[name];
+        return prevValue !== currentValue;
+      },
+      noStyle: true,
+      children: () => {
+        const value = form.getFieldValue(name);
+        const renderResult = createViewRenderChild(value);
+        return /* @__PURE__ */ jsx(
+          Form.Item,
+          {
+            ...omit(formItemProps, filterFormItemKey),
+            _internalItemRender: internalItemRender,
+            className,
+            style,
+            children: renderResult
+          }
+        );
+      }
     }
-  });
+  );
+};
+var CustomComponentViewWrapper_default = CustomComponentViewWrapper;
+export {
+  CustomComponentViewWrapper_default as default
 };
-export default CustomComponentViewWrapper;