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

package/es/ProLayout/components/TabsManager/utils/index.js

@@ -6,12 +6,54 @@ export const getMenuRoute = menuItem => {
   return menuItem.redirectUrl || menuItem.url || '';
 };
 export const hasRelationKey = relationKey => relationKey !== undefined && relationKey !== null && relationKey !== '';
-export const findExistingTab = (tabsList, menuItem) => {
+const resolveHttpUrl = value => {
+  if (!value || typeof window === 'undefined') return undefined;
+  try {
+    const resolved = new URL(value, window.location.origin);
+    return resolved.protocol === 'http:' || resolved.protocol === 'https:' ? resolved : undefined;
+  } catch (_error) {
+    return undefined;
+  }
+};
+
+/**
+ * 将同源 URL 规范化为应用内地址，保留 search 和 hash。
+ * 返回 undefined 表示 URL 无效或跨域。
+ */
+export const normalizeTabUrl = value => {
+  if (!value) return undefined;
+  if (typeof window === 'undefined') {
+    return value.startsWith('/') && !value.startsWith('//') ? value : undefined;
+  }
+  const resolved = resolveHttpUrl(value);
+  if (!resolved || resolved.origin !== window.location.origin) return undefined;
+  return `${resolved.pathname}${resolved.search}${resolved.hash}`;
+};
+
+/** 仅允许将跨域 HTTP(S) URL 交给浏览器外部打开。 */
+export const isSafeExternalUrl = value => {
+  const resolved = resolveHttpUrl(value);
+  return !!resolved && resolved.origin !== window.location.origin;
+};
+export const isSafeHttpUrl = value => !!resolveHttpUrl(value);
+export const getCurrentTabUrl = () => `${window.location.pathname}${window.location.search}${window.location.hash}`;
+export const getTabUrlPathname = value => {
+  const normalized = normalizeTabUrl(value);
+  if (!normalized || typeof window === 'undefined') return undefined;
+  return new URL(normalized, window.location.origin).pathname;
+};
+export const findExistingTab = (tabsList, menuItem, options = {}) => {
+  if (options.urlSync) {
+    const targetUrl = normalizeTabUrl(getMenuRoute(menuItem));
+    if (!targetUrl) return undefined;
+    return tabsList.find(tab => normalizeTabUrl(tab.url) === targetUrl);
+  }
   if (hasRelationKey(menuItem.relationKey)) {
     return tabsList.find(tab => tab.relationKey === menuItem.relationKey || tab.menuItem?.relationKey === menuItem.relationKey);
   }
   const menuRoute = getMenuRoute(menuItem);
-  return tabsList.find(tab => tab.menuItem?.code === menuItem.code || tab.url === menuRoute);
+  const hasCode = menuItem.code !== undefined && menuItem.code !== null && menuItem.code !== '';
+  return tabsList.find(tab => hasCode && tab.menuItem?.code === menuItem.code || tab.url === menuRoute);
 };
 
 /**
@@ -31,7 +73,8 @@ export const createTabFromMenu = (menuItem, index = 0) => {
     pinned,
     menuItem,
     icon: menuItem.icon || menuItem.imgUrl,
-    relationKey: menuItem.relationKey
+    relationKey: menuItem.relationKey,
+    menuCodeSource: menuItem.menuCodeSource
   };
   return result;
 };
@@ -63,11 +106,15 @@ export const shouldOpenExternal = (menuItem, target) => {
 /**
  * 处理外部跳转
  */
-export const handleExternalOpen = menuItem => {
+export const handleExternalOpen = (menuItem, secure = false) => {
   const url = getMenuRoute(menuItem);
-  if (url) {
-    window.open(url, menuItem.target || '_blank');
+  if (!url) return;
+  const target = menuItem.target || '_blank';
+  if (secure && target === '_blank') {
+    window.open(url, target, 'noopener,noreferrer');
+    return;
   }
+  window.open(url, target);
 };
 
 /**
@@ -112,21 +159,28 @@ export const flattenMenuData = (menus = []) => {
  */
 export const resolveTabMenuItem = (params, menus = []) => {
   const matchedMenu = flattenMenuData(menus).find(item => item.code === params.code);
+  const menuCodeSource = params.menuCodeSource?.trim() || matchedMenu?.menuCodeSource?.trim() || undefined;
   if (matchedMenu) {
     return {
       ...matchedMenu,
       name: params.name || matchedMenu.name,
+      ...(params.url !== undefined && {
+        url: params.url,
+        redirectUrl: undefined
+      }),
       extra: params.extra ?? matchedMenu.extra,
-      relationKey: params.relationKey ?? matchedMenu.relationKey
+      relationKey: params.relationKey ?? matchedMenu.relationKey,
+      menuCodeSource
     };
   }
   return {
     id: Date.now(),
     code: params.code,
     name: params.name,
-    url: `/${params.code}`,
+    url: params.url || `/${params.code}`,
     extra: params.extra,
-    relationKey: params.relationKey
+    relationKey: params.relationKey,
+    menuCodeSource
   };
 };
 

package/es/ProLayout/index.js

@@ -11,7 +11,7 @@ import { isTabsMode, validateTabsProps } from "./propTypes";
 import { useProLayoutTabs } from "./components/TabsManager/hooks/useProLayoutTabs";
 import { useActiveTab } from "./components/TabsManager/hooks/useActiveTab";
 import { transformMenus } from "./utils";
-import { canOpenAsTab } from "./components/TabsManager/utils";
+import { canOpenAsTab, flattenMenuData } from "./components/TabsManager/utils";
 import headerBg from "../assets/header_bg.png";
 
 // 全局上下文
@@ -185,7 +185,10 @@ const ProLayout = props => {
           });
           return;
         }
-        const targetPath = activeTab?.url || activeTab?.menuItem?.router || activeTab?.menuItem?.redirectUrl || activeTab?.menuItem?.url;
+        const menuCodeSource = activeTab?.menuCodeSource?.trim();
+        const sourceMenu = menuCodeSource ? flattenMenuData(menuDataSource.menus).find(menu => menu.code === menuCodeSource) : undefined;
+        const sourcePath = sourceMenu?.redirectUrl || sourceMenu?.url || sourceMenu?.router;
+        const targetPath = sourcePath || activeTab?.url || activeTab?.menuItem?.router || activeTab?.menuItem?.redirectUrl || activeTab?.menuItem?.url;
         if (targetPath && targetPath !== selectedPath) {
           setState({
             selectedPath: targetPath
@@ -194,7 +197,7 @@ const ProLayout = props => {
         tabs.onTabChange?.(activeKey, activeTab, allTabs);
       }
     };
-  }, [isTabsLayout, tabs, selectedPath]);
+  }, [isTabsLayout, menuDataSource.menus, tabs, selectedPath]);
   const renderContent = () => {
     if (!isTabsLayout || !enhancedTabsConfig) {
       return /*#__PURE__*/_jsx("div", {

package/es/ProLayout/propTypes.d.ts

@@ -321,7 +321,7 @@ export interface TabItem {
      */
     title: string;
     /**
-     * @description 标签关联路由
+     * @description 标签关联路由。URL 同步模式下保存当前完整的 pathname + search + hash
      */
     url?: string;
     /**
@@ -349,6 +349,10 @@ export interface TabItem {
      * @description 标签页关联键；用于业务详情页复用已有标签页
      */
     relationKey?: string | number;
+    /**
+     * @description 最初打开当前业务标签链路的左侧菜单 code；仅用于激活来源菜单
+     */
+    menuCodeSource?: string;
 }
 export interface TabsState {
     tabsList: TabItem[];
@@ -358,6 +362,13 @@ export interface TabsState {
     activeComponent?: string;
 }
 export type TabsStorageStrategy = 'localStorage' | 'sessionStorage';
+export interface TabsUrlSyncConfig {
+    /**
+     * @description 切换标签页时写入浏览器历史的方式
+     * @default 'replace'
+     */
+    history?: 'replace' | 'push';
+}
 /**
  * @description 添加标签页的业务参数
  */
@@ -370,6 +381,11 @@ export interface AddTabParams {
      * @description 标签页显示名称
      */
     name: string;
+    /**
+     * @description 应用内完整 URL。URL 同步模式下作为页签业务身份
+     * @example '/wjs/workbench/workbench/Record?recordTab=quote'
+     */
+    url?: string;
     /**
      * @description 额外的业务数据
      */
@@ -378,6 +394,10 @@ export interface AddTabParams {
      * @description 标签页关联键；相同关联键的业务详情重复打开时复用已有标签页
      */
     relationKey?: string | number;
+    /**
+     * @description 最初打开当前业务标签链路的左侧菜单 code；仅用于激活来源菜单
+     */
+    menuCodeSource?: string;
 }
 /**
  * @description 添加标签页的选项
@@ -519,6 +539,13 @@ export interface TabsConfig {
     max?: number;
     storage?: TabsStorageStrategy;
     cacheKey?: string;
+    /**
+     * @description 是否将活动页签与浏览器 URL 双向同步。默认不同步，保持现有行为
+     * - true: 开启同步，切换页签时使用 replace
+     * - object: 开启同步并自定义历史写入方式
+     * @default false
+     */
+    urlSync?: boolean | TabsUrlSyncConfig;
     /**
      * @description 普通初始标签页。无缓存时每次 ProLayout 挂载只初始化一次；关闭全部后本次挂载期间不会重新添加
      */

package/es/ProSelect/index.js

@@ -33,6 +33,7 @@ export const ProSelect = (props, ref) => {
     scrollFollowParent = true,
     defaultOne,
     onSearch: _onSearch,
+    onOpenChange,
     optionRender,
     onChange,
     transformResponse,
@@ -58,6 +59,12 @@ export const ProSelect = (props, ref) => {
 
   // 用来控制只有第一次才会设置 defaultOne 属性、🔒
   const [isDefaultOne, setIsDefaultOne] = useState(false);
+  const [innerPopupOpen, setInnerPopupOpen] = useState(selectProps.defaultOpen ?? false);
+  const popupOpen = selectProps.open ?? innerPopupOpen;
+  const handleOpenChange = useCallback(open => {
+    setInnerPopupOpen(open);
+    onOpenChange?.(open);
+  }, [onOpenChange]);
   const OptionRender = optionRender;
   const defaultOnSuccessFun = res => {
     const {
@@ -368,7 +375,7 @@ export const ProSelect = (props, ref) => {
   });
   return /*#__PURE__*/_jsx("div", {
     style: props.style,
-    className: "pro-select",
+    className: `pro-select${popupOpen ? ' pro-select-popup-open' : ''}`,
     children: /*#__PURE__*/_jsx(Select, {
       placeholder: locale?.ProSelect?.select,
       allowClear: true,
@@ -385,7 +392,9 @@ export const ProSelect = (props, ref) => {
       ..._omit({
         ...selectProps
       }, ['isView', 'showCodeName', 'form', 'name', 'style', 'onFieldChange', 'getChangeValue', 'viewportReady', 'showSearch', 'filterOption', 'optionFilterProp', 'searchValue']),
+      onOpenChange: handleOpenChange
       // 如果是多选模式且用户没有自定义maxTagPlaceholder，使用我们的hover版本
+      ,
       maxTagPlaceholder: selectProps.mode === 'multiple' && !selectProps.maxTagPlaceholder ? maxTagPlaceholder : selectProps.maxTagPlaceholder,
       optionRender: selectOptionRender,
       value: transformValue(),

package/es/ProSelect/style/index.less

@@ -8,6 +8,13 @@
 }
 .pro-select {
   width: 100%;
+
+  // Ant Design Compact 控件的交互层级为 2；弹层打开时临时提升当前选择框。
+  &.pro-select-popup-open {
+    position: relative;
+    z-index: 3;
+  }
+
   > .ant-select {
     width: 100%;
   }
@@ -18,3 +25,9 @@
     font-weight: bold;
   }
 }
+
+// scrollFollowParent 会让弹层受祖先堆叠上下文约束，需要同步提升嵌套 Form.Item。
+.ant-form-item:has(.pro-select-popup-open) {
+  position: relative;
+  z-index: 3 !important;
+}

package/es/ProStep/style/index.less

@@ -30,7 +30,7 @@
     height: 48px;
     font-size: var(--zaui-font-size-lg, 16px);
     border-bottom: 1px solid var(--zaui-line, #dddddd);
-    .pro-step-menu-name{
+    .pro-step-menu-name {
       margin-left: 8px;
     }
     > .anticon {

package/es/ProTable/hooks/useAntdTable.js

@@ -1,6 +1,5 @@
 import _omit from "lodash/omit";
 import _isEqual from "lodash/isEqual";
-import _set from "lodash/set";
 import _merge from "lodash/merge";
 import _isObject from "lodash/isObject";
 import _pickBy from "lodash/pickBy";
@@ -442,18 +441,20 @@ function useAntdTable(service, options, useRequestOptions) {
     }),
     selections
   };
-  const rowSelection = _isObject(returnRowSelection) ? _merge(_rowSelection, returnRowSelection) : _rowSelection;
-  if (_isObject(returnRowSelection) && !_isEqual(rowSelection, _rowSelection)) {
+  const rowSelection = _isObject(returnRowSelection) ? _merge({}, _rowSelection, returnRowSelection) : _rowSelection;
+  if (_isObject(returnRowSelection)) {
     // getCheckboxProps需要特殊兼容原有的逻辑，特殊处理
-    const isHasGetCheckboxProps = Reflect.ownKeys(returnRowSelection).includes('getCheckboxProps');
-    if (isHasGetCheckboxProps) {
-      _set(rowSelection, 'getCheckboxProps', record => {
-        const passReturnObjects = rowSelection.getCheckboxProps(record) ?? {};
+    const customGetCheckboxProps = returnRowSelection.getCheckboxProps;
+    if (typeof customGetCheckboxProps === 'function') {
+      rowSelection.getCheckboxProps = record => {
+        const internalProps = _rowSelection.getCheckboxProps(record);
+        const customProps = customGetCheckboxProps(record) ?? {};
         return {
-          className: allSelected && rowSelections ? 'checkbox-disabled' : '',
-          ...passReturnObjects
+          ...internalProps,
+          ...customProps,
+          className: [customProps.className, internalProps.className].filter(Boolean).join(' ')
         };
-      });
+      };
     }
   }
   const selectedTip = allSelected && selectedRowKeys.length ? formatMessage(locale?.ProTable?.selectAll, {

package/es/ProTabs/index.js

@@ -63,7 +63,7 @@ const ProTabs = (props, ref) => {
         })
       };
     });
-  }, [selectList, fetchFunction?.loading]);
+  }, [selectList, fetchFunction?.loading, mode, rest?.size]);
   const cls = classNames({
     'pro-tabs': mode === 'card',
     'pro-tabs-mode-card': mode === 'card',
@@ -97,10 +97,10 @@ const ProTabs = (props, ref) => {
 
   // dataSource变化时，更新selectList
   useDeepCompareEffect(() => {
-    if (!dataSource?.length) {
+    if (!Array.isArray(props.dataSource)) {
       return;
     }
-    setSelectList(dataSource);
+    setSelectList(props.dataSource);
   }, [dataSource]);
   useImperativeHandle(ref, () => ({
     useRequestRef: fetchFunction

package/es/ProTooltip/index.js

@@ -81,7 +81,7 @@ const ProTooltip = props => {
         })
       })
     }) : /*#__PURE__*/_jsx("div", {
-      className: isMultiLine ? 'multiLine' : 'singleLine',
+      className: "singleLine",
       style: {
         ...multiStyle,
         width: localWidth
@@ -137,9 +137,6 @@ const ProTooltip = props => {
     });
   };
   const AutoMixin = () => {
-    if (mode !== 'auto') {
-      return null;
-    }
     return line > 1 ? /*#__PURE__*/_jsx(AutoMixinMulti, {}) : /*#__PURE__*/_jsx(AutoMixinSingle, {});
   };
   useEffect(() => {
@@ -253,7 +250,7 @@ const ProTooltip = props => {
       },
       ...restProps,
       styles: {
-        root: mode === 'auto' ? rootStyles : {}
+        root: {}
       },
       children: renderContentBox()
     });

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

@@ -215,7 +215,7 @@ export const ProTreeSelect = (props, ref) => {
           origDataSource: resultData
         });
       } else {
-        defaultOnSuccessFun(fetchFunction.data);
+        defaultOnSuccessFun(data);
       }
     },
     ...useRequest?.options
@@ -227,7 +227,7 @@ export const ProTreeSelect = (props, ref) => {
 
   // 设置cacheKey后使用缓存的数据
   useDeepCompareEffect(() => {
-    if (fetchFunction?.data, useRequest?.options?.cacheKey) {
+    if (fetchFunction?.data && useRequest?.options?.cacheKey) {
       if (transformResponse && typeof transformResponse === 'function') {
         const responseData = transformResponse(fetchFunction.data);
         // 先转换字段名，再处理 code-name 展示与 checkLeaf 标记

package/es/ProTreeModal/index.js

@@ -564,9 +564,6 @@ const ProTreeModal = props => {
         checkAll: false,
         open: true
       });
-      if (appoint) {
-        openChange?.(true);
-      }
     }
   };
 

package/es/ProUpload/components/DragRender.js

@@ -53,26 +53,12 @@ const DragRender = props => {
    * @return {*}
    */
   const handleReSelect = file => {
-    if (disabled) return;
     handleDelFile(file);
     setTimeout(() => {
       refReSelect.current.click();
     }, 1);
   };
 
-  /**
-   * @description: 处理预览按钮
-   * @param {UploadFile} file
-   * @return {*}
-   */
-  const handlePreview = file => {
-    if (onPreview) {
-      onPreview(file);
-    } else {
-      window.open(file.url || file.thumbUrl);
-    }
-  };
-
   /**
    * @description: 单个拖拽上传界面
    * @param {UploadFile} file

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.5.9",
+  "version": "4.5.10-beta.1",
   "license": "MIT",
   "publishConfig": {
     "access": "public",
@@ -62,6 +62,7 @@
   ],
   "scripts": {
     "analyze": "ANALYZE=1 dumi build",
+    "build:demo": "father build",
     "build": "father build && npm run build:types && mv dist/index.min.css dist/index.esm.css && mv dist/less.min.css dist/less.esm.css && npm run build:ai-meta",
     "build:types": "tsc -p tsconfig.build.json",
     "build:ai-meta": "node ./scripts/build-ai-meta.mjs",

package/es/ProConfigProvider/demo/locale.js

@@ -1,58 +0,0 @@
-/**
- * iframe: 400
- */
-
-import { useState } from 'react';
-import { Button, Space } from 'antd';
-import { ProConfigProvider, ProForm } from '@zat-design/sisyphus-react';
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const LocaleDemo = () => {
-  const [locale, setLocale] = useState(localStorage.getItem('locale') || 'zh-CN');
-  const handleChange = value => {
-    setLocale(value);
-    localStorage.setItem('locale', value);
-    window.location.reload();
-  };
-  return /*#__PURE__*/_jsxs(Space, {
-    direction: "vertical",
-    size: 16,
-    style: {
-      width: '100%'
-    },
-    children: [/*#__PURE__*/_jsxs(Space, {
-      children: [/*#__PURE__*/_jsx(Button, {
-        type: locale === 'zh-CN' ? 'primary' : 'default',
-        onClick: () => handleChange('zh-CN'),
-        children: "\u4E2D\u6587"
-      }), /*#__PURE__*/_jsx(Button, {
-        type: locale === 'en-US' ? 'primary' : 'default',
-        onClick: () => handleChange('en-US'),
-        children: "English"
-      })]
-    }), /*#__PURE__*/_jsx(ProConfigProvider, {
-      locale: locale,
-      children: /*#__PURE__*/_jsx(ProForm, {
-        columns: [{
-          type: 'Input',
-          label: locale === 'zh-CN' ? '姓名' : 'Name',
-          name: 'name',
-          required: true
-        }, {
-          type: 'Select',
-          label: locale === 'zh-CN' ? '状态' : 'Status',
-          name: 'status',
-          fieldProps: {
-            options: [{
-              label: locale === 'zh-CN' ? '启用' : 'Enabled',
-              value: '1'
-            }, {
-              label: locale === 'zh-CN' ? '禁用' : 'Disabled',
-              value: '0'
-            }]
-          }
-        }]
-      })
-    })]
-  });
-};
-export default LocaleDemo;