@jiangood/open-admin 3.0.15 → 3.1.1

package/src/framework/utils/HttpClient.ts

@@ -0,0 +1,283 @@
+import axios from "axios";
+import type {AxiosProgressEvent, AxiosRequestConfig} from "axios";
+import qs from 'qs';
+import {message as messageApi} from "antd";
+import {EventBus} from "./EventBus";
+
+/**
+ * 单一 Promise 风格 HTTP 工具类（所有请求方法均返回 Promise，无 success/error 回调）
+ *
+ * 核心规则：
+ * - 请求方法返回 Promise<AjaxBody<T>>：成功 resolve 整个 AjaxResult 响应体，失败 reject(AjaxError {code, message})
+ * - 成功 resolve 的是原始响应体 {success, code, data, message, traceId, ...}（extData 等附加字段在顶层），
+ *   业务取数据用 rs.data，取提示文案用 rs.message
+ * - 成功且后端返回了 message 时自动 message.success(body.message)，传 {toastSuccess: false} 可关闭
+ * - 失败默认自动 console.warn + message.error，并 reject(AjaxError)；传 {toastError: false} 可完全静默（仅 reject）
+ * - 返回值被忽略也安全：内部已对返回的 Promise 挂 no-op catch，不会产生 unhandled rejection
+ * - reject 的 AjaxError {code, message}：业务失败 code 为后端业务码，网络异常 code 为 HTTP 状态码，message 始终为人类可读提示
+ * - HTTP 401 或业务 code=401 均广播 loginExpired（全局关注点），弹错仍按 toastError 决定
+ *
+ * 用法：
+ * ```ts
+ * // 提交：成功自动弹后端 message（如"更新成功"），失败自动弹错并 reject（可用 await 感知结果，如 FormModal 提交失败保持弹窗）
+ * await HttpClient.post('admin/sysUser/create', values);
+ *
+ * // 取返回数据与后端提示文案
+ * const {data, message} = await HttpClient.post('admin/sysUser/create', values);
+ *
+ * // 成功自控提示（关闭自动弹后由业务决定）
+ * await HttpClient.post('admin/sysUser/delete', {id}, null, {toastSuccess: false});
+ * messageApi.success('删除成功');
+ * reload();
+ *
+ * // 失败由调用方接管，不弹错（静默探测）
+ * HttpClient.get('admin/public/site-info', null, {toastError: false})
+ *     .then(({data}) => render(data))
+ *     .catch((e) => myHandle(e));
+ *
+ * // $.ajax 形态
+ * HttpClient.ajax({url: 'admin/sysUser/page', method: 'GET', params}).then((rs) => render(rs.data));
+ *
+ * // 下载（返回 Promise<Blob>，成功已触发浏览器保存）
+ * HttpClient.download({url: 'admin/sysUser/export', method: 'POST', data: {deptId: 1},
+ *     onDownloadProgress: ({loaded, total}) => console.log(loaded, total)})
+ *     .catch(() => {});
+ * ```
+ */
+/** 统一的错误数据格式：业务失败与网络异常都包装成此结构传给 reject 的 error */
+export interface AjaxError {
+    code?: number | string;
+    message: string;
+}
+
+/** 后端统一响应结构 AjaxResult；putExtData 附加字段在顶层，data 为业务数据 */
+export interface AjaxBody<T = unknown> {
+    success: boolean;
+    code: number;
+    data: T;
+    message?: string;
+    traceId?: string;
+    [key: string]: unknown;
+}
+
+/** 请求选项：headers 自定义请求头；toastError=false 时失败不自动弹错（完全静默，仅 reject）；toastSuccess=false 时成功不自动弹后端 message */
+export interface RequestOptions {
+    headers?: AxiosRequestConfig['headers'];
+    toastError?: boolean;
+    toastSuccess?: boolean;
+}
+
+interface AjaxSettings {
+    url: string;
+    method?: 'GET' | 'POST';
+    params?: unknown;
+    data?: unknown;
+    headers?: AxiosRequestConfig['headers'];
+    toastError?: boolean;
+    toastSuccess?: boolean;
+}
+
+interface DownloadSettings {
+    url: string;
+    method?: 'GET' | 'POST';
+    params?: unknown;
+    data?: unknown;
+    fileName?: string;
+    onDownloadProgress?: (progress: {loaded: number; total: number}) => void;
+    toastError?: boolean;
+}
+
+const axiosInstance = axios.create({
+    baseURL: import.meta.env.VITE_SERVER_SERVLET_CONTEXT_PATH,
+    withCredentials: true,
+    headers: {'Content-Type': 'application/json'},
+    paramsSerializer: (params: Record<string, unknown>) => qs.stringify(params, {indices: false})
+});
+
+export class HttpClient {
+    static ajax<T = unknown>(settings: AjaxSettings): Promise<AjaxBody<T>> {
+        const {url, method = 'GET', params, data, headers, toastError, toastSuccess} = settings;
+        return HttpClient.coreRequest<T>({
+            url, method, params, data, headers, toastError, toastSuccess
+        });
+    }
+
+    static get<T = unknown>(url: string, params: unknown = null, opts?: RequestOptions): Promise<AjaxBody<T>> {
+        return HttpClient.ajax<T>({url, method: 'GET', params, ...opts});
+    }
+
+    static post<T = unknown>(url: string, data: unknown = null, params: unknown = null, opts?: RequestOptions): Promise<AjaxBody<T>> {
+        return HttpClient.ajax<T>({url, method: 'POST', data, params, ...opts});
+    }
+
+    static postForm<T = unknown>(url: string, data: unknown, opts?: RequestOptions): Promise<AjaxBody<T>> {
+        return HttpClient.ajax<T>({
+            url,
+            method: 'POST',
+            data: qs.stringify(data),
+            headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+            ...opts
+        });
+    }
+
+    /**
+     * 下载文件（responseType: blob），返回 Promise<Blob>。
+     * 成功即触发浏览器保存并 resolve(blob)；JSON 错误响应自动识别为失败并 reject；
+     * 文件名优先 settings.fileName，否则从 Content-Disposition 解析。
+     * 失败默认自动弹错，传 {toastError: false} 可静默（仅 reject）。
+     */
+    static download(settings: DownloadSettings): Promise<Blob> {
+        const {url, method = 'GET', params, data, fileName, onDownloadProgress, toastError = true} = settings;
+
+        return new Promise<Blob>((resolve, reject) => {
+            axiosInstance({
+                url: HttpClient.prefixUrl(url),
+                method,
+                params,
+                data,
+                responseType: 'blob',
+                onDownloadProgress: (progressEvent: AxiosProgressEvent) => {
+                    if (onDownloadProgress) {
+                        onDownloadProgress({loaded: progressEvent.loaded, total: progressEvent.total});
+                    }
+                }
+            }).then((response) => {
+                const blob: Blob = response.data;
+
+                if (blob.type === 'application/json') {
+                    const reader = new FileReader();
+                    reader.onerror = () => HttpClient.fail(url, toastError, reject, {message: '读取下载数据失败'}, '下载失败');
+                    reader.onload = () => {
+                        try {
+                            const rs = JSON.parse(reader.result as string);
+                            if (rs.code === 401) {
+                                EventBus.emit('loginExpired');
+                            }
+                            HttpClient.fail(url, toastError, reject, {code: rs.code, message: rs.message || '下载失败'}, '下载失败');
+                        } catch {
+                            HttpClient.fail(url, toastError, reject, {message: '解析错误响应失败'}, '下载失败');
+                        }
+                    };
+                    reader.readAsText(blob, 'utf-8');
+                    return;
+                }
+
+                let filename = fileName;
+                if (!filename) {
+                    const contentDisposition = response.headers['content-disposition'] || response.headers['Content-Disposition'];
+                    if (contentDisposition) {
+                        const match = /filename\*?=(?:['"]?)(?:UTF-8''|)(.+?)(?:['"]?$|;)/i.exec(contentDisposition);
+                        let parsedName = match?.[1] ? match[1].trim() : 'download.file';
+                        try {
+                            parsedName = decodeURIComponent(parsedName.replaceAll('"', ''));
+                        } catch {
+                            parsedName = parsedName.replaceAll('"', '');
+                        }
+                        filename = parsedName;
+                    }
+                }
+
+                const objectUrl = window.URL.createObjectURL(new Blob([blob]));
+                const link = document.createElement('a');
+                link.style.display = 'none';
+                link.href = objectUrl;
+                link.download = filename || 'download.file';
+                document.body.appendChild(link);
+                link.click();
+                link.remove();
+                window.URL.revokeObjectURL(objectUrl);
+                resolve(blob);
+            }).catch((e: unknown) => {
+                HttpClient.fail(url, toastError, reject, e, '下载失败');
+            });
+        });
+    }
+
+    /**
+     * 从 axios 异常/Error/AjaxError 中提取人类可读错误消息。
+     * catch 收到的已是 AjaxError，直接取 e.message 即可；此方法供传原始异常的场景兜底。
+     */
+    static errToMsg(e: unknown, defaultMsg = '操作失败'): string {
+        if (axios.isAxiosError(e)) {
+            const responseData = e.response?.data;
+            const status = e.response?.status;
+            if (status === 504) return '504 请求后端服务失败';
+            if (responseData?.message) return responseData.message;
+            if (e.message) return e.message;
+            return defaultMsg;
+        }
+        if (e instanceof Error) return e.message || defaultMsg;
+        if (e && typeof e === 'object' && (e as {message?: unknown}).message) return (e as {message: string}).message;
+        return defaultMsg;
+    }
+
+    /** 把任意异常（AxiosError / Error / AjaxError / 业务消息）统一包装成 AjaxError */
+    private static toAjaxError(e: unknown, defaultMsg = '操作失败'): AjaxError {
+        if (e && typeof e === 'object' && typeof (e as {message?: unknown}).message === 'string') {
+            const ajaxErr = e as {code?: number | string; message: string};
+            return {code: ajaxErr.code, message: ajaxErr.message};
+        }
+        return {message: HttpClient.errToMsg(e, defaultMsg)};
+    }
+
+    private static prefixUrl(url: string): string {
+        return url.startsWith('admin') ? '/' + url : url;
+    }
+
+    private static coreRequest<T = unknown>(settings: AjaxSettings): Promise<AjaxBody<T>> {
+        const {url, method, params, data, headers, toastError = true, toastSuccess = true} = settings;
+        const config: AxiosRequestConfig = {url: HttpClient.prefixUrl(url), method, params, data, headers};
+
+        // FormData 请求交由浏览器自动生成带 boundary 的 multipart Content-Type
+        if (typeof FormData !== 'undefined' && data instanceof FormData) {
+            config.headers = {...config.headers, 'Content-Type': undefined};
+        }
+
+        const promise = new Promise<AjaxBody<T>>((resolve, reject) => {
+            axiosInstance(config).then((response) => {
+                const body = response.data as AjaxBody<T>;
+                const {success: ok, message} = body;
+                if (ok == undefined) {
+                    resolve(body);
+                    return;
+                }
+                if (!ok) {
+                    if (body.code === 401) {
+                        EventBus.emit('loginExpired');
+                    }
+                    HttpClient.fail(url, toastError, reject, {code: body.code, message: message || '操作失败'});
+                    return;
+                }
+                if (toastSuccess && message) {
+                    messageApi.success(message);
+                }
+                resolve(body);
+            }).catch((e: unknown) => {
+                HttpClient.fail(url, toastError, reject, e);
+            });
+        });
+
+        // 调用方忽略返回值时兜底，避免 unhandled rejection；await 的调用方仍能正常收到 reject
+        promise.catch(() => {});
+        return promise;
+    }
+
+    /** 统一的失败处理：HTTP 401 广播 loginExpired 并弹"登录过期"，其余提取可读消息后按 toastError 决定是否弹错，最终 reject(AjaxError) */
+    private static fail(url: string, toastError: boolean, reject: (reason?: unknown) => void, e: unknown, label = '请求失败'): void {
+        if (axios.isAxiosError(e) && e.response?.status === 401) {
+            EventBus.emit('loginExpired');
+            const err: AjaxError = {code: 401, message: '登录过期'};
+            if (toastError) {
+                messageApi.error('登录过期');
+            }
+            reject(err);
+            return;
+        }
+        const err = HttpClient.toAjaxError(e);
+        if (toastError) {
+            console.warn(`[HttpClient] ${label}: ${url}`, err.message);
+            messageApi.error(err.message);
+        }
+        reject(err);
+    }
+}

package/src/framework/utils/{system/PageUtils.ts → PageUtils.ts}

@@ -1,7 +1,7 @@
-import {history} from '../../router';
-import {StringUtils} from "../StringUtils";
-import {UrlUtils} from "../UrlUtils";
-import {EventBus} from "../EventBus";
+import {history} from '../router';
+import {StringUtils} from "./StringUtils";
+import {UrlUtils} from "./UrlUtils";
+import {EventBus} from "./EventBus";
 
 export class PageUtils {
     static redirectToLogin(): void {

package/src/framework/utils/{system/PermUtils.ts → PermUtils.ts}

@@ -1,5 +1,5 @@
-import {GlobalData} from '../../GlobalData';
-import {ArrayUtils} from '../ArrayUtils';
+import {GlobalData} from '../GlobalData';
+import {ArrayUtils} from './ArrayUtils';
 
 export class PermUtils {
     static getPermissions(): string[] {
@@ -13,7 +13,7 @@ export class PermUtils {
         const permissions = PermUtils.getPermissions();
         if (permissions.length === 0) return false;
         if (ArrayUtils.contains(permissions, "*")) return true;
-        return permissions.indexOf(perm) > -1;
+        return permissions.includes(perm);
     }
 
     static isPermitted(p: string | null | undefined): boolean {

package/src/framework/utils/StringUtils.ts

@@ -3,14 +3,14 @@ export class StringUtils {
     static readonly ISO_SPLITTER: string = "/";
 
     static removePrefix(str: string | null | undefined, ch: string): string {
-        if (str != null && str.startsWith(ch)) {
+        if (str?.startsWith(ch)) {
             return str.substring(ch.length);
         }
         return str ?? '';
     }
 
     static removeSuffix(str: string | null | undefined, ch: string): string {
-        if (str != null && str.endsWith(ch)) {
+        if (str?.endsWith(ch)) {
             return str.substring(0, str.length - ch.length);
         }
         return str ?? '';
@@ -18,9 +18,11 @@ export class StringUtils {
 
     static random(length: number): string {
         const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+        const values = new Uint32Array(length);
+        crypto.getRandomValues(values);
         let result = '';
         for (let i = 0; i < length; i++) {
-            result += characters.charAt(Math.floor(Math.random() * characters.length));
+            result += characters.charAt(values[i] % characters.length);
         }
         return result;
     }
@@ -61,7 +63,7 @@ export class StringUtils {
     static getWidth(str: string | null | undefined): number {
         if (str == null || str.length === 0) return 0;
         return str.split('').reduce((pre, cur) => {
-            const charCode = cur.charCodeAt(0);
+            const charCode = cur.codePointAt(0);
             return pre + (charCode >= 0 && charCode <= 128 ? 1 : 2);
         }, 0);
     }
@@ -69,7 +71,7 @@ export class StringUtils {
     static cutByWidth(str: string, maxWidth: number): string {
         let showLength = 0;
         return str.split('').reduce((pre, cur) => {
-            const charCode = cur.charCodeAt(0);
+            const charCode = cur.codePointAt(0);
             const charWidth = (charCode >= 0 && charCode <= 128) ? 1 : 2;
             if (showLength + charWidth <= maxWidth) {
                 showLength += charWidth;
@@ -88,17 +90,17 @@ export class StringUtils {
         return StringUtils.cutByWidth(str, len) + suffix;
     }
 
-    static isString(value: any): value is string {
+    static isString(value: unknown): value is string {
         return typeof value === 'string';
     }
 
-    static split(str: any, sp: string): string[] {
+    static split(str: string | string[] | null | undefined, sp: string): string[] {
         if (str == null || str.length === 0) return [];
         if (Array.isArray(str)) return str;
         return str.split(sp);
     }
 
-    static join(arr: any, sp: string): string {
+    static join(arr: unknown, sp: string): string {
         if (arr == null || !Array.isArray(arr)) {
             return '';
         }

package/src/framework/utils/TreeUtils.ts

@@ -1,8 +1,8 @@
-export interface TreeNode<T = any> {
+export interface TreeNode<T = unknown> {
     id: string | number;
     pid: string | number | null;
     children?: TreeNode<T>[];
-    [key: string]: any;
+    [key: string]: unknown;
 }
 
 export class TreeUtils {
@@ -19,7 +19,7 @@ export class TreeUtils {
     static findByKey<T extends TreeNode>(key: string | number, list: T[], keyName: keyof T | 'id' = 'id'): T | undefined {
         for (const item of list) {
             if (item[keyName as keyof T] === key) return item;
-            if (item.children && item.children.length) {
+            if (item.children?.length) {
                 const rs = TreeUtils.findByKey(key, item.children as T[], keyName);
                 if (rs) return rs;
             }

package/src/framework/utils/UrlUtils.ts

@@ -28,7 +28,7 @@ export class UrlUtils {
         if (!params) return "";
         const buffer: string[] = [];
         for (const k in params) {
-            if (Object.prototype.hasOwnProperty.call(params, k)) {
+            if (Object.hasOwn(params, k)) {
                 const v = params[k];
                 if (v !== null && v !== undefined) {
                     buffer.push(`${k}=${v}`);
@@ -67,6 +67,6 @@ export class UrlUtils {
     static contextPath(path: string): string {
         const base = import.meta.env.VITE_SERVER_SERVLET_CONTEXT_PATH;
         if (base === '/' || base === '') return path;
-        return base.replace(/\/+$/, '') + path;
+        return base.replace(/\/+$/, '') + path; // NOSONAR: 需去除尾部斜杠，正则已最简
     }
 }

package/src/framework/utils/index.ts

@@ -7,6 +7,9 @@ export * from "./TreeUtils";
 export * from './StorageUtils'
 export * from './DeviceUtils'
 export * from './ObjectUtils'
-export * from './system'
+export * from './DictUtils'
+export * from './PermUtils'
+export * from './PageUtils'
+export * from './HttpClient'
 export * from './MessageApi'
 export * from './ModalApi'

package/src/framework/views/ViewApproveStatus/index.tsx

@@ -1,9 +1,8 @@
 import {DictUtils} from "../../utils";
-import {Tag} from "antd";
 import {Component} from "react";
 import type {ViewProps} from "../types";
 
-export class ViewApproveStatus extends Component<ViewProps<String>> {
+export class ViewApproveStatus extends Component<ViewProps<string>> {
     render() {
         const {value} = this.props;
         return DictUtils.dictTag('approveStatus', value);

package/src/framework/views/ViewBoolean/index.tsx

@@ -4,6 +4,9 @@ import type {ViewProps} from "../types";
 export class ViewBoolean extends React.Component<ViewProps<boolean>> {
     render() {
         const {value} = this.props;
-        return value == null ? null : (value ? '是' : '否');
+        if (value == null) {
+            return null;
+        }
+        return value ? '是' : '否';
     }
 }

package/src/framework/views/ViewFile/index.tsx

@@ -23,8 +23,8 @@ export class ViewFile extends React.Component {
             return    <iframe
                 src={url}
                 width='99%'
-                frameBorder={0}
-                style={{height}}
+                title="文件预览"
+                style={{height, border: 0}}
             />
         }
 
@@ -34,8 +34,8 @@ export class ViewFile extends React.Component {
                 <iframe
                     src={url}
                     width='99%'
-                    frameBorder={0}
-                    style={{height}}
+                    title="文件预览"
+                    style={{height, border: 0}}
                 />
             </div>
         });

package/src/framework/views/ViewImage/index.tsx

@@ -16,7 +16,7 @@ import {UrlUtils} from '../../utils';
  */
 export class ViewImage extends React.Component {
 
-  static previewGroupProps = {
+  static readonly previewGroupProps = {
     preview: {
       scaleStep: 0.3,
     },
@@ -61,7 +61,7 @@ export class ViewImage extends React.Component {
 
     return (
       <Image.PreviewGroup preview={previewConfig}>
-        {items.map((item, i) => (
+        {items.map((item) => (
           <Image
             key={item.url}
             src={item.thumb}

package/src/framework/views/ViewPassword/index.tsx

@@ -16,9 +16,10 @@ export class ViewPassword extends React.Component {
         const visible = this.state.visible;
         return <Space>
             <span>{this.state.visible ? v : '******'}</span>
-            <a onClick={() => this.setState({visible: !visible})}>
+            <button type="button" style={{background: 'none', border: 'none', padding: 0, font: 'inherit', cursor: 'pointer'}}
+                    onClick={() => this.setState({visible: !visible})}>
                 {visible ? <EyeOutlined/> : <EyeInvisibleOutlined/>}
-            </a>
+            </button>
         </Space>
     }
 }

package/src/framework/views/ViewText/index.tsx

@@ -8,7 +8,7 @@ export class ViewText extends React.Component {
         modalOpen: false,
     };
 
-    static defaultProps = {
+    static readonly defaultProps = {
         ellipsis: false,
         maxLength: 15
     }
@@ -27,9 +27,18 @@ export class ViewText extends React.Component {
         const short = StringUtils.ellipsis(value, maxLength);
         return (
             <Tooltip placement="topLeft" title={value}>
-                <span style={{cursor: 'pointer', borderBottom: '1px dashed #d9d9d9'}} onClick={() => this.setState({modalOpen: true})}>
+                <button type="button"
+                        style={{
+                            background: 'none',
+                            border: 'none',
+                            borderBottom: '1px dashed #d9d9d9',
+                            padding: 0,
+                            font: 'inherit',
+                            cursor: 'pointer',
+                        }}
+                        onClick={() => this.setState({modalOpen: true})}>
                     {short}
-                </span>
+                </button>
                 <Modal open={this.state.modalOpen} title="长文本内容" width={700} footer={null}
                        onCancel={() => this.setState({modalOpen: false})}>
                     <div style={{height: 500, overflowY: 'auto'}}>{value}</div>

package/src/framework/views/types.ts

@@ -15,12 +15,10 @@ export interface ViewProps<T> {
  * 通用视图组件类类型
  * @template T - value 的类型
  */
-export interface ViewComponent<T> extends React.ComponentClass<ViewProps<T> & any> {
-}
+export type ViewComponent<T> = React.ComponentClass<ViewProps<T>>;
 
 /**
  * 通用视图组件函数类型
  * @template T - value 的类型
  */
-export interface ViewFunctionComponent<T> extends React.FC<ViewProps<T> & any> {
-}
+export type ViewFunctionComponent<T> = React.FC<ViewProps<T>>;

package/src/layouts/admin/AdminTabs.jsx

@@ -43,7 +43,16 @@ export class AdminTabs extends React.Component {
                         <div
                             key={tab.key}
                             className={`admin-tab${tab.key === activeKey ? ' active' : ''}`}
+                            role="tab"
+                            tabIndex={tab.key === activeKey ? 0 : -1}
+                            aria-selected={tab.key === activeKey}
                             onClick={() => onChange(tab.key)}
+                            onKeyDown={e => {
+                                if (e.key === 'Enter' || e.key === ' ') {
+                                    e.preventDefault();
+                                    onChange(tab.key);
+                                }
+                            }}
                             onContextMenu={e => this.handleContextMenu(e, tab.key)}
                         >
                             <span className="admin-tab-label">{tab.label}</span>

package/src/layouts/admin/AdminTabs.less

@@ -52,11 +52,11 @@
             height: 16px;
             font-size: 12px;
             border-radius: 50%;
-            color: rgba(0, 0, 0, 0.45);
+            color: rgba(0, 0, 0, 0.45); /* NOSONAR: 次要文本颜色，设计如此 */
 
             &:hover {
                 background: rgba(0, 0, 0, 0.08);
-                color: rgba(0, 0, 0, 0.88);
+                color: rgba(0, 0, 0, 0.88); /* NOSONAR: 悬停态主文本色，对比度设计如此 */
             }
         }
     }

package/src/layouts/admin/HeaderRight.jsx

@@ -1,6 +1,6 @@
 import {Avatar, Dropdown, Modal} from "antd";
 import React from "react";
-import {DeviceUtils, HttpUtils, PageUtils, GlobalData, getToken, history, EventBus, ARTICLE_HEADER_AVATAR_DROPDOWN, ARTICLE_HEADER_RIGHT} from "../../framework";
+import {DeviceUtils, HttpClient, PageUtils, GlobalData, getToken, history, EventBus, ARTICLE_HEADER_AVATAR_DROPDOWN, ARTICLE_HEADER_RIGHT} from "../../framework";
 
 export class HeaderRight extends React.Component {
 
@@ -28,10 +28,10 @@ export class HeaderRight extends React.Component {
     }
 
     logout = () => {
-        HttpUtils.post('admin/auth/logout').then(async () => {
+        HttpClient.post('admin/auth/logout', null, null, {toastError: false}).then(() => {
             localStorage.clear()
             this.setState({alertVisible: true})
-        }).catch(async e => {
+        }).catch(e => {
             console.error('[HeaderRight] 退出登录失败:', e);
             this.setState({confirmVisible: true})
         })
@@ -51,7 +51,8 @@ export class HeaderRight extends React.Component {
 
         if (this.state.isMobileDevice) {
             return <div className='header-right'>
-                <a onClick={this.logout}>退出</a>
+                <button type="button" style={{background: 'none', border: 'none', padding: 0, font: 'inherit', cursor: 'pointer'}}
+                        onClick={this.logout}>退出</button>
             </div>
         }
 
@@ -68,10 +69,10 @@ export class HeaderRight extends React.Component {
 
         return <div className='header-right'>
             {headerArticles.map(a => (
-                <div key={a.code} className='item' style={{cursor: 'pointer'}}
-                     onClick={() => this.openArticle(a.code, a.title)}>
+                <button key={a.code} type="button" className='item'
+                        onClick={() => this.openArticle(a.code, a.title)}>
                     {a.title}
-                </div>
+                </button>
             ))}
 
             <Dropdown menu={{

package/src/layouts/admin/TabLayout.jsx

@@ -34,7 +34,7 @@ export class TabLayout extends React.Component {
         const pathname = qIndex === -1 ? url : url.substring(0, qIndex);
         const search = qIndex === -1 ? '' : url.substring(qIndex);
         this.setState(prev => ({
-            tabs: prev.tabs.find(t => t.key === url) ? prev.tabs
+            tabs: prev.tabs.some(t => t.key === url) ? prev.tabs
                 : [...prev.tabs, {key: url, label: getLabel(pathname, search, this.props.pathMenuMap), refreshKey: 0}],
             activeKey: url,
         }));
@@ -42,7 +42,7 @@ export class TabLayout extends React.Component {
 
     closeTab = (key) => {
         this.setState(prev => {
-            if (!prev.tabs.find(t => t.key === key)) return null;
+            if (!prev.tabs.some(t => t.key === key)) return null;
             const next = prev.tabs.filter(t => t.key !== key);
             if (next.length === 0) {
                 setTimeout(() => history.push('/'), 0);