evan/next-terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加用户组的资产授权

Browse Source
This commit is contained in:
dushixiang
2021-01-21 21:43:00 +08:00
parent 26058476b3
commit cdbb7b567a
13 changed files with 138 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
web/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "next-terminal",
"version": "0.0.8",
"version": "0.0.9",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -3464,11 +3464,18 @@
"integrity": "sha512-5Kgy8Cz6LPC9DJcNb3yjAXTu3XihQgEdnIg50c//zOC/MyLP0Clg+Y8Sh9ZjjnvBrDZU4DgXS9C3T9r4/scGZQ=="
},
"axios": {
"version": "0.19.2",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
"integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
"version": "0.21.1",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
"integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
"requires": {
"follow-redirects": "1.5.10"
"follow-redirects": "^1.10.0"
},
"dependencies": {
"follow-redirects": {
"version": "1.13.1",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz",
"integrity": "sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg=="
}
}
},
"axobject-query": {
@ -8127,9 +8134,9 @@
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
},
"ini": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
"version": "1.3.8",
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
},
"inquirer": {
"version": "7.3.3",

3
web/package.json
View File

@ -5,9 +5,8 @@
"dependencies": {
"@ant-design/icons": "^4.3.0",
"antd": "^4.8.4",
"axios": "^0.19.2",
"axios": "^0.21.1",
"guacamole-common-js": "^1.2.0",
"http-proxy-middleware": "^1.0.6",
"qs": "^6.9.4",
"react": "^16.14.0",
"react-contexify": "^4.1.1",

26
web/src/common/constants.js
View File

@ -1,19 +1,19 @@
// prod
let wsPrefix;
if (window.location.protocol === 'https:') {
wsPrefix = 'wss:'
} else {
wsPrefix = 'ws:'
}
export const server = '';
export const wsServer = wsPrefix + window.location.host;
export const prefix = window.location.protocol + '//' + window.location.host;
// let wsPrefix;
// if (window.location.protocol === 'https:') {
// wsPrefix = 'wss:'
// } else {
// wsPrefix = 'ws:'
// }
//
// export const server = '';
// export const wsServer = wsPrefix + window.location.host;
// export const prefix = window.location.protocol + '//' + window.location.host;
// dev
// export const server = '//127.0.0.1:8088';
// export const wsServer = 'ws://127.0.0.1:8088';
// export const prefix = '';
export const server = '//127.0.0.1:8088';
export const wsServer = 'ws://127.0.0.1:8088';
export const prefix = '';
export const PROTOCOL_COLORS = {
'rdp': 'red',

1
web/src/components/user/User.js
View File

@ -602,7 +602,6 @@ class User extends Component {
>
<UserShareAsset
sharer={this.state.sharer}
owner={this.state.owner}
/>
</Modal>

39
web/src/components/user/UserGroup.js
View File

@ -8,6 +8,7 @@ import {message} from "antd/es";
import {DeleteOutlined, ExclamationCircleOutlined, PlusOutlined, SyncOutlined, UndoOutlined} from '@ant-design/icons';
import Logout from "./Logout";
import UserGroupModal from "./UserGroupModal";
import UserShareAsset from "./UserShareAsset";
const confirm = Modal.confirm;
const {Search} = Input;
@ -250,6 +251,13 @@ class UserGroup extends Component {
})
}
handleAssetCancel = () => {
this.loadTableData()
this.setState({
assetVisible: false
})
}
render() {
const columns = [{
@ -263,11 +271,16 @@ class UserGroup extends Component {
title: '名称',
dataIndex: 'name',
}, {
title: '成员人数',
dataIndex: 'memberCount',
key: 'memberCount',
title: '授权资产',
dataIndex: 'assetCount',
key: 'assetCount',
render: (text, record, index) => {
return <Button type='link' onClick={() => this.showModal('更新用户组', record['id'], index)}>{text}</Button>
return <Button type='link' onClick={async () => {
this.setState({
assetVisible: true,
userGroupId: record['id']
})
}}>{text}</Button>
}
}, {
title: '创建日期',
@ -417,6 +430,24 @@ class UserGroup extends Component {
</UserGroupModal> : undefined
}
<Modal
width={window.innerWidth * 0.8}
title='已授权资产'
visible={this.state.assetVisible}
maskClosable={false}
destroyOnClose={true}
onOk={() => {
}}
onCancel={this.handleAssetCancel}
okText='确定'
cancelText='取消'
footer={null}
>
<UserShareAsset
userGroupId={this.state.userGroupId}
/>
</Modal>
</Content>
</>

14
web/src/components/user/UserShareAsset.js
View File

@ -24,7 +24,7 @@ import {message} from "antd/es";
import {DeleteOutlined, ExclamationCircleOutlined, PlusOutlined, SyncOutlined, UndoOutlined} from '@ant-design/icons';
import {PROTOCOL_COLORS} from "../../common/constants";
import UserShareChooseAsset from "./UserShareSelectAsset";
import UserShareSelectedAsset from "./UserShareSelectedAsset";
const confirm = Modal.confirm;
const {Search} = Input;
@ -61,7 +61,8 @@ class UserShareAsset extends Component {
async componentDidMount() {
let sharer = this.props.sharer;
this.loadTableData({sharer: sharer});
let userGroupId = this.props.userGroupId;
this.loadTableData({sharer: sharer, userGroupId: userGroupId});
let result = await request.get('/tags');
if (result['code'] === 1) {
@ -132,10 +133,6 @@ class UserShareAsset extends Component {
};
handleTagsChange = tags => {
console.log(tags)
// this.setState({
// tags: tags
// })
let query = {
...this.state.queryParams,
'pageIndex': 1,
@ -375,11 +372,12 @@ class UserShareAsset extends Component {
visible={this.state.chooseAssetVisible}
width={window.innerWidth * 0.8}
>
<UserShareChooseAsset
<UserShareSelectedAsset
sharer={this.state.queryParams.sharer}
userGroupId={this.state.queryParams.userGroupId}
>
</UserShareChooseAsset>
</UserShareSelectedAsset>
</Drawer> : undefined
}

17
web/src/components/user/UserShareSelectAsset.js → web/src/components/user/UserShareSelectedAsset.js
View File

@ -13,7 +13,7 @@ const {Search} = Input;
const {Content} = Layout;
const {Title} = Typography;
class UserShareAsset extends Component {
class UserShareSelectedAsset extends Component {
inputRefOfName = React.createRef();
changeOwnerFormRef = React.createRef();
@ -45,16 +45,17 @@ class UserShareAsset extends Component {
async componentDidMount() {
this.setState({
sharer: this.props.sharer
sharer: this.props.sharer,
userGroupId: this.props.userGroupId
})
this.loadTableData();
this.init(this.props.sharer)
this.init(this.props.sharer, this.props.userGroupId)
}
async init(sharer) {
async init(sharer, userGroupId) {
let q1 = request.get('/tags');
let q2 = request.get('/assets/paging?pageIndex=1&pageSize=1000&sharer=' + sharer);
let q2 = request.get(`/assets/paging?pageIndex=1&pageSize=1000&sharer=${sharer}&userGroupId=${userGroupId}`);
let r1 = await q1;
let r2 = await q2;
@ -168,7 +169,9 @@ class UserShareAsset extends Component {
unSelectRow = async (assetId) => {
let userId = this.state.sharer;
let userGroupId = this.state.userGroupId;
let result = await request.post(`/resource-sharers/remove-resources`, {
userGroupId: userGroupId,
userId: userId,
resourceType: 'asset',
resourceIds: [assetId]
@ -368,7 +371,9 @@ class UserShareAsset extends Component {
}
let userId = this.state.sharer;
let userGroupId = this.state.userGroupId;
let result = await request.post(`/resource-sharers/add-resources`, {
userGroupId: userGroupId,
userId: userId,
resourceType: 'asset',
resourceIds: newRowKeys
@ -412,4 +417,4 @@ class UserShareAsset extends Component {
}
}
export default UserShareAsset;
export default UserShareSelectedAsset;