@jiangood/open-admin 1.3.3 → 2.0.0

package/src/pages/login.jsx

@@ -1,16 +1,144 @@
 import React from 'react';
+import {Button, Form, Input, message, Space} from 'antd';
+import {LockOutlined, SafetyCertificateOutlined, UserOutlined, WarningOutlined} from '@ant-design/icons';
+import {JSEncrypt} from "jsencrypt";
+import {history} from 'umi';
+import {EventBusUtils, HttpUtils, PageUtils, MessageUtils, SysUtils} from "../framework/utils";
 
-import {LoginPage} from "../framework/pages/LoginPage";
+import "./login.less"
 
+function getRedirect() {
+    let redirect = PageUtils.currentParams()['redirect'];
+    if (redirect) {
+        redirect = decodeURIComponent(redirect)
+    } else {
+        redirect = '/'
+    }
+    return redirect;
+}
+
+function postLogin(values) {
+    return new Promise((resolve, reject) => {
+        HttpUtils.post('/admin/auth/login', values).then(rs => {
+            EventBusUtils.emit('loginSuccess')
+            history.push(getRedirect())
+            resolve(rs)
+        }).catch(e => {
+            reject(e)
+        })
+    })
+}
 
 export default class extends React.Component {
 
+    state = {
+        logging: false,
+        siteInfo: {},
+        random: Math.random()
+    }
+
+    async componentDidMount() {
+        if (localStorage.length === 0) {
+            MessageUtils.alert('站点数据缺失，刷新当前页面...')
+            window.location.reload()
+            return
+        }
+
+        const siteInfo = SysUtils.getSiteInfo()
+        this.setState({siteInfo})
+    }
+
+    submit = values => {
+        this.setState({logging: true})
+
+        const pubkey = this.state.siteInfo.rsaPublicKey;
+        if (!pubkey) {
+            message.error("未获取密钥，请刷新浏览器再试")
+            this.setState({logging: false})
+            return
+        }
+        const crypt = new JSEncrypt();
+        crypt.setPublicKey(pubkey);
+        values.password = crypt.encrypt(values.password)
+
+        postLogin(values).finally(() => {
+            this.setState({logging: false})
+        })
+    }
 
     render() {
-        return <LoginPage/>
-        // 支持自定义
-        // return <LoginPage form={<Button type={"primary"} size='large'>xx登录</Button>} />
+        const {siteInfo} = this.state
+
+        const pageStyle = {}
+        if (siteInfo.loginBackground) {
+            const url = 'admin/sysFile/preview/' + siteInfo.loginBackground;
+            pageStyle.backgroundImage = 'url("' + url + '")'
+        }
+
+        return (
+            <section className='login-page' style={pageStyle}>
+                <div className="login-content">
+                    <h1>{siteInfo.title}</h1>
+                    {this.getForm(siteInfo)}
+                    {this.renderFormBottom()}
+                </div>
+            </section>
+        );
     }
 
+    getForm = siteInfo => {
+        const form = (
+            <Form
+                name="normal_login"
+                className="login-form"
+                initialValues={{remember: true}}
+                onFinish={this.submit}
+                requiredMark={false}
+                colon={false}
+            >
+                <Form.Item name="username" rules={[{required: true, message: '请输入用户名!'}]}>
+                    <Input size='large' prefix={<UserOutlined/>} placeholder="用户名" autoComplete="off"/>
+                </Form.Item>
+                <Form.Item name="password" rules={[{required: true, message: '请输入密码!'}]}>
+                    <Input autoComplete="off" prefix={<LockOutlined/>} type="password" placeholder="密码"
+                           size='large'
+                    />
+                </Form.Item>
 
+                {siteInfo.captcha && (
+                    <Form.Item name='captchaCode' rules={[{required: true}]}>
+                        <Space style={{alignItems: 'center'}}>
+                            <Input size='large' placeholder='验证码' prefix={<SafetyCertificateOutlined/>}/>
+                            <img height={36} width={100}
+                                 src={"/admin/auth/captcha-image?_random=" + this.state.random}
+                                 onClick={() => this.setState({random: Math.random()})}/>
+                        </Space>
+                    </Form.Item>
+                )}
+
+                <Form.Item style={{marginTop: 10}}>
+                    <Button loading={this.state.logging} type="primary" htmlType="submit"
+                            block size='large'>
+                        登录
+                    </Button>
+                </Form.Item>
+            </Form>
+        );
+
+        if (this.props.formRender) {
+            return this.props.formRender(form);
+        }
+        return form;
+    };
+
+    renderFormBottom() {
+        const siteInfo = this.state.siteInfo;
+        if (siteInfo.loginBoxBottomTip) {
+            return (
+                <div style={{color: 'white', marginTop: 50, fontSize: '14px', textAlign: 'center'}}>
+                    <WarningOutlined/> {siteInfo.loginBoxBottomTip}
+                </div>
+            )
+        }
+    }
 }

package/src/{framework/pages/LoginPage.less → pages/login.less}

@@ -17,7 +17,7 @@
     top: 20%;
 
     .ant-form-item-label > label{
-      color: white !important;
+      color: white;
     }
   }
 }
@@ -44,10 +44,10 @@
 
 
 
-.login-page h1 {
+.login-page.login-page h1 {
   margin-bottom: 50px;
   text-align: center;
-  color: white !important;
+  color: white;
   font-size: x-large;
 }
 

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

@@ -2,7 +2,7 @@ import {PlusOutlined} from '@ant-design/icons'
 import {Button, Form, Input, message, Modal, Popconfirm, Switch, Table, Tabs} from 'antd'
 import React from 'react'
 import {
-    ArrUtils,
+    ArrayUtils,
     ButtonList,
     FieldBoolean,
     FieldDate,
@@ -28,7 +28,7 @@ export default class extends React.Component {
     tableRef = React.createRef()
 
     componentDidMount() {
-        HttpUtils.get("/admin/apiAccount/permList").then(rs => {
+        HttpUtils.get("/admin/apiAccount/perm-list").then(rs => {
             this.setState({list: rs})
         })
     }
@@ -76,7 +76,7 @@ export default class extends React.Component {
         },
         {
             title: '启用',
-            dataIndex: 'enable',
+            dataIndex: 'enabled',
             render(v) {
                 return v == null ? null : (v ? '是' : '否')
             },
@@ -123,16 +123,16 @@ export default class extends React.Component {
     onGrantItemChange = (id, checked) => {
         const perms = this.state.formValues.perms
         if (checked) {
-            ArrUtils.add(perms, id)
+            ArrayUtils.add(perms, id)
         } else {
-            ArrUtils.remove(perms, id)
+            ArrayUtils.remove(perms, id)
         }
         this.setState({formValues: this.state.formValues})
     }
 
     onGrant = () => {
         const hide = message.loading('授权中...', 0)
-        let accountId = this.state.formValues.id;
+        const accountId = this.state.formValues.id;
         HttpUtils.post('admin/apiAccount/grant/'+accountId,  this.state.formValues.perms).then(rs => {
             this.setState({grantFormOpen: false})
             this.tableRef.current.reload()
@@ -203,7 +203,7 @@ export default class extends React.Component {
                    open={this.state.formOpen}
                    onOk={() => this.formRef.current.submit()}
                    onCancel={() => this.setState({formOpen: false})}
-                   destroyOnHidden
+                   destroyOnClose
                    mask={{closable:false}}
             >
 
@@ -234,7 +234,7 @@ export default class extends React.Component {
                     <Form.Item label='有效期' name='endTime' style={{marginTop: 32}}>
                         <FieldDate type='YYYY-MM-DD'/>
                     </Form.Item>
-                    <Form.Item label='启用' name='enable' rules={[{required: true}]}>
+                    <Form.Item label='启用' name='enabled' rules={[{required: true}]}>
                         <FieldBoolean/>
                     </Form.Item>
 
@@ -242,7 +242,7 @@ export default class extends React.Component {
             </Modal>
 
 
-            <Modal title='权限列表' destroyOnHidden={true} width={800}
+            <Modal title='权限列表' destroyOnClose={true} width={800}
                    open={this.state.grantFormOpen}
                    onCancel={() => this.setState({grantFormOpen: false, formValues: null})}
                    onOk={this.onGrant}
@@ -260,7 +260,7 @@ export default class extends React.Component {
                         {
                             dataIndex: 'option', title: '操作',
                             render: (_, record) => {
-                                let id = record.id;
+                                const id = record.id;
                                 return <Switch checked={this.state.formValues.perms.includes(id)}
                                                onChange={(checked) => {
                                                    this.onGrantItemChange(id, checked)

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

@@ -1,5 +1,7 @@
 import React from "react";
 import {Button, Form, Input, InputNumber, Modal, Popconfirm, Splitter, Tag, Tree, Typography} from "antd";
+import {PlusOutlined} from "@ant-design/icons";
+
 import {
     ButtonList,
     FieldBoolean, FieldDictSelect, FieldRemoteSelect,
@@ -8,7 +10,6 @@ import {
     ProTable,
     ViewBooleanEnableDisable, ViewText
 } from "../../../framework";
-import {PlusOutlined} from "@ant-design/icons";
 
 export default class extends React.Component {
 
@@ -132,7 +133,7 @@ export default class extends React.Component {
                 open={this.state.formOpen}
                 onOk={() => this.formRef.current.submit()}
                 onCancel={() => this.setState({formOpen: false})}
-                destroyOnHidden
+                destroyOnClose
             >
 
                 <Form ref={this.formRef} labelCol={{flex: '100px'}}
@@ -143,7 +144,7 @@ export default class extends React.Component {
                        <ViewText />
                     </Form.Item>
                     <Form.Item label='类型' name='typeCode' rules={[{required: true}]} >
-                        <FieldRemoteSelect url='/admin/dict/typeOptions' />
+                        <FieldRemoteSelect url='/admin/dict/type-options' />
                     </Form.Item>
                     <Form.Item label='编码' name='code' rules={[{required: true}]}>
                         <Input/>

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

@@ -1,8 +1,9 @@
-import {Button, Form, Input, Modal, Popconfirm} from 'antd'
 import React from 'react'
-import {ButtonList, FieldDateRange, FieldDictSelect, FieldUploadFile, HttpUtils, ProTable} from "../../../framework";
+import {Button, Form, Input, Modal, Popconfirm} from 'antd'
 import {CloudUploadOutlined} from "@ant-design/icons";
 
+import {ButtonList, FieldDateRange, FieldDictSelect, FieldUploadFile, HttpUtils, ProTable} from "../../../framework";
+
 export default class extends React.Component {
 
     state = {
@@ -63,8 +64,8 @@ export default class extends React.Component {
 
                 if (record.imageUrls?.length > 0) {
                     for (let item of record.imageUrls) {
-                        let url = item.url;
-                        let label = item.label;
+                        const url = item.url;
+                        const label = item.label;
                         nodes.push(<a href={(url)} target='_blank' style={{marginLeft: 8}}>{label}</a>)
                     }
                 }
@@ -126,7 +127,7 @@ export default class extends React.Component {
                        this.tableRef.current.reload()
                    }}
                    footer={null}
-                   destroyOnHidden
+                   destroyOnClose
             >
                 <Form ref={this.formRef}
                       initialValues={this.state.formValues}

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

@@ -1,3 +1,4 @@
+import React from 'react'
 import {
     Alert,
     AutoComplete,
@@ -13,8 +14,8 @@ import {
     Switch,
     Tag
 } from 'antd'
-import React from 'react'
 import {PlusOutlined} from "@ant-design/icons";
+
 import {ButtonList, HttpUtils, Page, ProTable, StringUtils, ValueType} from "../../../framework";
 
 
@@ -63,7 +64,7 @@ export default class extends React.Component {
     formRef = React.createRef()
 
     componentDidMount() {
-        HttpUtils.get('admin/job/jobClassOptions').then(rs => {
+        HttpUtils.get('admin/job/job-class-options').then(rs => {
             this.setState({jobClassOptions: rs})
         })
     }
@@ -78,7 +79,7 @@ export default class extends React.Component {
     }
 
     loadJobParamFields(className, jobData) {
-        HttpUtils.post("admin/job/getJobParamFields", jobData || {}, {className}).then(rs => {
+        HttpUtils.post("admin/job/get-job-param-fields", jobData || {}, {className}).then(rs => {
             this.setState({paramList: rs})
         })
     }
@@ -98,7 +99,7 @@ export default class extends React.Component {
     }
 
     handleTriggerJob = row => {
-        HttpUtils.get('admin/job/triggerJob', {id: row.id}).then(rs => {
+        HttpUtils.get('admin/job/trigger-job', {id: row.id}).then(rs => {
             this.tableRef.current.reload();
         })
     }
@@ -194,7 +195,7 @@ export default class extends React.Component {
 
             <Modal title='作业调度'
                    open={this.state.formOpen}
-                   destroyOnHidden
+                   destroyOnClose
                    width={800}
                    onOk={() => this.formRef.current.submit()}
                    onCancel={() => this.setState({formOpen: false})}
@@ -253,7 +254,7 @@ export default class extends React.Component {
                    onCancel={() => this.setState({executeRecordOpen: false})}
                    footer={null}
                    width={1024}
-                   destroyOnHidden
+                   destroyOnClose
             >
                 <ProTable columns={[{
                     title: '开始时间',
@@ -288,13 +289,13 @@ export default class extends React.Component {
                         title: '操作',
                         dataIndex: 'option',
                         render: (_, record) => {
-                            let url = '/admin/sys/log/' + record.id;
+                            const url = '/admin/sys/log/' + record.id;
                             return <a href={url} target='_blank'>日志</a>;
                         },
                     }
                 ]} request={params => {
                     params.jobId = this.state.formValues.id
-                    return HttpUtils.get('admin/job/executeRecord', params);
+                    return HttpUtils.get('admin/job/execute-record', params);
                 }}></ProTable>
 
             </Modal>
@@ -306,7 +307,7 @@ export default class extends React.Component {
             this.loadJobParamFields(values.jobClass)
             const option = this.state.jobClassOptions.find(o => o.value === changed.jobClass)
             if (option) {
-                let {label} = option;
+                const {label} = option;
                 if (StringUtils.contains(label, " ")) { // 取中文名部门设置为name
                     this.formRef.current.setFieldValue("name", label.split(" ")[1])
                 }

package/src/pages/system/{sysManual → manual}/index.jsx

@@ -97,7 +97,7 @@ export default class extends React.Component {
                    open={this.state.formOpen}
                    onOk={() => this.formRef.current.submit()}
                    onCancel={() => this.setState({formOpen: false})}
-                   destroyOnHidden
+                   destroyOnClose
                    maskClosable={false}
             >
 

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

@@ -44,7 +44,7 @@ export default class extends React.Component {
 
         const {params} = this.state
         HttpUtils.get('admin/sysOrg/tree', params).then(rs => {
-            let treeData = rs;
+            const treeData = rs;
             this.setState({treeData})
         }).finally(() => {
             this.setState({treeLoading: false});
@@ -91,9 +91,9 @@ export default class extends React.Component {
 
 
     render() {
-        let {formValues} = this.state;
-        let disabled = formValues == null;
-        let params = this.state.params;
+        const {formValues} = this.state;
+        const disabled = formValues == null;
+        const params = this.state.params;
         return <Page padding>
             <Card>
                 <Space>
@@ -250,7 +250,6 @@ export default class extends React.Component {
         const dropPosition = e.dropPosition - Number(dropPos[dropPos.length - 1]); // the drop position relative to the drop node, inside 0, top -1, bottom 1
 
 
-        console.log(dragNode.title, '->', node.title, 'dropToGap:', dropToGap, "dropPosition:", dropPosition)
         HttpUtils.post('admin/sysOrg/sort', {dropPosition, dropToGap, dropKey, dragKey}).then(this.loadTree)
     };
 }

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

@@ -39,7 +39,7 @@ export default class extends React.Component {
 
     handleEditUser = record => {
         this.setState({usersModalOpen: true, formValues: record})
-        HttpUtils.get('admin/sysRole/userList', {id: record.id}).then(rs => {
+        HttpUtils.get('admin/sysRole/user-list', {id: record.id}).then(rs => {
             this.setState({userList: rs.list, targetKeys: rs.selectedKeys})
         })
     }
@@ -153,7 +153,7 @@ export default class extends React.Component {
             id: this.state.formValues.id,
             userIdList: this.state.targetKeys
         }
-        HttpUtils.post('admin/sysRole/grantUsers', params).then(rs => {
+        HttpUtils.post('admin/sysRole/grant-users', params).then(rs => {
             this.setState({usersModalOpen: false})
         })
     }
@@ -197,7 +197,7 @@ export default class extends React.Component {
                    open={this.state.formOpen}
                    onOk={() => this.formRef.current.submit()}
                    onCancel={() => this.setState({formOpen: false})}
-                   destroyOnHidden
+                   destroyOnClose
                    maskClosable={false}
                    width={600}
             >
@@ -238,7 +238,7 @@ export default class extends React.Component {
 
             <Modal title={'角色用户' + "【" + this.state.formValues?.name + '】'}
                    open={this.state.usersModalOpen}
-                   destroyOnHidden
+                   destroyOnClose
                    maskClosable={false}
                    width={800}
                    onCancel={() => this.setState({usersModalOpen: false})}
@@ -271,7 +271,7 @@ export default class extends React.Component {
 
             <Modal title={'角色授权菜单权限' + "【" + this.state.formValues?.name + '】'}
                    open={this.state.menuOpen}
-                   destroyOnHidden
+                   destroyOnClose
                    maskClosable={false}
                    width={800}
                    onCancel={() => this.setState({menuOpen: false})}

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

@@ -1,7 +1,7 @@
 import React from "react";
 import {Button, Card, Checkbox, Table, Typography} from "antd";
 import {SaveOutlined} from "@ant-design/icons";
-import {ArrUtils, HttpUtils, PageUtils} from "../../../framework";
+import {ArrayUtils, HttpUtils, PageUtils} from "../../../framework";
 export default class extends React.Component {
 
 
@@ -35,7 +35,7 @@ export default class extends React.Component {
                 }
 
 
-                let rowSelectedKey = this.state.rowSelectedKeys[record.id];
+                const rowSelectedKey = this.state.rowSelectedKeys[record.id];
                 return <Checkbox.Group options={options}
                                        value={rowSelectedKey}
                                        onChange={(ks) => {
@@ -59,10 +59,10 @@ export default class extends React.Component {
             HttpUtils.get('admin/sysRole/get', {id: this.roleId}).then(rs => {
                 this.setState({roleInfo: rs})
             }),
-            HttpUtils.get('admin/sysRole/permTreeTable', {id: this.roleId}).then(rs => {
+            HttpUtils.get('admin/sysRole/perm-tree-table', {id: this.roleId}).then(rs => {
                 this.setState({dataSource: rs})
             }),
-            HttpUtils.get('admin/sysRole/ownPerms', {id: this.roleId}).then(rs => {
+            HttpUtils.get('admin/sysRole/own-perms', {id: this.roleId}).then(rs => {
                 this.setState({rowSelectedKeys: rs})
             })
         ]).then(rs => {
@@ -80,9 +80,9 @@ export default class extends React.Component {
                 continue;
             }
             menus.push(menuId)
-            ArrUtils.addAll(perms, ks)
+            ArrayUtils.addAll(perms, ks)
         }
-        HttpUtils.post('admin/sysRole/savePerms', {id: this.roleId, perms, menus}).then(rs => {
+        HttpUtils.post('admin/sysRole/save-perms', {id: this.roleId, perms, menus}).then(rs => {
             //  Page.open(PageUtils.currentPathname(), PageUtils.currentLabel())
         })
     };

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

@@ -20,7 +20,7 @@ export default class UserPerm extends React.Component {
     show(item) {
         this.setState({visible: true})
 
-        HttpUtils.get('admin/sysUser/getPermInfo', {id: item.id}).then(rs => {
+        HttpUtils.get('admin/sysUser/get-perm-info', {id: item.id}).then(rs => {
             this.setState({formValues: rs})
             this.formRef.current.setFieldsValue(rs)
         })
@@ -34,7 +34,7 @@ export default class UserPerm extends React.Component {
         })
 
 
-        HttpUtils.post('admin/sysUser/grantPerm', values).then(rs => {
+        HttpUtils.post('admin/sysUser/grant-perm', values).then(rs => {
             this.setState({
                 visible: false,
                 confirmLoading: false
@@ -49,11 +49,11 @@ export default class UserPerm extends React.Component {
     }
 
     render() {
-        let {visible, confirmLoading} = this.state
+        const {visible, confirmLoading} = this.state
 
         return <Modal
             title="授权"
-            destroyOnHidden
+            destroyOnClose
             width={600}
             open={visible}
             confirmLoading={confirmLoading}

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

@@ -30,7 +30,7 @@ export default class extends React.Component {
     tableRef = React.createRef()
 
     resetPwd(row) {
-        HttpUtils.post('admin/sysUser/resetPwd', {id: row.id}).then(rs => {
+        HttpUtils.post('admin/sysUser/reset-pwd', {id: row.id}).then(rs => {
             Modal.success({
                 title: '重置密码成功',
                 content: rs
@@ -206,7 +206,7 @@ export default class extends React.Component {
                    open={this.state.formOpen}
                    onOk={() => this.formRef.current.submit()}
                    onCancel={() => this.setState({formOpen: false})}
-                   destroyOnHidden
+                   destroyOnClose
             >
 
                 <Form ref={this.formRef} labelCol={{flex: '100px'}}

package/src/pages/userCenter/ChangePassword.jsx

@@ -1,15 +1,13 @@
 import React from "react";
 import {Button, Form, Input, Modal} from "antd";
-
-
 import {history} from 'umi'
-import {HttpUtils} from "../../framework";
+import {HttpUtils, SysUtils} from "../../framework";
 
 export default class extends React.Component {
 
 
     onFinish = (values) => {
-        HttpUtils.post('admin/userCenter/updatePwd', values).then(() => {
+        HttpUtils.post('admin/userCenter/update-pwd', values).then(() => {
             Modal.success({
                 title: '提示',
                 content: '修改密码成功',
@@ -23,7 +21,7 @@ export default class extends React.Component {
 
     validator = (rule, value) => {
         return new Promise((resolve, reject) => {
-            HttpUtils.get("admin/sysUser/pwdStrength", {password: value}).then(response => {
+            HttpUtils.get("admin/sysUser/pwd-strength", {password: value}).then(response => {
                 const rs = response.data
                 if (!rs.success) {
                     reject(rs.message)

package/src/pages/userCenter/manual.jsx

@@ -45,7 +45,7 @@ export default class extends React.Component {
         return <Page>
             <ProTable
                 actionRef={this.tableRef}
-                request={(params) => HttpUtils.get('admin/sysManual/pageForUser', params)}
+                request={(params) => HttpUtils.get('admin/sysManual/page-for-user', params)}
                 columns={this.columns}
             />
         </Page>

package/src/pages/userCenter/message.jsx

@@ -56,7 +56,7 @@ export default class extends React.Component {
     render() {
         return <Card variant={"borderless"}>
 
-            <Tabs defaultActiveKey="0" destroyOnHidden
+            <Tabs defaultActiveKey="0" destroyOnClose
             >
                 <Tabs.TabPane key='0' tab='所有消息'>
                     <ProTable

package/src/framework/components/DownloadFileButton/index.d.ts

@@ -1,11 +0,0 @@
-import React from "react";
-
-
-declare type DownloadFileButtonProps = {
-    url:  String;
-    params: any
-
-};
-
-export class DownloadFileButton extends React.Component<DownloadFileButtonProps, any> {
-}

package/src/framework/components/Gap/index.d.ts

@@ -1,23 +0,0 @@
-// @ts-ignore
-import React from "react";
-
-// 推荐(16+8n)px 作为间隔，n为自然数
-declare type GapProps = {
-    /**
-     * mini 4px
-     * middle 8px
-     * large 16px
-     *
-     * 默认 middle
-     */
-    size?: 'small' | 'middle' | 'large';
-
-    /** 方向：水平或垂直
-     * 默认垂直：上下间隔
-     *
-     */
-    direction?: 'horizontal' | 'vertical';
-};
-
-export class Gap extends React.Component<GapProps, any> {
-}