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

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

@@ -1,5 +1,4 @@
 import _isFunction from "lodash/isFunction";
-import _isEmpty from "lodash/isEmpty";
 import React from 'react';
 import { Space, Form } from 'antd';
 import classnames from 'classnames';
@@ -219,7 +218,7 @@ const FlexibleGroupRender = props => {
         requiredOnView: otherProps?.requiredOnView,
         viewRender: child.viewRender
       })
-    }, child.name || `item-${index}`);
+    }, String(child.name ?? `item-${index}`));
   };
 
   // 非compact模式：正常的表单项渲染
@@ -248,13 +247,13 @@ const FlexibleGroupRender = props => {
       // 添加分隔符（除最后一个元素外）
       if (index < visibleChildren.length - 1 && space?.separator) {
         // 检查是否在指定位置添加分隔符
-        const shouldAddSeparator = space.separatorIndex ? Array.isArray(space.separatorIndex) ? space.separatorIndex.includes(originalIndex) : space.separatorIndex === originalIndex : true; // 默认每个元素后都加分隔符
+        const shouldAddSeparator = space.separatorIndex != null ? Array.isArray(space.separatorIndex) ? space.separatorIndex.includes(originalIndex) : space.separatorIndex === originalIndex : true; // 默认每个元素后都加分隔符
 
         if (shouldAddSeparator) {
           elements.push( /*#__PURE__*/_jsx("span", {
             className: "pro-group-separator-space",
             children: space.separator
-          }, child.name ? `separator-${child.name}` : `separator-${originalIndex}`));
+          }, `separator-${String(child.name ?? originalIndex)}`));
         }
       }
     });
@@ -288,14 +287,14 @@ const FlexibleGroupRender = props => {
       // 查看模式下，如果没有配置separator，使用默认的 finalSeparator
       const separatorToUse = isView ? space?.separator || finalSeparator : space?.separator;
       if (index < visibleChildren.length - 1 && separatorToUse) {
-        const shouldAddSeparator = space.separatorIndex ? Array.isArray(space.separatorIndex) ? space.separatorIndex.includes(originalIndex) : space.separatorIndex === originalIndex : true;
+        const shouldAddSeparator = space.separatorIndex != null ? Array.isArray(space.separatorIndex) ? space.separatorIndex.includes(originalIndex) : space.separatorIndex === originalIndex : true;
         if (shouldAddSeparator) {
           // 查看模式下使用不同的className，避免显示边框
           const separatorClassName = isView ? 'pro-group-separator-compact pro-group-separator-view' : 'pro-group-separator-compact';
           elements.push( /*#__PURE__*/_jsx("span", {
             className: separatorClassName,
             children: separatorToUse
-          }, child.name ? `separator-${child.name}` : `separator-${originalIndex}`));
+          }, `separator-${String(child.name ?? originalIndex)}`));
         }
       }
     });
@@ -316,11 +315,6 @@ const FlexibleGroupRender = props => {
   // 检查是否有子项包含 show 函数，如果有则需要响应式更新
   const hasShowFunction = children.some(child => _isFunction(child.show));
 
-  // 查看模式下空值处理
-  if (isView && _isEmpty(children)) {
-    return otherProps?.viewEmpty || '-';
-  }
-
   // 查看模式下，检查所有children的值是否都为空
   if (isView && form && children.length > 0) {
     const allValuesEmpty = children.every(child => {

package/es/ProForm/components/combination/Group/hooks/index.js

@@ -46,7 +46,7 @@ export const useTransformColumns = params => {
     // 响应式字段改变后的回调
     const changedCallback = (lastDependency, current) => {
       // 清值防抖  多次刷新时以最后一次为准
-      if (clearNotShow !== false && names) {
+      if (clearNotShow !== false && (names || value)) {
         if (current?.show === false) {
           clearInterval(timerRef.current[index]);
           timerRef.current[index] = setTimeout(() => {

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

@@ -134,7 +134,7 @@ const LegacyGroup = props => {
         elements.push( /*#__PURE__*/_jsx("span", {
           className: "pro-group-separator-compact",
           children: newColumn.separator
-        }, `separator-${newColumn.name || index}`));
+        }, `separator-${String(newColumn.name ?? index)}`));
       }
     });
     return /*#__PURE__*/_jsx("div", {

package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -1,6 +1,6 @@
 import _isEqual from "lodash/isEqual";
 import { useDebounceFn, usePrevious, useRequest } from 'ahooks';
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import locale, { formatMessage } from "../../../../../locale";
 const defaultPage = {
   pageNum: 1,
@@ -32,7 +32,7 @@ export function useRequestList(service, options, useRequestOptions) {
   } = useRequestOptions || {};
   const _defaultParams = Array.isArray(defaultParams) ? defaultParams?.[0] : defaultParams || {};
   // 搜索表单里的值
-  const [searchValues, setSearchValues] = useState();
+  const [searchValues, setSearchValues] = useState({});
 
   // 当次执行service的请求,包括page参数
   const params = useMemo(() => {
@@ -60,18 +60,29 @@ export function useRequestList(service, options, useRequestOptions) {
 
   // 搜索条件变化时触发
   const prevParams = usePrevious(params);
+  const ready = useRequestOptions?.ready;
+  const prevReadyRef = useRef(ready);
   const {
-    run: queryList
+    run: queryList,
+    cancel: cancelQueryList
   } = useDebounceFn(() => {
     run(params);
   }, {
     wait: 300
   });
   useEffect(() => {
+    const prevReady = prevReadyRef.current;
+    prevReadyRef.current = ready;
+    const isAutomaticReadyRun = useRequestOptions?.manual !== true && prevReady === false && ready === true;
+    if (ready === false || isAutomaticReadyRun) {
+      cancelQueryList();
+      return;
+    }
     if (prevParams && !_isEqual(prevParams, params)) {
       queryList();
     }
-  }, [params, prevParams, queryList]);
+  }, [cancelQueryList, params, prevParams, queryList, ready, useRequestOptions?.manual]);
+  useEffect(() => cancelQueryList, [cancelQueryList]);
 
   // 分页变更
   const onChange = useCallback((current, pageSize) => {
@@ -80,15 +91,18 @@ export function useRequestList(service, options, useRequestOptions) {
       pageSize
     });
   }, [onPageChange]);
-  const onSearch = useCallback(values => {
+  const onSearch = useCallback((values, force = false) => {
+    const normalizedValues = values && typeof values === 'object' && Object.values(values).every(value => value === undefined) ? {} : values;
     if (page.pageNum !== 1) {
       // 查询或重置都从第一页开始，保留当前每页条数
       onChange(1, page.pageSize);
     }
-    if (!_isEqual(searchValues, values)) {
-      setSearchValues(values);
+    if (!_isEqual(searchValues, normalizedValues)) {
+      setSearchValues(normalizedValues);
+    } else if (force && page.pageNum === 1) {
+      run(params);
     }
-  }, [onChange, searchValues, page]);
+  }, [onChange, page, params, run, searchValues]);
 
   // 重置查询条件
   const onReset = useCallback(() => {

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

@@ -168,8 +168,9 @@ const ProModalSelect = (props, ref) => {
     transformParams,
     transformResponse
   }, {
-    ready: (initParams || defaultOne) && nextMode === 'input' || open,
-    ...useRequest?.options
+    ...useRequest?.options,
+    ready: useRequest?.options?.ready ?? ((initParams || defaultOne) && nextMode === 'input' ? true : undefined),
+    manual: useRequest?.options?.manual ?? ((initParams || defaultOne) && nextMode === 'input' ? undefined : true)
   });
   const defaultOptionRender = rowData => rowData?.[labelKey];
   let handleFormat = onFormat || defaultOptionRender;
@@ -190,6 +191,16 @@ const ProModalSelect = (props, ref) => {
     if (typeof data === 'string' || typeof data === 'number') {
       return data;
     }
+    // lodash isObject 对数组也为 true，必须先判数组，否则多选展示永远走对象臂
+    if (_isArray(data)) {
+      return data.map(item => {
+        return handleFormat({
+          ...item,
+          value: item[valueKey],
+          label: item[labelKey]
+        });
+      }).join('、');
+    }
     if (_isObject(data)) {
       return handleFormat({
         ...data,
@@ -197,13 +208,7 @@ const ProModalSelect = (props, ref) => {
         label: data[labelKey]
       });
     }
-    return _isArray(data) ? data?.map(item => {
-      return handleFormat({
-        ...item,
-        value: item[valueKey],
-        label: item[labelKey]
-      });
-    })?.join('、') : '';
+    return '';
   };
   const viewText = useMemo(() => {
     let nextValue = labelInValue ? value : _value;
@@ -334,6 +339,18 @@ const ProModalSelect = (props, ref) => {
       d: Date.now()
     });
   };
+  const handleReset = () => {
+    form.resetFields();
+    formColumns?.forEach(column => {
+      if (column?.name !== undefined && Object.prototype.hasOwnProperty.call(column, 'initialValue')) {
+        form.setFieldValue(column.name, column.initialValue);
+      }
+    });
+    onSearch({
+      ...form.getFieldsValue(),
+      d: Date.now()
+    });
+  };
   const _rowSelection = {
     type,
     // 多选时开启，保证翻页/筛选后不丢弃不在当前页的已选 key
@@ -501,9 +518,6 @@ const ProModalSelect = (props, ref) => {
   });
   useEffect(() => {
     if (onOff && !open) {
-      if (useRequest?.options?.manual !== true) {
-        onReset();
-      }
       const nextState = {
         open: true
       };
@@ -531,6 +545,11 @@ const ProModalSelect = (props, ref) => {
       setState(nextState);
     }
   }, [onOff, open, JSON.stringify(value)]);
+  useEffect(() => {
+    if (open && useRequest?.options?.ready !== false && useRequest?.options?.manual === undefined) {
+      onSearch(form.getFieldsValue(), true);
+    }
+  }, [open, useRequest?.options?.manual, useRequest?.options?.ready]);
   useEffect(() => {
     hideTooltipIfOpen(fieldRef.current, open);
   }, [open]);
@@ -741,6 +760,7 @@ const ProModalSelect = (props, ref) => {
         form: form,
         columns: formColumns,
         onFinish: handleSearch,
+        onCancel: handleReset,
         confirmLoading: loading,
         footer: formColumns?.length > 1
       }), /*#__PURE__*/_jsx(ProTable, {

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

@@ -18,7 +18,7 @@ const useControlled = props => {
     const internalValue = [props.value?.[0] && dayjs(props.value[0], props.format), props.value?.[1] && dayjs(props.value[1], props.format)];
     const handleChange = (value, other) => {
       if (!value) {
-        props?.onChange(value, other);
+        props?.onChange?.(value, other);
       } else {
         const [start, end] = value;
         if (props?.onChange) {

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

@@ -173,8 +173,8 @@ const Render = props => {
 
   // 防抖记忆化：handlerRef 始终指向最新 handler，debounce 仅按 debounceWait 重建，避免每次渲染重置定时器导致防抖失效
   const debounceWait = lastComponentProps?.debounceWait;
-  const handlerRef = useRef(() => undefined);
-  const debouncedHandleChange = useMemo(() => _debounce((...args) => handlerRef.current(...args), debounceWait), [debounceWait]);
+  const handlerRef = useRef(undefined);
+  const debouncedHandleChange = useMemo(() => _debounce((...args) => handlerRef.current?.(...args), debounceWait), [debounceWait]);
   useEffect(() => () => debouncedHandleChange.cancel(), [debouncedHandleChange]);
   const itemClassName = classNames({
     [className]: className,

package/es/ProForm/hooks/useWatch.js

@@ -49,14 +49,15 @@ function setValueByPath(obj, path, value) {
 
 // 创建之后namepath就不可变的警告
 // selector 模式（dependencies 为函数）下跳过：函数引用每次渲染不同，无法稳定 stringify
-const useWatchWarning = process.env.NODE_ENV !== 'production' ? dependencies => {
+// warning 在 production 下本身为空操作；始终走同一实现，避免 Jest 下 production 空函数不可达
+const useWatchWarning = dependencies => {
   const isSelector = typeof dependencies === 'function';
   const depsStr = isSelector ? '__selector__' : JSON.stringify(dependencies);
   const depsStrRef = useRef(depsStr);
   if (!isSelector) {
     warning(depsStrRef.current === depsStr, '`useWatch` is not support dynamic `namePath`. Please provide static instead.');
   }
-} : () => {};
+};
 
 /**
  * selector 函数：接收所有表单值，返回派生值
@@ -151,8 +152,8 @@ function useWatch(dependencies, form, wait) {
     if (!formInstance) return undefined;
 
     // 创建更新状态的函数
-    const updateState = () => {
-      const values = formInstance.getFieldsValue(true);
+    const updateState = watchValues => {
+      const values = watchValues ?? formInstance.getFieldsValue(true);
 
       // selector 模式：直接调用 selector 计算派生值
       if (isSelector && selectorRef.current) {
@@ -190,10 +191,8 @@ function useWatch(dependencies, form, wait) {
     const {
       registerWatch
     } = getInternalHooks('RC_FORM_INTERNAL_HOOKS');
-    const cancelWatch = registerWatch(values => {
-      if (values) {
-        updateState();
-      }
+    const cancelWatch = registerWatch((values, allValues) => {
+      updateState(allValues ?? values);
     });
 
     // 清理订阅

package/es/ProForm/utils/index.js

@@ -129,12 +129,12 @@ export const getAllNamePath = (object, currentPath = []) => {
 
     // 拆开组合key (组合key只可能存在于最外层)
     if (key.includes('-')) {
-      resultKeys.concat(key.split('-').map(keyStr => keyStr.split('_')));
+      resultKeys.push(...key.split('-').map(keyStr => keyStr.split('_')));
     }
 
     // 深度获取对象key
     if (_isObject(value)) {
-      resultKeys.concat(getAllNamePath(value, [...currentPath, key]));
+      resultKeys.push(...getAllNamePath(value, [...currentPath, key]));
     }
     resultKeys.push([...currentPath, key]);
   });

package/es/ProLayout/components/Layout/Menu/OpenMenu/index.js

@@ -49,6 +49,7 @@ const OpenMenu = props => {
   // 特殊处理：如果layoutSelectedPath是'##EMPTY##'，表示有意清空选中状态
   const preferredPath = query.get('activeMenu') || (layoutSelectedPath === '##EMPTY##' ? null : layoutSelectedPath) || window.location.pathname;
   const selectKeyIdPath = preferredPath ? getIdsByPathName(menus, preferredPath)?.map(item => String(item)) || [] : [];
+  const selectedRootKey = selectKeyIdPath[0];
   const itemsTransform = useMemo(() => {
     const result = _cloneDeep(menus);
     if (!Array.isArray(result) || !result.length) {
@@ -66,7 +67,7 @@ const OpenMenu = props => {
           children: [/*#__PURE__*/_jsx(_Fragment, {
             children: item.imgUrl && isFirstMenu ? /*#__PURE__*/_jsx("img", {
               className: "pro-layout-icon",
-              src: selectKeyIdPath[0] === String(item.id) ? item.imgActiveUrl || item.imgUrl : item.imgUrl,
+              src: selectedRootKey === String(item.id) ? item.imgActiveUrl || item.imgUrl : item.imgUrl,
               alt: "icon"
             }) : item.icon && isFirstMenu ? /*#__PURE__*/_jsx(ProIcon, {
               type: item.icon || '',
@@ -102,7 +103,7 @@ const OpenMenu = props => {
     };
     menuDeep(result);
     return result;
-  }, [dataSource]);
+  }, [dataSource, selectedRootKey]);
   useDeepCompareEffect(() => {
     if (Array.isArray(selectKeyIdPath)) {
       const newState = {
@@ -140,14 +141,13 @@ const OpenMenu = props => {
         });
       },
       onClick: ({
-        item,
         keyPath,
-        key,
-        domEvent
+        key
       }) => {
         // 查找完整的菜单项数据
         const menuItem = findMenuItemByKey(menus, key);
         const menuKeyPath = menuItem?.keyIdPath ? menuItem.keyIdPath.map(id => String(id)) : keyPath;
+        const menuRouter = menuItem?.redirectUrl || menuItem?.router || menuItem?.url;
 
         // 调用用户传入的onMenuClick回调，获取返回值（是否应该激活菜单）
         let shouldActivate = true;
@@ -168,13 +168,13 @@ const OpenMenu = props => {
         if (menuItem && canOpenAsTab(menuItem) && shouldActivate) {
           setState({
             selectedKeys: keyPath,
-            router: item?.props?.router
+            router: menuRouter
           });
           layoutOnSelected?.({
-            selectedPath: item?.props?.router
+            selectedPath: menuRouter
           });
           if (layoutTarget) {
-            window.open(item?.props?.router, layoutTarget);
+            window.open(menuRouter, layoutTarget);
           } else {
             setTimeout(() => {
               // 路由变更，且不再demo文档中

package/es/ProLayout/components/Layout/Menu/index.js

@@ -157,7 +157,7 @@ const Menu = props => {
       onMenuClick: onMenuClick,
       style: {
         display: collapsed ? 'none' : 'block',
-        height: `calc(100vh - ${headerHeight + (notice ? 32 : 0) + 48 || 0}px)`
+        height: `calc(100vh - ${(headerHeight ?? 0) + (notice ? 32 : 0) + 48}px)`
       }
     }), sideMenuFooterRender || /*#__PURE__*/_jsx("div", {
       className: "pro-layout-menu-collapsed",

package/es/ProLayout/components/ProFooter/index.js

@@ -31,11 +31,12 @@ const ProFooter = props => {
     'pro-footer': true,
     [`${className}`]: className
   });
+  const sideWidth = size?.width ?? 0;
   return /*#__PURE__*/_jsx("div", {
     className: cls,
     style: {
       zIndex,
-      width: `calc(100% - ${size?.width + 1}px)`,
+      width: `calc(100% - ${sideWidth + 1}px)`,
       ...props.style
     },
     children: /*#__PURE__*/_jsx(Space, {

package/es/ProLayout/components/ProHeader/components/Describe/index.js

@@ -46,7 +46,9 @@ export const DescribeValue = ({
     children: [link ? /*#__PURE__*/_jsx("a", {
       onClick: () => {
         const newWindow = window.open(link);
-        newWindow.opener = null;
+        if (newWindow) {
+          newWindow.opener = null;
+        }
       },
       children: value
     }) : value, copyable && _isString(value) ? /*#__PURE__*/_jsx(Copy, {

package/es/ProLayout/components/TabsManager/components/TabItem.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { CloseOutlined } from '@ant-design/icons';
-import ProTooltip from "../../../../ProTooltip";
+import { Tooltip } from 'antd';
 import { TabContextMenu } from "./TabContextMenu";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const MAX_TAB_TITLE_LENGTH = 12;
@@ -70,12 +70,13 @@ const TabItemComponent = ({
           }) : tab.icon
         }), /*#__PURE__*/_jsx("div", {
           className: "pro-layout-tab-title",
-          children: isTitleOverflow ? /*#__PURE__*/_jsx(ProTooltip, {
-            text: displayTitle,
+          children: isTitleOverflow ? /*#__PURE__*/_jsx(Tooltip, {
             title: tabTitle,
-            line: 1,
             placement: "top",
-            scrollFollowParent: false
+            children: /*#__PURE__*/_jsx("span", {
+              className: "pro-tooltip",
+              children: displayTitle
+            })
           }) : tabTitle
         }), tab.closable && /*#__PURE__*/_jsx("span", {
           className: "pro-layout-tab-close",