@zat-design/sisyphus-react 4.5.6-beta.2 → 4.5.6-beta.4

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

@@ -5,12 +5,22 @@
 export const getMenuRoute = menuItem => {
   return menuItem.redirectUrl || menuItem.url || '';
 };
+export const hasRelationKey = relationKey => relationKey !== undefined && relationKey !== null && relationKey !== '';
+export const findExistingTab = (tabsList, menuItem) => {
+  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);
+};
 
 /**
  * 根据菜单项生成TabItem
  */
 export const createTabFromMenu = (menuItem, index = 0) => {
   const route = getMenuRoute(menuItem);
+  // pinned 优先取菜单显式声明，否则由 closable===false 推导（声明式固定标签）
+  const pinned = menuItem.pinned ?? menuItem.closable === false;
   const result = {
     id: String(menuItem.id || menuItem.code || menuItem.url || index),
     code: menuItem.code,
@@ -18,8 +28,10 @@ export const createTabFromMenu = (menuItem, index = 0) => {
     title: menuItem.name,
     url: route,
     closable: menuItem.closable !== false,
+    pinned,
     menuItem,
-    icon: menuItem.icon || menuItem.imgUrl
+    icon: menuItem.icon || menuItem.imgUrl,
+    relationKey: menuItem.relationKey
   };
   return result;
 };
@@ -115,4 +127,97 @@ export const canOpenAsTab = menuItem => {
   if (!menuItem) return false;
   if (!(menuItem.url || menuItem.redirectUrl)) return false;
   return isLeafMenuItem(menuItem);
+};
+
+/**
+ * 推导标签页是否处于固定状态。
+ * pinned 为本质状态；未显式设置 pinned 的旧缓存标签，用 closable===false 推导。
+ */
+export const derivePinned = tab => tab.pinned ?? tab.closable === false;
+
+/**
+ * 分区边界：第一个「非固定标签」的下标，等于固定标签的数量。
+ * 约定固定区始终排在普通区左侧，故边界即两区分界点。
+ */
+export const getPinnedBoundary = tabs => {
+  const index = tabs.findIndex(tab => !derivePinned(tab));
+  return index === -1 ? tabs.length : index;
+};
+
+/**
+ * 不依赖外部库的数组移动（immutable）。
+ * from/to 越界时返回原数组的浅拷贝。
+ */
+const moveItem = (list, from, to) => {
+  const result = [...list];
+  if (from < 0 || from >= result.length || to < 0 || to >= result.length) return result;
+  const [removed] = result.splice(from, 1);
+  result.splice(to, 0, removed);
+  return result;
+};
+
+/**
+ * 固定标签：将目标标签设为 pinned=true / closable=false，并移动到固定区末尾。
+ * - 已固定则幂等（顺序不变）
+ * - tabId 不存在时返回原数组引用
+ */
+export const pinTab = (tabs, tabId) => {
+  const index = tabs.findIndex(tab => tab.id === tabId);
+  if (index === -1) return tabs;
+  if (derivePinned(tabs[index])) return tabs;
+  const pinnedTab = {
+    ...tabs[index],
+    pinned: true,
+    closable: false
+  };
+  // 移除目标后计算固定区末尾位置（= 剩余标签中的固定数量）
+  const rest = tabs.filter((_, i) => i !== index);
+  const insertAt = getPinnedBoundary(rest);
+  return [...rest.slice(0, insertAt), pinnedTab, ...rest.slice(insertAt)];
+};
+
+/**
+ * 取消固定：将目标标签设为 pinned=false / closable=true，并移动到普通区最前
+ * （即剩余固定区之后的第一位）。
+ * - 已是普通标签则幂等（顺序不变）
+ * - tabId 不存在时返回原数组引用
+ */
+export const unpinTab = (tabs, tabId) => {
+  const index = tabs.findIndex(tab => tab.id === tabId);
+  if (index === -1) return tabs;
+  if (!derivePinned(tabs[index])) return tabs;
+  const normalTab = {
+    ...tabs[index],
+    pinned: false,
+    closable: true
+  };
+  const rest = tabs.filter((_, i) => i !== index);
+  const insertAt = getPinnedBoundary(rest);
+  return [...rest.slice(0, insertAt), normalTab, ...rest.slice(insertAt)];
+};
+
+/**
+ * 约束重排：在普通 arrayMove 基础上，钳制落点以维持「固定区在左、普通区在右」不变量。
+ * - 被拖动的普通标签：落点钳制到 >= boundary（不进固定区）
+ * - 被拖动的固定标签：落点钳制到 <= boundary-1（不出固定区）
+ * - 钳制后落点等于原位、或 id 相同/无效时，返回原数组引用（避免无效更新）
+ */
+export const reorderWithPinConstraint = (tabs, activeId, overId) => {
+  if (activeId === overId) return tabs;
+  const activeIndex = tabs.findIndex(tab => tab.id === activeId);
+  const overIndex = tabs.findIndex(tab => tab.id === overId);
+  if (activeIndex === -1 || overIndex === -1) return tabs;
+  const boundary = getPinnedBoundary(tabs);
+  const activePinned = derivePinned(tabs[activeIndex]);
+  let targetIndex = overIndex;
+  if (activePinned) {
+    // 固定标签只能落在固定区内：[0, boundary-1]
+    const maxIndex = boundary - 1;
+    if (targetIndex > maxIndex) targetIndex = maxIndex;
+  } else {
+    // 普通标签只能落在普通区内：[boundary, length-1]
+    if (targetIndex < boundary) targetIndex = boundary;
+  }
+  if (targetIndex === activeIndex) return tabs;
+  return moveItem(tabs, activeIndex, targetIndex);
 };

package/es/ProLayout/propTypes.d.ts

@@ -129,6 +129,10 @@ export interface MenusType {
      * @default "_self"
      */
     target?: '_blank' | '_parent' | '_self' | '_top';
+    /**
+     * @description 标签页关联键；相同关联键的业务详情重复打开时复用已有标签页
+     */
+    relationKey?: string | number;
     /**
      * @description 允许扩展字段
      */
@@ -324,6 +328,11 @@ export interface TabItem {
      * @description 是否可关闭
      */
     closable: boolean;
+    /**
+     * @description 是否固定标签（本质状态）。固定后不可关闭并排入左侧固定区；
+     * closable 为其派生结果（pinned 时 closable=false）。未设置时以 closable===false 推导。
+     */
+    pinned?: boolean;
     /**
      * @description 关联菜单项
      */
@@ -336,6 +345,10 @@ export interface TabItem {
      * @description 图标
      */
     icon?: ReactNode | string;
+    /**
+     * @description 标签页关联键；用于业务详情页复用已有标签页
+     */
+    relationKey?: string | number;
 }
 export interface TabsState {
     tabsList: TabItem[];
@@ -361,6 +374,10 @@ export interface AddTabParams {
      * @description 额外的业务数据
      */
     extra?: Record<string, any>;
+    /**
+     * @description 标签页关联键；相同关联键的业务详情重复打开时复用已有标签页
+     */
+    relationKey?: string | number;
 }
 /**
  * @description 添加标签页的选项
@@ -397,6 +414,10 @@ export interface UpdateTabParams {
      * @description 是否可关闭
      */
     closable?: boolean;
+    /**
+     * @description 是否固定标签（本质状态，driven closable）
+     */
+    pinned?: boolean;
 }
 /**
  * @description 获取标签页信息返回值

package/es/ProLayout/style/index.less

@@ -308,7 +308,9 @@
     // 高度动画：CSS Grid 技巧，支持不定高度平滑过渡
     display: grid;
     grid-template-rows: 0fr;
-    transition: margin-left 0.3s cubic-bezier(0.2, 0, 0, 1), grid-template-rows 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+    transition:
+      margin-left 0.3s cubic-bezier(0.2, 0, 0, 1),
+      grid-template-rows 0.3s cubic-bezier(0.4, 0, 0.2, 1);
 
     // 菜单展开时与内容区同步右移
     &.tabs-menu-open {
@@ -383,6 +385,20 @@
       border-radius: 0;
       padding-top: var(--zaui-space-size-md, 16px);
       border-top-right-radius: var(--zaui-border-radius, 8px);
+
+      .pro-layout-tabs-content {
+        > .tab-pane {
+          > .pro-header.pro-header-no-describe:first-child {
+            padding: 0 !important;
+
+            .pro-header-title,
+            .pro-header-top {
+              margin: 0;
+              padding: 0;
+            }
+          }
+        }
+      }
     }
   }
 

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

@@ -7,6 +7,7 @@ import { CheckOutlined } from '@ant-design/icons';
 import { ReactSVG } from 'react-svg';
 import { isEmpty, isEllipsisActive } from "../../../utils";
 import copySvg from "../../../assets/copy.svg";
+import locale from "../../../locale";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const {
   Paragraph,
@@ -198,7 +199,7 @@ const RenderColumn = props => {
             className: "drag-icon",
             src: copySvg
           }, "copy-icon"), /*#__PURE__*/_jsx(CheckOutlined, {}, "copied-icon")],
-          tooltips: ['复制', '复制成功']
+          tooltips: locale.ProHeader.copyTooltips
         },
         children: node
       })

package/es/ProUpload/components/FileItem.js

@@ -9,6 +9,7 @@ import WORD from "../style/icon-word.png";
 import lookSvg from "../../assets/look.svg";
 import deleteSvg from "../../assets/delete.svg";
 import downloadSvg from "../../assets/download.svg";
+import locale from "../../locale";
 
 /**
  * @description: b 转成 Kb
@@ -119,10 +120,10 @@ const FileItem = props => {
               src: lookSvg
             })
           }), _showRemoveIcon && !disabled && (isConfirmDelete ? /*#__PURE__*/_jsx(Popconfirm, {
-            title: "\u786E\u5B9A\u5220\u9664?",
+            title: locale.ProUpload.deleteConfirmTitle,
             onConfirm: _onRemove,
-            okText: "\u786E\u8BA4",
-            cancelText: "\u53D6\u6D88",
+            okText: locale.ProDrawerForm.confirm,
+            cancelText: locale.ProDrawerForm.cancel,
             children: /*#__PURE__*/_jsx(Button, {
               type: "link",
               className: "file-action-item",

package/es/locale/en_US.d.ts

@@ -10,6 +10,12 @@ declare const _default: {
         tipAlt: string;
         closeAlt: string;
         tabMaxLimitMessage: string;
+        tabMenuClose: string;
+        tabMenuCloseOthers: string;
+        tabMenuCloseRight: string;
+        tabMenuCloseAll: string;
+        tabMenuPin: string;
+        tabMenuUnpin: string;
     };
     ProHeader: {
         versionTitle: string;
@@ -18,6 +24,8 @@ declare const _default: {
         confirmTitle: string;
         backText: string;
         copyTooltips: string[];
+        itemsCountPrefix: string;
+        itemsSeparator: string;
     };
     ProDownload: {
         errorMessage: string;
@@ -39,6 +47,8 @@ declare const _default: {
         formListConfirmMessage: string;
         noData: string;
         moreItems: string;
+        confirmTitle: string;
+        confirmContent: string;
     };
     ProAction: {
         errorMessage: string;
@@ -80,6 +90,7 @@ declare const _default: {
         view: string;
         delete: string;
         download: string;
+        deleteConfirmTitle: string;
     };
     ProStep: {
         catalogue: string;

package/es/locale/en_US.js

@@ -4,45 +4,55 @@ export default {
     confirm: 'Confirm',
     cancel: 'Cancel',
     isSureClose: 'Confirm to close the current page',
-    secondTipsWhenSave: 'Close the current page content will not be saved, need to click the Save button to save'
+    secondTipsWhenSave: 'Unsaved changes will be lost. Click Save to keep your changes.'
   },
   ProLayout: {
     tipAlt: 'Tips',
     closeAlt: 'Close',
-    tabMaxLimitMessage: 'Menu tabs cannot exceed the maximum limit of {max}'
+    tabMaxLimitMessage: 'Menu tabs cannot exceed the maximum limit of {max}',
+    tabMenuClose: 'Close',
+    tabMenuCloseOthers: 'Close others',
+    tabMenuCloseRight: 'Close tabs to the right',
+    tabMenuCloseAll: 'Close all',
+    tabMenuPin: 'Pin tab',
+    tabMenuUnpin: 'Unpin tab'
   },
   ProHeader: {
     versionTitle: 'Version number',
     confirm: 'Confirm',
     cancel: 'Cancel',
     confirmTitle: 'Confirm return?',
-    backText: 'Return',
-    copyTooltips: ['Copy', 'Copy successfully']
+    backText: 'Back',
+    copyTooltips: ['Copy', 'Copied successfully'],
+    itemsCountPrefix: '{count} items in total, ',
+    itemsSeparator: ', '
   },
   ProDownload: {
     errorMessage: 'Request failed!'
   },
   ProForm: {
     unfold: 'Unfold',
-    packUp: 'PackUp',
+    packUp: 'Collapse',
     inputPlaceholder: 'Please enter',
     treeSelectPlaceholder: 'Please select',
     selectPlaceHolder: 'Please select',
     switchText: ['Yes', 'No'],
-    ruleStartEndText: ['start value', 'end value'],
+    ruleStartEndText: ['Start value', 'End value'],
     search: 'Search',
     reset: 'Reset',
-    ruleText: 'correct',
-    completeText: 'enter in full',
+    ruleText: 'valid',
+    completeText: 'Please complete all fields',
     halfRuleText: 'Enter the value of ({total})',
     formListActions: ['Add', 'Delete', 'Copy', 'Move up', 'Move down', 'Add a new line', 'Click add'],
-    formListConfirmMessage: 'Are you sure delete it?',
+    formListConfirmMessage: 'Are you sure you want to delete?',
     noData: 'No data',
-    moreItems: '{count} more...'
+    moreItems: '{count} more...',
+    confirmTitle: 'Confirm action',
+    confirmContent: 'Are you sure you want to modify this field?'
   },
   ProAction: {
     errorMessage: 'The configuration config for ProAction must be data',
-    defaultTitle: 'Are you sure delete it?'
+    defaultTitle: 'Are you sure you want to delete?'
   },
   ProTable: {
     noData: 'No data',
@@ -51,7 +61,7 @@ export default {
     transformResponseMsg: 'Please return the correct data type',
     deselect: 'Deselect',
     selectCurPage: 'Select the current page ({total} items)',
-    selectAll: 'Select All ({total} items)',
+    selectAll: 'Select all ({total} items)',
     hasSelected: '{selectedNum} items selected',
     total: '{total} items in total'
   },
@@ -61,25 +71,26 @@ export default {
   },
   ProTree: {
     inputPlaceholder: 'Please enter',
-    unExpand: 'Put it all away',
+    unExpand: 'Collapse all',
     expand: 'Expand all',
     all: 'Select all',
-    emptyTips: "what you were looking for couldn't be found"
+    emptyTips: 'No results found'
   },
   ProUpload: {
     exampleTitle: 'View sample',
-    errorInfoExt: 'Only {} format files are supported',
+    errorInfoExt: 'Supported file formats:',
     errorInfoSize: 'File size cannot exceed ',
     buttonText: 'Upload',
     draggerSelect: 'Select file',
     draggerDelete: 'Delete',
-    draggerTips: 'Click or drag file to this area to upload',
-    draggerBtnTxt: 'Click to upload',
-    draggerFileExt: 'Support for extensions',
-    draggerLimitless: 'Limitless',
+    draggerTips: 'Click or drag file to this area to ',
+    draggerBtnTxt: 'upload',
+    draggerFileExt: 'Supported extensions',
+    draggerLimitless: 'No limit',
     view: 'View',
     delete: 'Delete',
-    download: 'Download'
+    download: 'Download',
+    deleteConfirmTitle: 'Are you sure you want to delete?'
   },
   ProStep: {
     catalogue: 'Catalogue'
@@ -138,27 +149,27 @@ export default {
     clearAll: 'Clear all',
     checkNumber: '{num} items selected',
     noFinal: 'Oops, the content you are looking for is not found.',
-    specifyMode: ['all', 'specify']
+    specifyMode: ['All', 'Specify']
   },
   ProTimeLimit: {
-    foreverText: 'long term'
+    foreverText: 'Permanent'
   },
   ProThemeTools: {
-    title: 'Global style customization ',
-    copySuccess: 'Copy success! ',
+    title: 'Global style customization',
+    copySuccess: 'Copied successfully!',
     layout: 'Layout',
-    layoutMode: ['Compact ', 'Regular', 'Loose'],
+    layoutMode: ['Compact', 'Regular', 'Loose'],
     themeColor: 'Theme color',
     formLabel: 'Form label',
     bigText: 'Large text mode',
-    flex: ['Left align ', 'Right align'],
-    switchText: ['on', 'off'],
+    flex: ['Left align', 'Right align'],
+    switchText: ['On', 'Off'],
     tableBorder: 'Table border',
-    tableStripe: 'Table zebra',
+    tableStripe: 'Table zebra stripe',
     reset: 'Reset'
   },
   ProViewer: {
-    preview: 'preview'
+    preview: 'Preview'
   },
   ProIcon: {
     language: 'en'
@@ -166,10 +177,10 @@ export default {
   RangePicker: {
     ranges: {
       today: 'Today',
-      lastWeek: 'Last Week',
-      lastMonth: 'Last Month',
-      last3Months: 'Last 3 Months',
-      lastYear: 'Last Year'
+      lastWeek: 'Last week',
+      lastMonth: 'Last month',
+      last3Months: 'Last 3 months',
+      lastYear: 'Last year'
     }
   }
 };

package/es/locale/zh_CN.d.ts

@@ -10,6 +10,12 @@ declare const _default: {
         tipAlt: string;
         closeAlt: string;
         tabMaxLimitMessage: string;
+        tabMenuClose: string;
+        tabMenuCloseOthers: string;
+        tabMenuCloseRight: string;
+        tabMenuCloseAll: string;
+        tabMenuPin: string;
+        tabMenuUnpin: string;
     };
     ProHeader: {
         versionTitle: string;
@@ -18,6 +24,8 @@ declare const _default: {
         cancel: string;
         backText: string;
         copyTooltips: string[];
+        itemsCountPrefix: string;
+        itemsSeparator: string;
     };
     ProDownload: {
         errorMessage: string;
@@ -39,6 +47,8 @@ declare const _default: {
         formListConfirmMessage: string;
         noData: string;
         moreItems: string;
+        confirmTitle: string;
+        confirmContent: string;
     };
     ProAction: {
         errorMessage: string;
@@ -80,6 +90,7 @@ declare const _default: {
         view: string;
         delete: string;
         download: string;
+        deleteConfirmTitle: string;
     };
     ProStep: {
         catalogue: string;

package/es/locale/zh_CN.js

@@ -9,7 +9,13 @@ export default {
   ProLayout: {
     tipAlt: '提示',
     closeAlt: '关闭',
-    tabMaxLimitMessage: '菜单tab不能超过上限{max}'
+    tabMaxLimitMessage: '菜单tab不能超过上限{max}',
+    tabMenuClose: '关闭',
+    tabMenuCloseOthers: '关闭其他',
+    tabMenuCloseRight: '关闭右侧标签页',
+    tabMenuCloseAll: '关闭全部',
+    tabMenuPin: '固定标签',
+    tabMenuUnpin: '取消固定'
   },
   ProHeader: {
     versionTitle: '版本号',
@@ -17,7 +23,9 @@ export default {
     confirm: '确定',
     cancel: '取消',
     backText: '返回',
-    copyTooltips: ['复制', '复制成功']
+    copyTooltips: ['复制', '复制成功'],
+    itemsCountPrefix: '共{count}个，',
+    itemsSeparator: ' 、'
   },
   ProDownload: {
     errorMessage: '请求失败！'
@@ -38,7 +46,9 @@ export default {
     formListActions: ['新增', '删除', '复制', '上移', '下移', '新增一行', '点击添加'],
     formListConfirmMessage: '确认删除吗?',
     noData: '暂无数据',
-    moreItems: '更多{count}项...'
+    moreItems: '更多{count}项...',
+    confirmTitle: '操作提示',
+    confirmContent: '确定要修改该字段吗？'
   },
   ProAction: {
     errorMessage: 'ProAction 配置 config 必须为数据',
@@ -79,7 +89,8 @@ export default {
     draggerLimitless: '无限制',
     view: '查看',
     delete: '删除',
-    download: '下载'
+    download: '下载',
+    deleteConfirmTitle: '确定删除?'
   },
   ProStep: {
     catalogue: '目录'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.5.6-beta.2",
+  "version": "4.5.6-beta.4",
   "license": "MIT",
   "files": [
     "es",
@@ -66,6 +66,7 @@
     "lint-staged:js": "eslint --ext .js,.jsx,.ts,.tsx --ignore-pattern '**/__tests__/**' --ignore-pattern '**/*.test.*' --ignore-pattern '**/*.spec.*'",
     "code-standards:check": "node ./scripts/code-standards-check.mjs",
     "check:types": "node ./scripts/check-public-types.mjs",
+    "check:locale": "node ./scripts/check-locale.mjs",
     "commit-msg:format": "node ./scripts/format-commit-msg.mjs",
     "lint:fix": "eslint --fix --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src",
     "lint:js": "eslint --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src",
@@ -122,7 +123,7 @@
     "lodash": "^4.17.21",
     "react-intersection-observer": "^9.13.0",
     "react-resizable": "^3.0.5",
-    "react-svg": "^15.1.7"
+    "react-svg": "^17.2.4"
   },
   "peerDependencies": {
     "@ant-design/icons": ">=6.0.0",