@jiangood/open-admin 2.0.1 → 2.2.4

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/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/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/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;

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/layouts/PageRender.d.ts

@@ -1,22 +1,7 @@
-// @ts-ignore
 import React from "react";
 
 declare type PageRenderProps = {
-
-   /**
-    * 路径 如 /flowable/task/form
-    */
-   pathname: string;
-   /***
-    * 搜索参数 如 /?id=1
-    */
-   search?:string;
-
-   /***
-    *   是否把location信息透传到真正页面
-    */
-   passLocation?: boolean
+    pathname: string;
 };
 
-export class PageRender extends React.Component<PageRenderProps, any> {
-}
+export declare function PageRender(props: PageRenderProps): React.JSX.Element;

package/src/layouts/PageRender.jsx

@@ -1,90 +1,28 @@
 import {matchRoutes, useAppData} from "umi";
 import React from "react";
 import {Result} from "antd";
-import {UrlUtils} from "../framework";
 
 /**
  * 通过指定 pathname 渲染页面
- * @param props
- * 为了规范，接收参数何router保持一致，
- * pathname： 路径 如 /flowable/task/form
- * search：搜索参数 如 /?id=1
- *
- * passLocation: 是否把location信息透传到真正页面
- *
- * @returns {React.JSX.Element|*}
- * @constructor
+ * @param {object} props
+ * @param {string} props.pathname - 路径 如 /flowable/task/form
  */
-
-let APP_DATA_CACHE = null
-
-
-/**
- * 写函数组件主要为了使用hooks
- * @param props
- * @returns {Element}
- * @constructor
- */
-export  function PageRender(props) {
-    const {pathname, search, passLocation} = props
-
-    let appData = useAppData()
-    if(Object.keys(appData).length === 0){
-        appData = APP_DATA_CACHE
-    }else {
-        APP_DATA_CACHE = appData;
-    }
-
-    return <_PageRender appData={appData}  pathname={pathname} search={search}
-                        passLocation={passLocation}/>
-}
-
-class _PageRender extends React.Component {
-
-    render() {
-        if (this.props.passLocation) {
-            return this.passLocationRender()
+export function PageRender({pathname}) {
+    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 this.defaultRender()
     }
 
-    passLocationRender = () => {
-        const {pathname, search,  appData} = this.props
-
-        const map = appData.routeComponents
-        const key = pathname.substring(1); // 移除第一个斜杠
-        const componentType = map[key] || map[key + '/index']
-        if (componentType) {
-            const params =search ? UrlUtils.getParams(search): {}
-            const location = {pathname, search, params}
-            return React.createElement(componentType, {location});
-        }
-    };
-
-
-    defaultRender = () => {
-        const {pathname, appData} = this.props
-        const matchArr = matchRoutes(appData.clientRoutes, pathname)
-
-        if (matchArr != null) {
-            if (pathname === '/') {
-                // 匹配结果为1，表示未定义index.jsx ，导致死循环
-                if (matchArr.length === 1) { // 如果项目中没有定义index.jsx
-                    return <Result icon={null} title='未定义首页'></Result>
-                }
-            }
-            // 取最匹配的那个
-            const mathResult = matchArr[matchArr.length - 1].route
-            if(mathResult){
-                return mathResult.element;
-            }
-        }
-
-        // 如果实在找不到页面组件，则404
-        return <Result
+    return (
+        <Result
             status={404}
             title='页面不存在！'
             subTitle={<div>路由地址：{pathname}</div>}
         />
-    };
-}
+    )
+}