@zat-design/sisyphus-react 4.5.2 → 4.5.4

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

@@ -97,24 +97,29 @@ const RenderField = ({
   }
 
   // 单行正在编辑时，临时生成一套formItem用来存储中间值，点击取消时候重置回上一次状态
-  const namePath = getNamePath(name, virtualKey);
-  const rowData = form.getFieldValue([...namePath, index]) || record || {};
+  const namePathKey = useMemo(() => {
+    const path = getNamePath(name, virtualKey);
+    return Array.isArray(path) ? path.join('.') : String(path);
+  }, [name, virtualKey]);
+  const namePath = useMemo(() => getNamePath(name, virtualKey), [namePathKey, name, virtualKey]);
+  const rowNamePath = useMemo(() => [...namePath, index], [namePath, index]);
+  const rowData = form.getFieldValue(rowNamePath) || record || {};
   let currentValue = dataIndex ? rowData?.[dataIndex] : null;
 
   // 构建新的参数格式（与 ProForm 保持一致）
   const reactiveParams = useMemo(() => ({
     form,
     index,
-    namePath: [...namePath, index]
-  }), [form, index, namePath]);
+    namePath: rowNamePath
+  }), [form, index, rowNamePath]);
 
   // 保留 options 用于 viewRender 和 formatArgs（兼容旧格式）
   const options = useMemo(() => ({
     index,
     form,
     name: column?.name,
-    namePath: [...namePath, index]
-  }), [index, column?.name, namePath, form]);
+    namePath: rowNamePath
+  }), [index, column?.name, rowNamePath, form]);
 
   // 行参数 - 使用useMemo优化（新格式：values, { form, index, namePath }）
   const rowParams = useMemo(() => [rowData, reactiveParams], [rowData, reactiveParams]);
@@ -141,7 +146,7 @@ const RenderField = ({
     lastValueType = dynamicProps.valueType ?? valueType(currentValue, rowData, {
       index,
       form,
-      namePath: [...namePath, index],
+      namePath: rowNamePath,
       name: column?.name
     });
   }
@@ -253,8 +258,8 @@ const RenderField = ({
   if (hasFunctionDependency) {
     // 使用 shouldUpdate 监听同一行的数据变化；shouldUpdate 与 dependencies 互斥，始终优先 shouldUpdate
     lastFormItemProps.shouldUpdate = (prevValues, currentValues) => {
-      const prevRow = _get(prevValues, [...namePath, index]);
-      const currentRow = _get(currentValues, [...namePath, index]);
+      const prevRow = _get(prevValues, rowNamePath);
+      const currentRow = _get(currentValues, rowNamePath);
       // 如果行数据发生变化，则重新渲染
       return !_isEqual(prevRow, currentRow);
     };
@@ -408,7 +413,7 @@ const RenderField = ({
         errorStore.clearCell(record.rowKey, String(column?.dataIndex));
       }
       let callArgs = [...innerArgs];
-      const rowPath = [...namePath, index];
+      const rowPath = rowNamePath;
       if (!onFieldChange && !onChange) {
         if (dependencies?.length) {
           const validateFieldKeys = dependencies?.map?.(key => [...rowPath, key]);
@@ -531,7 +536,7 @@ const RenderField = ({
       return;
     }
     let callArgs = formatArgs(...args);
-    const rowPath = [...namePath, index];
+    const rowPath = rowNamePath;
     const row = form.getFieldValue(rowPath, true);
     const orgRow = _cloneDeep(row);
     callArgs[1] = row;
@@ -564,7 +569,7 @@ const RenderField = ({
     name: cellName,
     ...lastFieldProps,
     ...TargetComponent?.props,
-    namePath: [...namePath, index],
+    namePath: rowNamePath,
     disabled: lastDisabled,
     onChange: handleChange,
     onBlur: handleBlur,
@@ -574,7 +579,7 @@ const RenderField = ({
     otherProps: {
       form,
       names,
-      namePath: [...namePath, index],
+      namePath: rowNamePath,
       name: originalName,
       listName: cellName,
       // 用于下拉框去重消费，保持和formlist一致
@@ -643,11 +648,11 @@ const RenderField = ({
   // shouldUpdate 模式下重新获取最新行数据并重算所有响应式属性，返回最新渲染状态（不修改外层闭包）
   const recalcShouldUpdateState = () => {
     // 重新获取最新的行数据（shouldUpdate 触发时，通过 getFieldValue 拿到最新值）
-    const latestRowData = form.getFieldValue([...namePath, index]) || record || {};
+    const latestRowData = form.getFieldValue(rowNamePath) || record || {};
     const latestReactiveParams = {
       form,
       index,
-      namePath: [...namePath, index]
+      namePath: rowNamePath
     };
     const latestRowParams = [latestRowData, latestReactiveParams];
 

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

@@ -3,7 +3,7 @@ import _isEqualWith from "lodash/isEqualWith";
 import _isEqual from "lodash/isEqual";
 import _get from "lodash/get";
 import { customEqualForFunction } from "../../../utils";
-import { getNamePath } from "../../utils/tools";
+import { getNamePath, isRecordShallowEqual } 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
 ];
@@ -121,8 +121,8 @@ export const arePropsEqual = (prevProps, nextProps) => {
   // 优化：不直接调用函数，而是比较输入参数（record 和 reactiveParams）
   // 如果输入参数相同，fieldProps 的返回值应该相同（纯函数假设）
   if (_isFunction(prevColumn?.fieldProps) && _isFunction(nextColumn?.fieldProps)) {
-    // 比较 record 数据是否变化
-    if (!_isEqualWith(prevRecord, nextRecord, customEqualForFunction)) {
+    // 比较 record 数据是否变化（浅比较，虚拟滚动性能优化）
+    if (!isRecordShallowEqual(prevRecord, nextRecord)) {
       return false;
     }
     // reactiveParams 中的 form、index、namePath 已经在外层比较过了，无需重复比较
@@ -144,7 +144,7 @@ export const arePropsEqual = (prevProps, nextProps) => {
       // 函数引用变化说明闭包可能捕获了新的外部状态（如异步加载的 list），必须重渲染
       if (prevFunc !== nextFunc) return false;
       // 同引用函数，比较输入参数（纯函数假设：输入相同则输出相同）
-      return _isEqualWith(prevValues, nextValues, customEqualForFunction);
+      return isRecordShallowEqual(prevValues, nextValues);
     }
     return true; // 如果不是函数或只有一个是函数，认为相等
   };
@@ -187,15 +187,7 @@ export const arePropsEqual = (prevProps, nextProps) => {
   // 特殊处理：当使用自定义 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])) {
+    if (!isRecordShallowEqual(prevRecord, nextRecord)) {
       return false;
     }
   }

package/es/ProEditTable/utils/index.js

@@ -1,5 +1,4 @@
 import _isFunction from "lodash/isFunction";
-import _isEqual from "lodash/isEqual";
 import _isBoolean from "lodash/isBoolean";
 import _isArray from "lodash/isArray";
 import _cloneDeepWith from "lodash/cloneDeepWith";
@@ -9,7 +8,7 @@ import classnames from 'classnames';
 import { tools } from '@zat-design/utils';
 import { QuestionCircleOutlined } from '@ant-design/icons';
 import { actions, defaultBtnNameMap, defaultSingleActionKeys, defaultMultipleActionKeys, defaultEditingActionKeys } from "./config";
-import { customValidate, getNamePath, splitNames, handleScrollToError, cloneDeepFilterNode } from "./tools";
+import { customValidate, getNamePath, splitNames, handleScrollToError, cloneDeepFilterNode, isRecordShallowEqual } from "./tools";
 import { filterInternalFields } from "../../ProForm/utils";
 import ProTooltip from "../../ProTooltip";
 import { RenderField, ActionButton } from "../components";
@@ -407,7 +406,7 @@ export const transformColumns = (columns = [], config, caches) => {
           if (record === prevRecord) {
             return true;
           }
-          return !_isEqual(record, prevRecord);
+          return !isRecordShallowEqual(record, prevRecord);
         }
         const key = item.dataIndex || item.key;
         if (!key) return true;

package/es/ProEditTable/utils/tools.js

@@ -11,13 +11,12 @@ import _cloneDeep from "lodash/cloneDeep";
 /* eslint-disable no-restricted-syntax */
 import React from 'react';
 import { tools, validate } from '@zat-design/utils';
+import { generateId } from "../../utils";
 /**
  * 生成随机字符串
  * @returns 随机字符串
  */
-export const getRandom = () => {
-  return crypto.randomUUID().replace(/-/g, '').slice(0, 6);
-};
+export const getRandom = () => generateId();
 
 /**
  * 构建 AntD Table 的 rowKey 函数，支持字符串/函数两种形式，
@@ -36,6 +35,25 @@ export const buildTableRowKey = rowKey => {
   };
 };
 
+/**
+ * 表格行数据的浅比较：仅比较第一层字段引用/值，避免虚拟滚动时整行深比较开销。
+ * 行对象在本组件场景通常为扁平标量字段；同引用时由调用方另行处理。
+ */
+export const isRecordShallowEqual = (a, b) => {
+  if (a === b) {
+    return true;
+  }
+  if (!a || !b) {
+    return false;
+  }
+  const aKeys = Object.keys(a);
+  const bKeys = Object.keys(b);
+  if (aKeys.length !== bKeys.length) {
+    return false;
+  }
+  return aKeys.every(key => a[key] === b[key]);
+};
+
 /**
  * 深层次对比两个对象且取出来差异值
  * @param object 比较对象

package/es/ProEditTable/utils/useShouldUpdateForTable.js

@@ -132,9 +132,10 @@ const useShouldUpdateForTable = props => {
   // 使用 ref 存储上一次的 rowParams，避免引用变化导致的重复调用
   const prevRowParamsRef = useRef(null);
 
-  // 只有当 rowParams 内容真正变化时才处理更新
-  // 或者是第一次初始化
-  const shouldProcess = !isInitializedRef.current || !_isEqualWith(prevRowParamsRef.current, rowParams, customEqualForFunction);
+  // 行数据引用 + 行索引均不变时跳过深比较（虚拟滚动常见路径）
+  const prevRowParams = prevRowParamsRef.current;
+  const rowDataUnchanged = isInitializedRef.current && prevRowParams?.[0] === rowParams[0] && prevRowParams?.[1]?.index === rowParams[1]?.index;
+  const shouldProcess = !isInitializedRef.current || !rowDataUnchanged && !_isEqualWith(prevRowParams, rowParams, customEqualForFunction);
   if (shouldProcess) {
     prevRowParamsRef.current = rowParams;
     isInitializedRef.current = true;

package/es/ProForm/components/combination/ProModalSelect/index.js

@@ -15,8 +15,8 @@ import Container from "../../Container";
 import viewSvg from "../../../../assets/view.svg";
 import useRequestList from "./hooks/useRequestList";
 import locale from "../../../../locale";
-import { hideTooltipIfOpen } from "./utils";
-import { mergeSelectedRows } from "./utils/mergeSelectedRows";
+import { hideTooltipIfOpen, mergeSelectedRows } from "./utils";
+import { generateId } from "../../../../utils";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const ProModalSelect = (props, ref) => {
   const {
@@ -81,7 +81,7 @@ const ProModalSelect = (props, ref) => {
   const isMultiple = type === 'checkbox';
 
   // 生成一个唯一id，用于满足tooltip功能
-  const uuid = crypto.randomUUID().slice(0, 8);
+  const uuid = generateId();
 
   // 全局配置fieldNames指定 value与label的key
   const {

package/es/ProForm/components/combination/ProModalSelect/utils/index.js

@@ -22,4 +22,28 @@ export const hideTooltipIfOpen = (dom, open) => {
   if (open && grandParent) {
     grandParent.classList.add('pro-modal-select-parent-open');
   }
+};
+
+/**
+ * 合并跨页/筛选场景下的多选行数据
+ *
+ * antd Table 开启 preserveSelectedRowKeys 后，onChange 回传的 rowKeys 是全量（含不在当前页的 key），
+ * 但 rows 中不在当前 dataSource 的行对象会是 undefined。此函数用历史已选行（prevRows）补全这些缺失的行对象，
+ * 保证返回的 rows 与 rowKeys 全量对齐，从而避免翻页/精准筛选后丢失已选数据。
+ *
+ * @param prevRows 历史已选行（累积缓存）
+ * @param nextRowKeys antd 回传的全量选中 key
+ * @param nextRows antd 回传的行对象（不在当前页的为 undefined）
+ * @param getRowKey 取行 key 的方法
+ * @returns 与 nextRowKeys 对齐的全量行对象（无法找到行对象的 key 会被过滤）
+ */
+export const mergeSelectedRows = (prevRows, nextRowKeys, nextRows, getRowKey) => {
+  const rowMap = new Map();
+  prevRows?.forEach(row => {
+    if (row) rowMap.set(getRowKey(row), row);
+  });
+  nextRows?.forEach(row => {
+    if (row) rowMap.set(getRowKey(row), row);
+  });
+  return nextRowKeys.map(key => rowMap.get(key)).filter(Boolean);
 };

package/es/ProTree/components/ProTree.js

@@ -111,7 +111,9 @@ const ProTree = props => {
     ...useRequest?.options
   });
   useDeepCompareEffect(() => {
-    if (dataSource && dataSource.length) {
+    // 显式传入数组（含空数组 []）时都同步到内部 state，
+    // 否则删除最后一个节点后 dataSource 变为 [] 时树数据不会被清空。
+    if (Array.isArray(dataSource)) {
       const allKey = getAllKeys(dataSource, fieldNames);
       setState({
         treeData: dataSource,

package/es/ProUpload/index.js

@@ -5,6 +5,7 @@ import { message } from 'antd';
 import { PointerSensor, useSensor } from '@dnd-kit/core';
 import { arrayMove } from '@dnd-kit/sortable';
 import { useProConfig } from "../ProConfigProvider";
+import { generateId } from "../utils";
 import DragRender from "./components/DragRender";
 import ButtonRender from "./components/ButtonRender";
 import ImageRender from "./components/ImageRender";
@@ -271,7 +272,7 @@ const ProUpload = /*#__PURE__*/React.forwardRef((props, ref) => {
           }
         });
         if (!file.uid) {
-          file.uid = crypto.randomUUID();
+          file.uid = generateId();
         }
         if (!file.status) {
           file.status = 'done';

package/es/utils/index.js

@@ -54,6 +54,11 @@ export const isEmpty = (value, emptyValue) => {
   return false;
 };
 
+/**
+ * 生成用于 UI 元素的随机短 ID（非安全用途）
+ */
+export const generateId = () => Math.random().toString(36).slice(-6);
+
 /**
  * 判断一个元素是否触发了省略号（文本溢出）
  * 如果元素设置为单行（white-space: nowrap）则比较 scrollWidth 与 clientWidth，

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.5.2",
+  "version": "4.5.4",
   "license": "MIT",
   "files": [
     "es",
@@ -140,7 +140,7 @@
     "@typescript-eslint/parser": "^7.18.0",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zat-design/sisyphus-login": "4.0.0-beta.1",
+    "@zat-design/sisyphus-login": "4.0.2",
     "ahooks": "3.9.5",
     "babel-plugin-import": "^1.13.8",
     "babel-plugin-lodash": "^3.3.4",

package/es/ProForm/components/combination/ProModalSelect/utils/mergeSelectedRows.js

@@ -1,26 +0,0 @@
-/**
- * 合并跨页/筛选场景下的多选行数据
- *
- * antd Table 开启 preserveSelectedRowKeys 后，onChange 回传的 rowKeys 是全量（含不在当前页的 key），
- * 但 rows 中不在当前 dataSource 的行对象会是 undefined。此函数用历史已选行（prevRows）补全这些缺失的行对象，
- * 保证返回的 rows 与 rowKeys 全量对齐，从而避免翻页/精准筛选后丢失已选数据。
- *
- * @param prevRows 历史已选行（累积缓存）
- * @param nextRowKeys antd 回传的全量选中 key
- * @param nextRows antd 回传的行对象（不在当前页的为 undefined）
- * @param getRowKey 取行 key 的方法
- * @returns 与 nextRowKeys 对齐的全量行对象（无法找到行对象的 key 会被过滤）
- */
-export const mergeSelectedRows = (prevRows, nextRowKeys, nextRows, getRowKey) => {
-  // 用 key -> row 建立查找表：当前页最新行覆盖历史行
-  const rowMap = new Map();
-  prevRows?.forEach(row => {
-    if (row) rowMap.set(getRowKey(row), row);
-  });
-  nextRows?.forEach(row => {
-    if (row) rowMap.set(getRowKey(row), row);
-  });
-
-  // 按 nextRowKeys 顺序取行对象，取不到的（无缓存）过滤掉
-  return nextRowKeys.map(key => rowMap.get(key)).filter(Boolean);
-};