@jiangood/open-admin 3.0.6 → 3.0.8

package/package.json

@@ -48,5 +48,5 @@
     "test:e2e": "playwright test",
     "test:e2e:ui": "playwright test --ui"
   },
-  "version": "3.0.6"
+  "version": "3.0.8"
 }

package/src/framework/biz/PermActions.tsx

@@ -36,7 +36,7 @@ export interface PermActionsProps {
 export class PermActions extends React.Component<PermActionsProps> {
     static defaultProps: Partial<PermActionsProps> = {
         more: false,
-        size: 'small',
+        size: 'middle',
     };
 
     render() {

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

@@ -87,6 +87,7 @@ export default class extends React.Component {
             render: (_, record) => {
                 return <PermActions
                     more
+                    size="small"
                     actions={[
                         {label: '预览', onClick: () => this.handlePreview(record)},
                         {label: '编辑', perm: 'article:update', onClick: () => this.handleEdit(record)},

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

@@ -147,6 +147,7 @@ export default class extends React.Component {
             render: (_, record) => {
                 return <PermActions
                     more
+                    size="small"
                     actions={[
                         {label: '编辑', perm: 'sys-dict:update', onClick: () => this.handleItemEdit(record)},
                         {label: '删除', perm: 'sys-dict:delete', confirm: '是否确定删除字典项', onClick: () => this.handleItemDelete(record)},

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

@@ -76,6 +76,7 @@ export default class extends React.Component {
             render: (_, record) => (
                 <PermActions
                     more
+                    size="small"
                     actions={[
                         {label: '删除', perm: 'sys-file:delete', confirm: '是否确定删除文件信息', onClick: () => this.handleDelete(record)},
                     ]}

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

@@ -153,6 +153,7 @@ export default class extends React.Component {
 
                 return <PermActions
                     more
+                    size="small"
                     actions={[
                         {label: '执行记录', onClick: () => this.showExecuteRecord(record)},
                         {label: '执行一次', perm: 'job:trigger', onClick: () => this.handleTriggerJob(record)},

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

@@ -1,5 +1,5 @@
 import {PlusOutlined} from '@ant-design/icons'
-import {Button, Form, Input, InputNumber, Modal, Select, Transfer, Tree} from 'antd'
+import {Button, Form, Input, InputNumber, Modal, Transfer} from 'antd'
 import React from 'react'
 import {FieldBoolean, FormModal, HttpUtils, Page, PageUtils, PermActions, ProTable, ViewText} from "../../../framework";
 
@@ -14,12 +14,6 @@ export default class extends React.Component {
         userList: [],
         targetKeys: [],
         selectedKeys: [],
-
-        menuOpen: false,
-        menuTree: [],
-        menuTreeLoading: false,
-        menuChecked: [],
-        menuHalfChecked: []
     }
 
     modalRef = React.createRef()
@@ -114,6 +108,7 @@ export default class extends React.Component {
 
                 return <PermActions
                     more
+                    size="small"
                     actions={[
                         {label: '用户设置', perm: 'sys-role:grant-permission', onClick: () => this.handleEditUser(record)},
                         {label: '权限设置', perm: 'sys-role:grant-permission', onClick: () => PageUtils.open('/system/role/rolePerm?id=' + record.id, '角色权限设置')},
@@ -138,25 +133,6 @@ export default class extends React.Component {
         })
     }
 
-    handleEditMenu = (record) => {
-        this.setState({menuOpen: true, selectedRecord: record, menuTreeLoading: true})
-        HttpUtils.get('admin/sysRole/ownMenu', {id: record.id}).then(rs => {
-            this.setState({menuChecked: rs.checked, menuHalfChecked: rs.halfChecked})
-        })
-        HttpUtils.get('admin/sysRole/menuTree').then(rs => {
-            this.setState({menuTree: rs, menuTreeLoading: false})
-        })
-    }
-    handleGrantMenu = () => {
-        const params = {
-            id: this.state.selectedRecord.id,
-            menuIds: [...this.state.menuChecked, ...this.state.menuHalfChecked]
-        }
-        HttpUtils.post('admin/sysRole/grantMenu', params).then(rs => {
-            this.setState({menuOpen: false})
-        })
-    }
-
     render() {
         return <Page
             title="角色管理"
@@ -241,31 +217,6 @@ export default class extends React.Component {
 
 
             </Modal>
-
-            <Modal title={'角色授权菜单权限' + "【" + this.state.selectedRecord?.name + '】'}
-                   open={this.state.menuOpen}
-                   destroyOnHidden
-                   mask={{ closable: false }}
-                   width={800}
-                   onCancel={() => this.setState({menuOpen: false})}
-                   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>
-                    }}
-                />
-            </Modal>
         </Page>
 
 

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

@@ -125,6 +125,7 @@ export default class extends React.Component {
             render: (_, record) => {
                 return <PermActions
                     more
+                    size="small"
                     actions={[
                         {label: '编辑', perm: 'sys-user:update', onClick: () => this.handleEdit(record)},
                         {label: '授权', perm: 'sys-user:grant-permission', onClick: () => this.permRef.current.show(record)},

package/src/pages/userCenter/index.jsx

@@ -62,7 +62,7 @@ export default class extends React.Component {
 
             <Modal open={changePwdOpen} title="修改密码" okText="确定" cancelText="取消"
                    onCancel={() => this.setState({changePwdOpen: false})}
-                   onOk={() => this.formRef?.submit()}>
+                   onOk={() => this.formRef.current?.submit()}>
                 <Form ref={this.formRef} onFinish={this.onPwdFinish} style={{maxWidth: 400}}>
                     <Form.Item name='oldPassword'
                                label='原密码'