@jiangood/open-admin 2.2.4 → 2.2.5

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/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/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/utils/system/HttpUtils.ts

@@ -46,6 +46,7 @@ export class HttpUtils {
                 }
 
                 if (!success) {
+                    console.error(`[HttpUtils] 请求失败: ${url}`, {code: body.code, message, data: body});
                     MessageUtils.error(message || '操作失败');
                     reject('操作失败');
                     return
@@ -58,6 +59,7 @@ export class HttpUtils {
                 resolve(transformData ? data : response);
             }).catch((e: unknown) => {
                 // 统一异常处理
+                console.error(`[HttpUtils] 请求异常: ${url}`, e);
                 let msg = '操作失败';
 
                 if (axios.isAxiosError(e)) {
@@ -239,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/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.jsx → PageRender.tsx}

@@ -1,13 +1,14 @@
 import {matchRoutes, useAppData} from "umi";
-import React from "react";
 import {Result} from "antd";
 
+interface PageRenderProps {
+    pathname: string;
+}
+
 /**
  * 通过指定 pathname 渲染页面
- * @param {object} props
- * @param {string} props.pathname - 路径 如 /flowable/task/form
  */
-export function PageRender({pathname}) {
+export function PageRender({pathname}: PageRenderProps) {
     const appData = useAppData()
     const matchArr = matchRoutes(appData.clientRoutes, pathname)
 
@@ -25,4 +26,4 @@ export function PageRender({pathname}) {
             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();

package/src/layouts/admin/index.jsx

@@ -197,7 +197,8 @@ export default class extends React.Component {
                     menu.icon = <Badge dot count={rs} size={"small"}>{menu.icon}</Badge>
                     this.setState({menuTree: [...menuTree]})
                 }
-
+            }).catch(e => {
+                console.error('[Layout] 加载消息数失败:', e);
             })
         }
     };
@@ -206,7 +207,7 @@ export default class extends React.Component {
     render() {
         const {siteInfo, loginInfo} = this.state
 
-        return <Layout className='main-layout'>
+        return <Layout className='main-layout' style={{'--primary-color': ThemeUtils.getColor("primary-color"), '--primary-color-click': ThemeUtils.getColor("primary-color-click")}}>
             <Header className='header'>
                 <div className='header-left'>
                     {siteInfo.showLogo !== false && siteInfo.logoUrl &&

package/src/layouts/admin/index.less

@@ -42,12 +42,12 @@
         white-space: nowrap;
 
         &:hover {
-          color: #1961AC;
+          color: var(--primary-color, var(--primary-color, #1961AC));
         }
 
         &.active {
-          color: #1961AC;
-          box-shadow: inset 0 -2px 0 #1961AC;
+          color: var(--primary-color, var(--primary-color, #1961AC));
+          box-shadow: inset 0 -2px 0 var(--primary-color, var(--primary-color, #1961AC));
         }
       }
     }
@@ -63,7 +63,7 @@
         cursor: pointer;
 
         &:hover {
-          background: #063A69;
+          background: var(--primary-color-click, #124B93);
           color: white;
         }
       }
@@ -134,11 +134,11 @@
         flex-shrink: 0;
 
         &:hover {
-          color: #1961AC;
+          color: var(--primary-color, #1961AC);
         }
 
         &.active {
-          color: #1961AC;
+          color: var(--primary-color, #1961AC);
           background: #fff;
           font-weight: 500;
         }

package/src/layouts/index.jsx

@@ -1,4 +1,4 @@
-import React, {useState, useEffect, useRef} from "react";
+import {useState, useEffect} from "react";
 import {App, ConfigProvider} from "antd";
 import zhCN from 'antd/locale/zh_CN';
 import dayjs from 'dayjs';
@@ -13,17 +13,6 @@ import './index.less'
 
 dayjs.locale('zh-cn');
 
-// 不需要登录和布局的页面
-const PUBLIC_PAGES = ['/login', '/test']
-
-function isPublicPage(pathname, search) {
-    if (pathname === '/' || pathname === '/index') return false;
-    if (pathname.startsWith("/test/")) return true;
-    if (PUBLIC_PAGES.includes(pathname)) return true;
-    if (search && new URLSearchParams(search).has('_noLayout')) return true;
-    return false;
-}
-
 const configProps = {
     input: {autoComplete: 'off'},
     form: {validateMessages: {required: '必填项'}, colon: false},
@@ -55,47 +44,74 @@ const configProps = {
     },
 };
 
-function initApp() {
-    return Promise.all([
-        HttpUtils.get("/admin/public/site-info"),
-        HttpUtils.get('/admin/public/check-login'),
-    ]).then(([siteInfo, loginRs]) => {
-        SysUtils.setSiteInfo(siteInfo);
-        const {needUpdatePwd, dictInfo, loginInfo} = loginRs;
-        SysUtils.setDictInfo(dictInfo);
-        SysUtils.setLoginInfo(loginInfo);
-        if (needUpdatePwd) {
-            PageUtils.open('/userCenter/ChangePassword', '修改密码');
-            return false;
+function AppWrapper({children}) {
+    return <ConfigProvider {...configProps}><App>{children}</App></ConfigProvider>;
+}
+
+const PUBLIC_PAGES = (() => {
+    const raw = typeof OPEN_ADMIN_PUBLIC_PAGES !== 'undefined' && OPEN_ADMIN_PUBLIC_PAGES;
+    return raw ? raw.split(',').map(s => s.trim()) : ['/login', '/test'];
+})();
+
+function isPublicPage(pathname, search) {
+    if (pathname === '/' || pathname === '/index') return false;
+
+    for (const pattern of PUBLIC_PAGES) {
+        if (pattern.endsWith('/**')) {
+            if (pathname.startsWith(pattern.slice(0, -3))) return true;
+        } else if (pathname === pattern) {
+            return true;
         }
-        return true;
-    }).catch(() => {
-        PageUtils.redirectToLogin();
-        return false;
-    });
+    }
+
+    if (new URLSearchParams(search).has('_noLayout')) return true;
+    return false;
 }
 
 export function Layouts() {
     const {pathname, search} = useLocation();
-    const [ready, setReady] = useState(false);
-    const loadedRef = useRef(false);
+    const [siteInfoLoaded, setSiteInfoLoaded] = useState(false);
+    const [loginChecked, setLoginChecked] = useState(false);
+
+    const ready = siteInfoLoaded && loginChecked;
+    const isPublic = isPublicPage(pathname, search);
 
     useEffect(() => {
-        if (isPublicPage(pathname)) return;
-        if (loadedRef.current) return;
-        loadedRef.current = true;
-        initApp().then(ok => { if (ok) setReady(true); });
-    }, [pathname]);
+        if (isPublic) {
+            setSiteInfoLoaded(false);
+            setLoginChecked(false);
+            return;
+        }
+        if (ready) return;
 
-    if (isPublicPage(pathname, search)) {
-        return <ConfigProvider {...configProps}><App><Outlet/></App></ConfigProvider>;
-    }
+        Promise.all([
+            HttpUtils.get("/admin/public/site-info").then(data => {
+                SysUtils.setSiteInfo(data);
+                setSiteInfoLoaded(true);
+            }),
+            HttpUtils.get('/admin/public/check-login').then(data => {
+                SysUtils.setDictInfo(data.dictInfo);
+                SysUtils.setLoginInfo(data.loginInfo);
+                setLoginChecked(true);
+            }),
+        ]).catch(() => {
+            console.error('[Layout] 初始化应用失败');
+            PageUtils.redirectToLogin();
+        });
+    }, [pathname]);
 
-    if (!ready) {
-        return <ConfigProvider {...configProps}><App><PageLoading message='加载中...'/></App></ConfigProvider>;
-    }
+    if (isPublic) return <AppWrapper><Outlet/></AppWrapper>;
 
-    return <ConfigProvider {...configProps}><App><AdminLayout/></App></ConfigProvider>;
+    return (
+        <AppWrapper>
+            {ready ? <AdminLayout/> : (
+                <PageLoading messages={[
+                    !siteInfoLoaded && '加载站点信息...',
+                    !loginChecked && '检查登录中...',
+                ].filter(Boolean)}/>
+            )}
+        </AppWrapper>
+    );
 }
 
 export default Layouts;

package/src/pages/login.jsx

@@ -24,6 +24,7 @@ function postLogin(values) {
             history.push(getRedirect())
             resolve(rs)
         }).catch(e => {
+            console.error('[Login] 登录失败:', e);
             reject(e)
         })
     })
@@ -49,6 +50,7 @@ export default class extends React.Component {
             SysUtils.setSiteInfo(rs)
             this.setState({siteInfo: rs})
         } catch (e) {
+            console.error('[Login] 加载站点信息失败:', e);
             message.error('加载站点信息失败，请刷新页面重试')
         }
     }

package/src/pages/system/dict/index.jsx

@@ -130,7 +130,7 @@ export default class extends React.Component {
                 open={this.state.formOpen}
                 onOk={() => this.formRef.current.submit()}
                 onCancel={() => this.setState({formOpen: false})}
-                destroyOnClose
+                destroyOnHidden
             >
 
                 <Form ref={this.formRef} labelCol={{flex: '100px'}}

package/src/pages/system/file/index.jsx

@@ -127,7 +127,7 @@ export default class extends React.Component {
                        this.tableRef.current.reload()
                    }}
                    footer={null}
-                   destroyOnClose
+                   destroyOnHidden
             >
                 <Form ref={this.formRef}
                       initialValues={this.state.formValues}

package/src/pages/system/job/index.jsx

@@ -66,6 +66,8 @@ export default class extends React.Component {
     componentDidMount() {
         HttpUtils.get('admin/job/job-class-options').then(rs => {
             this.setState({jobClassOptions: rs})
+        }).catch(e => {
+            console.error('[Job] 加载作业类选项失败:', e);
         })
     }
 
@@ -81,6 +83,8 @@ export default class extends React.Component {
     loadJobParamFields(className, jobData) {
         HttpUtils.post("admin/job/get-job-param-fields", jobData || {}, {className}).then(rs => {
             this.setState({paramList: rs})
+        }).catch(e => {
+            console.error('[Job] 加载作业参数字段失败:', e);
         })
     }
 
@@ -90,6 +94,8 @@ export default class extends React.Component {
         HttpUtils.post(url, values).then(rs => {
             this.setState({formOpen: false})
             this.tableRef.current.reload();
+        }).catch(e => {
+            console.error('[Job] 保存作业失败:', e);
         })
     }
 
@@ -97,12 +103,17 @@ export default class extends React.Component {
         const hide = message.loading("删除作业中...")
         HttpUtils.post('admin/job/delete', {id: row.id}).then(rs => {
             this.tableRef.current.reload();
-        }).catch(hide)
+        }).catch(e => {
+            console.error('[Job] 删除作业失败:', e);
+            hide();
+        })
     }
 
     handleTriggerJob = row => {
         HttpUtils.get('admin/job/trigger-job', {id: row.id}).then(rs => {
             this.tableRef.current.reload();
+        }).catch(e => {
+            console.error('[Job] 触发作业失败:', e);
         })
     }
 
@@ -167,6 +178,8 @@ export default class extends React.Component {
         this.setState({statusOpen: true})
         HttpUtils.get('admin/job/status').then(rs => {
             this.setState({status: rs})
+        }).catch(e => {
+            console.error('[Job] 加载状态失败:', e);
         })
     };
 
@@ -197,7 +210,7 @@ export default class extends React.Component {
 
             <Modal title='作业调度'
                    open={this.state.formOpen}
-                   destroyOnClose
+                   destroyOnHidden
                    width={800}
                    onOk={() => this.formRef.current.submit()}
                    onCancel={() => this.setState({formOpen: false})}
@@ -247,7 +260,7 @@ export default class extends React.Component {
                    footer={null}
                    width={1024}
             >
-                <Alert message={<pre>{this.state.status}</pre>}></Alert>
+                <Alert title={<pre>{this.state.status}</pre>}></Alert>
 
             </Modal>
 
@@ -256,7 +269,7 @@ export default class extends React.Component {
                    onCancel={() => this.setState({executeRecordOpen: false})}
                    footer={null}
                    width={1024}
-                   destroyOnClose
+                   destroyOnHidden
             >
                 <ProTable columns={[{
                     title: '开始时间',

package/src/pages/system/manual/index.jsx

@@ -99,8 +99,8 @@ export default class extends React.Component {
                    open={this.state.formOpen}
                    onOk={() => this.formRef.current.submit()}
                    onCancel={() => this.setState({formOpen: false})}
-                   destroyOnClose
-                   maskClosable={false}
+                   destroyOnHidden
+                   mask={{ closable: false }}
             >
 
                 <Form ref={this.formRef} labelCol={{flex: '100px'}}

package/src/pages/system/role/index.jsx

@@ -199,8 +199,8 @@ export default class extends React.Component {
                    open={this.state.formOpen}
                    onOk={() => this.formRef.current.submit()}
                    onCancel={() => this.setState({formOpen: false})}
-                   destroyOnClose
-                   maskClosable={false}
+                   destroyOnHidden
+                   mask={{ closable: false }}
                    width={600}
             >
 
@@ -240,8 +240,8 @@ export default class extends React.Component {
 
             <Modal title={'角色用户' + "【" + this.state.formValues?.name + '】'}
                    open={this.state.usersModalOpen}
-                   destroyOnClose
-                   maskClosable={false}
+                   destroyOnHidden
+                   mask={{ closable: false }}
                    width={800}
                    onCancel={() => this.setState({usersModalOpen: false})}
                    onOk={this.handleSaveUsers}
@@ -249,7 +249,7 @@ export default class extends React.Component {
 
 
                 <Transfer
-                    listStyle={{height: '60vh', width: 300}}
+                    styles={{ section: { height: '60vh', width: 300 } }}
 
                     dataSource={this.state.userList} titles={["未选择", "已选择"]}
                     targetKeys={this.state.targetKeys}
@@ -273,8 +273,8 @@ export default class extends React.Component {
 
             <Modal title={'角色授权菜单权限' + "【" + this.state.formValues?.name + '】'}
                    open={this.state.menuOpen}
-                   destroyOnClose
-                   maskClosable={false}
+                   destroyOnHidden
+                   mask={{ closable: false }}
                    width={800}
                    onCancel={() => this.setState({menuOpen: false})}
                    onOk={this.handleGrantMenu}

package/src/pages/system/user/UserPerm.jsx

@@ -53,7 +53,7 @@ export default class UserPerm extends React.Component {
 
         return <Modal
             title="授权"
-            destroyOnClose
+            destroyOnHidden
             width={600}
             open={visible}
             confirmLoading={confirmLoading}

package/src/pages/system/user/index.jsx

@@ -208,7 +208,7 @@ export default class extends React.Component {
                    open={this.state.formOpen}
                    onOk={() => this.formRef.current.submit()}
                    onCancel={() => this.setState({formOpen: false})}
-                   destroyOnClose
+                   destroyOnHidden
             >
 
                 <Form ref={this.formRef} labelCol={{flex: '100px'}}

package/src/pages/userCenter/index.jsx

@@ -76,7 +76,7 @@ export default class extends React.Component {
                                     </div>
                                 }
                             ]}
-                            tabPosition='left'
+                            tabPlacement='left'
                         >
                         </Tabs>
                     </Card>

package/src/layouts/PageRender.d.ts

@@ -1,7 +0,0 @@
-import React from "react";
-
-declare type PageRenderProps = {
-    pathname: string;
-};
-
-export declare function PageRender(props: PageRenderProps): React.JSX.Element;