@jiangood/open-admin 3.1.6 → 3.1.8

package/package.json

@@ -2,7 +2,6 @@
   "devDependencies": {
     "@babel/core": "^7.29.7",
     "@eslint/js": "^10.0.1",
-    "@playwright/test": "^1.62.0",
     "@types/qs": "^6.15.1",
     "@types/react": "^19.2.2",
     "@types/react-dom": "^19.0.0",
@@ -54,11 +53,9 @@
     "build": "vite build",
     "preview": "vite preview",
     "lint": "eslint src --max-warnings=0",
-    "lint:fix": "eslint src --fix",
-    "test:e2e": "playwright test",
-    "test:e2e:ui": "playwright test --ui"
+    "lint:fix": "eslint src --fix"
   },
-  "version": "3.1.6",
+  "version": "3.1.8",
   "overrides": {
     "zod-validation-error": "^4.0.2"
   }

package/src/framework/biz/PermActions.tsx

@@ -101,7 +101,7 @@ export class PermActions extends React.Component<PermActionsProps> {
 
         if (!more || visible.length <= 1) {
             const buttons = visible.map((action, index) => (
-                <React.Fragment key={index}>{this.renderButton(action, size)}</React.Fragment> // NOSONAR: 按钮无稳定 id，静态过滤后顺序不变
+                <React.Fragment key={index}>{this.renderButton(action, size)}</React.Fragment>
             ));
             return <Space>{buttons}</Space>;
         }

package/src/framework/biz/UserPicker.less

@@ -0,0 +1,17 @@
+/* 选人器左侧机构树：机构名称过长时不换行，改为容器横向滚动 */
+.oa-user-picker-tree {
+  height: 100%;
+  overflow: auto;
+
+  /* 让树按内容宽度撑开，超宽时由外层容器横向滚动 */
+  .ant-tree {
+    width: max-content;
+    min-width: 100%;
+  }
+
+  .ant-tree-treenode,
+  .ant-tree-node-content-wrapper,
+  .ant-tree-title {
+    white-space: nowrap;
+  }
+}

package/src/framework/biz/UserPicker.tsx

@@ -0,0 +1,296 @@
+import React from 'react';
+import {Button, Empty, Form, Input, Modal, Splitter, Table} from 'antd';
+import type {FormInstance, TableColumnsType} from 'antd';
+import {CloseOutlined} from '@ant-design/icons';
+import {OrgTree} from './OrgTree';
+import {formatUserLabel, type PickerUser} from './pickerUser';
+import {HttpClient} from '../utils';
+import './UserPicker.less';
+
+export interface UserPickerProps {
+    /** 是否显示 */
+    open: boolean;
+    /** 弹窗标题 */
+    title?: string;
+    /** 是否多选，默认 true */
+    multiple?: boolean;
+    /** 已选用户 id（受控） */
+    value?: string[];
+    /** 弹窗宽度，默认 1080 */
+    width?: number;
+    /** 内容区高度，默认 530（刚好容纳默认每页 10 行，不出现表格内部纵向滚动） */
+    height?: number;
+    /** 分页数据源地址，默认 admin/sysUser/page */
+    requestUrl?: string;
+    /** 按 id 查询用户详情地址（用于回显），默认 admin/sysUser/by-ids */
+    usersUrl?: string;
+    /** 确定按钮 loading */
+    confirmLoading?: boolean;
+    /** 选择变化（点击确定时触发） */
+    onChange?: (ids: string[], users: PickerUser[]) => void;
+    /** 点击确定 */
+    onOk?: (ids: string[], users: PickerUser[]) => void;
+    /** 取消 */
+    onCancel?: () => void;
+}
+
+interface UserPickerState {
+    loading: boolean;
+    dataSource: PickerUser[];
+    total: number;
+    current: number;
+    pageSize: number;
+    filters: {name?: string; account?: string};
+    orgId: string | null;
+    selectedMap: Record<string, PickerUser>;
+    selectedKeyword: string;
+}
+
+// 候选人表格列与状态无关，提到模块级，避免每次勾选都重建列定义
+const USER_TABLE_COLUMNS: TableColumnsType<PickerUser> = [
+    {title: '姓名', dataIndex: 'name', width: 90},
+    {title: '登录账号', dataIndex: 'account', width: 120},
+    {title: '所属机构', dataIndex: 'orgLabel', ellipsis: true, render: (_, row) => row.orgLabel || row.unitLabel || ''},
+];
+
+// 机构树不随选择变化，memo 避免每次勾选都重渲染
+const MemoOrgTree = React.memo(OrgTree);
+
+/**
+ * 通用选人器
+ *
+ * 机构树 + 服务端分页搜索 + 跨页多选，解决用户量大、同名难以区分的问题。
+ */
+export class UserPicker extends React.Component<UserPickerProps, UserPickerState> {
+
+    static readonly defaultProps = {
+        title: '选择用户',
+        multiple: true,
+    };
+
+    formRef = React.createRef<FormInstance>();
+
+    state: UserPickerState = {
+        loading: false,
+        dataSource: [],
+        total: 0,
+        current: 1,
+        pageSize: 10,
+        filters: {},
+        orgId: null,
+        selectedMap: {},
+        selectedKeyword: '',
+    };
+
+    componentDidUpdate(prevProps: UserPickerProps) {
+        if (this.props.open && !prevProps.open) {
+            this.init();
+        }
+    }
+
+    getRequestUrl = () => this.props.requestUrl || 'admin/sysUser/page';
+
+    getUsersUrl = () => this.props.usersUrl || 'admin/sysUser/by-ids';
+
+    init = () => {
+        this.formRef.current?.resetFields();
+        this.setState({current: 1, filters: {}, orgId: null, selectedMap: {}, selectedKeyword: ''}, () => {
+            this.loadData();
+            this.loadSelected(this.props.value || []);
+        });
+    };
+
+    loadSelected = (ids: string[]) => {
+        if (!ids.length) {
+            this.setState({selectedMap: {}});
+            return;
+        }
+        HttpClient.get<PickerUser[]>(this.getUsersUrl(), {ids}, {toastError: false}).then(rs => {
+            const data = rs.data || [];
+            const map: Record<string, PickerUser> = {};
+            ids.forEach(id => {
+                const user = data.find(item => item.id === id);
+                if (user) {
+                    map[id] = user;
+                }
+            });
+            this.setState({selectedMap: map});
+        });
+    };
+
+    loadData = () => {
+        const {filters, orgId, current, pageSize} = this.state;
+        this.setState({loading: true});
+        HttpClient.get<{ content: PickerUser[]; totalElements: number | string; size: number }>(this.getRequestUrl(), {
+            name: filters.name,
+            account: filters.account,
+            orgId: orgId || undefined,
+            page: current,
+            size: pageSize,
+        }).then(rs => {
+            const {content, totalElements, size} = rs.data;
+            this.setState({dataSource: content || [], total: Number(totalElements), pageSize: size || pageSize, loading: false});
+        }).catch(() => {
+            this.setState({loading: false});
+        });
+    };
+
+    onSearch = (values: UserPickerState['filters']) => {
+        this.setState({filters: values, current: 1}, this.loadData);
+    };
+
+    resetSearch = () => {
+        this.formRef.current?.resetFields();
+        this.setState({filters: {}, current: 1}, this.loadData);
+    };
+
+    onSelectOrg = (orgId: string | null) => {
+        this.setState({orgId, current: 1}, this.loadData);
+    };
+
+    // 跨页累计选择：保留已选行数据，去掉本次取消勾选的 key
+    // 注意：preserveSelectedRowKeys 下，跨页已选但不在当前页的行在 selectedRows 中为 undefined，需跳过
+    onSelectionChange = (keys: React.Key[], rows: PickerUser[]) => {
+        const map = {...this.state.selectedMap};
+        rows.forEach(row => {
+            if (row && row.id != null) {
+                map[row.id] = row;
+            }
+        });
+        const keySet = new Set(keys.map(String));
+        Object.keys(map).forEach(id => {
+            if (!keySet.has(id)) {
+                delete map[id];
+            }
+        });
+        this.setState({selectedMap: map});
+    };
+
+    removeSelected = (id: string) => {
+        const map = {...this.state.selectedMap};
+        delete map[id];
+        this.setState({selectedMap: map});
+    };
+
+    clearSelected = () => this.setState({selectedMap: {}, selectedKeyword: ''});
+
+    handleOk = () => {
+        const users = Object.values(this.state.selectedMap);
+        const ids = users.map(user => user.id);
+        this.props.onOk?.(ids, users);
+        this.props.onChange?.(ids, users);
+    };
+
+    render() {
+        const {open, title, multiple, width, height, confirmLoading, onCancel} = this.props;
+        const {loading, dataSource, total, current, pageSize, selectedMap, selectedKeyword} = this.state;
+        const selectedUsers = Object.values(selectedMap);
+        const keyword = selectedKeyword.trim().toLowerCase();
+        const filteredSelected = keyword
+            ? selectedUsers.filter(user => formatUserLabel(user).toLowerCase().includes(keyword))
+            : selectedUsers;
+
+        return <Modal
+            open={open}
+            title={title}
+            width={width || 1120}
+            confirmLoading={confirmLoading}
+            okText='确定'
+            cancelText='取消'
+            mask={{closable: false}}
+            destroyOnHidden
+            onOk={this.handleOk}
+            onCancel={onCancel}
+        >
+            <Splitter style={{height: height || 530}}>
+                <Splitter.Panel defaultSize={320} min={180} max={560} style={{paddingRight: 8}}>
+                    <div className="oa-user-picker-tree">
+                        <MemoOrgTree onChange={this.onSelectOrg}/>
+                    </div>
+                </Splitter.Panel>
+                <Splitter.Panel style={{padding: '0 12px'}}>
+                    <div style={{height: '100%', display: 'flex', flexDirection: 'column'}}>
+                        <Form layout='inline' ref={this.formRef} onFinish={this.onSearch} style={{marginBottom: 8}}>
+                            <Form.Item name='name'><Input allowClear placeholder='姓名' style={{width: 100}}/></Form.Item>
+                            <Form.Item name='account'><Input allowClear placeholder='账号' style={{width: 100}}/></Form.Item>
+                            <Form.Item><Button type='primary' htmlType='submit'>查询</Button></Form.Item>
+                            <Form.Item><Button onClick={this.resetSearch}>重置</Button></Form.Item>
+                        </Form>
+                        <div style={{flex: 1, minHeight: 0, overflow: 'auto'}}>
+                            <Table<PickerUser>
+                                rowKey='id'
+                                size='small'
+                                loading={loading}
+                                columns={USER_TABLE_COLUMNS}
+                                dataSource={dataSource}
+                                rowSelection={{
+                                    type: multiple === false ? 'radio' : 'checkbox',
+                                    selectedRowKeys: selectedUsers.map(user => user.id),
+                                    preserveSelectedRowKeys: true,
+                                    onChange: this.onSelectionChange,
+                                }}
+                                pagination={{
+                                    current,
+                                    pageSize,
+                                    total,
+                                    size: 'small',
+                                    showSizeChanger: true,
+                                    pageSizeOptions: [10, 20, 50, 100],
+                                    showTotal: (count) => `共 ${count} 条`,
+                                }}
+                                onChange={(pagination) => this.setState({
+                                    current: pagination.current || 1,
+                                    pageSize: pagination.pageSize || pageSize,
+                                }, this.loadData)}
+                                locale={{emptyText: <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} description='暂无数据'/>}}
+                            />
+                        </div>
+                    </div>
+                </Splitter.Panel>
+                <Splitter.Panel defaultSize={260} min={180} max={520} style={{paddingLeft: 8}}>
+                    <div style={{height: '100%', display: 'flex', flexDirection: 'column'}}>
+                        <div style={{display: 'flex', alignItems: 'center', justifyContent: 'space-between', marginBottom: 8}}>
+                            <span>已选 <b>{selectedUsers.length}</b> 人</span>
+                            {selectedUsers.length > 0 && <a onClick={this.clearSelected}>清空</a>}
+                        </div>
+                        <Input
+                            allowClear
+                            placeholder='搜索已选'
+                            value={selectedKeyword}
+                            onChange={(e) => this.setState({selectedKeyword: e.target.value})}
+                            style={{marginBottom: 8}}
+                        />
+                        <div style={{flex: 1, minHeight: 0, overflow: 'auto'}}>
+                            {selectedUsers.length === 0 && (
+                                <div style={{color: 'var(--oa-color-text-tertiary, #999)', textAlign: 'center', marginTop: 24}}>暂未选择</div>
+                            )}
+                            {selectedUsers.length > 0 && filteredSelected.length === 0 && (
+                                <div style={{color: 'var(--oa-color-text-tertiary, #999)', textAlign: 'center', marginTop: 24}}>无匹配人员</div>
+                            )}
+                            {filteredSelected.map(user => (
+                                <div key={user.id} style={{
+                                    display: 'flex',
+                                    alignItems: 'center',
+                                    gap: 4,
+                                    padding: '3px 0',
+                                    borderBottom: '1px dashed var(--oa-color-border, #f0f0f0)',
+                                }}>
+                                    <span
+                                        title={formatUserLabel(user)}
+                                        style={{flex: 1, minWidth: 0, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap'}}
+                                    >
+                                        {formatUserLabel(user)}
+                                    </span>
+                                    <CloseOutlined
+                                        style={{cursor: 'pointer', color: 'var(--oa-color-text-tertiary, #999)', flexShrink: 0}}
+                                        onClick={() => this.removeSelected(user.id)}
+                                    />
+                                </div>
+                            ))}
+                        </div>
+                    </div>
+                </Splitter.Panel>
+            </Splitter>
+        </Modal>;
+    }
+}

package/src/framework/biz/index.tsx

@@ -6,6 +6,8 @@ export * from './PermActions'
 export * from './Perm'
 export * from './OrgTree'
 export * from './RoleTree'
+export * from './UserPicker'
+export * from './pickerUser'
 
 class InnerFieldUserSelect extends React.Component<ComponentProps<typeof FieldRemoteSelect>> {
     render() {

package/src/framework/biz/pickerUser.ts

@@ -0,0 +1,19 @@
+/** 选人器使用到的用户信息 */
+export interface PickerUser {
+    id: string;
+    name?: string;
+    account?: string;
+    phone?: string;
+    orgLabel?: string;
+    unitLabel?: string;
+    [key: string]: unknown;
+}
+
+/** 用户标签文案：姓名（账号 · 机构），用于区分同名用户 */
+export function formatUserLabel(user: PickerUser): string {
+    const extras = [user.account, user.orgLabel || user.unitLabel].filter(Boolean) as string[];
+    if (extras.length === 0) {
+        return user.name || user.id;
+    }
+    return `${user.name || ''}（${extras.join(' · ')}）`;
+}

package/src/framework/components/ContextMenu/index.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import {getToken} from '../../config';
 
 interface ContextMenuItem {
     key: string;
@@ -19,9 +20,10 @@ interface ContextMenuProps {
 
 export class ContextMenu extends React.Component<ContextMenuProps> {
     menuItemColor = (item): string => {
-        if (item.danger) return '#ff4d4f';
-        if (item.disabled) return 'rgba(0,0,0,0.25)';
-        return '#333';
+        const token = getToken();
+        if (item.danger) return token.colorError;
+        if (item.disabled) return String(token.colorTextDisabled);
+        return String(token.colorText);
     };
     menuRef = React.createRef<HTMLDivElement>();
     timer: ReturnType<typeof setTimeout> | null = null;
@@ -73,6 +75,7 @@ export class ContextMenu extends React.Component<ContextMenuProps> {
 
     render() {
         const { x, y, items, onClick, onClose } = this.props;
+        const token = getToken();
 
         return (
             <div
@@ -82,16 +85,16 @@ export class ContextMenu extends React.Component<ContextMenuProps> {
                     left: x,
                     top: y,
                     zIndex: 1050,
-                    background: '#fff',
-                    borderRadius: 4,
+                    background: String(token.colorBgElevated ?? token.colorBgContainer),
+                    borderRadius: 'var(--oa-border-radius, 4px)',
                     padding: '4px 0',
                     minWidth: 120,
-                    boxShadow: '0 6px 16px 0 rgba(0,0,0,0.08), 0 3px 6px -4px rgba(0,0,0,0.12), 0 9px 28px 8px rgba(0,0,0,0.05)',
+                    boxShadow: String(token.boxShadowSecondary ?? '0 6px 16px 0 rgba(0,0,0,0.08)'),
                 }}
             >
                 {items.map(item => (
                     item.divider ? (
-                        <div key={item.key} style={{ height: 1, background: '#f0f0f0', margin: '4px 0' }} />
+                        <div key={item.key} style={{ height: 1, background: String(token.colorSplit ?? token.colorBorderSecondary), margin: '4px 0' }} />
                     ) : (
                         <div
                             key={item.key}
@@ -125,7 +128,7 @@ export class ContextMenu extends React.Component<ContextMenuProps> {
                                 userSelect: 'none',
                             }}
                             onMouseEnter={(e) => {
-                                if (!item.disabled) e.currentTarget.style.background = '#f5f5f5';
+                                if (!item.disabled) e.currentTarget.style.background = String(token.colorFillTertiary);
                             }}
                             onMouseLeave={(e) => {
                                 e.currentTarget.style.background = 'transparent';

package/src/framework/components/DownloadModal/index.tsx

@@ -40,8 +40,8 @@ export interface DownloadModalProps {
   onFinish?: () => void;
 }
 
-export class DownloadModal extends React.Component<DownloadModalProps, ModalState> { // NOSONAR: state/定时器字段构造器赋值，无法全部 readonly
-  private abortController: AbortController | null = null; // NOSONAR: 构造器中赋值
+export class DownloadModal extends React.Component<DownloadModalProps, ModalState> {
+  private abortController: AbortController | null = null;
   private lastOptions: DownloadOptions | null = null;
   private lastTime: number = 0;
   private lastLoaded: number = 0;
@@ -61,7 +61,7 @@ export class DownloadModal extends React.Component<DownloadModalProps, ModalStat
     };
   }
 
-  download = (options: DownloadOptions) => { // NOSONAR: ref 暴露给父组件/业务项目调用的公共 API
+  download = (options: DownloadOptions) => {
     this.startDownload(options);
   };
 
@@ -287,7 +287,7 @@ export class DownloadModal extends React.Component<DownloadModalProps, ModalStat
       >
         <div style={{padding: '20px 0'}}>
           {/* 文件名 */}
-          <div style={{marginBottom: 16, fontSize: 15, fontWeight: 500, color: '#333'}}>
+          <div style={{marginBottom: 16, fontSize: 15, fontWeight: 500, color: 'var(--oa-color-text, #333)'}}>
             文件名：{fileName || '未知文件'}
           </div>
 
@@ -295,7 +295,7 @@ export class DownloadModal extends React.Component<DownloadModalProps, ModalStat
           {status === 'downloading' && (
             <>
               <Progress percent={progress} status="active" strokeColor="var(--ant-color-primary)"/>
-              <div style={{marginTop: 8, fontSize: 13, color: '#999'}}>
+              <div style={{marginTop: 8, fontSize: 13, color: 'var(--oa-color-text-tertiary, #999)'}}>
                 <span>{this.formatSize(loaded)}</span>
                 {total > 0 && <span> / {this.formatSize(total)}</span>}
                 {speed && <span style={{marginLeft: 12}}>{speed}</span>}
@@ -310,7 +310,7 @@ export class DownloadModal extends React.Component<DownloadModalProps, ModalStat
           {status === 'completed' && (
             <>
               <Progress percent={100} status="success"/>
-              <div style={{marginTop: 8, fontSize: 13, color: '#999'}}>
+              <div style={{marginTop: 8, fontSize: 13, color: 'var(--oa-color-text-tertiary, #999)'}}>
                 {loaded > 0 && <span>文件大小：{this.formatSize(loaded)}</span>}
               </div>
               <div style={{marginTop: 8}}>
@@ -323,7 +323,7 @@ export class DownloadModal extends React.Component<DownloadModalProps, ModalStat
           {status === 'failed' && (
             <>
               <Progress percent={progress} status="exception"/>
-              <div style={{marginTop: 8, fontSize: 13, color: '#ff4d4f'}}>
+              <div style={{marginTop: 8, fontSize: 13, color: 'var(--oa-color-error, #ff4d4f)'}}>
                 <CloseCircleOutlined style={{marginRight: 4}}/>
                 {errorMessage}
               </div>

package/src/framework/components/ErrorBoundary/index.tsx

@@ -68,7 +68,7 @@ export default class ErrorBoundary extends React.Component<Props, State> {
             maxHeight: 300, overflow: 'auto',
             fontSize: 12, fontFamily: 'monospace',
             whiteSpace: 'pre-wrap', wordBreak: 'break-all',
-            background: '#f5f5f5', padding: 12, borderRadius: 4,
+            background: 'var(--oa-color-fill, #f5f5f5)', padding: 12, borderRadius: 'var(--oa-border-radius, 4px)',
             color: getToken().colorError,
         };
 

package/src/framework/components/FormModal/index.tsx

@@ -12,9 +12,9 @@ export interface FormModalProps {
   children?: React.ReactNode
 }
 
-export default class FormModal extends React.Component<FormModalProps> { // NOSONAR: state 构造器中赋值
+export default class FormModal extends React.Component<FormModalProps> {
 
-  readonly state = { // NOSONAR: React state 惯例
+  readonly state = {
     visible: false,
     confirmLoading: false,
   }
@@ -22,11 +22,11 @@ export default class FormModal extends React.Component<FormModalProps> { // NOSO
   private pendingValues: Record<string, unknown> | null = null
   private formRef = React.createRef<FormInstance>()
 
-  get formInstance() { // NOSONAR: ref 暴露给父组件/业务项目调用的公共 API
+  get formInstance() {
     return this.formRef.current
   }
 
-  open = (values?: Record<string, unknown>) => { // NOSONAR: ref 暴露给父组件/业务项目调用的公共 API
+  open = (values?: Record<string, unknown>) => {
     this.pendingValues = values || {}
     this.setState({visible: true})
   }

package/src/framework/components/NamedIcon/index.tsx

@@ -12,7 +12,7 @@ const iconLoaders: Record<string, () => Promise<{ default: IconComponent }>> = {
 for (const [path, loader] of Object.entries(
     import.meta.glob('/node_modules/@ant-design/icons/es/icons/*.js')
 )) {
-    const name = /([^/]+)\.js$/.exec(path)?.[1]; // NOSONAR: 提取文件名，已最简
+    const name = /([^/]+)\.js$/.exec(path)?.[1];
     if (name) {
         iconLoaders[name] = loader as () => Promise<{ default: IconComponent }>;
     }

package/src/framework/components/OrgSwitcher/index.tsx

@@ -35,7 +35,7 @@ export class OrgSwitcher extends React.Component<Record<string, never>, {tree: O
         const {tree, currentOrgId} = this.state;
 
         if (countUnits(tree) === 0) {
-            return <span style={{marginRight: 8, color: "#999"}}>暂无组织机构</span>;
+            return <span style={{marginRight: 8, color: 'var(--oa-color-text-tertiary, #999)'}}>暂无组织机构</span>;
         }
 
         if (countUnits(tree) === 1) {

package/src/framework/components/Page/index.tsx

@@ -1,8 +1,19 @@
 import React from "react";
-import { Typography } from "antd";
+import { Space, Typography } from "antd";
 import './index.less'
 import {getToken} from "../../config";
-import { PermActions } from "../../biz/PermActions";
+import { PermActions, type PermAction } from "../../biz/PermActions";
+import { PermUtils } from "../../utils";
+
+/** 兼容旧写法：按子节点的 perm 属性过滤（新代码请用 PermAction[]） */
+function renderActionNodes(nodes: React.ReactNode) {
+    const visible = React.Children.toArray(nodes).filter((node) => {
+        const perm = (node as React.ReactElement<{ perm?: string }>)?.props?.perm;
+        return !perm || PermUtils.hasPermission(perm);
+    });
+    if (visible.length === 0) return null;
+    return <Space>{visible}</Space>;
+}
 
 interface PageProps {
     padding?: boolean;
@@ -10,7 +21,8 @@ interface PageProps {
     debug?: boolean;
     title?: React.ReactNode;
     description?: React.ReactNode;
-    actions?: React.ReactNode;
+    /** 右侧操作区：推荐传 PermAction[]（数据驱动），兼容带 perm 属性的节点 */
+    actions?: PermAction[] | React.ReactNode;
     children?: React.ReactNode;
 }
 
@@ -44,7 +56,9 @@ export class Page extends React.Component<PageProps> {
                                 {description && <div><Typography.Text type="secondary">{description}</Typography.Text></div>}
                             </div>
                         </div>
-                        {actions && <PermActions>{actions}</PermActions>}
+                        {actions != null && (Array.isArray(actions)
+                            ? <PermActions actions={actions}/>
+                            : renderActionNodes(actions))}
                     </div>
                 </div>
             )}

package/src/framework/components/PageLoading/index.tsx

@@ -9,7 +9,7 @@ export interface PageLoadingProps {
     messages?: string[];
 }
 
-export function PageLoading(props: PageLoadingProps) { // NOSONAR: 仅读取 props，函数组件无需变更
+export function PageLoading(props: PageLoadingProps) {
     const titles = props.messages || (props.message ? [props.message] : ['页面加载中...']);
     const primaryColor = getToken().colorPrimary ?? "";
 
@@ -22,7 +22,7 @@ export function PageLoading(props: PageLoadingProps) { // NOSONAR: 仅读取 pro
                 <div className="oa-page-loading-messages">
                     {titles.map((msg, i) => (
                         <Alert
-                            key={i} // NOSONAR: 提示文案列表静态无稳定 key
+                            key={i}
                             title={<span style={{color: primaryColor}}>{msg}</span>}
                             type="info"
                             showIcon