@jiangood/springboot-admin-starter 0.0.3 → 0.0.5

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

@@ -2,11 +2,9 @@ import {PlusOutlined} from '@ant-design/icons';
 import {Button, Form, Input, Modal, Popconfirm, Splitter, Tabs} from 'antd';
 import React from 'react';
 import {
-    ButtonList,
-    dictValueTag,
-    FieldOrgTreeSelect,
-    FieldRadioBoolean,
-    HttpUtil,
+    ButtonList, DictUtils,
+    FieldBoolean,
+    FieldSysOrgTreeSelect, HttpUtils,
     OrgTree,
     Page,
     ProTable,
@@ -79,7 +77,7 @@ export default class extends React.Component {
             title: '数据权限',
             dataIndex: 'dataPermType',
             render(v) {
-                return dictValueTag('dataPermType', v)
+                return DictUtils.dictTag('dataPermType', v)
             }
         },
 
@@ -99,12 +97,12 @@ export default class extends React.Component {
                             onClick={() => this.permRef.current.show(record)}> 授权 </Button>
 
                     <Popconfirm perm='sysUser:resetPwd' title='确认重置密码？' onConfirm={() => this.resetPwd(record)}>
-                        <a>重置密码</a>
+                        <Button  size='small' >重置密码</Button>
                     </Popconfirm>
 
                     <Popconfirm perm='sysUser:delete' title={'是否确定删除用户'}
                                 onConfirm={() => this.handleDelete(record)}>
-                        <a>删除</a>
+                        <Button  size='small' >删除</Button>
                     </Popconfirm>
                 </ButtonList>;
             },
@@ -115,7 +113,7 @@ export default class extends React.Component {
 
 
     resetPwd(row) {
-        HttpUtil.post('admin/sysUser/resetPwd', {id: row.id}).then(rs => {
+        HttpUtils.post('admin/sysUser/resetPwd', {id: row.id}).then(rs => {
             Modal.success({
                 title: '重置密码成功',
                 content: rs
@@ -125,7 +123,7 @@ export default class extends React.Component {
 
 
     handleDelete = r => {
-        HttpUtil.get('admin/sysUser/delete', {id: r.id}).then(rs => {
+        HttpUtils.get('admin/sysUser/delete', {id: r.id}).then(rs => {
             this.tableRef.current.reload();
         })
     }
@@ -151,7 +149,7 @@ export default class extends React.Component {
 
 
     onFinish = values => {
-        HttpUtil.post('admin/sysUser/save', values).then(rs => {
+        HttpUtils.post('admin/sysUser/save', values).then(rs => {
             this.setState({formOpen: false})
             this.tableRef.current.reload()
         })
@@ -182,7 +180,7 @@ export default class extends React.Component {
                 <Splitter.Panel style={{paddingLeft:16}}>
                     <ProTable
                         actionRef={this.tableRef}
-                        toolBarRender={(params, {selectedRows,selectedRowKeys}) => {
+                        toolBarRender={() => {
                             return <ButtonList>
                                 <Button
                                     perm='sysUser:save'
@@ -197,12 +195,10 @@ export default class extends React.Component {
                         request={(params) => {
                             params.orgId = this.state.currentOrgId
                             params.roleId = this.state.currentRoleId
-                            return HttpUtil.pageData('admin/sysUser/page', params)
+                            return HttpUtils.get('admin/sysUser/page', params)
                         }
                         }
                         columns={this.columns}
-                        rowKey="id"
-                        scroll={{x: 'max-content'}}
                     >
 
                     </ProTable>
@@ -223,7 +219,7 @@ export default class extends React.Component {
                     <Form.Item name='id' noStyle></Form.Item>
 
                     <Form.Item label='所属机构' name='deptId' rules={[{required: true}]}>
-                        <FieldOrgTreeSelect/>
+                        <FieldSysOrgTreeSelect />
                     </Form.Item>
 
                     <Form.Item label='姓名' name='name' rules={[{required: true}]}>
@@ -242,7 +238,7 @@ export default class extends React.Component {
                     </Form.Item>
 
                     <Form.Item label='启用状态' name='enabled' rules={[{required: true}]}>
-                        <FieldRadioBoolean/>
+                        <FieldBoolean/>
                     </Form.Item>
 
                 </Form>

package/src/pages/test.jsx

@@ -1,15 +1,200 @@
 import React from "react";
-import {Card} from "antd";
+import {Button, Card, Divider, Form, Space} from "antd";
+import {
+    FieldBoolean,
+    FieldDate,
+    FieldDateRange,
+    FieldEditor,
+    FieldPercent,
+    FieldRemoteSelect,
+    FieldRemoteSelectMultiple,
+    FieldRemoteTree,
+    FieldRemoteTreeCascader,
+    FieldRemoteTreeSelect,
+    FieldRemoteTreeSelectMultiple,
+    FieldSysOrgTree,
+    FieldSysOrgTreeSelect,
+    FieldTable,
+    FieldTableSelect,
+    FieldUploadFile
+} from "../framework";
 
 export default class extends React.Component {
 
 
+    state = {
+        formValues: {}
+    }
+
+
+    componentDidMount() {
+        const json = localStorage.getItem("_test")
+        const formValues = json ? JSON.parse(json) : {}
+        this.formRef.current.setFieldsValue(formValues)
+        this.setState({formValues})
+    }
+
+    formRef = React.createRef()
+
+
     render() {
 
-        return <Card title='测试页面'>
+        return <>
+            <Card title='表单组件-自定义封装'>
+                {JSON.stringify(this.state.formValues)}
+                <Divider></Divider>
+                <Form
+                    ref={this.formRef}
+                    onValuesChange={(changedValues, allValues) => {
+                        this.setState({formValues: allValues})
+                    }}
+                    onReset={() => {
+                        this.setState({formValues: {}})
+                    }}
+
+                    onFinish={values => {
+                        localStorage.setItem("_test", JSON.stringify(values))
+                    }}
+
+                    labelAlign={'left'}
+                    labelCol={{flex: '400px',}}
+                    layout='horizontal'
+                >
+                    <Form.Item label='上传'   name='file'>
+                        <FieldUploadFile cropImage={true} />
+                    </Form.Item>
+
+                    <Form.Item label='百分数'   name='number'>
+                        <FieldPercent />
+                    </Form.Item>
+                    <Form.Item label='机构树选择 （部门） FieldSysOrgTree'   name='org'>
+                        <FieldSysOrgTree />
+                    </Form.Item>
+                    <Form.Item label='机构树选择 （部门） FieldSysOrgTreeSelect'   name='org'>
+                        <FieldSysOrgTreeSelect />
+                    </Form.Item>
+
+                    <Form.Item label='机构树选择（单位） FieldSysOrgTreeSelect'   name='org'>
+                        <FieldSysOrgTreeSelect type='unit' />
+                    </Form.Item>
+
+
+
+                    <Form.Item label='选择表格 FieldTableSelect' name='user'>
+                        <FieldTableSelect url='admin/sysUser/page'  columns={[
+                            {title: '姓名', dataIndex: 'name'},
+                            {title: '账号', dataIndex: 'account'},
+                        ]}/>
+                    </Form.Item>
+
+                    <Form.Item label='可编辑表格' name='tableData'>
+                        <FieldTable columns={[
+                            {title: '名称', dataIndex: 'name'},
+                            {title: '年龄', dataIndex: 'age'},
+                            {title: '婚否', dataIndex: 'marry',render(){
+                                return <FieldBoolean type='select'></FieldBoolean>
+                                }},
+                        ]}></FieldTable>
+                    </Form.Item>
+
+                    <Divider>日期区间 FieldDateRange</Divider>
+                    <Form.Item label=' YYYY-MM-DD HH:mm:ss' name='dateRange'>
+                        <FieldDateRange type='YYYY-MM-DD HH:mm:ss'></FieldDateRange>
+                    </Form.Item>
+                    <Form.Item label='YYYY-MM-DD HH:mm' name='dateRange'>
+                        <FieldDateRange type='YYYY-MM-DD HH:mm'></FieldDateRange>
+                    </Form.Item>
+                    <Form.Item label='日期' name='dateRange'>
+                        <FieldDateRange ></FieldDateRange>
+                    </Form.Item>
+                    <Form.Item label='YYYY-QQ 季度' name='dateRange'>
+                        <FieldDateRange type='YYYY-QQ'></FieldDateRange>
+                    </Form.Item>
+                    <Form.Item label='YYYY-MM' name='dateRange'>
+                        <FieldDateRange type='YYYY-MM'></FieldDateRange>
+                    </Form.Item>
+                    <Form.Item label='YYYY' name='dateRange'>
+                        <FieldDateRange type='YYYY'></FieldDateRange>
+                    </Form.Item>
+                    <Form.Item label='HH:mm' name='dateRange'>
+                        <FieldDateRange type='HH:mm'></FieldDateRange>
+                    </Form.Item>
+                    <Form.Item label='HH:mm:ss' name='dateRange'>
+                        <FieldDateRange type='HH:mm:ss'></FieldDateRange>
+                    </Form.Item>
+
+
+                    <Divider>日期</Divider>
+                    <Form.Item label='YYYY-MM-DD HH:mm:ss' name='date'>
+                        <FieldDate type='YYYY-MM-DD HH:mm:ss'></FieldDate>
+                    </Form.Item>
+                    <Form.Item label='FieldDate YYYY-MM-DD HH:mm' name='date'>
+                        <FieldDate type='YYYY-MM-DD HH:mm'></FieldDate>
+                    </Form.Item>
+                    <Form.Item label='FieldDate 日期' name='date'>
+                        <FieldDate ></FieldDate>
+                    </Form.Item>
+                    <Form.Item label='FieldDate YYYY-QQ 季度' name='date'>
+                        <FieldDate type='YYYY-QQ'></FieldDate>
+                    </Form.Item>
+                    <Form.Item label='FieldDate YYYY-MM' name='date'>
+                        <FieldDate type='YYYY-MM'></FieldDate>
+                    </Form.Item>
+                    <Form.Item label='FieldDate YYYY' name='date'>
+                        <FieldDate type='YYYY'></FieldDate>
+                    </Form.Item>
+                    <Form.Item label='FieldDate HH:mm' name='date'>
+                        <FieldDate type='HH:mm'></FieldDate>
+                    </Form.Item>
+                    <Form.Item label='FieldDate HH:mm:ss' name='date'>
+                        <FieldDate type='HH:mm:ss'></FieldDate>
+                    </Form.Item>
+                    <Divider>布尔</Divider>
+                    <Form.Item label='FieldBoolean 布尔 (switch)' name='boolean'>
+                        <FieldBoolean type='switch'></FieldBoolean>
+                    </Form.Item>
+                    <Form.Item label='FieldBoolean 布尔 (checkbox)' name='boolean'>
+                        <FieldBoolean type='checkbox'></FieldBoolean>
+                    </Form.Item>
+                    <Form.Item label='FieldBoolean 布尔 (radio)' name='boolean'>
+                        <FieldBoolean type='radio'></FieldBoolean>
+                    </Form.Item>
+                    <Form.Item label='FieldBoolean 布尔 (选择框)' name='boolean'>
+                        <FieldBoolean type='select'></FieldBoolean>
+                    </Form.Item>
+                    <Form.Item label='FieldRemoteTreeSelectMultiple 远程树选择(多选)' name='users'>
+                        <FieldRemoteTreeSelectMultiple url='admin/sysUser/tree'/>
+                    </Form.Item>
+
+                    <Divider>选择</Divider>
+                    <Form.Item label='远程树选择' name='user'>
+                        <FieldRemoteTreeSelect url='admin/sysUser/tree'/>
+                    </Form.Item>
+                    <Form.Item label='远程树（多选）' name='users'>
+                        <FieldRemoteTree url='admin/sysUser/tree'/>
+                    </Form.Item>
+                    <Form.Item label='远程树级联选择' name='user'>
+                        <FieldRemoteTreeCascader url='admin/sysUser/tree'/>
+                    </Form.Item>
+
+                    <Form.Item label='单选' name='user'>
+                        <FieldRemoteSelect url='admin/sysUser/options'/>
+                    </Form.Item>
+                    <Form.Item label='多选' name='users'>
+                        <FieldRemoteSelectMultiple url='admin/sysUser/options'/>
+                    </Form.Item>
+                    <Form.Item label='富文本' name='富文本'>
+                        <FieldEditor height={100}/>
+                    </Form.Item>
 
+                    <Space>
+                        <Button type='primary' htmlType='submit'>保存</Button>
+                        <Button htmlType='reset'>重置</Button>
+                    </Space>
+                </Form>
 
 
-        </Card>
+            </Card>
+        </>
     }
 }

package/src/pages/ureport/index.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import {Button} from "antd";
-import {ButtonList, HttpUtil, ProTable} from "../../framework";
+import {ButtonList, HttpUtils, Page, ProTable} from "../../framework";
 
 export default class extends React.Component {
 
@@ -10,14 +10,14 @@ export default class extends React.Component {
 
 
     render() {
-        return <div>
+        return <Page padding>
 
             <ProTable
                 toolBarRender={() => <Button type='primary'
                                              target='_blank'
                                              href={"/ureport/designer"}>打开设计器</Button>}
 
-                request={(params) => HttpUtil.pageData('admin/ureport/page', params)}
+                request={(params) => HttpUtils.get('admin/ureport/page', params)}
                 columns={[
                     {title: "文件名称", dataIndex: 'name'},
                     {title: "存储器", dataIndex: 'providerName'},
@@ -33,7 +33,7 @@ export default class extends React.Component {
                 ]}></ProTable>
 
 
-        </div>
+        </Page>
     }
 
 

package/src/pages/userCenter/ChangePassword.jsx

@@ -3,18 +3,17 @@ import {Button, Form, Input, Modal} from "antd";
 
 
 import {history} from 'umi'
-import {HttpUtil, SysUtil} from "../../framework";
 
 export default class extends React.Component {
 
 
     onFinish = (values) => {
-        HttpUtil.post('admin/userCenter/updatePwd', values).then(() => {
+        HttpUtils.post('admin/userCenter/updatePwd', values).then(() => {
             Modal.success({
                 title: '提示',
                 content: '修改密码成功',
                 onOk: () => {
-                    SysUtil.setToken(null)
+                    SysUtils.setToken(null)
                     history.push('/login')
                 }
             })
@@ -23,7 +22,7 @@ export default class extends React.Component {
 
     validator = (rule, value) => {
         return new Promise((resolve, reject) => {
-            HttpUtil.create().get("admin/sysUser/pwdStrength", {password: value}).then(response => {
+            HttpUtils.create().get("admin/sysUser/pwdStrength", {password: value}).then(response => {
                 const rs = response.data
                 if (!rs.success) {
                     reject(rs.message)

package/src/pages/userCenter/index.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import {Avatar, Card, Col, Row, Tabs} from "antd";
 import ChangePassword from "./ChangePassword";
-import {HttpUtil, Page} from "../../framework";
+import {Page} from "../../framework";
 
 export default class extends React.Component {
 
@@ -10,7 +10,7 @@ export default class extends React.Component {
     }
 
     componentDidMount() {
-        HttpUtil.get('admin/userCenter/info').then(rs=>{
+        HttpUtils.get('admin/userCenter/info').then(rs=>{
             this.setState({info:rs})
         })
     }

package/src/pages/userCenter/manual.jsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import {HttpUtil, Page, ProTable, SysUtil} from "../../framework";
+import {HttpUtils, Page, ProTable} from "../../framework";
 
 
 export default class extends React.Component {
@@ -28,7 +28,7 @@ export default class extends React.Component {
             title: '文件',
             dataIndex: 'fileId',
             render(id){
-               const url = SysUtil.wrapServerUrl('admin/sysFile/preview/' + id);
+               const url = ('admin/sysFile/preview/' + id);
                 return <a href={url} target='_blank'>查看文件</a>
             }
 
@@ -47,13 +47,9 @@ export default class extends React.Component {
         return <Page>
             <ProTable
                 actionRef={this.tableRef}
-
-                request={(params) => HttpUtil.pageData('admin/sysManual/pageForUser', params)}
+                request={(params) => HttpUtils.get('admin/sysManual/pageForUser', params)}
                 columns={this.columns}
-
             />
-
-
         </Page>
 
 

package/src/pages/userCenter/message.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 import {Button, Card, Tabs, Tag} from "antd";
-import {HttpUtil, ProTable} from "../../framework";
+import {ProTable} from "../../framework";
 
 export default class  extends React.Component {
 
@@ -48,7 +48,7 @@ export default class  extends React.Component {
     ]
 
     read = (record) => {
-        HttpUtil.post("admin/user/msg/read", record).then(rs => {
+        HttpUtils.post("admin/user/msg/read", record).then(rs => {
             this.tableRef.current.reload()
         })
     }
@@ -63,7 +63,7 @@ export default class  extends React.Component {
                 <Tabs.TabPane key='0' tab='所有消息'>
                     <ProTable
                         actionRef={this.tableRef}
-                        request={(params) => HttpUtil.pageData("admin/user/msg/page", params)}
+                        request={(params) => HttpUtils.get("admin/user/msg/page", params)}
                         columns={this.columns}
                         toolbarOptions={{showSearch:false}}
                         size='small'
@@ -72,7 +72,7 @@ export default class  extends React.Component {
                 <Tabs.TabPane key='1' tab='未读消息'>
                     <ProTable
                         actionRef={this.tableRef}
-                        request={(params) => HttpUtil.pageData("admin/user/msg/page?read=false", params)}
+                        request={(params) => HttpUtils.get("admin/user/msg/page?read=false", params)}
                         columns={this.columns}
                         rowSelection={false}
                         rowKey='id'
@@ -86,7 +86,7 @@ export default class  extends React.Component {
 
                     <ProTable
                         actionRef={this.tableRef}
-                        request={(params) => HttpUtil.pageData("admin/user/msg/page?read=true", params)}
+                        request={(params) => HttpUtils.get("admin/user/msg/page?read=true", params)}
                         rowSelection={false}
                         rowKey='id'
                         toolbarOptions={{showSearch:false}}

package/config/dist/config.local.js

@@ -1,23 +0,0 @@
-"use strict";
-// .umirc.local.ts 仅在 umi dev 时有效。umi build 时不会被加载
-// 这份配置会和 .umirc.ts 做 deep merge 后形成最终配置。
-Object.defineProperty(exports, "__esModule", { value: true });
-var umi_1 = require("umi");
-exports.default = (0, umi_1.defineConfig)({
-    proxy: {
-        '/admin': {
-            target: 'http://127.0.0.1:8002',
-            changeOrigin: true,
-        },
-        '/ureport': {
-            target: 'http://127.0.0.1:8002',
-            changeOrigin: true,
-            pathRewrite: { '^/ureport': '/ureport' },
-        },
-        '/ws-log-view': {
-            target: 'http://127.0.0.1:8002',
-            changeOrigin: true,
-            ws: true,
-        },
-    }
-});

package/src/components/InstanceStatusInfo.jsx

@@ -1,79 +0,0 @@
-import React from "react";
-import {Card, Empty, Skeleton, Table} from "antd";
-import {HttpUtil} from "../framework";
-
-
-export default class InstanceStatusInfo extends React.Component {
-
-    state = {
-        instanceCommentList: [],
-        vars: {},
-
-        id: null,
-        starter: null,
-        startTime: null,
-        name: null,
-
-        data: {
-            commentList: [],
-            img: null
-        },
-        loading: true,
-
-        errorMsg: null
-    }
-
-
-    componentDidMount() {
-        const {id, businessKey} = this.props;
-        HttpUtil.get("admin/flowable/my/getInstanceInfo", {id, businessKey}).then(rs => {
-            this.setState(rs)
-            this.setState({data: rs})
-        }).catch(e => {
-            this.setState({errorMsg: e})
-        }).finally(() => {
-            this.setState({loading: false})
-        })
-
-    }
-
-
-    render() {
-        if (this.state.errorMsg) {
-            return <Empty description={this.state.errorMsg}></Empty>
-        }
-
-        const {data, loading} = this.state
-        const {commentList, img} = data
-        if (loading) {
-            return <Skeleton/>
-        }
-
-
-        return <Card title='处理记录'>
-            <img src={img} style={{maxWidth: '100%'}}/>
-            <Table dataSource={commentList}
-                   bordered
-                   size='small'
-                   pagination={false}
-                   rowKey='id'
-                   columns={[
-                       {
-                           dataIndex: 'content',
-                           title: '操作'
-                       },
-                       {
-                           dataIndex: 'user',
-                           title: '处理人'
-                       },
-                       {
-                           dataIndex: 'time',
-                           title: '处理时间'
-                       },
-                   ]}
-            />
-        </Card>
-
-    }
-
-}

package/src/components/StreamLog.jsx

@@ -1,27 +0,0 @@
-import {LazyLog, ScrollFollow} from "react-lazylog";
-import React from "react";
-import {SysUtil} from "../framework";
-
-/**
- * https://mozilla-frontend-infra.github.io/react-lazylog/
- */
-export default class extends React.Component {
-
-  render() {
-    const url = this.props.url;
-    const headers = SysUtil.getHeaders();
-
-
-    return <ScrollFollow
-      startFollowing={true}
-      render={({follow, onScroll}) => (
-        <LazyLog url={url}
-                 height={500}
-                 follow={follow}
-                 fetchOptions={{credentials:'include', ...headers}}
-                 onScroll={onScroll}/>
-      )}
-    />
-
-  }
-}