@jiangood/open-admin 2.0.1 → 2.2.5

package/src/.umi-production/umi.ts

@@ -11,7 +11,7 @@ import Loading from '/home/runner/work/open-admin/open-admin/web/src/loading.jsx
 import { ApplyPluginsType } from 'umi';
 import {FormRegistryUtils} from '/home/runner/work/open-admin/open-admin/web/src/framework';
 
-const publicPath = "/";
+const publicPath = "./";
 const runtimePublicPath = false;
 
 async function render() {
@@ -78,6 +78,6 @@ render();
 
     if (typeof window !== 'undefined') {
       window.g_umi = {
-        version: '4.6.55',
+        version: '4.6.57',
       };
     }

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

@@ -25,7 +25,7 @@ export class DownloadFileButton extends React.Component {
 
         return <> <Button {...rest}>{children}</Button>
 
-            <Modal title='提示' footer={null} onCancel={()=>{this.setState({open:false})}} maskClosable={false}>
+            <Modal title='提示' footer={null} mask={{closable: false}} onCancel={()=>{this.setState({open:false})}}>
                 <Spin /> 下载文件中，请勿关闭浏览器
             </Modal>
         </>

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

@@ -29,7 +29,7 @@ export class OrgTree extends React.Component<any, any> {
         }
 
         if (treeData.length === 0) {
-            return <Alert type={"warning"} message={'组织机构数据为空'}/>
+            return <Alert type={"warning"} title={'组织机构数据为空'}/>
         }
 
         return <Tree

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

@@ -2,7 +2,7 @@
   width: 100%;
 
   // header 48 footer 43, tab 36
-  height: calc(100vh - 127px);
+  height: 100%;
 
   overflow: auto;
 

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

@@ -2,29 +2,26 @@ import React from "react";
 import './index.less'
 import {ThemeUtils} from "../../utils";
 
-/**
- * 上下间隔
- */
-export class Page extends React.Component {
+interface PageProps {
+    padding?: boolean;
+    backgroundGray?: boolean;
+    debug?: boolean;
+    children?: React.ReactNode;
+}
 
-    static defaultProps = {
-        padding: false,
-        backgroundGray:false
+export const Page: React.FC<PageProps> = ({ padding = true, backgroundGray = false, debug = false, children }) => {
+    const style: React.CSSProperties = {};
+    if (padding) {
+        style.padding = 16;
     }
-
-    render() {
-        const style = {}
-        if(this.props.padding){
-            style.padding = 16
-        }
-        if(this.props.backgroundGray){
-            style.backgroundColor = ThemeUtils.getColor("background-color")
-        }
-
-
-        return <div className={'tmgg-page'}  style={style}>
-            {this.props.children}
-        </div>
+    if (backgroundGray) {
+        style.backgroundColor = ThemeUtils.getColor("background-color");
+    }
+    if (debug) {
+        style.backgroundColor = 'rgba(255, 0, 0, 0.08)';
     }
 
-}
+    return <div className={'tmgg-page'} style={style}>
+        {children}
+    </div>
+};

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

@@ -2,8 +2,8 @@ import React from "react";
 import {Alert, Spin} from "antd";
 import {ThemeUtils} from "../../utils";
 
-export function PageLoading(props: { message?: string }) {
-    const msg = props.message || '页面加载中...';
+export function PageLoading(props: { message?: string; messages?: string[] }) {
+    const titles = props.messages || (props.message ? [props.message] : ['页面加载中...']);
 
     return <div style={{
         height: '100vh', width: '100%',
@@ -15,7 +15,9 @@ export function PageLoading(props: { message?: string }) {
                 <Spin size={"large"}></Spin>
             </div>
             <div style={{marginTop: '1rem'}}>
-                <Alert title={msg}></Alert>
+                {titles.map((msg, i) => (
+                    <Alert key={i} message={msg} type="info" showIcon style={{marginBottom: i < titles.length - 1 ? 8 : 0}} />
+                ))}
             </div>
         </div>
     </div>;

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

@@ -51,8 +51,8 @@ export class ProModal extends React.Component<ProModalProps, any> {
   render() {
     return (
       <Modal
-        maskClosable={false}
-        destroyOnClose
+        mask={{ closable: false }}
+        destroyOnHidden
         title={this.props.title}
         open={this.state.visible}
         onCancel={this.hide}

package/src/framework/components/ProTable/components/ToolBar/index.tsx

@@ -55,7 +55,7 @@ export class Toolbar extends React.Component {
                       open={this.state.historyOpen}
                       onCancel={() => this.setState({historyOpen: false})}
                       footer={null}
-                      destroyOnClose
+                      destroyOnHidden
         >
 
             <Table

package/src/framework/fields/FieldEditor/index.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import {Editor as TinyMceEditor} from '@tinymce/tinymce-react';
+import {SysUtils} from '../../utils';
 
 /**
  * 富文本编辑器
@@ -8,8 +9,8 @@ import {Editor as TinyMceEditor} from '@tinymce/tinymce-react';
  */
 export class FieldEditor extends React.Component {
     render() {
-        const uploadUrl = 'admin/sysFile/upload';
-        const jsUrl = 'admin/tinymce/tinymce.min.js';
+        const uploadUrl = SysUtils.contextPath('/admin/sysFile/upload');
+        const jsUrl = SysUtils.contextPath('/admin/tinymce/tinymce.min.js');
         const {value, onChange, height} = this.props;
 
         return (

package/src/framework/fields/FieldRemoteTreeSelect/index.tsx

@@ -23,14 +23,14 @@ export class FieldRemoteTreeSelect extends BaseRemoteSelect {
             <TreeSelect
                 style={{ width: '100%', minWidth: 200 }}
                 allowClear
-                dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
+                styles={{ popup: { root: { maxHeight: 400, overflow: 'auto' } } }}
                 treeData={data}
                 showCheckedStrategy={TreeSelect.SHOW_ALL}
                 value={value || undefined}
                 onChange={onChange}
-                filterTreeNode={(inputValue, treeNode) =>
+                showSearch={{ filterTreeNode: (inputValue, treeNode) =>
                     StringUtils.contains(treeNode.title, inputValue)
-                }
+                }}
                 treeLine={{ showLeafIcon: true }}
                 treeDefaultExpandAll={treeDefaultExpandAll}
             />

package/src/framework/fields/FieldRemoteTreeSelectMultiple/index.tsx

@@ -26,15 +26,15 @@ export class FieldRemoteTreeSelectMultiple extends BaseRemoteSelect {
             <TreeSelect
                 style={style}
                 allowClear
-                dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
+                styles={{ popup: { root: { maxHeight: 400, overflow: 'auto' } } }}
                 treeData={data}
                 showCheckedStrategy={TreeSelect.SHOW_ALL}
                 value={value || undefined}
                 onChange={onChange}
                 multiple
-                filterTreeNode={(inputValue, treeNode) =>
+                showSearch={{ filterTreeNode: (inputValue, treeNode) =>
                     StringUtils.contains(treeNode.title, inputValue)
-                }
+                }}
                 treeLine={{ showLeafIcon: true }}
                 treeDefaultExpandAll={treeDefaultExpandAll}
             />

package/src/framework/fields/FieldUploadFile/index.tsx

@@ -1,9 +1,9 @@
 import React from "react";
 import ImgCrop from "antd-img-crop";
-import {Modal, Upload} from "antd";
+import {Modal, Upload, message} from "antd";
 import { UploadOutlined } from "@ant-design/icons";
 import {ViewFile} from "../../views";
-import {ObjectUtils} from "../../utils";
+import {ObjectUtils, SysUtils} from "../../utils";
 
 /**
  * 上传图片前裁切， 单张图片
@@ -33,7 +33,7 @@ export class FieldUploadFile extends React.Component {
         if (value && value.length > 0) {
             const arr = value.split(",");
             for (const id of arr) {
-                const url = 'admin/sysFile/preview/' + id;
+                const url = SysUtils.contextPath('/admin/sysFile/preview/' + id);
                 const file = {id, url, uid: id, name: id, status: 'done', fileName: id};
                 list.push(file);
             }
@@ -73,6 +73,10 @@ export class FieldUploadFile extends React.Component {
             return;
         }
 
+        if (file.status === 'done' && rs?.success) {
+            message.success(`文件「${rs.data?.name || ''}」上传成功`);
+        }
+
         this.setState({fileList});
 
         const newIds = this.convertComponentValueToOutput(fileList);
@@ -109,7 +113,7 @@ export class FieldUploadFile extends React.Component {
         const {accept, fileList, maxCount} = this.state;
 
         return <Upload
-            action={'admin/sysFile/upload'}
+            action={SysUtils.contextPath('/admin/sysFile/upload')}
             listType={this.props.listType || 'picture-card'}
             fileList={fileList}
             onChange={this.handleChange}

package/src/framework/utils/MessageUtils.tsx

@@ -1,44 +1,29 @@
 import {Form, Input, InputNumber, message, Modal} from 'antd';
 import type {ModalFuncProps} from 'antd/es/modal/interface';
 import React from 'react';
-import {MessageInstance} from "antd/lib/message/interface";
-import {HookAPI} from "antd/lib/modal/useModal";
-import {Logger} from "./Logger";
-
-
 
 /**
- * 消息工具类 (MsgUtils)
- * 封装了 Ant Design 的 Modal, message, 和 notification 静态方法
+ * 消息工具类
+ * 直接使用 Ant Design 6 的静态方法，无需 hook 初始化
  */
 export class MessageUtils {
 
-    /**
-     * 弹出 Alert 提示框
-     */
     static alert(content: any, config?: Omit<ModalFuncProps, 'content' | 'icon' | 'onOk' | 'onCancel'>) {
         return new Promise(resolve => {
-           this.modalApi.info({
+            Modal.info({
                 title: '提示',
                 content,
                 okText: '确定',
-                onOk: (close)=>{
-                    close()
-                    resolve()
-                },
+                onOk: () => resolve(),
                 icon: null,
                 ...config,
             });
         })
-
     }
 
-    /**
-     * 弹出 Confirm 确认框
-     */
     static confirm(content: React.ReactNode, config?: Omit<ModalFuncProps, 'content' | 'icon' | 'onOk' | 'onCancel'>) {
         return new Promise((resolve) => {
-            this.modalApi.confirm({
+            Modal.confirm({
                 title: '确认操作',
                 content,
                 okText: '确定',
@@ -48,29 +33,25 @@ export class MessageUtils {
                 ...config,
             });
         })
-
     }
 
-    /**
-     * 弹出 Prompt 输入框对话框, 如果默认值是数字, 则使用 InputNumber 输入框
-     */
-    static prompt(message: React.ReactNode, initialValue?: string|number, placeholder?: string, config?: Omit<ModalFuncProps, 'content' | 'title' | 'icon' | 'onOk'>) {
+    static prompt(msg: React.ReactNode, initialValue?: string | number, placeholder?: string, config?: Omit<ModalFuncProps, 'content' | 'title' | 'icon' | 'onOk'>) {
         const isNumber = typeof initialValue === 'number';
         return new Promise((resolve) => {
             const ref = React.createRef()
-            let element:any = isNumber ? <InputNumber placeholder={placeholder}/> : <Input placeholder={placeholder}/>;
-            const content:any = <div>
-                <div style={{marginBottom: 4}}>{message}</div>
+            let element: any = isNumber ? <InputNumber placeholder={placeholder}/> : <Input placeholder={placeholder}/>;
+            const content: any = <div>
+                <div style={{marginBottom: 4}}>{msg}</div>
                 <Form ref={ref}>
                     <Form.Item name='inputValue' initialValue={initialValue}>
                         {element}
                     </Form.Item>
                 </Form>
             </div>;
-            this.modalApi.confirm({
+            Modal.confirm({
                 icon: null,
                 title: '提示',
-                content:content,
+                content,
                 okText: '确定',
                 cancelText: '取消',
                 onOk: () => {
@@ -86,83 +67,24 @@ export class MessageUtils {
         })
     }
 
-    // --- Antd message 封装 (全局通知/Loading) ---
-
-    /**
-     * 成功消息
-     */
-    static success(content: String, duration: number = 3) {
-        if(!this.messageApi){
-            alert(content)
-            return
-        }
-        this.messageApi.success(content, duration);
+    static success(content: string, duration: number = 3) {
+        message.success(content, duration);
     }
 
-    /**
-     * 错误消息
-     */
-    static error(content: String, duration: number = 3) {
-        if(!this.messageApi){
-            alert(content)
-            return
-        }
-        this.messageApi.error(content, duration);
+    static error(content: string, duration: number = 3) {
+        message.error(content, duration);
     }
 
-    /**
-     * 警告消息
-     */
-    static warning(content: String, duration: number = 3) {
-        if(!this.messageApi){
-            alert(content)
-            return
-        }
-        this.messageApi.warning(content, duration);
+    static warning(content: string, duration: number = 3) {
+        message.warning(content, duration);
     }
 
-    /**
-     * 通用消息
-     */
     static info(content: React.ReactNode, duration: number = 3) {
-        if(!this.messageApi){
-            alert(content)
-            return
-        }
-        this.messageApi.info(content, duration);
+        message.info(content, duration);
     }
 
-    /**
-     * 弹出 Loading 提示
-     */
     static loading(content: string = '正在加载...', duration?: number) {
-         duration = duration === undefined ? 0 : duration;
-        return this.messageApi.loading(content, duration);
+        duration = duration === undefined ? 0 : duration;
+        return message.loading(content, duration);
     }
-
-    static config(messageApi: MessageInstance, modalApi: HookAPI) {
-        this.messageApi = messageApi;
-        this.modalApi = modalApi;
-    }
-
-    private static modalApi:HookAPI = null;
-    private static messageApi:MessageInstance = null;
-}
-
-/**
- * antd6 推荐使用这个hooks，这里统一设置， 供公共layout使用
- * @constructor
- */
-export function MessageHolder(props){
-    const [modalApi, modalContextHolder] = Modal.useModal();
-    const [messageApi, messageContextHolder] = message.useMessage();
-
-    React.useEffect(()=>{
-        Logger.getLogger("MessageHolder").debug('Rendered')
-        MessageUtils.config(messageApi,modalApi);
-        props.onFinish()
-    },[])
-    return <>
-        {modalContextHolder} {messageContextHolder}
-    </>
-}
+}

package/src/framework/utils/system/HttpUtils.ts

@@ -6,6 +6,7 @@ import {MessageUtils} from "../MessageUtils";
 
 
 const axiosInstance = axios.create({
+    baseURL: (typeof SERVLET_CONTEXT !== 'undefined' && SERVLET_CONTEXT) || '',
     withCredentials: true,
     headers: {
         'Content-Type': 'application/json'
@@ -35,7 +36,7 @@ export class HttpUtils {
         config.url = url.startsWith('admin') ? '/' + url : url;
 
         return new Promise((resolve, reject) => {
-            axios(config).then((response: AxiosResponse) => {
+            axiosInstance(config).then((response: AxiosResponse) => {
                 const body = response.data;
                 // 假设后端响应结构为 { success: boolean | null, message: string, data: any, code: number }
                 let {success, message, data} = body;
@@ -45,6 +46,7 @@ export class HttpUtils {
                 }
 
                 if (!success) {
+                    console.error(`[HttpUtils] 请求失败: ${url}`, {code: body.code, message, data: body});
                     MessageUtils.error(message || '操作失败');
                     reject('操作失败');
                     return
@@ -57,6 +59,7 @@ export class HttpUtils {
                 resolve(transformData ? data : response);
             }).catch((e: unknown) => {
                 // 统一异常处理
+                console.error(`[HttpUtils] 请求异常: ${url}`, e);
                 let msg = '操作失败';
 
                 if (axios.isAxiosError(e)) {
@@ -238,6 +241,7 @@ export class HttpUtils {
             const response = await HttpUtils.coreRequest(downloadConfig, false) as AxiosResponse;
             await HttpUtils.handleDownloadBlob(response);
         } catch (error) {
+            console.error('[HttpUtils] 下载文件失败:', error);
             // coreRequest已经处理了401、504和通用的错误提示
             return Promise.reject(error);
         }

package/src/framework/utils/system/SysUtils.ts

@@ -89,6 +89,14 @@ export class SysUtils {
     public static getDictInfo(): DictInfo {
         return StorageUtils.get(DICT_INFO_KEY);
     }
+
+    /**
+     * 拼接 servlet context-path，例如 contextPath('/admin/auth/login') → '/open-admin/admin/auth/login'
+     */
+    public static contextPath(path: string): string {
+        const base = (typeof SERVLET_CONTEXT !== 'undefined' && SERVLET_CONTEXT) || '';
+        return base + path;
+    }
 }
 
 // 导出常量（保持不变，但通常将常量放在类内部作为 static readonly 属性更符合 class 模式，

package/src/framework/utils/system/ThemeUtils.ts

@@ -1,25 +1,50 @@
-/**
- * 主题相关的工具类
- */
+import {ColorsUtils} from '../ColorsUtils';
+
+declare const OPEN_ADMIN_THEME: Record<string, string> | undefined;
+
 export class ThemeUtils {
-    // 使用 readonly 属性来定义主题常量，保持其不可变性
-    public static readonly theme = {
+    private static readonly defaultTheme: Record<string, string> = {
         "primary-color": "#1961AC",
         "success-color": "#52c41a",
         "warning-color": "#faad14",
         "error-color": "#ff4d4f",
         "background-color": "#f5f5f5",
-
         "primary-color-hover": "#4990CD",
         "primary-color-click": "#124B93"
     };
 
-    /**
-     * @description 可选：提供一个获取主题颜色的静态方法，增强工具类的可用性
-     * @param key 主题颜色键名
-     * @returns 对应的颜色值，如果键名不存在则返回undefined
-     */
-    public static getColor(key: keyof typeof ThemeUtils.theme): string | undefined {
+    private static cachedTheme: Record<string, string> | null = null;
+
+    static get theme(): Record<string, string> {
+        if (this.cachedTheme) return this.cachedTheme;
+        this.cachedTheme = this.loadTheme();
+        return this.cachedTheme;
+    }
+
+    private static loadTheme(): Record<string, string> {
+        let custom: Record<string, string> = {};
+        try {
+            if (typeof OPEN_ADMIN_THEME !== 'undefined' && OPEN_ADMIN_THEME) {
+                custom = OPEN_ADMIN_THEME;
+            }
+        } catch {}
+
+        const result = {...this.defaultTheme, ...custom};
+
+        // Auto-derive hover/click from primary if not explicitly set
+        if (custom["primary-color"]) {
+            if (!custom["primary-color-hover"]) {
+                result["primary-color-hover"] = ColorsUtils.lighten(result["primary-color"], 20);
+            }
+            if (!custom["primary-color-click"]) {
+                result["primary-color-click"] = ColorsUtils.lighten(result["primary-color"], -10);
+            }
+        }
+
+        return result;
+    }
+
+    public static getColor(key: string): string | undefined {
         return ThemeUtils.theme[key];
     }
 }

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

@@ -41,7 +41,7 @@ export class ViewFile extends React.Component {
         });
 
         return <div style={{height}}>
-            <Carousel dotPosition={"top"}>
+            <Carousel dotPlacement={"top"}>
                 {iframeList}
             </Carousel>
         </div>

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

@@ -32,6 +32,7 @@ export class ViewProcessInstanceProgress extends React.Component {
             this.setState(rs)
             this.setState({data: rs})
         }).catch(e => {
+            console.error('[ViewProcessInstanceProgress] 加载流程实例失败:', e);
             this.setState({errorMsg: e})
         }).finally(() => {
             this.setState({loading: false})

package/src/layouts/PageRender.tsx

@@ -0,0 +1,29 @@
+import {matchRoutes, useAppData} from "umi";
+import {Result} from "antd";
+
+interface PageRenderProps {
+    pathname: string;
+}
+
+/**
+ * 通过指定 pathname 渲染页面
+ */
+export function PageRender({pathname}: PageRenderProps) {
+    const appData = useAppData()
+    const matchArr = matchRoutes(appData.clientRoutes, pathname)
+
+    if (matchArr != null) {
+        const matchResult = matchArr[matchArr.length - 1].route
+        if (matchResult && matchResult.element) {
+            return matchResult.element
+        }
+    }
+
+    return (
+        <Result
+            status={404}
+            title='页面不存在！'
+            subTitle={<div>路由地址：{pathname}</div>}
+        />
+    )
+}

package/src/layouts/admin/HeaderRight.jsx

@@ -27,6 +27,7 @@ export class HeaderRight extends React.Component {
             await MessageUtils.alert('退出登录成功');
             history.replace('/login')
         }).catch(async e => {
+            console.error('[HeaderRight] 退出登录失败:', e);
             const confirm = await MessageUtils.confirm('退出登录失败，是否清空缓存');
             if (confirm) {
                 localStorage.clear();