@zat-design/sisyphus-react 4.4.3-beta.2 → 4.4.3

package/es/ProEditTable/components/RenderField/propsType.d.ts

@@ -0,0 +1,30 @@
+import { FormInstance } from 'antd';
+import { InternalNamePath, NamePath } from 'antd/lib/form/interface';
+import { DiffOriginalParams } from '../../utils/diffOriginal';
+export interface GetOriginalValueParams {
+    namePath: InternalNamePath;
+    originalName: InternalNamePath;
+    originalNames?: InternalNamePath[];
+    originalValues?: any;
+    rowKeyPath?: InternalNamePath;
+    form: FormInstance;
+}
+export interface Props {
+    name?: NamePath;
+    names?: NamePath[];
+    originalName?: NamePath;
+    originalNames?: NamePath[];
+    namesStr?: NamePath;
+    originalValues?: any;
+    form: FormInstance;
+    onDiff?: DiffOriginalParams['onDiff'];
+    [name: string]: any;
+}
+/** RenderField 的 props 多为表格运行期动态结构（column/config/record），保留显式 any */
+export interface RenderFieldComparableProps {
+    text?: any;
+    record?: any;
+    index: number;
+    column?: any;
+    config?: any;
+}

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

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

package/es/ProEditTable/components/RenderField/tools.d.ts

@@ -0,0 +1,22 @@
+import { InternalNamePath, NamePath } from 'antd/lib/form/interface';
+import { GetOriginalValueParams, RenderFieldComparableProps } from './propsType';
+/** 列配置中不应透传到 Form.Item 或 DOM 的字段（与 ProForm Render 保持一致） */
+export declare const OMIT_FORM_ITEM_AND_DOM_KEYS: string[];
+/** 克隆子元素时需从 props 中剔除，避免透传到 div 等 DOM 导致 React 警告 */
+export declare const OMIT_FROM_DOM_KEYS: string[];
+export declare const toNamePath: (name: NamePath) => InternalNamePath;
+export declare const toNamePaths: (names: NamePath[]) => InternalNamePath[];
+export declare const getOriginalValue: ({ namePath, originalName, originalNames, originalValues, rowKeyPath, form, }: GetOriginalValueParams) => {
+    originalValue: any;
+    originRecord: any;
+    record: any;
+} | {
+    originalValue: any;
+    originRecord: any;
+    record?: undefined;
+};
+/**
+ * memo 自定义比较函数：只有关键 props 变化时才重新渲染。
+ * 从 RenderField 拆出，行为与原内联实现保持一致。
+ */
+export declare const arePropsEqual: (prevProps: RenderFieldComparableProps, nextProps: RenderFieldComparableProps) => boolean;

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

@@ -0,0 +1,203 @@
+import _isFunction from "lodash/isFunction";
+import _isEqualWith from "lodash/isEqualWith";
+import _isEqual from "lodash/isEqual";
+import _get from "lodash/get";
+import { customEqualForFunction } from "../../../utils";
+import { getNamePath } from "../../utils/tools";
+/** 列配置中不应透传到 Form.Item 或 DOM 的字段（与 ProForm Render 保持一致） */
+export const OMIT_FORM_ITEM_AND_DOM_KEYS = ['format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames', 'shouldCellUpdate' // 表格内部性能优化属性，不应传递给 Form.Item
+];
+
+/** 克隆子元素时需从 props 中剔除，避免透传到 div 等 DOM 导致 React 警告 */
+export const OMIT_FROM_DOM_KEYS = ['disabled',
+// div 不支持 disabled，且值可能非 string/number
+'toCSTString', 'toISOString', 'format', 'switchValue', 'precision', 'clearNotShow', 'dependNames'];
+export const toNamePath = name => {
+  if (Array.isArray(name)) {
+    return name;
+  }
+  return [name];
+};
+export const toNamePaths = names => {
+  return names.map(name => toNamePath(name));
+};
+export const getOriginalValue = ({
+  namePath,
+  originalName,
+  originalNames,
+  originalValues,
+  rowKeyPath,
+  form
+}) => {
+  if (!originalValues) {
+    return undefined;
+  }
+  let originRecord;
+  if (rowKeyPath) {
+    const rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1); // 表单中变动值所在行
+    const rowKeyName = rowKeyPath[rowKeyPath.length - 1]; // rowKey在行内的name
+
+    const rowValue = form.getFieldValue(rowValueNamePath);
+    if (!rowValue) return undefined;
+    const keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
+    if (!keyValue) return undefined;
+    const originalValueList = _get(originalValues, originalName.slice(0, rowKeyPath.length - 2));
+    originRecord = originalValueList?.find(item => {
+      return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
+    });
+    let originalValue;
+    if (originalNames?.length) {
+      const originalNamesValue = originalNames.map(originalName => {
+        return _get(originRecord, originalName.slice(rowKeyPath.length - 1));
+      });
+
+      // 有可能出现数组中全是undefined的情况  视为没有值
+      const fillUndefined = originalNamesValue.every(valItem => valItem === undefined);
+      originalValue = fillUndefined ? undefined : originalNamesValue;
+    } else {
+      originalValue = _get(originRecord, originalName.slice(rowKeyPath.length - 1));
+    }
+    return {
+      originalValue,
+      originRecord,
+      record: rowValue
+    };
+  }
+
+  // 这个方法是给editTable专用的  暂时不存在不传rowKey的情况
+  return {
+    originalValue: originalNames?.length ? originalNames.map(originalName => _get(originalValues, originalName)) : _get(originalValues, originalName),
+    originRecord
+  };
+};
+
+/**
+ * memo 自定义比较函数：只有关键 props 变化时才重新渲染。
+ * 从 RenderField 拆出，行为与原内联实现保持一致。
+ */
+export const arePropsEqual = (prevProps, nextProps) => {
+  const {
+    text: prevText,
+    record: prevRecord,
+    index: prevIndex,
+    column: prevColumn,
+    config: prevConfig
+  } = prevProps;
+  const {
+    text: nextText,
+    record: nextRecord,
+    index: nextIndex,
+    column: nextColumn,
+    config: nextConfig
+  } = nextProps;
+
+  // 函数型动态属性（component/editRender/fieldProps/rules/required/disabled/isEditable/valueType）
+  // 可能依赖行内兄弟字段；行对象为同引用（原地修改）时，浅比较无法区分，需强制重渲染
+  const hasFunctionDependency = _isFunction(prevColumn?.component) || _isFunction(prevColumn?.editRender) || _isFunction(prevColumn?.fieldProps) || _isFunction(prevColumn?.rules) || _isFunction(prevColumn?.required) || _isFunction(prevColumn?.disabled) || _isFunction(prevColumn?.isEditable) || _isFunction(prevColumn?.valueType) || _isFunction(nextColumn?.component) || _isFunction(nextColumn?.editRender) || _isFunction(nextColumn?.fieldProps) || _isFunction(nextColumn?.rules) || _isFunction(nextColumn?.required) || _isFunction(nextColumn?.disabled) || _isFunction(nextColumn?.isEditable) || _isFunction(nextColumn?.valueType);
+  if (hasFunctionDependency && prevRecord === nextRecord) {
+    return false;
+  }
+
+  // 构建新的参数格式（与 ProForm 保持一致）
+  const prevNamePath = getNamePath(prevConfig?.name, prevConfig?.virtualKey);
+  const nextNamePath = getNamePath(nextConfig?.name, nextConfig?.virtualKey);
+  const prevReactiveParams = {
+    form: prevConfig?.form,
+    index: prevIndex,
+    namePath: [...prevNamePath, prevIndex]
+  };
+  const nextReactiveParams = {
+    form: nextConfig?.form,
+    index: nextIndex,
+    namePath: [...nextNamePath, nextIndex]
+  };
+  if (_isFunction(prevColumn?.disabled) && _isFunction(nextColumn?.disabled)) {
+    if (prevColumn?.disabled(prevRecord, prevReactiveParams) !== nextColumn?.disabled(nextRecord, nextReactiveParams)) {
+      return false;
+    }
+  }
+
+  // fieldProps 函数化直接更新，无法比对返回值是否一致
+  // 优化：不直接调用函数，而是比较输入参数（record 和 reactiveParams）
+  // 如果输入参数相同，fieldProps 的返回值应该相同（纯函数假设）
+  if (_isFunction(prevColumn?.fieldProps) && _isFunction(nextColumn?.fieldProps)) {
+    // 比较 record 数据是否变化
+    if (!_isEqualWith(prevRecord, nextRecord, customEqualForFunction)) {
+      return false;
+    }
+    // reactiveParams 中的 form、index、namePath 已经在外层比较过了，无需重复比较
+  }
+  // fieldProps 为对象时，必须比较配置变化（如 dataSource 异步更新）
+  if (!_isFunction(prevColumn?.fieldProps) && !_isFunction(nextColumn?.fieldProps)) {
+    const isFieldPropsEqual = _isEqualWith(prevColumn?.fieldProps, nextColumn?.fieldProps, customEqualForFunction);
+    if (!isFieldPropsEqual) {
+      return false;
+    }
+  }
+
+  // 通用函数比较方法
+  // 优化：不直接调用函数，而是比较函数引用和输入参数
+  const compareFunctionResult = (prevCol, nextCol, prevValues, nextValues, _prevReactiveParams, _nextReactiveParams, functionName) => {
+    const prevFunc = prevCol?.[functionName];
+    const nextFunc = nextCol?.[functionName];
+    if (_isFunction(prevFunc) && _isFunction(nextFunc)) {
+      // 函数引用变化说明闭包可能捕获了新的外部状态（如异步加载的 list），必须重渲染
+      if (prevFunc !== nextFunc) return false;
+      // 同引用函数，比较输入参数（纯函数假设：输入相同则输出相同）
+      return _isEqualWith(prevValues, nextValues, customEqualForFunction);
+    }
+    return true; // 如果不是函数或只有一个是函数，认为相等
+  };
+
+  // 使用简化后的比较逻辑
+  const functionFields = ['rules', 'component', 'desensitization', 'isEditable', 'required'];
+  if (functionFields.some(field => !compareFunctionResult(prevColumn, nextColumn, prevRecord, nextRecord, prevReactiveParams, nextReactiveParams, field))) {
+    return false;
+  }
+
+  // 基本props比较
+  if (!_isEqual(prevText, nextText) || prevIndex !== nextIndex) {
+    return false;
+  }
+
+  // 记录关键字段比较（避免完整对象比较的性能开销）
+  if (prevRecord?.rowKey !== nextRecord?.rowKey || prevRecord?._addFlag !== nextRecord?._addFlag) {
+    return false;
+  }
+
+  // 列配置比较（只比较关键字段）,required,disabled为函数时，需要重新计算
+  if (prevColumn?.dataIndex !== nextColumn?.dataIndex || prevColumn?.type !== nextColumn?.type || prevColumn?.name !== nextColumn?.name) {
+    return false;
+  }
+
+  // config中关键字段比较
+  if (prevConfig?._isEditing !== nextConfig?._isEditing || prevConfig?.mode !== nextConfig?.mode) {
+    return false;
+  }
+
+  // 当前单元格的值比较
+  const prevDataIndex = prevColumn?.dataIndex;
+  const nextDataIndex = nextColumn?.dataIndex;
+  if (prevDataIndex && nextDataIndex && prevDataIndex === nextDataIndex) {
+    if (prevRecord?.[prevDataIndex] !== nextRecord?.[nextDataIndex]) {
+      return false;
+    }
+  }
+
+  // 特殊处理：当使用自定义 component 函数时，比较整个 record 对象
+  // 因为自定义组件可能依赖 record 中的其他字段（不只是当前列的 dataIndex）
+  if (_isFunction(prevColumn?.component) || _isFunction(nextColumn?.component)) {
+    // 浅比较 record 的所有属性
+    const prevKeys = Object.keys(prevRecord || {});
+    const nextKeys = Object.keys(nextRecord || {});
+    if (prevKeys.length !== nextKeys.length) {
+      return false;
+    }
+
+    // 使用 some 方法代替 for 循环
+    if (prevKeys.some(key => prevRecord?.[key] !== nextRecord?.[key])) {
+      return false;
+    }
+  }
+  return true;
+};

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

@@ -75,58 +75,58 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     confirm?: boolean | import("antd").ModalFuncProps | import("../../../render/propsType").FunctionArgs<any, boolean | import("antd").ModalFuncProps>;
     show?: boolean | ReactiveFunction<any, boolean>;
     component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
-    toISOString?: boolean;
-    toCSTString?: boolean;
-    switchValue?: [any, any];
-    clearNotShow?: boolean;
-    trim?: boolean;
-    upperCase?: boolean;
-    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
+    className?: string;
+    hidden?: boolean;
+    id?: string;
+    style?: React.CSSProperties;
+    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
+    onReset?: () => void;
+    prefixCls?: string;
+    isView?: boolean;
+    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
+    rootClassName?: string;
+    status?: "" | "warning" | "error" | "success" | "validating";
+    vertical?: boolean;
     getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
-    shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
     colon?: boolean;
     htmlFor?: string;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
     labelCol?: import("antd").ColProps;
-    vertical?: boolean;
-    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
+    shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
     trigger?: string;
     validateTrigger?: string | false | string[];
     validateDebounce?: number;
     valuePropName?: string;
     messageVariables?: Record<string, string>;
     initialValue?: any;
-    onReset?: () => void;
     onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
     preserve?: boolean;
     isListField?: boolean;
     isList?: boolean;
-    prefixCls?: string;
     noStyle?: boolean;
-    style?: React.CSSProperties;
-    className?: string;
-    rootClassName?: string;
-    id?: string;
     hasFeedback?: boolean | {
         icons: import("antd/es/form/FormItem").FeedbackIcons;
     };
-    validateStatus?: "" | "success" | "warning" | "error" | "validating";
-    hidden?: boolean;
+    validateStatus?: "" | "warning" | "error" | "success" | "validating";
     layout?: import("antd/es/form/Form").FormItemLayout;
     wrapperCol?: import("antd").ColProps;
-    status?: "" | "success" | "warning" | "error" | "validating";
     help?: React.ReactNode;
     fieldId?: string;
     valueType?: import("../../../render/propsType").ProFormValueType;
-    isView?: boolean;
+    toISOString?: boolean;
+    toCSTString?: boolean;
+    switchValue?: [any, any];
+    clearNotShow?: boolean;
+    trim?: boolean;
+    upperCase?: boolean;
     viewRender?: (value: any, record: any, { form, index, namePath, }: {
         [key: string]: any;
         form: FormInstance<any>;
         index?: number;
     }) => string | React.ReactElement<any, any>;
     viewType?: import("../../../render/propsType").ViewType;
-    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
     name: any;
     dependencies: any[];
     tooltip: string | {
@@ -141,7 +141,7 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
  * 创建组件属性
  */
 export declare const createComponentProps: (column: FlexibleGroupColumnType, formItemProps: any) => {
-    componentProps: import("lodash").Omit<any, "format" | "toISOString" | "toCSTString" | "switchValue" | "precision" | "clearNotShow" | "dependNames" | "valueType">;
+    componentProps: import("lodash").Omit<any, "precision" | "valueType" | "toISOString" | "toCSTString" | "switchValue" | "format" | "clearNotShow" | "dependNames">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

package/es/ProTree/components/ProTreeSelect/index.js

@@ -10,7 +10,7 @@ import locale from "../../../locale";
 import { useProConfig } from "../../../ProConfigProvider";
 import Container from "../../../ProForm/components/Container";
 import AdaptiveTooltip from "../AdaptiveTooltip";
-import { getFlatTreeData } from "../../utils";
+import { getFlatTreeData, restoreCodeNameLabel } from "../../utils";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const {
   SHOW_PARENT
@@ -629,7 +629,8 @@ export const ProTreeSelect = (props, ref) => {
     if (props?.labelInValue) {
       result = getLabelByValue(_selectList, newVal);
     }
-    const options = findTreeNode(_selectList, extra?.triggerValue);
+    // showCodeName 仅影响展示，回调返回的 option 需还原原始 label
+    const options = restoreCodeNameLabel(findTreeNode(_selectList, extra?.triggerValue), showCodeName);
     onChange && onChange(result, options, extra);
     // 重置搜索
     showSearch && searchTreeEvent('');

package/es/ProTree/utils.d.ts

@@ -35,6 +35,15 @@ export declare function filterCheckedNodes(data: any, checkedKeys: any, searchSt
  * @returns
  */
 export declare function getChildrenKeys(node: ProTreeDataType, childrenKeys: string[], fieldNames: ProTreeFieldNamesType, type: 'treeClose' | 'treeCheck'): void;
+/**
+ * 还原 showCodeName 合并到 label 上的 `${value}-` 前缀
+ * showCodeName 仅影响展示，回调返回的 option 应保持原始 label
+ * 注意：此处 option 已是标准格式（label, value）
+ * @param option 单个或数组形式的选项（标准格式）
+ * @param showCodeName 是否开启了 code-name 展示
+ * @returns 还原 label 后的新对象/数组（不可变）
+ */
+export declare function restoreCodeNameLabel<T extends Record<string, any>>(option: T | T[], showCodeName?: boolean): T | T[];
 /**
  * 如果默认全开展那么返回所有key，否则返回空[]
  * @param isExpand 是否全展开

package/es/ProTree/utils.js

@@ -160,6 +160,37 @@ export function getChildrenKeys(node, childrenKeys, fieldNames, type) {
   }
 }
 
+/**
+ * 还原 showCodeName 合并到 label 上的 `${value}-` 前缀
+ * showCodeName 仅影响展示，回调返回的 option 应保持原始 label
+ * 注意：此处 option 已是标准格式（label, value）
+ * @param option 单个或数组形式的选项（标准格式）
+ * @param showCodeName 是否开启了 code-name 展示
+ * @returns 还原 label 后的新对象/数组（不可变）
+ */
+export function restoreCodeNameLabel(option, showCodeName) {
+  if (!showCodeName || !option) {
+    return option;
+  }
+  const restore = node => {
+    const {
+      label,
+      value
+    } = node;
+    if (typeof label === 'string') {
+      const prefix = `${value}-`;
+      if (label.startsWith(prefix)) {
+        return {
+          ...node,
+          label: label.slice(prefix.length)
+        };
+      }
+    }
+    return node;
+  };
+  return Array.isArray(option) ? option.map(restore) : restore(option);
+}
+
 /**
  * 如果默认全开展那么返回所有key，否则返回空[]
  * @param isExpand 是否全展开

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.4.3-beta.2",
+  "version": "4.4.3",
   "license": "MIT",
   "files": [
     "es",
@@ -163,7 +163,6 @@
     "husky": "^9.0.0",
     "jest-canvas-mock": "^2.5.2",
     "lint-staged": "^10.0.0",
-    "mini-css-extract-plugin": "^2.9.4",
     "minimatch": "^9.0.5",
     "mockjs": "^1.0.0",
     "patch-package": "^8.0.1",