@jiangood/open-admin 1.0.0 → 1.1.0

package/src/pages/404.jsx

@@ -4,10 +4,10 @@ import {Result} from "antd";
 export default class extends React.Component {
 
     render() {
-            return  <Result
-                status={404}
-                title='页面不存在'
-            />
+        return <Result
+            status={404}
+            title='页面不存在'
+        />
 
     }
 }

package/src/pages/about.jsx

@@ -3,8 +3,6 @@ import React from "react";
 export default class extends React.Component {
 
 
-
-
     render() {
         return <>
             <h1>关于</h1>

package/src/pages/index.jsx

@@ -1,25 +1,10 @@
 import React from "react";
 import {Card} from "antd";
-import {MessageUtils} from "../framework";
 
 
-export default class extends React.Component {
-
-    state = {}
-
-    componentDidMount() {
-
-    }
-
-    render() {
-
-        return <Card>
-            欢迎使用本系统
-
-
-
-
-        </Card>
-    }
+export default function () {
 
+    return <Card>
+        欢迎使用本系统
+    </Card>
 }

package/src/pages/login.jsx

@@ -1,21 +1,16 @@
 import React from 'react';
 
 import {LoginPage} from "../framework/pages/LoginPage";
-import {Button} from "antd";
-
-
-export default class  extends React.Component {
 
 
+export default class extends React.Component {
 
 
     render() {
-        return <LoginPage />
+        return <LoginPage/>
         // 支持自定义
-      // return <LoginPage form={<Button type={"primary"} size='large'>xx登录</Button>} />
+        // return <LoginPage form={<Button type={"primary"} size='large'>xx登录</Button>} />
     }
 
 
-
-
 }

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

@@ -4,14 +4,14 @@ import {Button, Descriptions, message, Space, Table, Typography} from "antd";
 
 const {Title, Paragraph, Text, Link} = Typography;
 
-export  class ApiDoc extends React.Component {
+export class ApiDoc extends React.Component {
 
     state = {
         url: null,
         appId: null,
         apiList: [],
         frameworkVersion: null,
-        errorList:[]
+        errorList: []
     }
 
     columns = [
@@ -44,14 +44,14 @@ export  class ApiDoc extends React.Component {
     }
 
 
-
     render() {
         const {apiList} = this.state
         return <div>
 
             <Space>
-                <FieldRemoteSelect url='admin/apiAccount/accountOptions' placeholder='请选择账号' onChange={v=>this.loadData(v)}/>
-                <Button type='primary' >导出PDF</Button>
+                <FieldRemoteSelect url='admin/apiAccount/accountOptions' placeholder='请选择账号'
+                                   onChange={v => this.loadData(v)}/>
+                <Button type='primary'>导出PDF</Button>
             </Space>
             <div id='doc-content'>
                 <Title level={1}>接口说明文档</Title>
@@ -88,23 +88,27 @@ export  class ApiDoc extends React.Component {
                 <Table rowKey='name' columns={this.columns} bordered dataSource={[
                     {name: 'appId', type: 'String', required: true, desc: '账号标识,appId'},
                     {name: 'timestamp', type: 'String', required: true, desc: '时间戳，当前UNIX时间戳，13位，精确到毫秒'},
-                    {name: 'sign', type: 'String', required: true, desc: '数据签名，appId + appSecret + timestamp拼接后，进行md5摘要，值为32位小写'},
+                    {
+                        name: 'sign',
+                        type: 'String',
+                        required: true,
+                        desc: '数据签名，appId + appSecret + timestamp拼接后，进行md5摘要，值为32位小写'
+                    },
                 ]} size='small' pagination={false}>
                 </Table>
 
 
-
                 <Typography.Title level={4}>公共错误码</Typography.Title>
-                <Table  columns={[
-                    {dataIndex:'code',title:'错误码'},
-                    {dataIndex:'message', title:'错误描述'}
+                <Table columns={[
+                    {dataIndex: 'code', title: '错误码'},
+                    {dataIndex: 'message', title: '错误描述'}
                 ]} rowKey='code' bordered dataSource={this.state.errorList} size='small' pagination={false}>
                 </Table>
 
                 <Typography.Title level={2}>二、接口列表</Typography.Title>
                 {apiList.map((api, index) => {
                     return <div key={index}>
-                        <Typography.Title level={3}>{ api.name} </Typography.Title>
+                        <Typography.Title level={3}>{api.name} </Typography.Title>
                         <p>接口名称： {api.action}</p>
                         <p>功能描述：{api.desc}</p>
 
@@ -118,10 +122,10 @@ export  class ApiDoc extends React.Component {
                         <Table columns={this.columns} bordered
                                rowKey={'name'}
                                dataSource={[
-                            {name: 'code', type: 'int', required: true, desc: '响应码，0表示成功'},
-                            {name: 'message', type: 'String', required: false, desc: '结果提示信息'},
-                            {name: 'data', type: api.returnType, required: false, desc: '返回数据'}
-                        ]} size='small' pagination={false}>
+                                   {name: 'code', type: 'int', required: true, desc: '响应码，0表示成功'},
+                                   {name: 'message', type: 'String', required: false, desc: '结果提示信息'},
+                                   {name: 'data', type: api.returnType, required: false, desc: '返回数据'}
+                               ]} size='small' pagination={false}>
                         </Table>
                         {api.returnList != null && api.returnList.length > 0 && <>
                             <Title level={5}>data 对象 {api.returnType} 说明</Title>

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

@@ -4,7 +4,8 @@ import React from 'react'
 import {
     ButtonList,
     FieldBoolean,
-    FieldDate, HttpUtils,
+    FieldDate,
+    HttpUtils,
     Page,
     PageUtils,
     ProTable,
@@ -24,6 +25,27 @@ export default class extends React.Component {
     formRef = React.createRef()
     tableRef = React.createRef()
 
+    handleAdd = () => {
+        this.setState({formOpen: true, formValues: {}})
+    }
+
+    handleEdit = record => {
+        this.setState({formOpen: true, formValues: record})
+    }
+
+    onFinish = values => {
+        HttpUtils.post('admin/apiAccount/save', values).then(rs => {
+            this.setState({formOpen: false})
+            this.tableRef.current.reload()
+        })
+    }
+
+    handleDelete = record => {
+        HttpUtils.get('admin/apiAccount/delete', {id: record.id}).then(rs => {
+            this.tableRef.current.reload()
+        })
+    }
+
     columns = [
         {
             title: '名称',
@@ -73,29 +95,6 @@ export default class extends React.Component {
         },
     ]
 
-    handleAdd = () => {
-        this.setState({formOpen: true, formValues: {}})
-    }
-
-    handleEdit = record => {
-        this.setState({formOpen: true, formValues: record})
-    }
-
-
-    onFinish = values => {
-        HttpUtils.post('admin/apiAccount/save', values).then(rs => {
-            this.setState({formOpen: false})
-            this.tableRef.current.reload()
-        })
-    }
-
-
-    handleDelete = record => {
-        HttpUtils.get('admin/apiAccount/delete', {id: record.id}).then(rs => {
-            this.tableRef.current.reload()
-        })
-    }
-
     randomAppSecret = () => {
         const appSecret = StringUtils.random(32)
         this.formRef.current.setFieldsValue({appSecret})

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

@@ -6,15 +6,15 @@ import {ArrUtils, HttpUtils, Page, PageUtils, ProTable} from "../../../framework
 export default class extends React.Component {
 
 
+    state = {
+        perms: []
+    }
+
     constructor(props) {
         super(props);
         this.accountId = PageUtils.currentParams().accountId
     }
 
-    state = {
-        perms: []
-    }
-
     async componentDidMount() {
         const rs = await HttpUtils.get('admin/apiAccount/get', {id: this.accountId})
         this.setState({perms: rs.perms})

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

@@ -16,7 +16,6 @@ export default class extends React.Component {
     columns = [
 
 
-
         {
             title: '编码',
             dataIndex: 'code',
@@ -29,11 +28,9 @@ export default class extends React.Component {
         },
 
 
-
     ]
 
 
-
     render() {
         return <>
             <ProTable
@@ -60,8 +57,6 @@ export default class extends React.Component {
             />
 
 
-
-
         </>
 
 

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

@@ -21,6 +21,28 @@ export default class extends React.Component {
         }
     }
 
+    handleAdd = () => {
+        this.setState({formOpen: true, formValues: {}})
+    }
+
+    handleEdit = record => {
+        this.setState({formOpen: true, formValues: record})
+    }
+
+    onFinish = values => {
+        values.sysDict = {id: this.props.sysDictId}
+        HttpUtils.post('admin/sysDictItem/save', values).then(rs => {
+            this.setState({formOpen: false})
+            this.tableRef.current.reload()
+        })
+    }
+
+    handleDelete = row => {
+        HttpUtils.get('admin/sysDictItem/delete', row).then(rs => {
+            this.tableRef.current.reload()
+        })
+    }
+
     columns = [
         {
             title: '文本',
@@ -77,30 +99,6 @@ export default class extends React.Component {
         },
     ]
 
-    handleAdd = () => {
-        this.setState({formOpen: true, formValues: {}})
-    }
-
-    handleEdit = record => {
-        this.setState({formOpen: true, formValues: record})
-    }
-
-
-    onFinish = values => {
-        values.sysDict = {id: this.props.sysDictId}
-        HttpUtils.post('admin/sysDictItem/save', values).then(rs => {
-            this.setState({formOpen: false})
-            this.tableRef.current.reload()
-        })
-    }
-
-
-    handleDelete = row => {
-        HttpUtils.get('admin/sysDictItem/delete', row).then(rs => {
-            this.tableRef.current.reload()
-        })
-    }
-
     render() {
         return <>
             <ProTable
@@ -162,7 +160,7 @@ export default class extends React.Component {
                     </Row>
 
                     <Form.Item label='启用' name='enabled' rules={[{required: true}]}>
-                       <FieldBoolean />
+                        <FieldBoolean/>
                     </Form.Item>
 
                 </Form>

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

@@ -12,10 +12,10 @@ export default class extends React.Component {
 
     render() {
         return <Splitter>
-            <Splitter.Panel defaultSize={600} style={{paddingRight:16}}>
+            <Splitter.Panel defaultSize={600} style={{paddingRight: 16}}>
                 <Dict onChange={selectedKey => this.setState({selectedKey})}/>
             </Splitter.Panel>
-            <Splitter.Panel style={{paddingLeft:16}}>
+            <Splitter.Panel style={{paddingLeft: 16}}>
                 <DictItem sysDictId={this.state.selectedKey}/>
             </Splitter.Panel>
         </Splitter>

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

@@ -1,17 +1,8 @@
 import {Button, Form, Input, Modal, Popconfirm} from 'antd'
 import React from 'react'
-import {
-    ButtonList,
-    FieldDateRange,
-    FieldDictSelect,
-    FieldUploadFile,
-    HttpUtils,
-    ProTable,
-    SysUtils
-} from "../../../framework";
+import {ButtonList, FieldDateRange, FieldDictSelect, FieldUploadFile, HttpUtils, ProTable} from "../../../framework";
 import {CloudUploadOutlined} from "@ant-design/icons";
 
-
 export default class extends React.Component {
 
     state = {
@@ -22,13 +13,18 @@ export default class extends React.Component {
     tableRef = React.createRef()
     formRef = React.createRef()
 
+    handleDelete = row => {
+        HttpUtils.get('admin/sysFile/delete', row).then(rs => {
+            this.tableRef.current.reload()
+        })
+    }
 
     columns = [
         {
             title: '原始名称',
             tooltip: '上传时候的文件名',
             dataIndex: 'originName',
-            width:200,
+            width: 200,
         },
         {
             title: '存储名称',
@@ -61,16 +57,16 @@ export default class extends React.Component {
         {
             title: '预览',
             dataIndex: 'id',
-            render(id,record){
-                const nodes = [  <a href={'/admin/sysFile/preview/' + record.id } target='_blank'>预览</a>]
+            render(id, record) {
+                const nodes = [<a href={'/admin/sysFile/preview/' + record.id} target='_blank'>预览</a>]
 
 
-                if(record.imageUrls?.length > 0){
-                   for(let item of record.imageUrls){
-                       let url = item.url;
-                       let label = item.label;
-                       nodes.push(<a href={( url) } target='_blank' style={{marginLeft:8}} >{label}</a>)
-                   }
+                if (record.imageUrls?.length > 0) {
+                    for (let item of record.imageUrls) {
+                        let url = item.url;
+                        let label = item.label;
+                        nodes.push(<a href={(url)} target='_blank' style={{marginLeft: 8}}>{label}</a>)
+                    }
                 }
 
                 return nodes;
@@ -91,15 +87,6 @@ export default class extends React.Component {
         },
     ]
 
-
-    handleDelete = row => {
-        HttpUtils.get('admin/sysFile/delete', row).then(rs => {
-            this.tableRef.current.reload()
-        })
-    }
-
-
-
     render() {
         return <>
             <ProTable
@@ -143,7 +130,7 @@ export default class extends React.Component {
             >
                 <Form ref={this.formRef}
                       initialValues={this.state.formValues}
-                     >
+                >
                     <Form.Item name='文件'>
                         <FieldUploadFile accept="*/*"/>
                     </Form.Item>

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

@@ -59,6 +59,8 @@ export default class extends React.Component {
 
         executeRecordOpen: false,
     }
+    tableRef = React.createRef()
+    formRef = React.createRef()
 
     componentDidMount() {
         HttpUtils.get('admin/job/jobClassOptions').then(rs => {
@@ -66,8 +68,40 @@ export default class extends React.Component {
         })
     }
 
-    tableRef = React.createRef()
-    formRef = React.createRef()
+    handleAdd = () => {
+        this.setState({formOpen: true, formValues: {}, paramList: []})
+    }
+
+    handleEdit = (record) => {
+        this.loadJobParamFields(record.jobClass, record.jobData)
+        this.setState({formOpen: true, formValues: record,})
+    }
+
+    loadJobParamFields(className, jobData) {
+        HttpUtils.post("admin/job/getJobParamFields", jobData || {}, {className}).then(rs => {
+            this.setState({paramList: rs})
+        })
+    }
+
+    onFinish = (values) => {
+        HttpUtils.post('admin/job/save', values).then(rs => {
+            this.setState({formOpen: false})
+            this.tableRef.current.reload();
+        })
+    }
+
+    handleDelete = row => {
+        const hide = message.loading("删除作业中...")
+        HttpUtils.get('admin/job/delete', {id: row.id}).then(rs => {
+            this.tableRef.current.reload();
+        }).catch(hide)
+    }
+
+    handleTriggerJob = row => {
+        HttpUtils.get('admin/job/triggerJob', {id: row.id}).then(rs => {
+            this.tableRef.current.reload();
+        })
+    }
 
     columns = [
         {
@@ -97,7 +131,6 @@ export default class extends React.Component {
         },
 
 
-
         {
             title: '启用状态',
             dataIndex: 'enabled',
@@ -114,7 +147,7 @@ export default class extends React.Component {
 
                 return (
                     <Space>
-                        <Button size='small' onClick={()=>this.showExecuteRecord(record)}>执行记录</Button>
+                        <Button size='small' onClick={() => this.showExecuteRecord(record)}>执行记录</Button>
                         <Button size='small' onClick={() => this.handleTriggerJob(record)}>执行一次</Button>
                         <Button size='small' onClick={() => this.handleEdit(record)}> 编辑 </Button>
                         <Popconfirm title='是否确定删除?' onConfirm={() => this.handleDelete(record)}>
@@ -127,39 +160,6 @@ export default class extends React.Component {
 
     ]
 
-    handleAdd = () => {
-        this.setState({formOpen: true, formValues: {}, paramList: []})
-    }
-    handleEdit = (record) => {
-        this.loadJobParamFields(record.jobClass, record.jobData)
-        this.setState({formOpen: true, formValues: record,})
-    }
-
-    loadJobParamFields(className, jobData) {
-        HttpUtils.post("admin/job/getJobParamFields", jobData || {}, {className}).then(rs => {
-            this.setState({paramList: rs})
-        })
-    }
-
-    onFinish = (values) => {
-        HttpUtils.post('admin/job/save', values).then(rs => {
-            this.setState({formOpen: false})
-            this.tableRef.current.reload();
-        })
-    }
-
-    handleDelete = row => {
-        const hide = message.loading("删除作业中...")
-        HttpUtils.get('admin/job/delete', {id: row.id}).then(rs => {
-            this.tableRef.current.reload();
-        }).catch(hide)
-    }
-    handleTriggerJob = row => {
-        HttpUtils.get('admin/job/triggerJob', {id: row.id}).then(rs => {
-            this.tableRef.current.reload();
-        })
-    }
-
     showStatus = () => {
         this.setState({statusOpen: true})
         HttpUtils.get('admin/job/status').then(rs => {
@@ -168,7 +168,7 @@ export default class extends React.Component {
     };
 
     showExecuteRecord(record) {
-        this.setState({executeRecordOpen: true,formValues: record})
+        this.setState({executeRecordOpen: true, formValues: record})
     }
 
 
@@ -272,24 +272,24 @@ export default class extends React.Component {
                         title: '是否成功',
                         dataIndex: 'success',
                         width: 200,
-                        render:v=>{
-                            if(v != null){
-                                return v ? '成功':'异常'
+                        render: v => {
+                            if (v != null) {
+                                return v ? '成功' : '异常'
                             }
                         }
                     },
                     {
                         title: '返回结果',
                         dataIndex: 'result',
-                        width:300
+                        width: 300
                     },
 
                     {
                         title: '操作',
                         dataIndex: 'option',
                         render: (_, record) => {
-                            let url = '/admin/sys/log/'+ record.id;
-                            return <a  href={url} target='_blank'>日志</a>;
+                            let url = '/admin/sys/log/' + record.id;
+                            return <a href={url} target='_blank'>日志</a>;
                         },
                     }
                 ]} request={params => {

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

@@ -1,7 +1,6 @@
 import React, {Fragment} from 'react';
 import {Form, Input, Tag} from "antd";
-import {Ellipsis, FieldDateRange, HttpUtils, ProTable} from "../../../framework";
-
+import {ViewText, FieldDateRange, HttpUtils, ProTable} from "../../../framework";
 
 export default class extends React.Component {
 
@@ -31,7 +30,7 @@ export default class extends React.Component {
             title: '参数',
             dataIndex: 'params',
             render(v) {
-                return <Ellipsis pre={true}>{v}</Ellipsis>
+                return <ViewText value={v} ellipsis={true} />
             }
 
         },
@@ -48,7 +47,7 @@ export default class extends React.Component {
             title: '错误消息',
             dataIndex: 'error',
             render(v) {
-                return <Ellipsis>{v}</Ellipsis>
+                return <ViewText value={v} ellipsis={true} />
             }
         },
     ];