@jiangood/open-admin 1.0.1 → 1.1.0

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

@@ -6,7 +6,8 @@ import {
     FieldDictSelect,
     FieldRemoteTreeSelect,
     FieldUserSelect,
-    Gap, HttpUtils,
+    Gap,
+    HttpUtils,
     NamedIcon,
     Page
 } from "../../../framework";
@@ -39,7 +40,7 @@ export default class extends React.Component {
     }
 
     loadTree = () => {
-            this.setState({treeLoading: true})
+        this.setState({treeLoading: true})
 
         const {params} = this.state
         HttpUtils.get('admin/sysOrg/tree', params).then(rs => {
@@ -51,7 +52,7 @@ export default class extends React.Component {
     }
 
     handleDelete = record => {
-           HttpUtils.get('admin/sysOrg/delete', {id:record.id})
+        HttpUtils.get('admin/sysOrg/delete', {id: record.id})
             .then(rs => {
                 this.setState({formValues: null})
                 this.loadTree()
@@ -67,7 +68,7 @@ export default class extends React.Component {
 
         const key = selectedKeys[0]
         this.setState({formLoading: true, formEditing: false})
-        HttpUtils.get( "admin/sysOrg/detail", {id: key}).then(rs => {
+        HttpUtils.get("admin/sysOrg/detail", {id: key}).then(rs => {
             this.setState({formValues: rs})
         }).finally(() => {
             this.setState({formLoading: false})
@@ -76,7 +77,7 @@ export default class extends React.Component {
 
     onFinish = (values) => {
         this.setState({submitLoading: true, formEditing: false})
-        HttpUtils.post( 'admin/sysOrg/save', values).then(rs => {
+        HttpUtils.post('admin/sysOrg/save', values).then(rs => {
             this.loadTree()
         }).finally(() => {
             this.setState({submitLoading: false})
@@ -95,26 +96,26 @@ export default class extends React.Component {
         let params = this.state.params;
         return <Page padding>
             <Card>
-            <Space>
-
-                <Input.Search placeholder='搜索' value={params.searchText} onChange={e => {
-                    params.searchText = e.target.value
-                    this.setState({params}, this.loadTree)
-                }}/>
-                <Checkbox  checked={params.onlyShowEnabled}
-                           onChange={e => {
-                               params.onlyShowEnabled = e.target.checked;
-                               this.setState({params}, this.loadTree);
-                           }}>仅显示启用</Checkbox>
-
-                <Checkbox  checked={params.onlyShowUnit}
-                           onChange={e => {
-                               params.onlyShowUnit = e.target.checked;
-                               this.setState({params}, this.loadTree);
-                           }}>仅显示单位</Checkbox>
-
-
-            </Space>
+                <Space>
+
+                    <Input.Search placeholder='搜索' value={params.searchText} onChange={e => {
+                        params.searchText = e.target.value
+                        this.setState({params}, this.loadTree)
+                    }}/>
+                    <Checkbox checked={params.onlyShowEnabled}
+                              onChange={e => {
+                                  params.onlyShowEnabled = e.target.checked;
+                                  this.setState({params}, this.loadTree);
+                              }}>仅显示启用</Checkbox>
+
+                    <Checkbox checked={params.onlyShowUnit}
+                              onChange={e => {
+                                  params.onlyShowUnit = e.target.checked;
+                                  this.setState({params}, this.loadTree);
+                              }}>仅显示单位</Checkbox>
+
+
+                </Space>
             </Card>
             <Gap/>
             <Splitter>
@@ -182,7 +183,6 @@ export default class extends React.Component {
                             </Popconfirm>
 
 
-
                         </Space>}
                     >
 
@@ -199,7 +199,7 @@ export default class extends React.Component {
                                 <FieldRemoteTreeSelect url='admin/sysOrg/tree'/>
                             </Form.Item>
                             <Form.Item label='名称' name='name' rules={[{required: true}]}>
-                                <Input />
+                                <Input/>
                             </Form.Item>
 
 
@@ -207,25 +207,23 @@ export default class extends React.Component {
                                 <FieldDictSelect typeCode='orgType'/>
                             </Form.Item>
 
-                            <Form.Item label='部门领导' name={['leader','id']} >
-                                <FieldUserSelect  />
+                            <Form.Item label='部门领导' name={['leader', 'id']}>
+                                <FieldUserSelect/>
                             </Form.Item>
                             <Form.Item label='启用' name='enabled' rules={[{required: true}]}>
                                 <FieldBoolean/>
                             </Form.Item>
                             <Form.Item label='扩展字段1' name='extra1'>
-                                <Input />
+                                <Input/>
                             </Form.Item>
                             <Form.Item label='扩展字段2' name='extra2'>
-                                <Input />
+                                <Input/>
                             </Form.Item>
                             <Form.Item label='扩展字段3' name='extra3'>
-                                <Input />
+                                <Input/>
                             </Form.Item>
 
 
-
-
                             <Form.Item label=' ' colon={false}>
                                 <Button type="primary" htmlType='submit'
                                         loading={this.state.submitLoading}>保存</Button>
@@ -245,7 +243,7 @@ export default class extends React.Component {
     }
 
     onDrop = (e) => {
-        const {dragNode,  dropToGap, node} = e;
+        const {dragNode, dropToGap, node} = e;
         const dropKey = node.key;
         const dragKey = dragNode.key;
 
@@ -253,7 +251,7 @@ 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)
+        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

@@ -1,7 +1,7 @@
 import {PlusOutlined} from '@ant-design/icons'
 import {Button, Form, Input, InputNumber, Modal, Popconfirm, Transfer, Tree} from 'antd'
 import React from 'react'
-import {ButtonList, Ellipsis, FieldBoolean, HttpUtils, Page, PageUtils, ProTable} from "../../../framework";
+import {ButtonList, FieldBoolean, HttpUtils, Page, PageUtils, ProTable, ViewText} from "../../../framework";
 
 
 export default class extends React.Component {
@@ -17,16 +17,46 @@ export default class extends React.Component {
         targetKeys: [],
         selectedKeys: [],
 
-        menuOpen:false,
-        menuTree:[],
-        menuTreeLoading:false,
-        menuChecked:[],
-        menuHalfChecked:[]
+        menuOpen: false,
+        menuTree: [],
+        menuTreeLoading: false,
+        menuChecked: [],
+        menuHalfChecked: []
     }
 
     formRef = React.createRef()
     tableRef = React.createRef()
 
+    handleAdd = () => {
+        this.setState({formOpen: true, formValues: {}})
+    }
+
+    handleEdit = record => {
+        this.setState({formOpen: true, formValues: record}, () => {
+
+        })
+    }
+
+    handleEditUser = record => {
+        this.setState({usersModalOpen: true, formValues: record})
+        HttpUtils.get('admin/sysRole/userList', {id: record.id}).then(rs => {
+            this.setState({userList: rs.list, targetKeys: rs.selectedKeys})
+        })
+    }
+
+    onFinish = values => {
+        HttpUtils.post('admin/sysRole/save', values).then(rs => {
+            this.setState({formOpen: false})
+            this.tableRef.current.reload()
+        })
+    }
+
+    handleDelete = record => {
+        HttpUtils.get('admin/sysRole/delete', {id: record.id}).then(rs => {
+            this.tableRef.current.reload()
+        })
+    }
+
     columns = [
 
         {
@@ -86,7 +116,7 @@ export default class extends React.Component {
             width: 300,
             render(v) {
                 if (v) {
-                    return <Ellipsis>{v.join(',')}</Ellipsis>
+                    return <ViewText value={v.join(',')} ellipsis={true} />
                 }
             }
 
@@ -104,7 +134,7 @@ export default class extends React.Component {
                                 onClick={() => this.handleEditUser(record)}>用户设置</Button>
 
                         <Button size='small' perm='sysRole:manage' disabled={record.builtin}
-                                onClick={() => PageUtils.open('/system/role/perm?id='+record.id, '角色权限设置')}>权限设置</Button>
+                                onClick={() => PageUtils.open('/system/role/perm?id=' + record.id, '角色权限设置')}>权限设置</Button>
 
                         <Button size='small' perm='sysRole:manage' disabled={record.builtin}
                                 onClick={() => this.handleEdit(record)}>编辑</Button>
@@ -118,67 +148,33 @@ export default class extends React.Component {
         },
     ]
 
-    handleAdd = () => {
-        this.setState({formOpen: true, formValues: {}})
-    }
-
-    handleEdit = record => {
-        this.setState({formOpen: true, formValues: record}, () => {
-
-        })
-    }
-
-
-    handleEditUser = record => {
-        this.setState({usersModalOpen: true, formValues: record})
-        HttpUtils.get('admin/sysRole/userList', {id: record.id}).then(rs => {
-            this.setState({userList: rs.list, targetKeys: rs.selectedKeys})
-        })
-    }
-
-
-
-    onFinish = values => {
-        HttpUtils.post('admin/sysRole/save', values).then(rs => {
-            this.setState({formOpen: false})
-            this.tableRef.current.reload()
-        })
-    }
-
-
-    handleDelete = record => {
-        HttpUtils.get('admin/sysRole/delete', {id: record.id}).then(rs => {
-            this.tableRef.current.reload()
-        })
-    }
-
-    handleSaveUsers =()=>{
+    handleSaveUsers = () => {
         const params = {
             id: this.state.formValues.id,
-            userIdList:this.state.targetKeys
+            userIdList: this.state.targetKeys
         }
         HttpUtils.post('admin/sysRole/grantUsers', params).then(rs => {
-            this.setState({usersModalOpen:false})
+            this.setState({usersModalOpen: false})
         })
     }
 
-    handleEditMenu =(record)=>{
-        this.setState({menuOpen:true,formValues:record,menuTreeLoading:true})
+    handleEditMenu = (record) => {
+        this.setState({menuOpen: true, formValues: record, menuTreeLoading: true})
         HttpUtils.get('admin/sysRole/ownMenu', {id: record.id}).then(rs => {
-            this.setState({menuChecked:rs.checked,menuHalfChecked:rs.halfChecked})
+            this.setState({menuChecked: rs.checked, menuHalfChecked: rs.halfChecked})
         })
         HttpUtils.get('admin/sysRole/menuTree').then(rs => {
-            this.setState({menuTree:rs, menuTreeLoading:false})
+            this.setState({menuTree: rs, menuTreeLoading: false})
         })
     }
-    handleGrantMenu =()=>{
+    handleGrantMenu = () => {
         const params = {
             id: this.state.formValues.id,
-            menuIds:[...this.state.menuChecked, ...this.state.menuHalfChecked]
+            menuIds: [...this.state.menuChecked, ...this.state.menuHalfChecked]
         }
         HttpUtils.post('admin/sysRole/grantMenu', params).then(rs => {
             debugger
-            this.setState({menuOpen:false})
+            this.setState({menuOpen: false})
         })
     }
 
@@ -237,14 +233,12 @@ export default class extends React.Component {
                     </Form.Item>
 
 
-
-
                 </Form>
             </Modal>
 
 
-            <Modal title={'角色用户' +"【" +this.state.formValues?.name + '】'}
-                   open={this.state.usersModalOpen }
+            <Modal title={'角色用户' + "【" + this.state.formValues?.name + '】'}
+                   open={this.state.usersModalOpen}
                    destroyOnHidden
                    maskClosable={false}
                    width={800}
@@ -254,7 +248,7 @@ export default class extends React.Component {
 
 
                 <Transfer
-                    listStyle={{height:'60vh', width:300}}
+                    listStyle={{height: '60vh', width: 300}}
 
                     dataSource={this.state.userList} titles={["未选择", "已选择"]}
                     targetKeys={this.state.targetKeys}
@@ -265,7 +259,7 @@ export default class extends React.Component {
                             targetKeys: nextTargetKeys
                         })
                     }}
-                    onSelectChange={(sourceSelectedKeys, targetSelectedKeys)=>{
+                    onSelectChange={(sourceSelectedKeys, targetSelectedKeys) => {
                         this.setState({
                             selectedKeys: [...sourceSelectedKeys, ...targetSelectedKeys]
                         })
@@ -276,8 +270,8 @@ export default class extends React.Component {
 
             </Modal>
 
-            <Modal title={'角色授权菜单权限' +"【" +this.state.formValues?.name + '】'}
-                   open={this.state.menuOpen }
+            <Modal title={'角色授权菜单权限' + "【" + this.state.formValues?.name + '】'}
+                   open={this.state.menuOpen}
                    destroyOnHidden
                    maskClosable={false}
                    width={800}
@@ -285,20 +279,20 @@ export default class extends React.Component {
                    onOk={this.handleGrantMenu}
                    loading={this.state.menuTreeLoading}
             >
-                    <Tree
-                        height={600}
-                        treeData={this.state.menuTree}
-                        multiple
-                        checkable
-                        checkedKeys={{checked:this.state.menuChecked}}
-                        onCheck={(keys,e) =>{
-                            this.setState({menuChecked:keys,menuHalfChecked:e.halfCheckedKeys})
-                        }}
-                        defaultExpandAll
-                        titleRender={node=>{
-                            return <span title={node.perm} >{node.title}</span>
-                        }}
-                    />
+                <Tree
+                    height={600}
+                    treeData={this.state.menuTree}
+                    multiple
+                    checkable
+                    checkedKeys={{checked: this.state.menuChecked}}
+                    onCheck={(keys, e) => {
+                        this.setState({menuChecked: keys, menuHalfChecked: e.halfCheckedKeys})
+                    }}
+                    defaultExpandAll
+                    titleRender={node => {
+                        return <span title={node.perm}>{node.title}</span>
+                    }}
+                />
             </Modal>
         </Page>
 

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

@@ -2,7 +2,6 @@ import React from "react";
 import {Button, Card, Checkbox, Table, Typography} from "antd";
 import {SaveOutlined} from "@ant-design/icons";
 import {ArrUtils, HttpUtils, PageUtils} from "../../../framework";
-
 export default class extends React.Component {
 
 

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

@@ -14,6 +14,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/sysManual/save', values).then(rs => {
+            this.setState({formOpen: false})
+            this.tableRef.current.reload()
+        })
+    }
+
+    handleDelete = record => {
+        HttpUtils.get('admin/sysManual/delete', {id: record.id}).then(rs => {
+            this.tableRef.current.reload()
+        })
+    }
+
     columns = [
 
         {
@@ -27,15 +48,15 @@ export default class extends React.Component {
             title: '版本',
             dataIndex: 'version',
             render(version) {
-                return 'v' +version;
+                return 'v' + version;
             }
         },
 
         {
             title: '文件',
             dataIndex: 'fileId',
-            render(id){
-               const url = 'admin/sysFile/preview/' + id;
+            render(id) {
+                const url = 'admin/sysFile/preview/' + id;
                 return <a href={url} target='_blank'>查看文件</a>
             }
 
@@ -46,7 +67,8 @@ export default class extends React.Component {
             render: (_, record) => (
                 <ButtonList>
                     <Button size='small' perm='sysManual:save' onClick={() => this.handleEdit(record)}>编辑</Button>
-                    <Popconfirm perm='sysManual:delete' title='是否确定删除操作手册'  onConfirm={() => this.handleDelete(record)}>
+                    <Popconfirm perm='sysManual:delete' title='是否确定删除操作手册'
+                                onConfirm={() => this.handleDelete(record)}>
                         <Button size='small'>删除</Button>
                     </Popconfirm>
                 </ButtonList>
@@ -55,29 +77,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/sysManual/save', values).then(rs => {
-            this.setState({formOpen: false})
-            this.tableRef.current.reload()
-        })
-    }
-
-
-    handleDelete = record => {
-        HttpUtils.get('admin/sysManual/delete', {id: record.id}).then(rs => {
-            this.tableRef.current.reload()
-        })
-    }
-
     render() {
         return <Page>
             <ProTable
@@ -113,7 +112,7 @@ export default class extends React.Component {
                     </Form.Item>
 
                     <Form.Item label='文件' name='fileId' rules={[{required: true}]}>
-                        <FieldUploadFile accept=".pdf" maxCount={1} />
+                        <FieldUploadFile accept=".pdf" maxCount={1}/>
                     </Form.Item>
 
                 </Form>

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

@@ -15,6 +15,8 @@ export default class UserPerm extends React.Component {
             dataPermType: null
         },
     }
+    formRef = React.createRef()
+
     show(item) {
         this.setState({visible: true})
 
@@ -38,7 +40,7 @@ export default class UserPerm extends React.Component {
                 confirmLoading: false
             })
             this.props.onOk()
-        }).finally(()=>{
+        }).finally(() => {
             this.setState({
                 confirmLoading: false
             })
@@ -46,11 +48,6 @@ export default class UserPerm extends React.Component {
         })
     }
 
-
-
-    formRef = React.createRef()
-
-
     render() {
         let {visible, confirmLoading} = this.state
 
@@ -76,13 +73,13 @@ export default class UserPerm extends React.Component {
                     <FieldRemoteSelectMultiple url='admin/sysRole/options'/>
                 </Form.Item>
                 <Form.Item label='数据权限' name='dataPermType' rules={[{required: true}]}>
-                    <FieldDictSelect typeCode='dataPermType' />
+                    <FieldDictSelect typeCode='dataPermType'/>
                 </Form.Item>
 
 
                 {this.state.formValues.dataPermType === 'CUSTOM' && <>
                     <Form.Item label='组织机构' name='orgIds'>
-                      <FieldSysOrgTree />
+                        <FieldSysOrgTree/>
                     </Form.Item>
                 </>}