@jiangood/open-admin 2.5.9 → 3.0.1

package/src/framework/utils/{ArrayUtils.js → ArrayUtils.ts}

@@ -1,18 +1,18 @@
 export class ArrayUtils {
-    static contains(arr, item) {
+    static contains<T>(arr: T[], item: T): boolean {
         return arr.indexOf(item) !== -1;
     }
 
-    static containsAny(arr, ...items) {
+    static containsAny<T>(arr: T[], ...items: T[]): boolean {
         for (const item of items) {
             if (ArrayUtils.contains(arr, item)) return true;
         }
         return false;
     }
 
-    static maxBy(arr, key) {
+    static maxBy<T extends Record<K, any>, K extends keyof T>(arr: T[], key: K): T | undefined {
         if (arr == null || arr.length === 0) return undefined;
-        let maxElement = undefined;
+        let maxElement: T | undefined = undefined;
         let maxValue = -Infinity;
         for (const element of arr) {
             const value = element[key];
@@ -24,7 +24,7 @@ export class ArrayUtils {
         return maxElement;
     }
 
-    static unique(arr) {
+    static unique<T>(arr: T[]): T[] {
         return [...new Set(arr)];
     }
 }

package/src/framework/utils/{DateUtils.js → DateUtils.ts}

@@ -1,7 +1,7 @@
 import {StringUtils} from './StringUtils';
 
 export class DateUtils {
-    static convertTypeToFormat(type) {
+    static convertTypeToFormat(type: string): string {
         if (type === 'YEAR') type = 'YYYY';
         else if (type === 'YEAR_MONTH') type = 'YYYY-MM';
         else if (type === 'YEAR_QUARTER') type = 'YYYY-QQ';
@@ -9,35 +9,35 @@ export class DateUtils {
         return type;
     }
 
-    static year(date) { return date.getFullYear(); }
-    static month(date) { return StringUtils.pad(date.getMonth() + 1, 2); }
-    static date(date) { return StringUtils.pad(date.getDate(), 2); }
-    static hour(date) { return StringUtils.pad(date.getHours(), 2); }
-    static minute(date) { return StringUtils.pad(date.getMinutes(), 2); }
-    static second(date) { return StringUtils.pad(date.getSeconds(), 2); }
+    static year(date: Date): number { return date.getFullYear(); }
+    static month(date: Date): string { return StringUtils.pad(date.getMonth() + 1, 2); }
+    static date(date: Date): string { return StringUtils.pad(date.getDate(), 2); }
+    static hour(date: Date): string { return StringUtils.pad(date.getHours(), 2); }
+    static minute(date: Date): string { return StringUtils.pad(date.getMinutes(), 2); }
+    static second(date: Date): string { return StringUtils.pad(date.getSeconds(), 2); }
 
-    static formatDate(d) {
+    static formatDate(d: Date): string {
         return this.year(d) + '-' + this.month(d) + '-' + this.date(d);
     }
 
-    static formatTime(d) {
+    static formatTime(d: Date): string {
         return this.hour(d) + ':' + this.minute(d) + ':' + this.second(d);
     }
 
-    static formatDateTime(d) {
+    static formatDateTime(d: Date): string {
         return this.formatDate(d) + ' ' + this.formatTime(d);
     }
 
-    static formatDateCn(d) {
+    static formatDateCn(d: Date): string {
         return this.year(d) + '年' + (d.getMonth() + 1) + '月' + d.getDate() + '日';
     }
 
-    static now() { return this.formatDateTime(new Date()); }
-    static today() { return this.formatDate(new Date()); }
-    static thisYear() { return this.year(new Date()); }
-    static thisMonth() { return this.month(new Date()); }
+    static now(): string { return this.formatDateTime(new Date()); }
+    static today(): string { return this.formatDate(new Date()); }
+    static thisYear(): number { return this.year(new Date()); }
+    static thisMonth(): string { return this.month(new Date()); }
 
-    static friendlyTime(pastDate) {
+    static friendlyTime(pastDate: Date | string | number): string | undefined {
         if (pastDate == null) return undefined;
         if (!(pastDate instanceof Date)) pastDate = new Date(pastDate);
         const currentDate = new Date();
@@ -59,9 +59,9 @@ export class DateUtils {
         return `${elapsedSeconds} 秒${suffix}`;
     }
 
-    static friendlyTotalTime(time) {
+    static friendlyTotalTime(time: number | string | null): string | null {
         if (time == null || time === '-') return null;
-        let seconds;
+        let seconds: number;
         if (typeof time === 'string') seconds = parseInt(time, 10) / 1000;
         else seconds = time / 1000;
         seconds = Math.floor(seconds);
@@ -73,7 +73,7 @@ export class DateUtils {
         return min + '分' + seconds + '秒';
     }
 
-    static beginOfMonth() {
+    static beginOfMonth(): string {
         const d = new Date();
         d.setDate(1);
         return this.formatDate(d);

package/src/framework/utils/{DeviceUtils.js → DeviceUtils.ts}

@@ -1,6 +1,13 @@
+declare global {
+    interface Window {
+        opera?: string;
+        MSStream?: unknown;
+    }
+}
+
 export class DeviceUtils {
 
-    static isMobileDevice() {
+    static isMobileDevice(): boolean {
         const userAgent = navigator?.userAgent || navigator?.vendor || window?.opera || '';
         if (/windows phone/i.test(userAgent)) return true;
         if (/android/i.test(userAgent)) return true;

package/src/framework/utils/{EventBus.js → EventBus.ts}

@@ -1,7 +1,14 @@
+type EventCallback = (...args: any[]) => void;
+
+interface EventEntry {
+    fn: EventCallback & { __callback?: EventCallback };
+    ctx?: any;
+}
+
 export class EventBus {
-    static __stack = {};
+    private static __stack: Record<string, EventEntry[]> = {};
 
-    static on(name, callback, ctx) {
+    static on<T extends any[] = []>(name: string, callback: (...args: T) => void, ctx?: any): () => void {
         if (!EventBus.__stack[name]) {
             EventBus.__stack[name] = [];
         }
@@ -9,9 +16,9 @@ export class EventBus {
         return () => EventBus.off(name, callback);
     }
 
-    static once(name, callback, ctx) {
+    static once<T extends any[] = []>(name: string, callback: (...args: T) => void, ctx?: any): () => void {
         const unsubscribe = () => EventBus.off(name, callback);
-        const listener = (...args) => {
+        const listener: EventEntry['fn'] = (...args: any[]) => {
             EventBus.off(name, listener);
             callback.apply(ctx, args);
         };
@@ -21,7 +28,7 @@ export class EventBus {
         return unsubscribe;
     }
 
-    static emit(name, ...args) {
+    static emit<T extends any[] = []>(name: string, ...args: T): void {
         const list = EventBus.__stack[name];
         if (list !== undefined) {
             list.slice(0).forEach(entry => {
@@ -30,7 +37,7 @@ export class EventBus {
         }
     }
 
-    static off(name, callback) {
+    static off<T extends any[] = []>(name: string, callback?: (...args: T) => void): void {
         const list = EventBus.__stack[name];
         if (list === undefined) return;
         if (callback === undefined) {

package/src/framework/utils/MessageApi.ts

@@ -0,0 +1,5 @@
+import {message} from 'antd';
+
+export function getMessageApi() {
+    return message;
+}

package/src/framework/utils/ModalApi.ts

@@ -0,0 +1,5 @@
+import {Modal} from 'antd';
+
+export function getModalApi() {
+    return Modal;
+}

package/src/framework/utils/ObjectUtils.ts

@@ -0,0 +1,15 @@
+export class ObjectUtils {
+
+    static copyPropertyIfPresent<TSource extends object, TTarget extends object>(
+        source: TSource | null | undefined,
+        target: TTarget | null | undefined
+    ): void {
+        if (!source || !target || typeof source !== 'object' || typeof target !== 'object') return;
+        const keys = Object.keys(target);
+        for (const key of keys) {
+            if (Object.hasOwn(source, key)) {
+                (target as Record<string, unknown>)[key] = (source as Record<string, unknown>)[key];
+            }
+        }
+    }
+}

package/src/framework/utils/{StorageUtils.js → StorageUtils.ts}

@@ -6,11 +6,11 @@ export class StorageUtils {
 
     /**
      * 从 localStorage 获取数据。
-     * @param {string} key 存储的键。
-     * @param {*} [defaultValue=null] 如果找不到键或值，返回的默认值。
-     * @returns {*} 存储的值或默认值。
+     * @param key 存储的键。
+     * @param defaultValue 如果找不到键或值，返回的默认值。
+     * @returns 存储的值或默认值。
      */
-    static get(key, defaultValue = null) {
+    static get<T>(key: string, defaultValue: T | null = null): T | null {
         const vStr = localStorage.getItem(key);
         if (vStr == null) {
             return defaultValue;
@@ -27,10 +27,10 @@ export class StorageUtils {
     /**
      * 将数据存储到 localStorage。
      * 如果值为 null 或 undefined，则删除该键。
-     * @param {string} key 存储的键。
-     * @param {*} value 要存储的值。
+     * @param key 存储的键。
+     * @param value 要存储的值。
      */
-    static set(key, value) {
+    static set<T>(key: string, value: T | null | undefined): void {
         if (value == null) {
             localStorage.removeItem(key);
             return;

package/src/framework/utils/{StringUtils.js → StringUtils.ts}

@@ -1,22 +1,22 @@
 export class StringUtils {
 
-    static ISO_SPLITTER = "/";
+    static readonly ISO_SPLITTER: string = "/";
 
-    static removePrefix(str, ch) {
+    static removePrefix(str: string | null | undefined, ch: string): string {
         if (str != null && str.startsWith(ch)) {
             return str.substring(ch.length);
         }
         return str ?? '';
     }
 
-    static removeSuffix(str, ch) {
+    static removeSuffix(str: string | null | undefined, ch: string): string {
         if (str != null && str.endsWith(ch)) {
             return str.substring(0, str.length - ch.length);
         }
         return str ?? '';
     }
 
-    static random(length) {
+    static random(length: number): string {
         const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
         let result = '';
         for (let i = 0; i < length; i++) {
@@ -25,30 +25,30 @@ export class StringUtils {
         return result;
     }
 
-    static contains(str, subStr) {
+    static contains(str: string | null | undefined, subStr: string): boolean {
         if (!str) return false;
         return str.includes(subStr);
     }
 
-    static subAfter(source, str) {
+    static subAfter(source: string | null | undefined, str: string): string {
         if (source == null) return '';
         const index = source.indexOf(str);
         return index === -1 ? source : source.substring(index + str.length);
     }
 
-    static subAfterLast(source, str) {
+    static subAfterLast(source: string | null | undefined, str: string): string {
         if (source == null) return '';
         const index = source.lastIndexOf(str);
         return index === -1 ? source : source.substring(index + str.length);
     }
 
-    static subBefore(str, sub) {
+    static subBefore(str: string | null | undefined, sub: string): string {
         if (str == null) return "";
         const index = str.indexOf(sub);
         return index === -1 ? str : str.substring(0, index);
     }
 
-    static pad(input, totalLen, padChar = '0') {
+    static pad(input: string | number | null | undefined, totalLen: number, padChar = '0'): string {
         if (input == null) return padChar.repeat(totalLen);
         let str = String(input);
         const charsNeeded = totalLen - str.length;
@@ -58,7 +58,7 @@ export class StringUtils {
         return str;
     }
 
-    static getWidth(str) {
+    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);
@@ -66,7 +66,7 @@ export class StringUtils {
         }, 0);
     }
 
-    static cutByWidth(str, maxWidth) {
+    static cutByWidth(str: string, maxWidth: number): string {
         let showLength = 0;
         return str.split('').reduce((pre, cur) => {
             const charCode = cur.charCodeAt(0);
@@ -79,7 +79,7 @@ export class StringUtils {
         }, '');
     }
 
-    static ellipsis(str, len, suffix = '...') {
+    static ellipsis(str: string | null | undefined, len: number, suffix = '...'): string {
         if (str == null) return '';
         if (!StringUtils.isString(str)) return '';
         if (str.length * 2 < len) return str;
@@ -88,17 +88,17 @@ export class StringUtils {
         return StringUtils.cutByWidth(str, len) + suffix;
     }
 
-    static isString(value) {
+    static isString(value: any): value is string {
         return typeof value === 'string';
     }
 
-    static split(str, sp) {
+    static split(str: any, sp: string): string[] {
         if (str == null || str.length === 0) return [];
         if (Array.isArray(str)) return str;
         return str.split(sp);
     }
 
-    static join(arr, sp) {
+    static join(arr: any, sp: string): string {
         if (arr == null || !Array.isArray(arr)) {
             return '';
         }

package/src/framework/utils/{TreeUtils.js → TreeUtils.ts}

@@ -1,19 +1,26 @@
+export interface TreeNode<T = any> {
+    id: string | number;
+    pid: string | number | null;
+    children?: TreeNode<T>[];
+    [key: string]: any;
+}
+
 export class TreeUtils {
-    static walk(tree, callback) {
+    static walk<T extends TreeNode>(tree: T[], callback: (node: T) => void): void {
         if (tree == null) return;
         for (const node of tree) {
             callback(node);
             if (node.children && node.children.length > 0) {
-                TreeUtils.walk(node.children, callback);
+                TreeUtils.walk(node.children as T[], callback);
             }
         }
     }
 
-    static findByKey(key, list, keyName = 'id') {
+    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] === key) return item;
+            if (item[keyName as keyof T] === key) return item;
             if (item.children && item.children.length) {
-                const rs = TreeUtils.findByKey(key, item.children, keyName);
+                const rs = TreeUtils.findByKey(key, item.children as T[], keyName);
                 if (rs) return rs;
             }
         }
@@ -21,9 +28,9 @@ export class TreeUtils {
     }
 
     /** @private */
-    static getChildRecursive(treeNode, buffer) {
+    static getChildRecursive<T extends TreeNode>(treeNode: T, buffer: T[]): T[] {
         if (treeNode.children != null && treeNode.children.length > 0) {
-            treeNode.children.forEach((c) => {
+            (treeNode.children as T[]).forEach((c) => {
                 buffer.push(c);
                 TreeUtils.getChildRecursive(c, buffer);
             });
@@ -31,8 +38,8 @@ export class TreeUtils {
         return buffer;
     }
 
-    static flattenTree(treeNodeList) {
-        const buffer = [];
+    static flattenTree<T extends TreeNode>(treeNodeList: T[]): T[] {
+        const buffer: T[] = [];
         if (treeNodeList != null) {
             treeNodeList.forEach((t) => {
                 buffer.push(t);
@@ -42,16 +49,16 @@ export class TreeUtils {
         return buffer;
     }
 
-    static getKeyList(tree, value) {
+    static getKeyList<T extends TreeNode>(tree: T[], value: string | number): (string | number)[] {
         const list = TreeUtils.flattenTree(tree);
-        const map = new Map();
+        const map = new Map<string | number, T>();
         list.forEach((t) => {
             const key = t.key || t.id;
             map.set(key, t);
         });
         const targetNode = map.get(value);
         if (targetNode == null) return [];
-        const keys = [targetNode.key || targetNode.id];
+        const keys: (string | number)[] = [targetNode.key || targetNode.id];
         let parentKey = targetNode.parentKey || targetNode.pid;
         while (parentKey != null) {
             const parent = map.get(parentKey);

package/src/framework/utils/{UrlUtils.js → UrlUtils.ts}

@@ -1,8 +1,8 @@
 import {StringUtils} from './StringUtils';
 
 export class UrlUtils {
-    static getParams(url = null) {
-        let targetUrl;
+    static getParams(url: string | null = null): Record<string, string> {
+        let targetUrl: string;
         if (url === null || url === undefined) {
             targetUrl = location.href;
         } else {
@@ -12,21 +12,21 @@ export class UrlUtils {
         if (!StringUtils.contains(targetUrl, '?')) return {};
         const search = StringUtils.subAfter(targetUrl, '?');
         const params = new URLSearchParams(search);
-        const result = {};
+        const result: Record<string, string> = {};
         for (const [key, value] of params.entries()) {
             result[key] = value;
         }
         return result;
     }
 
-    static getPathname(url) {
+    static getPathname(url: string | null | undefined): string | null {
         if (!url) return null;
         return StringUtils.subBefore(url, '?');
     }
 
-    static paramsToSearch(params) {
+    static paramsToSearch(params: Record<string, string | number | boolean | null | undefined> | null | undefined): string {
         if (!params) return "";
-        const buffer = [];
+        const buffer: string[] = [];
         for (const k in params) {
             if (Object.prototype.hasOwnProperty.call(params, k)) {
                 const v = params[k];
@@ -38,7 +38,7 @@ export class UrlUtils {
         return buffer.join('&');
     }
 
-    static setParam(url, key, value) {
+    static setParam(url: string, key: string, value: string | number | boolean | null | undefined): string {
         const currentParams = this.getParams(url);
         if (value === null || value === undefined) {
             delete currentParams[key];
@@ -56,7 +56,7 @@ export class UrlUtils {
     /**
      * 根据当前页面协议和主机名构建 WebSocket 基础 URL
      */
-    static getWebsocketBaseUrl() {
+    static getWebsocketBaseUrl(): string {
         const protocol = location.protocol === 'http:' ? 'ws:' : 'wss:';
         return `${protocol}//${location.host}`;
     }
@@ -64,8 +64,8 @@ export class UrlUtils {
     /**
      * 为路径添加 SERVLET_CONTEXT 前缀
      */
-    static contextPath(path) {
-        const base = (typeof SERVLET_CONTEXT !== 'undefined' && SERVLET_CONTEXT) || '';
+    static contextPath(path: string): string {
+        const base = import.meta.env.VITE_SERVER_SERVLET_CONTEXT_PATH;
         return base + path;
     }
 }

package/src/framework/utils/index.ts

@@ -8,4 +8,5 @@ export * from './StorageUtils'
 export * from './DeviceUtils'
 export * from './ObjectUtils'
 export * from './system'
-export * from './MessageUtils'
+export * from './MessageApi'
+export * from './ModalApi'

package/src/framework/utils/system/{DictUtils.js → DictUtils.ts}

@@ -2,25 +2,37 @@ import {GlobalData} from '../../GlobalData';
 import {Tag} from 'antd';
 import React from 'react';
 
+export interface DictItem {
+    code: string | number;
+    label: string;
+    color?: string;
+    typeCode?: string;
+}
+
+export interface DictOption {
+    value: string | number;
+    label: string;
+}
+
 export class DictUtils {
-    static dictList(code) {
+    static dictList(code: string): DictItem[] {
         const info = GlobalData.getDictInfo();
         if (!info) return [];
         return info.filter(e => e.typeCode === code);
     }
 
-    static dictOptions(typeCode) {
+    static dictOptions(typeCode: string): DictOption[] {
         const list = DictUtils.dictList(typeCode);
         return list.map(i => ({ value: i.code, label: i.label }));
     }
 
-    static dictLabel(typeCode, code) {
+    static dictLabel(typeCode: string, code: string | number): string | undefined {
         const items = DictUtils.dictList(typeCode);
         const item = items.find(i => i.code === code);
         return item ? item.label : undefined;
     }
 
-    static dictTag(typeCode, code) {
+    static dictTag(typeCode: string, code: string | number): React.ReactElement | string | null {
         if (typeCode == null || code == null) return null;
         const item = DictUtils.dictList(typeCode).find(i => i.code === code);
         if (item == null) return null;

package/src/framework/utils/system/{HttpUtils.js → HttpUtils.ts}

@@ -1,59 +1,63 @@
 import axios from "axios";
+import type {AxiosRequestConfig} from "axios";
 import qs from 'qs';
 import {PageUtils} from "./PageUtils";
-import {MessageUtils} from "../MessageUtils";
+import {message as messageApi} from "antd";
+import {EventBus} from "../EventBus";
+
+interface RequestOptions extends AxiosRequestConfig {
+    showError?: boolean;
+}
 
 const axiosInstance = axios.create({
-    baseURL: (typeof SERVLET_CONTEXT !== 'undefined' && SERVLET_CONTEXT) || '',
+    baseURL: import.meta.env.VITE_SERVER_SERVLET_CONTEXT_PATH,
     withCredentials: true,
     headers: { 'Content-Type': 'application/json' },
-    paramsSerializer: (params) => qs.stringify(params, {indices: false})
+    paramsSerializer: (params: Record<string, unknown>) => qs.stringify(params, {indices: false})
 });
 
 export class HttpUtils {
-    static coreRequest(config, transformData = true) {
-        const url = config.url;
+    static coreRequest<T = any>(config: RequestOptions, transformData = true): Promise<T> {
+        const url = config.url as string;
         config.url = url.startsWith('admin') ? '/' + url : url;
 
-        return new Promise((resolve, reject) => {
+        return new Promise<T>((resolve, reject) => {
             axiosInstance(config).then((response) => {
                 const body = response.data;
                 let {success, message, data} = body;
                 if (success == undefined) {
-                    resolve(response);
+                    resolve(response as unknown as T);
                     return;
                 }
                 if (!success) {
                     console.error(`[HttpUtils] 请求失败: ${url}`, {code: body.code, message, data: body});
                     if (config.showError !== false) {
-                        MessageUtils.error(message || '操作失败');
+                        messageApi.error(message || '操作失败');
                     }
                     reject(message || '操作失败');
                     return;
                 }
                 if (message) {
-                    MessageUtils.success(message);
+                    messageApi.success(message);
                 }
-                resolve(transformData ? data : response);
+                resolve((transformData ? data : response) as T);
             }).catch((e) => {
                 console.error(`[HttpUtils] 请求异常: ${url}`, e);
                 if (axios.isAxiosError(e) && e.response?.status === 401) {
-                    MessageUtils.confirm('登录已过期，请重新登录').then(() => {
-                        PageUtils.redirectToLogin();
-                    });
+                    EventBus.emit('loginExpired');
                     reject('登录过期');
                     return;
                 }
                 const msg = HttpUtils.extractErrorMessage(e);
                 if (config.showError !== false) {
-                    MessageUtils.error(msg);
+                    messageApi.error(msg);
                 }
                 reject(msg);
             });
         });
     }
 
-    static extractErrorMessage(e, defaultMsg = '操作失败') {
+    static extractErrorMessage(e: unknown, defaultMsg = '操作失败'): string {
         if (axios.isAxiosError(e)) {
             const responseData = e.response?.data;
             const status = e.response?.status;
@@ -66,16 +70,16 @@ export class HttpUtils {
         return defaultMsg;
     }
 
-    static get(url, params = null, options = {}) {
-        return HttpUtils.coreRequest({...options, url, method: 'GET', params});
+    static get<T = any>(url: string, params: any = null, options: Partial<RequestOptions> = {}): Promise<T> {
+        return HttpUtils.coreRequest<T>({...options, url, method: 'GET', params});
     }
 
-    static post(url, data = null, params = null, options = {}) {
-        return HttpUtils.coreRequest({...options, url, method: 'POST', data, params});
+    static post<T = any>(url: string, data: any = null, params: any = null, options: Partial<RequestOptions> = {}): Promise<T> {
+        return HttpUtils.coreRequest<T>({...options, url, method: 'POST', data, params});
     }
 
-    static postForm(url, data, options = {}) {
-        return HttpUtils.coreRequest({
+    static postForm<T = any>(url: string, data: any, options: Partial<RequestOptions> = {}): Promise<T> {
+        return HttpUtils.coreRequest<T>({
             ...options,
             url,
             method: 'POST',