manager/zyplayer-doc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户支持分组，wiki空间支持按分组授权，细节优化

Browse Source
This commit is contained in:
暮光：城中城
2021-02-09 22:57:52 +08:00
parent 13d6f3ca8b
commit a153809649
111 changed files with 2760 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
zyplayer-doc-ui/console-ui/package-lock.json generated
View File

@@ -919,6 +919,15 @@
"@hapi/hoek": "^8.3.0"
}
},
"@icon-park/vue": {
"version": "1.2.6",
"resolved": "https://registry.npm.taobao.org/@icon-park/vue/download/@icon-park/vue-1.2.6.tgz",
"integrity": "sha1-bAV9BAa3JVYvIIXmlHvLXKBMHO0=",
"requires": {
"@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
"csstype": "^3.0.3"
}
},
"@intervolga/optimize-cssnano-plugin": {
"version": "1.0.6",
"resolved": "http://registry.npm.taobao.org/@intervolga/optimize-cssnano-plugin/download/@intervolga/optimize-cssnano-plugin-1.0.6.tgz",
@@ -1049,8 +1058,7 @@
"@vue/babel-helper-vue-jsx-merge-props": {
"version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/@vue/babel-helper-vue-jsx-merge-props/download/@vue/babel-helper-vue-jsx-merge-props-1.0.0.tgz",
"integrity": "sha1-BI/leZWNpAj7eosqPsBQtQpmEEA=",
"dev": true
"integrity": "sha1-BI/leZWNpAj7eosqPsBQtQpmEEA="
},
"@vue/babel-plugin-transform-vue-jsx": {
"version": "1.1.2",
@@ -1971,6 +1979,14 @@
"integrity": "sha1-3TeelPDbgxCwgpH51kwyCXZmF/0=",
"dev": true
},
"async-validator": {
"version": "1.8.5",
"resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.8.5.tgz?cache=0&sync_timestamp=1605749896979&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fasync-validator%2Fdownload%2Fasync-validator-1.8.5.tgz",
"integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=",
"requires": {
"babel-runtime": "6.x"
}
},
"asynckit": {
"version": "0.4.0",
"resolved": "http://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz",
@@ -2057,7 +2073,7 @@
},
"babel-helper-vue-jsx-merge-props": {
"version": "2.0.3",
"resolved": "http://registry.npm.taobao.org/babel-helper-vue-jsx-merge-props/download/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
"resolved": "https://registry.npm.taobao.org/babel-helper-vue-jsx-merge-props/download/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
"integrity": "sha1-Iq69OzOQIyjlEyk6jkmSs4T58bY="
},
"babel-loader": {
@@ -2096,7 +2112,7 @@
},
"babel-runtime": {
"version": "6.26.0",
"resolved": "http://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz",
"resolved": "https://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz",
"integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
"requires": {
"core-js": "^2.4.0",
@@ -2104,9 +2120,9 @@
},
"dependencies": {
"core-js": {
"version": "2.6.10",
"resolved": "https://registry.npm.taobao.org/core-js/download/core-js-2.6.10.tgz?cache=0&sync_timestamp=1573985371469&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-2.6.10.tgz",
"integrity": "sha1-iluDkfjMcBPacDQRzltYVwYwDX8="
"version": "2.6.12",
"resolved": "https://registry.npm.taobao.org/core-js/download/core-js-2.6.12.tgz?cache=0&sync_timestamp=1611038902573&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-2.6.12.tgz",
"integrity": "sha1-2TM9+nsGXjR8xWgiGdb2kIWcwuw="
},
"regenerator-runtime": {
"version": "0.11.1",
@@ -3580,6 +3596,11 @@
"css-tree": "1.0.0-alpha.37"
}
},
"csstype": {
"version": "3.0.6",
"resolved": "https://registry.npm.taobao.org/csstype/download/csstype-3.0.6.tgz?cache=0&sync_timestamp=1610107098407&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcsstype%2Fdownload%2Fcsstype-3.0.6.tgz",
"integrity": "sha1-hl0LWDPX2NQPTluKbXauo95HJe8="
},
"current-script-polyfill": {
"version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/current-script-polyfill/download/current-script-polyfill-1.0.0.tgz",
@@ -4110,9 +4131,9 @@
"dev": true
},
"element-ui": {
"version": "2.13.1",
"resolved": "https://registry.npm.taobao.org/element-ui/download/element-ui-2.13.1.tgz?cache=0&sync_timestamp=1586761028754&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felement-ui%2Fdownload%2Felement-ui-2.13.1.tgz",
"integrity": "sha1-DLGkXPJ6phxgHe++GSdArFy533w=",
"version": "2.15.0",
"resolved": "https://registry.npm.taobao.org/element-ui/download/element-ui-2.15.0.tgz?cache=0&sync_timestamp=1610713839122&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felement-ui%2Fdownload%2Felement-ui-2.15.0.tgz",
"integrity": "sha1-3ptzqNHj47UOgrkjpfqVKVI5vUE=",
"requires": {
"async-validator": "~1.8.1",
"babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -4120,16 +4141,6 @@
"normalize-wheel": "^1.0.1",
"resize-observer-polyfill": "^1.5.0",
"throttle-debounce": "^1.0.1"
},
"dependencies": {
"async-validator": {
"version": "1.8.5",
"resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.8.5.tgz",
"integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=",
"requires": {
"babel-runtime": "6.x"
}
}
}
},
"elliptic": {
@@ -7497,7 +7508,7 @@
},
"normalize-wheel": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnormalize-wheel%2Fdownload%2Fnormalize-wheel-1.0.1.tgz",
"resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
"integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
},
"npm-run-path": {

5
zyplayer-doc-ui/console-ui/package.json
View File

@@ -7,18 +7,19 @@
"build": "vue-cli-service build --mode production"
},
"dependencies": {
"@icon-park/vue": "^1.2.6",
"axios": "^0.19.0",
"core-js": "^3.3.2",
"echarts": "^4.5.0",
"element-ui": "^2.15.0",
"js-cookie": "^2.2.1",
"pouchdb": "^7.1.1",
"sql-formatter": "^2.3.3",
"vue": "^2.6.10",
"vue-axios": "^2.1.5",
"vue-hljs": "^1.1.2",
"vue-router": "^3.1.3",
"vuex": "^3.1.2",
"element-ui": "^2.10.0",
"sql-formatter": "^2.3.3",
"wangeditor": "^3.1.1"
},
"devDependencies": {

21
zyplayer-doc-ui/console-ui/src/App.vue
View File

@@ -5,7 +5,7 @@
</template>
<el-container v-else>
<el-aside>
<div style="padding: 10px;height: 100%;box-sizing: border-box;background: #fafafa;">
<div class="menu-box">
<el-menu default-active="1-4-1" :router="true" class="el-menu-vertical" @open="handleOpen" @close="handleClose" :collapse="isCollapse">
<el-menu-item index="/"><i class="el-icon-s-home"></i>控制台</el-menu-item>
<el-submenu index="1" v-if="userAuth.userManage">
@@ -13,9 +13,14 @@
<i class="el-icon-s-platform"></i>
<span slot="title">系统管理</span>
</template>
<el-menu-item index="/console/userList"><i class="el-icon-user-solid"></i>用户管理</el-menu-item>
<!-- <el-menu-item index="/console/roleList"><i class="el-icon-s-custom"></i>角色管理</el-menu-item>-->
<!-- <el-menu-item index="/console/authList"><i class="el-icon-s-claim"></i>权限列表</el-menu-item>-->
<el-menu-item index="/console/userList">
<people theme="filled" size="16" fill="#909399"></people>
<span>用户管理</span>
</el-menu-item>
<el-menu-item index="/console/userGroupList">
<peoples theme="filled" size="16" fill="#909399"></peoples>
<span>分组管理</span>
</el-menu-item>
</el-submenu>
</el-menu>
</div>
@@ -65,6 +70,7 @@
<script>
import consoleApi from './common/api/console'
import {Peoples, People} from '@icon-park/vue';
export default {
data() {
@@ -79,6 +85,10 @@
upgradeInfo: {},
}
},
components: {
"peoples": Peoples,
"people": People,
},
computed: {
fullscreen () {
return this.$store.state.global.fullscreen;
@@ -158,4 +168,7 @@
.el-menu-vertical{border-right: 0;background: #fafafa;}
.el-menu-vertical .el-menu{background: #fafafa;}
.el-header {background-color: #409EFF; color: #333; line-height: 40px; text-align: right;height: 40px !important;}
.menu-box{padding: 10px;height: 100%;box-sizing: border-box;background: #fafafa;}
.menu-box .i-icon{line-height: 1;margin-right: 5px;}
</style>

21
zyplayer-doc-ui/console-ui/src/common/api/console.js
View File

@@ -19,6 +19,9 @@ export default {
},
getUserInfoList: data => {
return request({url: '/user/info/list', method: 'post', data: Qs.stringify(data)});
},
searchUserInfoList: data => {
return request({url: '/user/info/search', method: 'post', data: Qs.stringify(data)});
},
updateUserInfo: data => {
return request({url: '/user/info/update', method: 'post', data: Qs.stringify(data)});
@@ -35,4 +38,22 @@ export default {
resetPassword: data => {
return request({url: '/user/info/resetPassword', method: 'post', data: Qs.stringify(data)});
},
userGroupList: data => {
return request({url: '/user/group/list', method: 'post', data: Qs.stringify(data)});
},
updateUserGroup: data => {
return request({url: '/user/group/update', method: 'post', data: Qs.stringify(data)});
},
deleteUserGroup: data => {
return request({url: '/user/group/delete', method: 'post', data: Qs.stringify(data)});
},
updateUserGroupRelation: data => {
return request({url: '/user/group/relation/update', method: 'post', data: Qs.stringify(data)});
},
removeUserGroupRelation: data => {
return request({url: '/user/group/relation/remove', method: 'post', data: Qs.stringify(data)});
},
userGroupRelationList: data => {
return request({url: '/user/group/relation/list', method: 'post', data: Qs.stringify(data)});
},
};

1
zyplayer-doc-ui/console-ui/src/routes.js
View File

@@ -29,6 +29,7 @@ let routes = [
{path: 'userList', name: '用户管理', component: () => import('@/views/console/UserList.vue')},
{path: 'roleList', name: '权限管理', component: () => import('@/views/console/AuthList.vue')},
{path: 'authList', name: '角色列表', component: () => import('@/views/console/RoleList.vue')},
{path: 'userGroupList', name: '分组管理', component: () => import('@/views/console/UserGroupList.vue')},
]
}, {
path: '/common',

217
zyplayer-doc-ui/console-ui/src/views/console/UserGroupList.vue Normal file
View File

@@ -0,0 +1,217 @@
<template>
<div class="user-group-vue">
<el-breadcrumb separator-class="el-icon-arrow-right" style="padding: 20px 10px;">
<el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
<el-breadcrumb-item>系统管理</el-breadcrumb-item>
<el-breadcrumb-item>分组管理</el-breadcrumb-item>
</el-breadcrumb>
<el-row>
<el-col :span="6">
<div class="group-box page-scroll-box">
<el-popover placement="bottom" width="300" trigger="click" v-model="createUserGroupVisible">
<el-tag slot="reference" class="group-item" @click="">
<div style="text-align: center;"><i class="el-icon-plus"></i> 创建分组</div>
</el-tag>
<div>
<el-input v-model="editGroupName" placeholder="请输入新的分组名称" style="width: 220px;margin-right: 10px;"></el-input>
<el-button plain type="primary" v-on:click="createUserGroup">创建</el-button>
</div>
</el-popover>
<el-tag :type="item.id==checkedUserGroupId?'warning':'info'" class="group-item" @click="loadUserGroupRelation(item.id)" @dblclick.native="item.edit = true" v-for="item in userGroupList">
<el-input v-if="item.edit" size="mini" v-model="item.editName" @keyup.enter.native="updateUserGroup(item)" @blur="updateUserGroup(item)" class="group-name-input">{{item.name}}</el-input>
<span v-else>{{item.name}}</span>
<el-popconfirm title="确定要删除此分组吗？" @confirm="removeUserGroup(item.id)">
<i slot="reference" class="el-tag__close el-icon-close"></i>
</el-popconfirm>
</el-tag>
</div>
</el-col>
<el-col :span="18">
<div v-if="checkedUserGroupId > 0" class="page-scroll-box" v-loading="searchLoading">
<div style="margin-bottom: 10px;">
<el-button size="mini" plain type="primary" @click="showChoiceUserDialog" icon="el-icon-plus">添加用户</el-button>
</div>
<el-table :data="userGroupRelationList" border style="width: 100%; margin-bottom: 5px;" :max-height="tableHeight">
<el-table-column prop="id" label="编号" width="60"></el-table-column>
<el-table-column prop="userNo" label="账号"></el-table-column>
<el-table-column prop="email" label="邮箱"></el-table-column>
<el-table-column prop="userName" label="用户名"></el-table-column>
<el-table-column prop="phone" label="手机号"></el-table-column>
<el-table-column label="性别">
<template slot-scope="scope">{{scope.row.sex==0?'女':'男'}}</template>
</el-table-column>
<el-table-column label="操作" width="300">
<template slot-scope="scope">
<el-button size="mini" plain type="danger" v-on:click="removeUserRelationFromList(scope.row.id)">移除</el-button>
</template>
</el-table-column>
</el-table>
</div>
</el-col>
</el-row>
<!--添加用户到分组弹窗-->
<el-dialog title="添加用户到分组" :visible.sync="choiceUserVisible" width="600px" @close="closeChoiceUserDialog">
<el-row>
<el-select v-model="searchAddNewUser" filterable remote reserve-keyword autoComplete="new-password"
placeholder="请输入名字、邮箱、账号搜索用户" :remote-method="getSearchUserList"
:loading="searchUserLoading" style="width: 450px;margin-right: 10px;">
<el-option v-for="item in searchUserList" :key="item.id" :label="item.userName" :value="item.id"></el-option>
</el-select>
<el-button v-on:click="addSearchChoiceUser">添加</el-button>
</el-row>
<div style="margin: 10px 0;">
<el-tag v-for="item in searchAddUserList" :key="item.userId" closable type="info" style="margin-right: 10px;" @close="removeUserRelationFromSearch(item.userId)">
{{item.userName}}
</el-tag>
</div>
</el-dialog>
</div>
</template>
<script>
import consoleApi from '../../common/api/console'
export default {
data() {
return {
searchLoading: false,
editUserDialogVisible: false,
editUserAuthDialogVisible: false,
totalCount: 0,
searchParam: {
type: 1,
keyword: '',
},
searchResultList: [],
roleOptions: [
{value: '管理员'}
],
editUserForm: {},
allUserAuth: [],
editUserAuth: [],
userGroupRelationList: [],
userGroupList: [],
editGroupName: '',
checkedUserGroupId: '',
createUserGroupVisible: false,
choiceUserVisible: false,
// 添加用户
searchAddUserList: [],
searchUserList: [],
searchAddNewUser: "",
searchUserLoading: false,
tableHeight: (document.body.clientHeight - 250),
};
},
mounted() {
this.getUserGroupList();
},
methods: {
getUserGroupList() {
this.userGroupList = [];
consoleApi.userGroupList().then(json => {
let userGroupList = json.data || [];
userGroupList.forEach(item => {
item.edit = false;
item.checked = false;
item.editName = item.name;
});
this.userGroupList = userGroupList;
});
},
loadUserGroupRelation(groupId, force) {
if (!force && groupId == this.checkedUserGroupId) return;
this.checkedUserGroupId = groupId;
this.searchLoading = true;
consoleApi.userGroupRelationList({groupId: groupId}).then(json => {
this.searchLoading = false;
this.userGroupRelationList = json.data || [];
});
},
updateUserGroup(item) {
if (item.name == item.editName) {
item.edit = false;
return;
}
let param = {id: item.id, name: item.editName};
consoleApi.updateUserGroup(param).then(json => {
item.edit = false;
item.name = item.editName;
});
},
createUserGroup() {
let param = {name: this.editGroupName};
consoleApi.updateUserGroup(param).then(json => {
this.editGroupName = '';
this.createUserGroupVisible = false;
this.getUserGroupList();
});
},
removeUserGroup(id) {
consoleApi.deleteUserGroup({id: id}).then(json => {
this.checkedUserGroupId = '';
this.getUserGroupList();
});
},
closeChoiceUserDialog() {
this.loadUserGroupRelation(this.checkedUserGroupId, true);
},
showChoiceUserDialog() {
this.choiceUserVisible = true;
this.searchAddUserList = [];
this.userGroupRelationList.forEach(item => {
this.searchAddUserList.push({userName: item.userName, userId: item.id});
});
},
getSearchUserList(query) {
if (!query) return;
this.searchUserLoading = true;
consoleApi.searchUserInfoList({search: query}).then(json => {
this.searchUserList = json.data || [];
this.searchUserLoading = false;
});
},
removeUserRelationFromSearch(userId) {
let param = {groupId: this.checkedUserGroupId, userId: userId};
consoleApi.removeUserGroupRelation(param).then(json => {
this.searchAddUserList = this.searchAddUserList.filter(item => item.userId != userId);
});
},
removeUserRelationFromList(userId) {
let param = {groupId: this.checkedUserGroupId, userId: userId};
consoleApi.removeUserGroupRelation(param).then(json => {
this.loadUserGroupRelation(this.checkedUserGroupId, true);
});
},
addSearchChoiceUser() {
if (this.searchAddNewUser.length <= 0) {
this.$message.warning("请先选择用户");
return;
}
if (!!this.searchAddUserList.find(item => item.userId == this.searchAddNewUser)) {
this.searchAddNewUser = "";
return;
}
let userName = this.searchUserList.find(item => item.id == this.searchAddNewUser).userName;
let param = {groupId: this.checkedUserGroupId, userId: this.searchAddNewUser};
consoleApi.updateUserGroupRelation(param).then(json => {
this.searchAddUserList.push({userName: userName, userId: this.searchAddNewUser});
});
this.searchAddNewUser = "";
},
}
}
</script>
<style>
.user-group-vue .search-form-box{padding: 10px;}
.user-group-vue .page-info-box{text-align: right;margin: 20px 0 50px 0;}
.user-group-vue .el-button+.el-button{margin-left: 5px;}
.user-group-vue .page-scroll-box{padding: 10px;height: calc(100vh - 200px);overflow: auto;}
.user-group-vue .group-box .group-item{width: 100%;margin-bottom: 10px;cursor: pointer;}
.user-group-vue .group-box .group-item .el-icon-close{float: right; top: 6px;}
.user-group-vue .group-box .group-item .group-name-input{width: calc(100% - 30px);}
.user-group-vue .group-box .group-item .group-name-input input{border: 0;padding-left: 5px;}
</style>