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

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

@@ -1,8 +1,9 @@
-import _isString from "lodash/isString";
-import _union from "lodash/union";
-import _isFunction from "lodash/isFunction";
-import _isBoolean from "lodash/isBoolean";
-import React from 'react';
+import { Fragment, jsx } from "react/jsx-runtime";
+import React from "react";
+import isBoolean from "lodash/isBoolean";
+import isFunction from "lodash/isFunction";
+import union from "lodash/union";
+import isString from "lodash/isString";
 import Render from "./Render";
 import { getDefaultProps } from "../../utils/getDefaultProps";
 import * as componentMap from "../index";
@@ -10,8 +11,7 @@ import { isSelect } from "../../utils";
 import { FieldProvider } from "../../hooks/useFieldProps";
 import locale from "../../../locale";
 import processDependencies from "../../utils/processDependencies";
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-const RenderFields = props => {
+const RenderFields = (props) => {
   const {
     isView,
     columns = [],
@@ -20,7 +20,7 @@ const RenderFields = props => {
     form,
     expand,
     colProps: defaultColProps,
-    viewEmpty = '-',
+    viewEmpty = "-",
     openState,
     labelWidth,
     clearNotShow: outerClearNotShow,
@@ -30,20 +30,18 @@ const RenderFields = props => {
     globalControl,
     shouldUpdateDebounce
   } = props;
-
-  // 根据 hiddenNames 生成隐藏字段供表单收集（不可变：不修改入参 columns，避免稳定引用下跨渲染累积）
-  const hiddenColumns = columns.filter(item => Array.isArray(item.hiddenNames)).flatMap(item => item.hiddenNames).map(nameItem => ({
+  const hiddenColumns = columns.filter((item) => Array.isArray(item.hiddenNames)).flatMap((item) => item.hiddenNames).map((nameItem) => ({
     name: Array.isArray(nameItem) ? nameItem : `${nameItem}`,
     hidden: true
   }));
   const renderColumns = hiddenColumns.length ? [...columns, ...hiddenColumns] : columns;
   const comList = renderColumns.flatMap((column, index) => {
+    var _a;
     if (!!expand && !openState) {
-      // expand为Number时 过滤掉大于expand 且 非fixed的column
-      if (typeof expand === 'number') {
-        if (index >= expand && column.fixed !== true) return [];
+      if (typeof expand === "number") {
+        if (index >= expand && column.fixed !== true)
+          return [];
       } else if (column.fixed !== true) {
-        // 否则只过滤非fixed的column
         return [];
       }
     }
@@ -65,15 +63,10 @@ const RenderFields = props => {
       span,
       ...otherFormItemProps
     } = column;
-    const {
-      component
-    } = column;
-    const _isView = typeof column.isView === 'boolean' ? column.isView : isView;
+    const { component } = column;
+    const _isView = typeof column.isView === "boolean" ? column.isView : isView;
     const defaultProps = getDefaultProps(column);
-    // 处理dependencies，支持namesPaths格式
     const processedDeps = processDependencies(column.dependencies);
-
-    // formItem 的属性平铺在 column 最外层
     const _formItemProps = {
       ...defaultProps,
       ...otherFormItemProps,
@@ -81,74 +74,54 @@ const RenderFields = props => {
       clearNotShow,
       dependencies: processedDeps
     };
-    _formItemProps.labelWidth = _formItemProps.labelWidth || labelWidth; // 接收Form中的labelWidth
-
+    _formItemProps.labelWidth = _formItemProps.labelWidth || labelWidth;
     if (type && component) {
-      console.error('Warning: type and component are mutually exclusive. type will not take effect');
+      console.error(
+        "Warning: type and component are mutually exclusive. type will not take effect"
+      );
     }
-    let _type = type || 'Input';
+    let _type = type || "Input";
     let TargetComponent;
-
-    // 查看高阶函数
     const viewRenderHandle = () => {
+      var _a2;
       let value = form.getFieldValue(column.name);
       let record = form.getFieldsValue();
-      let index;
-      // FormList场景
-      if (Array.isArray(column?.namePath) && column?.namePath?.length) {
-        value = form.getFieldValue(_union(column.namePath, column?.name || []));
+      let index2;
+      if (Array.isArray(column == null ? void 0 : column.namePath) && ((_a2 = column == null ? void 0 : column.namePath) == null ? void 0 : _a2.length)) {
+        value = form.getFieldValue(union(column.namePath, (column == null ? void 0 : column.name) || []));
         record = form.getFieldValue(column.namePath);
-        index = column?.index;
+        index2 = column == null ? void 0 : column.index;
       }
-      return viewRender ? viewRender(value, record, {
-        form,
-        index,
-        namePath: column?.namePath
-      }) || null : null;
+      return viewRender ? viewRender(value, record, { form, index: index2, namePath: column == null ? void 0 : column.namePath }) || null : null;
     };
-    if (typeof _type === 'string') {
+    if (typeof _type === "string") {
       TargetComponent = _isView && viewRender ? viewRenderHandle : componentMap[_type];
     }
-    // 自定义组件时 防止默认值影像后续判断
-    if ('component' in column) {
+    if ("component" in column) {
       _type = null;
     }
-    if (component && /*#__PURE__*/React.isValidElement(component)) {
+    if (component && React.isValidElement(component)) {
       const newComponent = component;
-      const isProEditTable = newComponent?.props?.onlyOneLineMsg != null;
-      TargetComponent = _isView ? viewRenderHandle || '' : component;
-      // 可编辑表格内部支持
+      const isProEditTable = ((_a = newComponent == null ? void 0 : newComponent.props) == null ? void 0 : _a.onlyOneLineMsg) != null;
+      TargetComponent = _isView ? viewRenderHandle || "" : component;
       if (isProEditTable) {
         TargetComponent = _isView ? viewRenderHandle || component : component;
       }
     }
-    const {
-      label,
-      placeholder,
-      dataSource
-    } = formItemChildProps;
-    const {
-      label: formLabel
-    } = _formItemProps;
-    const comDisabled = _formItemProps?.disabled ?? fieldProps.disabled; // 组件属性层disabled fieldProps可能为函数
-
-    // 当前组件是不是一个选择组件
-    const _isSelect = isSelect({
-      dataSource,
-      type: _type
-    });
+    const { label, placeholder, dataSource } = formItemChildProps;
+    const { label: formLabel } = _formItemProps;
+    const comDisabled = (_formItemProps == null ? void 0 : _formItemProps.disabled) ?? fieldProps.disabled;
+    const _isSelect = isSelect({ dataSource, type: _type });
     const placeholderHandle = () => {
-      const _label = _isString(label) ? label : '';
-      const _formLabel = _isString(formLabel) ? formLabel : '';
-      return placeholder || `${_isSelect ? `${locale.ProForm.selectPlaceHolder}` : `${locale.ProForm.inputPlaceholder}`}${_label || _formLabel || ''}`;
+      const _label = isString(label) ? label : "";
+      const _formLabel = isString(formLabel) ? formLabel : "";
+      return placeholder || `${_isSelect ? `${locale.ProForm.selectPlaceHolder}` : `${locale.ProForm.inputPlaceholder}`}${_label || _formLabel || ""}`;
     };
-
-    // 表单组件Props 兼容2.0版本
     const _fieldProps = {
       ...formItemChildProps,
       ...fieldProps
     };
-    if (_isBoolean(formDisabled)) {
+    if (isBoolean(formDisabled)) {
       _fieldProps.disabled = formDisabled;
     }
     const componentProps = {
@@ -156,38 +129,23 @@ const RenderFields = props => {
       ..._fieldProps,
       disabled: comDisabled
     };
-
-    // 容器组件，额外处理show的问题
-    if (['ProCollapse', 'Container'].includes(_type)) {
+    if (["ProCollapse", "Container"].includes(_type)) {
       componentProps.show = show;
       componentProps.clearNotShow = clearNotShow;
       componentProps.diffConfig = diffConfig;
     }
-
-    // switch与SwitchCheckbox单独添加valuePropName
-    if (['Switch', 'SwitchCheckbox'].includes(_type)) {
-      _formItemProps.valuePropName = 'checked';
+    if (["Switch", "SwitchCheckbox"].includes(_type)) {
+      _formItemProps.valuePropName = "checked";
     }
-
-    // 时间范围placeholder处理
-    if (['RangePicker'].includes(_type) && !fieldProps?.placeholder) {
+    if (["RangePicker"].includes(_type) && !(fieldProps == null ? void 0 : fieldProps.placeholder)) {
       delete componentProps.placeholder;
     }
-
-    // 没有找到对应组件  不渲染
     if (!TargetComponent) {
       return [];
     }
-    const _colProps = span ? {
-      span
-    } : {
-      ...defaultColProps,
-      ...colProps
-    };
+    const _colProps = span ? { span } : { ...defaultColProps, ...colProps };
     const columnName = _formItemProps.name;
-    const fieldKey = (Array.isArray(columnName) ? columnName.join('.') : columnName) ?? _formItemProps.label ?? _type;
-
-    // 其余参数收进对象里传给子组件 componentProps只包含子组件参数
+    const fieldKey = (Array.isArray(columnName) ? columnName.join(".") : columnName) ?? _formItemProps.label ?? _type;
     const otherProps = {
       label: _formItemProps.label,
       name: _formItemProps.name,
@@ -209,31 +167,36 @@ const RenderFields = props => {
       diffConfig,
       shouldUpdateDebounce
     };
-    return /*#__PURE__*/_jsx(FieldProvider, {
-      value: otherProps,
-      children: /*#__PURE__*/_jsx(Render, {
-        show: show,
-        disabled: column.disabled // 外层配置disabled（与 otherProps.disabled 语义不同，单独传递）
-        ,
-        originComponent: component // 原始自定义component，用于动态函数场景，TargetComponent已经默认赋值Input被污染
-        ,
-        component: TargetComponent,
-        formItemProps: _formItemProps,
-        confirm: confirm,
-        componentProps: componentProps,
-        otherProps: otherProps,
-        fieldProps: _isFunction(fieldProps) ? fieldProps : null // 透传fieldProps函数
-        ,
-        isSelect: _isSelect,
-        onDiff: onDiff,
-        requiredOnView: requiredOnView,
-        viewRender: viewRender,
-        desensitization: desensitization
-      })
-    }, fieldKey != null && fieldKey !== '' ? String(fieldKey) : `column-${index}`);
-  });
-  return /*#__PURE__*/_jsx(_Fragment, {
-    children: comList
+    return /* @__PURE__ */ jsx(
+      FieldProvider,
+      {
+        value: otherProps,
+        children: /* @__PURE__ */ jsx(
+          Render,
+          {
+            show,
+            disabled: column.disabled,
+            originComponent: component,
+            component: TargetComponent,
+            formItemProps: _formItemProps,
+            confirm,
+            componentProps,
+            otherProps,
+            fieldProps: isFunction(fieldProps) ? fieldProps : null,
+            isSelect: _isSelect,
+            onDiff,
+            requiredOnView,
+            viewRender,
+            desensitization
+          }
+        )
+      },
+      fieldKey != null && fieldKey !== "" ? String(fieldKey) : `column-${index}`
+    );
   });
+  return /* @__PURE__ */ jsx(Fragment, { children: comList });
+};
+var RenderFields_default = RenderFields;
+export {
+  RenderFields_default as default
 };
-export default RenderFields;

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

@@ -1 +0,0 @@
-export {};

package/es/ProForm/hooks/useControlled.js

@@ -1,14 +1,12 @@
-import { useState } from 'react';
-
-// 受控状态
-export const useControlled = props => {
-  const {
-    value,
-    onChange
-  } = props;
+import { useState } from "react";
+const useControlled = (props) => {
+  const { value, onChange } = props;
   const [state, setState] = useState(value || false);
-  if (value !== undefined) {
+  if (value !== void 0) {
     return [value, onChange];
   }
   return [state, setState];
-};
+};
+export {
+  useControlled
+};

package/es/ProForm/hooks/useDeepCompareMemo.js

@@ -1,17 +1,17 @@
-import _isEqualWith from "lodash/isEqualWith";
-import { useRef } from 'react';
+import { useRef } from "react";
+import isEqualWith from "lodash/isEqualWith";
 import { customEqualForFunction } from "../../utils";
-
-/** 深度比较依赖变化memo */
-export const useDeepCompareMemo = (fun, changedCb, depList) => {
-  const lastDependency = useRef({}); // 上一次的依赖
-  const lastRes = useRef({}); // 上一次的结果
-
-  if (!_isEqualWith(depList, lastDependency?.current, customEqualForFunction)) {
+const useDeepCompareMemo = (fun, changedCb, depList) => {
+  const lastDependency = useRef({});
+  const lastRes = useRef({});
+  if (!isEqualWith(depList, lastDependency == null ? void 0 : lastDependency.current, customEqualForFunction)) {
     const res = fun();
-    changedCb?.(lastRes.current, res);
+    changedCb == null ? void 0 : changedCb(lastRes.current, res);
     lastRes.current = res;
   }
   lastDependency.current = depList;
   return lastRes.current;
-};
+};
+export {
+  useDeepCompareMemo
+};

package/es/ProForm/hooks/useFieldProps.js

@@ -1,4 +1,8 @@
-import React, { useContext } from 'react';
-const FieldContext = /*#__PURE__*/React.createContext({});
-export const FieldProvider = FieldContext.Provider;
-export const useFieldProps = () => useContext(FieldContext);
+import React, { useContext } from "react";
+const FieldContext = React.createContext({});
+const FieldProvider = FieldContext.Provider;
+const useFieldProps = () => useContext(FieldContext);
+export {
+  FieldProvider,
+  useFieldProps
+};

package/es/ProForm/hooks/useForm.js

@@ -1,48 +1,30 @@
-import { Form } from 'antd';
-import { useContext } from 'react';
+import { Form } from "antd";
+import { useContext } from "react";
 import { filterInternalFields, getFormFieldPaths, mergeNames, isListForm } from "../utils";
 import { handleScrollToError as handleScrollToErrorProEditTable } from "../../ProEditTable/utils/tools";
 import { FormsContext } from "../../FormsProvider";
-export const useForm = function (originForm, options) {
-  // 如果没有form实例可以直接把options放在第一个参数位置
-  // @ts-ignore
-  const _originForm = originForm?._init ? originForm : undefined;
-  const _options =
-  // @ts-ignore
-  options || (originForm && !originForm?._init ? originForm : undefined);
-  const {
-    scrollToError = true,
-    optimize,
-    formKey,
-    source
-  } = _options || {};
-
-  // formKey全局共享逻辑
+const useForm = function(originForm, options) {
+  const _originForm = (originForm == null ? void 0 : originForm._init) ? originForm : void 0;
+  const _options = (
+    // @ts-ignore
+    options || (originForm && !(originForm == null ? void 0 : originForm._init) ? originForm : void 0)
+  );
+  const { scrollToError = true, optimize, formKey, source } = _options || {};
   const forms = useContext(FormsContext);
   const [localForm] = Form.useForm(_originForm);
-  // 同步注册共享实例，确保同一渲染流程中相同 formKey 复用同一个实例
   if (formKey && !forms[formKey]) {
     forms[formKey] = localForm;
     localForm.formKey = formKey;
   }
-  const sharedForm = formKey ? forms[formKey] : undefined;
+  const sharedForm = formKey ? forms[formKey] : void 0;
   const form = sharedForm || localForm;
   if (formKey && form.formKey !== formKey) {
     form.formKey = formKey;
   }
-  const {
-    getFieldsValue,
-    validateFields,
-    isModified,
-    setFields,
-    getFieldsError,
-    setFieldsValue
-  } = form;
-  if (isModified) return [form];
-
-  // @ts-ignore
+  const { getFieldsValue, validateFields, isModified, setFields, getFieldsError, setFieldsValue } = form;
+  if (isModified)
+    return [form];
   const nextGetFieldsValue = (nameList, filterFunc) => {
-    // 全部查询
     if (nameList !== true) {
       const values = getFieldsValue(nameList || true, filterFunc);
       return filterInternalFields(values, optimize);
@@ -50,69 +32,43 @@ export const useForm = function (originForm, options) {
     return getFieldsValue(nameList, filterFunc);
   };
   const nextValidateFields = async (nameList, ...rest) => {
-    // 内部选项：行内联动等被动校验只想触发校验、不想滚动到报错位置；
-    // 全局/主动提交校验不传，保持滚动。提取后从传给 antd 底层的选项中剔除，避免污染原生 options。
-    // @ts-ignore
-    const skipScrollOnError = !!rest?.[0]?.__skipScrollOnError;
-    // @ts-ignore
-    const restForNative = rest?.[0] ? [(({
-      __skipScrollOnError,
-      ...opts
-    }) => opts)(rest[0]), ...rest.slice(1)] : rest;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    const skipScrollOnError = !!((_a = rest == null ? void 0 : rest[0]) == null ? void 0 : _a.__skipScrollOnError);
+    const restForNative = (rest == null ? void 0 : rest[0]) ? [(({ __skipScrollOnError, ...opts }) => opts)(rest[0]), ...rest.slice(1)] : rest;
     try {
-      const isRecursive = rest?.[0]?.recursive;
-      const stopOnFirstError = form?.__INTERNAL_CONFIG__?.stopOnFirstError;
-
-      // 如果启用了 stopOnFirstError 且没有指定字段列表
+      const isRecursive = (_b = rest == null ? void 0 : rest[0]) == null ? void 0 : _b.recursive;
+      const stopOnFirstError = (_c = form == null ? void 0 : form.__INTERNAL_CONFIG__) == null ? void 0 : _c.stopOnFirstError;
       if (stopOnFirstError && !nameList) {
-        // 获取所有表单字段
         const allFields = getFormFieldPaths(form);
-        // 单独验证每个字段
-        // eslint-disable-next-line no-restricted-syntax
         for (const field of allFields) {
           try {
-            // 创建不包含 stopOnFirstError / 内部选项的选项
-            // @ts-ignore
-            const options = rest?.[0] ? {
-              ...rest[0]
-            } : {};
-            delete options.stopOnFirstError;
-            delete options.__skipScrollOnError;
-            // 验证单个字段
-            // eslint-disable-next-line no-await-in-loop
-            await validateFields([field], options);
+            const options2 = (rest == null ? void 0 : rest[0]) ? { ...rest[0] } : {};
+            delete options2.stopOnFirstError;
+            delete options2.__skipScrollOnError;
+            await validateFields([field], options2);
           } catch (error) {
-            // 遇到错误，滚动到错误位置（skipScrollOnError 时跳过）
-            if (!skipScrollOnError && scrollToError && error?.errorFields?.length) {
-              form.scrollToField(error.errorFields[0]?.name, {
-                block: 'center',
-                behavior: 'smooth'
+            if (!skipScrollOnError && scrollToError && ((_d = error == null ? void 0 : error.errorFields) == null ? void 0 : _d.length)) {
+              form.scrollToField((_e = error.errorFields[0]) == null ? void 0 : _e.name, {
+                block: "center",
+                behavior: "smooth"
               });
             }
-            // 中止验证，抛出错误
             throw error;
           }
         }
-        // 全部验证通过，返回表单值
         return form.getFieldsValue();
       }
       let validateNames = [];
-      // 前缀校验模式
       if (isRecursive) {
-        // @ts-ignore
-        const {
-          getFields
-        } = form.getInternalHooks('RC_FORM_INTERNAL_HOOKS');
+        const { getFields } = form.getInternalHooks("RC_FORM_INTERNAL_HOOKS");
         const fieldsList = getFields();
-
-        // formList& proEditTable 特殊处理
         if (Array.isArray(nameList) && isListForm(String(nameList))) {
-          const fieldsNames = fieldsList.map(item => item.name);
+          const fieldsNames = fieldsList.map((item) => item.name);
           validateNames = mergeNames(nameList, fieldsNames);
         } else {
-          // 其他情况
-          fieldsList.forEach(item => {
-            if (nameList[0] === item.name?.[0] || item.name?.[0]?.startsWith(`${nameList[0]}_`)) {
+          fieldsList.forEach((item) => {
+            var _a2, _b2, _c2;
+            if (nameList[0] === ((_a2 = item.name) == null ? void 0 : _a2[0]) || ((_c2 = (_b2 = item.name) == null ? void 0 : _b2[0]) == null ? void 0 : _c2.startsWith(`${nameList[0]}_`))) {
               validateNames.push(item.name);
             }
           });
@@ -120,30 +76,25 @@ export const useForm = function (originForm, options) {
         if (Array.isArray(nameList) && nameList.length && !validateNames.length) {
           validateNames = [...nameList];
         }
-
-        // @ts-ignore
-        return await validateFields(validateNames, ...restForNative).then(values => {
+        return await validateFields(validateNames, ...restForNative).then((values) => {
           return filterInternalFields(values, optimize);
         });
       }
-
-      // 解决，单个pro-edit-table的表单校验
-      if (nameList?.length && !nameList.join('-').includes(',')) {
-        const tablePagination = document && document?.querySelector(`#pro-edit-table-pagination-${nameList.join('-')}`);
+      if ((nameList == null ? void 0 : nameList.length) && !nameList.join("-").includes(",")) {
+        const tablePagination = document && (document == null ? void 0 : document.querySelector(`#pro-edit-table-pagination-${nameList.join("-")}`));
         if (tablePagination) {
-          tablePagination?.click?.();
+          (_f = tablePagination == null ? void 0 : tablePagination.click) == null ? void 0 : _f.call(tablePagination);
         }
       }
-      return await validateFields(nameList, ...restForNative).then(values => {
+      return await validateFields(nameList, ...restForNative).then((values) => {
         return nameList ? values : nextGetFieldsValue();
       });
     } catch (error) {
-      // skipScrollOnError（行内联动等被动校验）时不滚动，仅抛出错误
       if (!skipScrollOnError) {
-        if (scrollToError && error?.errorFields?.length && source === 'ProForm') {
-          form.scrollToField(error.errorFields[0]?.name, {
-            block: 'center',
-            behavior: 'smooth'
+        if (scrollToError && ((_g = error == null ? void 0 : error.errorFields) == null ? void 0 : _g.length) && source === "ProForm") {
+          form.scrollToField((_h = error.errorFields[0]) == null ? void 0 : _h.name, {
+            block: "center",
+            behavior: "smooth"
           });
         }
         handleScrollToErrorProEditTable();
@@ -153,21 +104,12 @@ export const useForm = function (originForm, options) {
   };
   const nextSetFieldValue = (name, value, info) => {
     if (info) {
-      setFields([{
-        name,
-        value,
-        ...info
-      }]);
+      setFields([{ name, value, ...info }]);
     } else {
-      setFields([{
-        name,
-        value,
-        errors: [],
-        warnings: []
-      }]);
+      setFields([{ name, value, errors: [], warnings: [] }]);
     }
   };
-  const nextSetFieldsValue = values => {
+  const nextSetFieldsValue = (values) => {
     const errors = getFieldsError();
     const errorNames = errors.reduce((acc, entry) => {
       if (entry.errors.length > 0) {
@@ -176,14 +118,9 @@ export const useForm = function (originForm, options) {
       return acc;
     }, []) || [];
     if (errorNames.length) {
-      errorNames.forEach(errorName => {
-        // 只处理names的报错
-        if (errorName.includes('-')) {
-          setFields([{
-            name: errorName,
-            errors: [],
-            warnings: []
-          }]);
+      errorNames.forEach((errorName) => {
+        if (errorName.includes("-")) {
+          setFields([{ name: errorName, errors: [], warnings: [] }]);
         }
       });
       setFieldsValue(values);
@@ -198,4 +135,7 @@ export const useForm = function (originForm, options) {
   form.isModified = true;
   form.__INTERNAL_CONFIG__ = {};
   return [form];
-};
+};
+export {
+  useForm
+};