@jiangood/open-admin 2.5.2 → 2.5.6

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

@@ -29,9 +29,8 @@ export class ViewFile extends React.Component {
 
         // 多个文件则用走马灯
         const iframeList = urlList.map((url) => {
-            return <div style={{height}}>
+            return <div key={url} style={{height}}>
                 <iframe
-                    key={url}
                     src={url}
                     width='99%'
                     frameBorder={0}

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import {Modal} from 'antd';
-import {SysUtils} from '../../utils';
+import {UrlUtils} from '../../utils';
 
 
 export class ViewImage extends React.Component {
@@ -27,11 +27,11 @@ export class ViewImage extends React.Component {
       }
 
       if (isId) {
-        urlList.push(SysUtils.contextPath('/admin/sysFile/preview/' + v));
+        urlList.push(UrlUtils.contextPath('/admin/sysFile/preview/' + v));
         continue;
       }
 
-      urlList.push(SysUtils.contextPath(v));
+      urlList.push(UrlUtils.contextPath(v));
     }
 
     const imgs = urlList.map((url) => (

package/src/framework/views/{ViewBooleanEnableDisable → ViewSwitch}/index.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Tag } from 'antd';
 
-export class ViewBooleanEnableDisable extends React.Component {
+export class ViewSwitch extends React.Component {
 
     render() {
         const { value } = this.props;

package/src/framework/views/index.ts

@@ -3,10 +3,9 @@ export * from './types';
 export * from './ViewPassword';
 export * from './ViewBoolean';
 export * from './ViewApproveStatus'
-export * from './ViewProcessInstanceProgress'
-export * from './ViewProcessInstanceProgressButton'
-export * from './ViewBooleanEnableDisable'
+export * from './ViewSwitch'
 export * from './ViewImage'
 export * from  './ViewFile'
 export * from './ViewText'
-export * from './ViewFileButton'
+export * from './ViewFileButton'
+export * from './ViewRange'

package/src/layouts/admin/HeaderRight.jsx

@@ -1,8 +1,7 @@
-import {Badge, Dropdown} from "antd";
-import {NotificationOutlined, SettingOutlined, UserOutlined} from "@ant-design/icons";
+import {Avatar, Dropdown} from "antd";
 import React from "react";
 import {history} from "umi";
-import {DeviceUtils, HttpUtils, MessageUtils,  PageUtils, SysUtils} from "../../framework";
+import {DeviceUtils, HttpUtils, MessageUtils,  PageUtils, GlobalData} from "../../framework";
 
 
 const ID = 'header-right';
@@ -36,12 +35,12 @@ export class HeaderRight extends React.Component {
         })
     }
 
-    userCenter = () => {
-        PageUtils.open('/userCenter', '个人中心')
+    account = () => {
+        PageUtils.open('/account', '个人中心')
     }
 
     render() {
-        const info = SysUtils.getLoginInfo()
+        const info = GlobalData.getLoginInfo()
 
         if (this.state.isMobileDevice) {
             return <div className='header-right'>
@@ -51,44 +50,33 @@ export class HeaderRight extends React.Component {
 
         return <div className='header-right'>
 
-            <div className='item'>
-                <UserOutlined/> {info.name}
-            </div>
-
-
-            <div className='item' onClick={() => PageUtils.open('/userCenter/message', '我的消息')}>
-                <Badge count={info.messageCount} size="small">
-                    <NotificationOutlined/>
-                </Badge>
-            </div>
-
-            <div className='item'>
-
-                <Dropdown menu={{
-                    onClick: ({key}) => {
-                        switch (key) {
-                            case 'userCenter':
-                                this.userCenter()
-                                break;
-                            case 'logout':
-                                this.logout();
-                                break;
-                            case 'about':
-                                this.about()
-                                break
-                        }
-                    },
-                    items: [
-                        {key: 'userCenter', label: '个人中心'},
-                        {key: 'about', label: '关于系统'},
-                        {key: 'logout', label: '退出登录'},
-
-                    ]
-                }}><SettingOutlined/>
-
-                </Dropdown>
-
-            </div>
+            <Dropdown menu={{
+                onClick: ({key}) => {
+                    switch (key) {
+                        case 'account':
+                            this.account()
+                            break;
+                        case 'logout':
+                            this.logout();
+                            break;
+                        case 'about':
+                            this.about()
+                            break
+                    }
+                },
+                items: [
+                    {key: 'account', label: '个人中心'},
+                    {key: 'about', label: '关于系统'},
+                    {key: 'logout', label: '退出登录'},
+                ]
+            }}>
+                <div className='item' style={{cursor: 'pointer'}}>
+                    <Avatar size="small" style={{backgroundColor: '#1677ff', verticalAlign: 'middle'}}>
+                        {info.name?.charAt(0)}
+                    </Avatar>
+                    <span style={{marginLeft: 8}}>{info.name}</span>
+                </div>
+            </Dropdown>
 
         </div>
     }

package/src/layouts/admin/index.jsx

@@ -1,9 +1,9 @@
 import React from 'react';
-import {Badge, Layout, Menu, Skeleton, Watermark} from 'antd';
+import {Layout, Menu, Skeleton, Watermark} from 'antd';
 
 import {history, Link} from 'umi';
 import "./index.less"
-import {ErrorBoundary, HttpUtils, NamedIcon, PageUtils, SysUtils, ThemeUtils, TreeUtils} from "../../framework";
+import {HttpUtils, NamedIcon, PageUtils, GlobalData, ThemeUtils, TreeUtils} from "../../framework";
 
 import { HeaderRight } from "./HeaderRight";
 import { TabPageRender } from "./TabPageRender";
@@ -37,8 +37,8 @@ export default class extends React.Component {
         // 判断是否手机端，自动收起菜单
 
 
-        const siteInfo = SysUtils.getSiteInfo();
-        const loginInfo = SysUtils.getLoginInfo()
+        const siteInfo = GlobalData.getSiteInfo();
+        const loginInfo = GlobalData.getLoginInfo()
         this.setState({siteInfo, loginInfo})
 
         this.initMenu()
@@ -84,7 +84,6 @@ export default class extends React.Component {
 
             this.setState({menuTree, pathMenuMap, topMenus, sideMenus, activeTopMenuKey, currentMenuKey})
 
-            this.loadBadge(menuMap)
         }).catch(err => {
             console.error('加载菜单失败:', err)
             this.setState({menuTree: [], topMenus: [], sideMenus: []})
@@ -170,27 +169,6 @@ export default class extends React.Component {
         );
     }
 
-    loadBadge = menuMap => {
-        for (let id in menuMap) {
-            const item = menuMap[id]
-            const {messageCountUrl} = item;
-            if (!messageCountUrl) {
-                continue
-            }
-            HttpUtils.get(messageCountUrl).then(rs => {
-                const {menuTree} = this.state
-                const menu = TreeUtils.findByKey(id, menuTree, 'key')
-                if (menu) {
-                    menu.icon = <Badge dot count={rs} size={"small"}>{menu.icon}</Badge>
-                    this.setState({menuTree: [...menuTree]})
-                }
-            }).catch(e => {
-                console.error('[Layout] 加载消息数失败:', e);
-            })
-        }
-    };
-
-
     render() {
         const {siteInfo, loginInfo} = this.state
 
@@ -217,9 +195,7 @@ export default class extends React.Component {
                 </Header>
 
                 <Content id='admin-layout-content'>
-                    <ErrorBoundary>
-                        {this.renderCenterContent(loginInfo)}
-                    </ErrorBoundary>
+                    {this.renderCenterContent(loginInfo)}
                 </Content>
 
             </Layout>

package/src/layouts/index.jsx

@@ -3,10 +3,11 @@ import {App, ConfigProvider} from "antd";
 import zhCN from 'antd/locale/zh_CN';
 import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
-import {Outlet, useLocation} from "umi";
+import {Outlet, useLocation, history} from "umi";
 
 import AdminLayout from "./admin"
-import {HttpUtils, PageLoading, PageUtils, SysUtils, ThemeUtils} from "../framework";
+import {HttpUtils, PageLoading, PageUtils, GlobalData, ThemeUtils, DownloadModal} from "../framework";
+import {ErrorBoundary} from "../framework";
 
 import '../style/global.less'
 import './index.less'
@@ -36,12 +37,12 @@ const configProps = {
 };
 
 function AppWrapper({children}) {
-    return <ConfigProvider {...configProps}><App>{children}</App></ConfigProvider>;
+    return <ConfigProvider {...configProps}><App><DownloadModal />{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'];
+    return raw ? raw.split(',').map(s => s.trim()) : ['/login', '/test', '/forceUpdatePwd'];
 })();
 
 function isPublicPage(pathname, search) {
@@ -77,12 +78,18 @@ export function Layouts() {
 
         Promise.all([
             HttpUtils.get("/admin/public/site-info").then(data => {
-                SysUtils.setSiteInfo(data);
+                GlobalData.setSiteInfo(data);
                 setSiteInfoLoaded(true);
             }),
-            HttpUtils.get('/admin/public/check-login').then(data => {
-                SysUtils.setDictInfo(data.dictInfo);
-                SysUtils.setLoginInfo(data.loginInfo);
+            HttpUtils.get('/admin/public/user-info').then(data => {
+                GlobalData.setDictInfo(data.dictInfo);
+                GlobalData.setLoginInfo(data.loginInfo);
+
+                if (data.needUpdatePwd && pathname !== '/forceUpdatePwd') {
+                    history.push('/forceUpdatePwd');
+                    return;
+                }
+
                 setLoginChecked(true);
             }),
         ]).catch(() => {
@@ -91,17 +98,19 @@ export function Layouts() {
         });
     }, [pathname]);
 
-    if (isPublic) return <AppWrapper><Outlet/></AppWrapper>;
+    if (isPublic) return <ErrorBoundary minimal><AppWrapper><Outlet/></AppWrapper></ErrorBoundary>;
 
     return (
-        <AppWrapper>
-            {ready ? <AdminLayout/> : (
-                <PageLoading messages={[
-                    !siteInfoLoaded && '加载站点信息...',
-                    !loginChecked && '检查登录中...',
-                ].filter(Boolean)}/>
-            )}
-        </AppWrapper>
+        <ErrorBoundary minimal>
+            <AppWrapper>
+                {ready ? <AdminLayout/> : (
+                    <PageLoading messages={[
+                        !siteInfoLoaded && '加载站点信息...',
+                        !loginChecked && '检查登录中...',
+                    ].filter(Boolean)}/>
+                )}
+            </AppWrapper>
+        </ErrorBoundary>
     );
 }
 

package/src/pages/about.jsx

@@ -1,12 +1,32 @@
 import React from "react";
-import {Page} from "../framework";
+import {HttpUtils, Page} from "../framework";
 
 export default class extends React.Component {
 
+    state = {
+        buildInfo: null,
+    }
+
+    componentDidMount() {
+        HttpUtils.get('/admin/lib-info').then(data => {
+            this.setState({buildInfo: data})
+        }).catch(e => {
+            console.error('[About] 加载版本信息失败:', e);
+        })
+    }
 
     render() {
-        return <Page title="关于" description="了解系统版本与相关信息">
-            <h1>关于</h1>
-        </Page>
+        const {buildInfo} = this.state;
+
+        return (
+            <Page title="关于" description="了解系统版本与相关信息">
+                <h1>关于</h1>
+                {buildInfo && (
+                    <div style={{marginTop: '3em', color: 'rgba(0,0,0,0.45)', fontSize: 12}}>
+                        依赖库版本 v{buildInfo.version} / {buildInfo.buildTime}
+                    </div>
+                )}
+            </Page>
+        );
     }
 }

package/src/pages/{userCenter/ChangePassword.jsx → account/changePassword.jsx}

@@ -1,7 +1,7 @@
 import React from "react";
 import {Button, Form, Input, Modal} from "antd";
 import {history} from 'umi'
-import {HttpUtils, SysUtils} from "../../framework";
+import {HttpUtils} from "../../framework";
 
 export default class extends React.Component {
 
@@ -12,7 +12,6 @@ export default class extends React.Component {
                 title: '提示',
                 content: '修改密码成功',
                 onOk: () => {
-                    SysUtils.setToken(null)
                     history.push('/login')
                 }
             })

package/src/pages/{userCenter → account}/index.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 import {Avatar, Card, Col, Row, Tabs} from "antd";
-import ChangePassword from "./ChangePassword";
+import ChangePassword from "./changePassword";
 import {HttpUtils, Page} from "../../framework";
 
 export default class extends React.Component {
@@ -71,11 +71,7 @@ export default class extends React.Component {
                                         <ChangePassword/>
                                     </div>
                                 },
-                                {
-                                    label: '消息订阅', key: 'topic', children: <div>
-                                        当账号管理邮箱后，系统消息会发送邮件给您
-                                    </div>
-                                }
+
                             ]}
                             tabPlacement='left'
                         >

package/src/pages/forceUpdatePwd.jsx

@@ -0,0 +1,89 @@
+import React from "react";
+import {Button, Form, Input, message} from "antd";
+import {history} from 'umi'
+import {HttpUtils, PageUtils, GlobalData} from "../framework";
+
+export default class extends React.Component {
+
+    state = {
+        checking: true
+    }
+
+    async componentDidMount() {
+        try {
+            const rs = await HttpUtils.get('/admin/public/user-info', null, {showError: false});
+            if (!rs.login) {
+                PageUtils.redirectToLogin();
+                return;
+            }
+            GlobalData.setLoginInfo(rs.loginInfo);
+            this.setState({checking: false});
+        } catch (e) {
+            PageUtils.redirectToLogin();
+        }
+    }
+
+    onFinish = (values) => {
+        HttpUtils.post('admin/userCenter/update-pwd', values).then(() => {
+            message.success('修改密码成功，请重新登录');
+            history.push('/login');
+        })
+    }
+
+    validator = (rule, value) => {
+        return new Promise((resolve, reject) => {
+            HttpUtils.get("admin/sysUser/pwd-strength", {password: value}).then(response => {
+                const rs = response.data
+                if (!rs.success) {
+                    reject(rs.message)
+                }
+                resolve()
+            })
+        })
+    }
+
+    render() {
+        if (this.state.checking) return null;
+
+        return (
+            <div style={{
+                display: 'flex',
+                justifyContent: 'center',
+                alignItems: 'center',
+                minHeight: '100vh',
+                background: '#f0f2f5'
+            }}>
+                <div style={{
+                    background: '#fff',
+                    padding: '40px',
+                    borderRadius: '8px',
+                    boxShadow: '0 2px 8px rgba(0,0,0,0.1)',
+                    maxWidth: 400,
+                    width: '100%'
+                }}>
+                    <h2 style={{textAlign: 'center', marginBottom: 24}}>修改密码</h2>
+                    <p style={{textAlign: 'center', color: '#999', marginBottom: 24}}>
+                        首次登录或密码已被重置，请修改密码后重新登录
+                    </p>
+                    <Form onFinish={this.onFinish}>
+                        <Form.Item name='newPassword'
+                                   label='新密码'
+                                   extra={'请输入字母、数字、特殊字符'}
+                                   rules={[
+                                       {required: true, message: '请输入新密码'},
+                                       {validator: this.validator}
+                                   ]}
+                        >
+                            <Input.Password/>
+                        </Form.Item>
+                        <Form.Item style={{marginTop: 40}}>
+                            <Button type="primary" htmlType="submit" block size='large'>
+                                确定
+                            </Button>
+                        </Form.Item>
+                    </Form>
+                </div>
+            </div>
+        )
+    }
+}

package/src/pages/login.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import {Button, Form, Input, message} from 'antd';
 import {LockOutlined, UserOutlined, WarningOutlined} from '@ant-design/icons';
 import {history} from 'umi';
-import {EventBusUtils, HttpUtils, PageUtils, SysUtils} from "../framework/utils";
+import {EventBus, HttpUtils, PageUtils, GlobalData} from "../framework";
 
 import "./login.less"
 
@@ -19,7 +19,7 @@ function getRedirect() {
 function postLogin(values) {
     return new Promise((resolve, reject) => {
         HttpUtils.post('/admin/auth/login', values).then(rs => {
-            EventBusUtils.emit('loginSuccess')
+            EventBus.emit('loginSuccess')
             history.push(getRedirect())
             resolve(rs)
         }).catch(e => {
@@ -44,15 +44,15 @@ export default class extends React.Component {
     }
 
     async componentDidMount() {
-        const siteInfo = SysUtils.getSiteInfo()
+        const siteInfo = GlobalData.getSiteInfo()
         if (siteInfo && siteInfo.title) {
             this.setState({siteInfo})
             return
         }
         // localStorage 中无站点信息，从服务端重新加载
         try {
-            const rs = await HttpUtils.get('/admin/public/site-info')
-            SysUtils.setSiteInfo(rs)
+            const rs = await HttpUtils.get('/admin/public/site-info', null, { showError: false })
+            GlobalData.setSiteInfo(rs)
             this.setState({siteInfo: rs})
         } catch (e) {
             console.error('[Login] 加载站点信息失败:', e);

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

@@ -2,13 +2,13 @@ import {DeleteOutlined, EditOutlined, PlusOutlined} from '@ant-design/icons';
 import {Button, Card, Descriptions, Empty, Form, Input, InputNumber, Modal, Popconfirm, Splitter, Tree, Tag, TreeSelect, Typography} from 'antd';
 import React from 'react';
 import {
-    ButtonList,
+    PermActions,
     FieldBoolean,
     FieldDictSelect,
     HttpUtils,
     Page,
     ProTable,
-    ViewBooleanEnableDisable,
+    ViewSwitch,
 } from "../../../framework";
 
 export default class extends React.Component {
@@ -139,7 +139,7 @@ export default class extends React.Component {
         {
             title: '启用', dataIndex: 'enabled',
             render(v) {
-                return <ViewBooleanEnableDisable value={v}/>
+                return <ViewSwitch value={v}/>
             }
         },
         {title: '序号', dataIndex: 'seq'},
@@ -147,14 +147,14 @@ export default class extends React.Component {
             title: '操作', dataIndex: 'option',
             render: (_, record) => {
                 return (
-                    <ButtonList>
+                    <PermActions>
                         <Button size='small' perm='sys-dict:update'
                                 onClick={() => this.handleItemEdit(record)}>编辑</Button>
                         <Popconfirm perm='sys-dict:delete' title='是否确定删除字典项'
                                     onConfirm={() => this.handleItemDelete(record)}>
                             <Button size='small'>删除</Button>
                         </Popconfirm>
-                    </ButtonList>
+                    </PermActions>
                 );
             },
         },
@@ -204,7 +204,7 @@ export default class extends React.Component {
                             <Descriptions.Item label="类型编码">{selectedType.typeCode}</Descriptions.Item>
                             <Descriptions.Item label="分类">{this.getParentLabel() || '-'}</Descriptions.Item>
                             <Descriptions.Item label="序号">{selectedType.seq}</Descriptions.Item>
-                            <Descriptions.Item label="启用"><ViewBooleanEnableDisable value={selectedType.enabled}/></Descriptions.Item>
+                            <Descriptions.Item label="启用"><ViewSwitch value={selectedType.enabled}/></Descriptions.Item>
                         </Descriptions>}
                     </Card>
                     <Card size='small'>

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

@@ -2,7 +2,7 @@ import React from 'react'
 import {Button, Form, Input, Modal, Popconfirm} from 'antd'
 import {CloudUploadOutlined} from "@ant-design/icons";
 
-import {ButtonList, FieldDateRange, FieldDictSelect, FieldUploadFile, HttpUtils, Page, ProTable, SysUtils} from "../../../framework";
+import {PermActions, FieldDateRange, FieldDictSelect, FieldUploadFile, HttpUtils, Page, ProTable, UrlUtils} from "../../../framework";
 
 export default class extends React.Component {
 
@@ -59,7 +59,7 @@ export default class extends React.Component {
             title: '预览',
             dataIndex: 'id',
             render(id, record) {
-                const nodes = [<a href={SysUtils.contextPath('/admin/sysFile/preview/' + record.id)} target='_blank'>预览</a>]
+                const nodes = [<a href={UrlUtils.contextPath('/admin/sysFile/preview/' + record.id)} target='_blank'>预览</a>]
 
 
                 if (record.imageUrls?.length > 0) {
@@ -78,12 +78,12 @@ export default class extends React.Component {
             title: '操作',
             dataIndex: 'option',
             render: (_, record) => (
-                <ButtonList>
+                <PermActions>
                     <Popconfirm perm='sys-file:delete' title='是否确定删除文件信息'
                                 onConfirm={() => this.handleDelete(record)}>
                         <a>删除</a>
                     </Popconfirm>
-                </ButtonList>
+                </PermActions>
             ),
         },
     ]

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

@@ -15,7 +15,7 @@ import {
     Tag
 } from 'antd'
 import {PlusOutlined} from "@ant-design/icons";
-import {ButtonList, HttpUtils, Page, ProTable, StringUtils, SysUtils, ValueType} from "../../../framework";
+import {HttpUtils, Page, ProTable, StringUtils, UrlUtils, ValueType} from "../../../framework";
 
 
 const cronOptions = [
@@ -241,8 +241,12 @@ export default class extends React.Component {
                             <Form.Item label={p.label}
                                        name={['jobData', p.name]}
                                        key={p.name}
+                                       initialValue={p.defaultValue}
                                        rules={[{required: p.required}]}>
-                                {ValueType.renderField(p.componentType, p.componentProps)}
+                                {ValueType.renderField(p.componentType, {
+                                    ...p.componentProps,
+                                    placeholder: p.placeholder || '请输入'
+                                })}
                             </Form.Item>
                         </div>
                     ))}
@@ -299,7 +303,7 @@ export default class extends React.Component {
                         title: '操作',
                         dataIndex: 'option',
                         render: (_, record) => {
-                            const url = SysUtils.contextPath('/admin/sys/log/' + record.id);
+                            const url = UrlUtils.contextPath('/admin/sys/log/' + record.id);
                             return <a href={url} target='_blank'>日志</a>;
                         },
                     }

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

@@ -9,7 +9,7 @@ import {
     HttpUtils,
     NamedIcon,
     Page,
-    ViewBooleanEnableDisable,
+    ViewSwitch,
 } from "../../../framework";
 
 export default class extends React.Component {
@@ -173,7 +173,7 @@ export default class extends React.Component {
                                 <Descriptions.Item label="上级机构">{selectedOrg.parentName || '-'}</Descriptions.Item>
                                 <Descriptions.Item label="序号">{selectedOrg.seq ?? '-'}</Descriptions.Item>
                                 <Descriptions.Item label="部门领导">{selectedOrg.leader?.name || '-'}</Descriptions.Item>
-                                <Descriptions.Item label="启用"><ViewBooleanEnableDisable value={selectedOrg.enabled}/></Descriptions.Item>
+                                <Descriptions.Item label="启用"><ViewSwitch value={selectedOrg.enabled}/></Descriptions.Item>
                                 {selectedOrg.extra1 && <Descriptions.Item label="扩展字段1">{selectedOrg.extra1}</Descriptions.Item>}
                                 {selectedOrg.extra2 && <Descriptions.Item label="扩展字段2">{selectedOrg.extra2}</Descriptions.Item>}
                                 {selectedOrg.extra3 && <Descriptions.Item label="扩展字段3">{selectedOrg.extra3}</Descriptions.Item>}