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

package/es/ProLayout/components/TabsManager/hooks/useTabsState.js

@@ -13,6 +13,7 @@ import {
   flattenMenuData,
   canOpenAsTab,
   getMenuRoute,
+  hasRelationKey,
   findExistingTab,
   normalizeTabUrl,
   isSafeExternalUrl,
@@ -28,6 +29,7 @@ const useTabsState = (options) => {
   const { initialState = {}, config, dataSource, cacheEnabled = true } = options;
   const finalConfig = { ...DEFAULT_TABS_CONFIG, ...config };
   const urlSyncEnabled = finalConfig.urlSync === true || typeof finalConfig.urlSync === "object" && finalConfig.urlSync !== null;
+  const urlSyncIdentity = typeof finalConfig.urlSync === "object" && finalConfig.urlSync !== null ? finalConfig.urlSync.identity || "url" : "url";
   const [state, setState] = useState(() => ({
     tabsList: [],
     activeKey: "",
@@ -62,22 +64,26 @@ const useTabsState = (options) => {
       }));
       restoredState.activeKey = restoredState.activeKey === void 0 || restoredState.activeKey === null ? "" : String(restoredState.activeKey);
       if (urlSyncEnabled) {
-        const retainedTabByUrl = /* @__PURE__ */ new Map();
+        const retainedTabByIdentity = /* @__PURE__ */ new Map();
         const retainedIdByOriginalId = /* @__PURE__ */ new Map();
         restoredState.tabsList.forEach((tab) => {
+          var _a2;
           const normalizedUrl = normalizeTabUrl(tab.url);
           if (!normalizedUrl)
             return;
-          const retainedTab = retainedTabByUrl.get(normalizedUrl);
+          const relationKey = tab.relationKey ?? ((_a2 = tab.menuItem) == null ? void 0 : _a2.relationKey);
+          const identity = urlSyncIdentity === "relationKey" && hasRelationKey(relationKey) ? `relationKey:${typeof relationKey}:${String(relationKey)}` : `url:${normalizedUrl}`;
+          const retainedTab = retainedTabByIdentity.get(identity);
           if (retainedTab) {
+            retainedTabByIdentity.set(identity, { ...retainedTab, url: normalizedUrl });
             retainedIdByOriginalId.set(tab.id, retainedTab.id);
             return;
           }
           const normalizedTab = { ...tab, url: normalizedUrl };
-          retainedTabByUrl.set(normalizedUrl, normalizedTab);
+          retainedTabByIdentity.set(identity, normalizedTab);
           retainedIdByOriginalId.set(tab.id, normalizedTab.id);
         });
-        restoredState.tabsList = Array.from(retainedTabByUrl.values());
+        restoredState.tabsList = Array.from(retainedTabByIdentity.values());
         restoredState.activeKey = retainedIdByOriginalId.get(restoredState.activeKey) || ((_a = restoredState.tabsList[0]) == null ? void 0 : _a.id) || "";
       }
       restoredState.activeTabInfo = restoredState.tabsList.find(
@@ -87,7 +93,7 @@ const useTabsState = (options) => {
       setState(restoredState);
     }
     setIsInitialized(true);
-  }, [restoreFromCache, urlSyncEnabled]);
+  }, [restoreFromCache, urlSyncEnabled, urlSyncIdentity]);
   const lastActiveKeyRef = useRef("");
   const shouldSkipSaveRef = useRef(false);
   const initialTabsAppliedRef = useRef(false);
@@ -125,7 +131,8 @@ const useTabsState = (options) => {
       }
       if (urlSyncEnabled || !forceNew) {
         const existingTab = findExistingTab(state.tabsList, menuItem, {
-          urlSync: urlSyncEnabled
+          urlSync: urlSyncEnabled,
+          identity: urlSyncIdentity
         });
         if (existingTab) {
           return true;
@@ -136,7 +143,7 @@ const useTabsState = (options) => {
       }
       return true;
     },
-    [state.tabsList, finalConfig, urlSyncEnabled]
+    [state.tabsList, finalConfig, urlSyncEnabled, urlSyncIdentity]
   );
   const addTab = useCallback(
     (menuItem, options2) => {
@@ -161,9 +168,18 @@ const useTabsState = (options) => {
           return prevState;
         }
         const resolvedMenuItem = normalizedUrl ? { ...menuItem, url: normalizedUrl, redirectUrl: void 0 } : menuItem;
-        const existingTab = urlSyncEnabled || !forceNew ? findExistingTab(prevState.tabsList, resolvedMenuItem, { urlSync: urlSyncEnabled }) : void 0;
+        const existingTab = urlSyncEnabled || !forceNew ? findExistingTab(prevState.tabsList, resolvedMenuItem, {
+          urlSync: urlSyncEnabled,
+          identity: urlSyncIdentity
+        }) : void 0;
         if (existingTab) {
-          const correctedTab = resolvedMenuItem.closable === false && existingTab.closable !== false ? { ...existingTab, closable: false } : existingTab;
+          const shouldFixClosable = resolvedMenuItem.closable === false && existingTab.closable !== false;
+          const shouldUpdateUrl = urlSyncIdentity === "relationKey" && normalizedUrl !== void 0 && existingTab.url !== normalizedUrl;
+          const correctedTab = shouldFixClosable || shouldUpdateUrl ? {
+            ...existingTab,
+            ...shouldFixClosable ? { closable: false } : {},
+            ...shouldUpdateUrl ? { url: normalizedUrl } : {}
+          } : existingTab;
           const updatedTabsList = correctedTab !== existingTab ? prevState.tabsList.map((t) => t.id === existingTab.id ? correctedTab : t) : prevState.tabsList;
           return {
             ...prevState,
@@ -200,7 +216,7 @@ const useTabsState = (options) => {
         };
       });
     },
-    [finalConfig, urlSyncEnabled]
+    [finalConfig, urlSyncEnabled, urlSyncIdentity]
   );
   useEffect(() => {
     const initialTabs = finalConfig.initialTabs;
@@ -257,21 +273,22 @@ const useTabsState = (options) => {
     (tabId) => {
       setState((prevState) => {
         var _a;
-        const tabToRemove = prevState.tabsList.find((tab) => tab.id === tabId);
+        const targetTabId = tabId ?? prevState.activeKey;
+        const tabToRemove = prevState.tabsList.find((tab) => tab.id === targetTabId);
         if (!tabToRemove || !tabToRemove.closable) {
           return prevState;
         }
-        const newTabs = prevState.tabsList.filter((tab) => tab.id !== tabId);
+        const newTabs = prevState.tabsList.filter((tab) => tab.id !== targetTabId);
         let newActiveKey = prevState.activeKey;
         let newActiveTabInfo = prevState.activeTabInfo;
         let newActiveComponent = prevState.activeComponent;
-        if (prevState.activeKey === tabId && newTabs.length > 0) {
-          const currentIndex = prevState.tabsList.findIndex((tab) => tab.id === tabId);
+        if (prevState.activeKey === targetTabId && newTabs.length > 0) {
+          const currentIndex = prevState.tabsList.findIndex((tab) => tab.id === targetTabId);
           const newActiveIndex = Math.min(currentIndex, newTabs.length - 1);
           newActiveTabInfo = newTabs[newActiveIndex];
           newActiveKey = newActiveTabInfo.id;
           newActiveComponent = ((_a = newActiveTabInfo.menuItem) == null ? void 0 : _a.code) || newActiveTabInfo.id;
-        } else if (prevState.activeKey === tabId) {
+        } else if (prevState.activeKey === targetTabId) {
           newActiveKey = "";
           newActiveTabInfo = void 0;
           newActiveComponent = "";

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

@@ -13,7 +13,7 @@ import { createPortal } from "react-dom";
 import { useTabsState } from "./hooks/useTabsState";
 import { useTabsUrlSync } from "./hooks/useTabsUrlSync";
 import { useIframeRoute } from "./hooks/useIframeRoute";
-import { flattenMenuData, resolveTabMenuItem, derivePinned } from "./utils";
+import { flattenMenuData, resolveTabMenuItem, derivePinned, normalizeTabUrl } from "./utils";
 import { TabItemComponent } from "./components/TabItem";
 import { TabsHeader } from "./components/TabsHeader";
 import { TabsContext } from "./components/TabsContext";
@@ -234,6 +234,13 @@ const TabsManager = forwardRef(
           removeTab(tabId);
         },
         updateTab,
+        updateTabUrl: (tabId, url) => {
+          const normalizedUrl = normalizeTabUrl(url);
+          if (!normalizedUrl)
+            return;
+          markTabInteraction();
+          updateTabUrl(tabId, normalizedUrl);
+        },
         getTabInfo: () => ({
           tabsList: state.tabsList,
           activeTabInfo: state.tabsList.find((tab) => tab.id === state.activeKey),
@@ -248,6 +255,7 @@ const TabsManager = forwardRef(
         markTabInteraction,
         removeTab,
         updateTab,
+        updateTabUrl,
         state.tabsList,
         state.activeKey,
         state.activeComponent,

package/es/ProLayout/components/TabsManager/propTypes.d.ts

@@ -67,8 +67,8 @@ export interface UseTabsStateReturn {
     addTab: (menuItem: MenusType, options?: AddTabOptions) => void;
     /** 检查是否可以添加标签页 */
     canAddTab: (menuItem: MenusType, options?: AddTabOptions) => boolean;
-    /** 移除标签页 */
-    removeTab: (tabId: string) => void;
+    /** 移除指定标签页；不传 tabId 时移除当前激活标签页 */
+    removeTab: (tabId?: string) => void;
     /** 更新指定 id 的标签页字段（替换语义；找不到时 no-op） */
     updateTab: (tabId: string, updates: UpdateTabParams) => void;
     /** 更新页签当前 URL，保持 tab.id 不变 */

package/es/ProLayout/components/TabsManager/utils/index.d.ts

@@ -1,4 +1,4 @@
-import { AddTabParams, TabItem, MenusType } from '../../../propTypes';
+import { AddTabParams, TabItem, MenusType, TabsUrlSyncConfig } from '../../../propTypes';
 /**
  * 获取菜单实际用于路由/签页的路径
  * 约定优先使用 redirectUrl，其次回退 url
@@ -17,6 +17,7 @@ export declare const getCurrentTabUrl: () => string;
 export declare const getTabUrlPathname: (value?: string) => string | undefined;
 export interface FindExistingTabOptions {
     urlSync?: boolean;
+    identity?: TabsUrlSyncConfig['identity'];
 }
 export declare const findExistingTab: (tabsList: TabItem[], menuItem: MenusType, options?: FindExistingTabOptions) => TabItem | undefined;
 /**

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

@@ -37,6 +37,14 @@ const getTabUrlPathname = (value) => {
 };
 const findExistingTab = (tabsList, menuItem, options = {}) => {
   if (options.urlSync) {
+    if (options.identity === "relationKey" && hasRelationKey(menuItem.relationKey)) {
+      return tabsList.find(
+        (tab) => {
+          var _a;
+          return tab.relationKey === menuItem.relationKey || ((_a = tab.menuItem) == null ? void 0 : _a.relationKey) === menuItem.relationKey;
+        }
+      );
+    }
     const targetUrl = normalizeTabUrl(getMenuRoute(menuItem));
     if (!targetUrl)
       return void 0;

package/es/ProLayout/propTypes.d.ts

@@ -368,6 +368,11 @@ export interface TabsUrlSyncConfig {
      * @default 'replace'
      */
     history?: 'replace' | 'push';
+    /**
+     * @description 页签复用身份。url 保持既有完整 URL 唯一语义；relationKey 在显式传入时优先按业务关联键复用
+     * @default 'url'
+     */
+    identity?: 'url' | 'relationKey';
 }
 /**
  * @description 添加标签页的业务参数
@@ -459,15 +464,25 @@ export interface ProLayoutTabsInstance {
      */
     addTab: (params: AddTabParams, options?: AddTabOptions) => void;
     /**
-     * @description 删除标签页
+     * @description 删除指定标签页；不传 tabId 时删除当前激活标签页
+     * @param tabId 目标标签页 id，省略时使用当前激活标签页
+     * @example
+     * ```tsx
+     * layoutTabs.removeTab();
+     * layoutTabs.removeTab('tab-id');
+     * ```
      */
-    removeTab: (tabId: string) => void;
+    removeTab: (tabId?: string) => void;
     /**
      * @description 更新已存在标签页的展示信息（不会卸载/重挂渲染组件）
      * @param tabId 目标标签页 id
      * @param updates 仅更新传入的字段，extra 为替换式覆盖
      */
     updateTab: (tabId: string, updates: UpdateTabParams) => void;
+    /**
+     * @description 就地更新页签完整 URL，保持 tab id 与已挂载组件不变
+     */
+    updateTabUrl: (tabId: string, url: string) => void;
     /**
      * @description 获取标签页信息
      */

package/es/ProSelect/index.js

@@ -14,6 +14,7 @@ import React, {
 import isFunction from "lodash/isFunction";
 import omit from "lodash/omit";
 import isNumber from "lodash/isNumber";
+import isString from "lodash/isString";
 import { useProConfig } from "../ProConfigProvider";
 import Container from "../ProForm/components/Container";
 import AdaptiveTooltip from "./components/AdaptiveTooltip";
@@ -190,9 +191,25 @@ const ProSelect = (props, ref) => {
       const option = findOption(v);
       if (!option)
         return "-";
-      return selectProps.showCodeName ? `${option[code]}-${option[label]}` : option == null ? void 0 : option[label];
+      const optionLabel = option[label];
+      if (!selectProps.showCodeName)
+        return optionLabel;
+      if (isString(optionLabel) || isNumber(optionLabel)) {
+        return `${option[code]}-${optionLabel}`;
+      }
+      return /* @__PURE__ */ jsxs(React.Fragment, { children: [
+        option[code],
+        "-",
+        optionLabel
+      ] });
     });
-    return labelList == null ? void 0 : labelList.join("、");
+    if (labelList.every((item) => isString(item) || isNumber(item))) {
+      return labelList.join("、");
+    }
+    return labelList.map((item, index) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
+      index > 0 ? "、" : null,
+      item
+    ] }, `${String(value2[index] ?? "empty")}-${index}`));
   };
   const defaultFilterOption = useCallback(defaultFilterOptionFn, []);
   const mergedShowSearch = useMemo(() => {
@@ -282,13 +299,11 @@ const ProSelect = (props, ref) => {
   };
   const isReactElement = (element) => isValidElement(element);
   const selectOptionRender = (option) => {
-    var _a2, _b2, _c2;
+    var _a2, _b2;
     const currentRecord = ((_a2 = option == null ? void 0 : option.data) == null ? void 0 : _a2.record) || (option == null ? void 0 : option.record);
-    const text = ((_b2 = option == null ? void 0 : option.data) == null ? void 0 : _b2.searchText) ?? ((_c2 = option == null ? void 0 : option.data) == null ? void 0 : _c2.title) ?? (option == null ? void 0 : option.label) ?? "";
-    if (!currentRecord) {
-      return /* @__PURE__ */ jsx(TooltipOption, { title: String(text), children: String(text) });
-    }
-    return /* @__PURE__ */ jsx(TooltipOption, { title: String(text), children: OptionRender ? /* @__PURE__ */ jsx("span", { children: OptionRender(currentRecord) }) : /* @__PURE__ */ jsx("span", { children: String(text) }) });
+    const optionLabel = ((_b2 = option == null ? void 0 : option.data) == null ? void 0 : _b2.label) ?? (option == null ? void 0 : option.label) ?? "";
+    const content = currentRecord && OptionRender ? OptionRender(currentRecord) : optionLabel;
+    return /* @__PURE__ */ jsx(TooltipOption, { children: /* @__PURE__ */ jsx("span", { children: content }) });
   };
   const mode = selectProps.mode;
   const handleChange = (value2, rawOption) => {

package/es/ProSelect/utils/index.d.ts

@@ -1,3 +1,4 @@
+import type { ReactNode } from 'react';
 import type { DataOptionType } from '../propsType';
 /**
  * 返回当前组件可以显示的数据源
@@ -27,7 +28,7 @@ export declare const getOptionText: ({ item, optionRender, showCodeName, code, l
     showCodeName?: boolean;
     code: string;
     label: string;
-}) => string;
+}) => ReactNode;
 /** 构建单个 antd Select option 对象 */
 export declare const buildOptionItem: (item: DataOptionType, index: number, config: {
     optionRender?: (item: DataOptionType) => any;
@@ -36,7 +37,7 @@ export declare const buildOptionItem: (item: DataOptionType, index: number, conf
     label: string;
 }) => {
     key: string;
-    label: string;
+    label: ReactNode;
     value: any;
     disabled: boolean;
     title: string;

package/es/ProSelect/utils/index.js

@@ -2,6 +2,7 @@ import difference from "lodash/difference";
 import isNumber from "lodash/isNumber";
 import isObject from "lodash/isObject";
 import isString from "lodash/isString";
+import { createElement, Fragment } from "react";
 const findSelectNameValues = ({
   list = [],
   selectName,
@@ -130,22 +131,30 @@ const getOptionText = ({
   code,
   label
 }) => {
+  const itemLabel = item[label];
   if (optionRender) {
     const rendered = optionRender(item);
-    return isString(rendered) ? rendered : String(item[label] ?? "");
+    return isString(rendered) ? rendered : isObject(itemLabel) ? itemLabel : String(itemLabel ?? "");
   }
-  const text = showCodeName ? `${item[code]}-${item[label]}` : item[label];
-  return isString(text) ? text : String(text ?? "");
+  if (!showCodeName) {
+    return isObject(itemLabel) ? itemLabel : String(itemLabel ?? "");
+  }
+  if (isString(itemLabel) || isNumber(itemLabel)) {
+    return `${item[code]}-${itemLabel}`;
+  }
+  return createElement(Fragment, null, item[code], "-", itemLabel);
 };
 const buildOptionItem = (item, index, config) => {
-  const text = getOptionText({ item, ...config });
+  const optionLabel = getOptionText({ item, ...config });
+  const isTextLabel = isString(optionLabel) || isNumber(optionLabel);
+  const searchText = isTextLabel ? String(optionLabel) : isString(item[config.label]) || isNumber(item[config.label]) ? String(item[config.label]) : item[config.code] != null ? String(item[config.code]) : "";
   return {
     key: item[config.code] != null ? `${item[config.code]}-${index}` : `option-${index}`,
-    label: text,
+    label: optionLabel,
     value: item[config.code] != null ? item[config.code] : void 0,
     disabled: !!item.disabled,
-    title: text,
-    searchText: text,
+    title: isTextLabel ? String(optionLabel) : void 0,
+    searchText,
     record: item
   };
 };
@@ -156,9 +165,10 @@ const buildSelectOptions = (list, config) => {
   return list.map((item, index) => {
     const groupOptions = item.options;
     if (Array.isArray(groupOptions)) {
+      const groupLabel = item[config.label];
       return {
-        key: item[config.label] ?? `group-${index}`,
-        label: item[config.label],
+        key: isString(groupLabel) || isNumber(groupLabel) ? String(groupLabel) : item[config.code] != null ? String(item[config.code]) : `group-${index}`,
+        label: groupLabel,
         options: groupOptions.map(
           (opt, optIndex) => buildOptionItem(opt, optIndex, config)
         )

package/es/ProTable/components/RenderTabs/index.js

@@ -14,7 +14,8 @@ const RenderTabs = (props) => {
     formTableProps,
     transformParams
   } = props;
-  const { form, onSearch } = formTableProps || {};
+  const { form, onSearch, loading } = formTableProps || {};
+  const requestLoading = Boolean(loading);
   const [activeKey, setActiveKey] = useState(props.activeKey);
   const [options] = useEnum(code || "__PRO_TABLE_NO_CODE__");
   const fieldValue = Form.useWatch(name, form);
@@ -48,6 +49,8 @@ const RenderTabs = (props) => {
     return null;
   }
   const handleChange = (key) => {
+    if (requestLoading)
+      return;
     const fieldsValues = (form == null ? void 0 : form.getFieldsValue()) || {};
     setActiveKey(key);
     form.setFieldValue(name, key);
@@ -65,7 +68,7 @@ const RenderTabs = (props) => {
         onChange: handleChange,
         type: "card",
         ...tabsProps,
-        items: tabItems,
+        items: requestLoading ? tabItems.map((item) => ({ ...item, disabled: true })) : tabItems,
         activeKey
       }
     );
@@ -76,6 +79,7 @@ const RenderTabs = (props) => {
       className: "pro-table-segmented",
       options: tabItems.map((item) => ({ label: item.label, value: item.key })),
       ...segmentedProps,
+      disabled: requestLoading || (segmentedProps == null ? void 0 : segmentedProps.disabled),
       onChange: (value) => handleChange(value),
       value: activeKey
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.5.10-beta.2",
+  "version": "4.6.0-beta.2",
   "license": "MIT",
   "publishConfig": {
     "access": "public",