refactor(系统设置): 成员列表对话框优化

This commit is contained in:
shiziyuan9527 2021-07-05 16:39:33 +08:00 committed by 刘瑞斌
parent 51e3e34201
commit 511695a720
5 changed files with 40 additions and 29 deletions

View File

@ -71,9 +71,12 @@
<el-dialog :close-on-click-modal="false" :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" <el-dialog :close-on-click-modal="false" :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true"
@close="close" @close="close"
class="dialog-css"> class="dialog-css">
<ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch" <template v-slot:title>
:create-permission="['ORGANIZATION_WORKSPACE:READ+CREATE', 'ORGANIZATION_WORKSPACE:READ+EDIT']" <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch"
:create-tip="$t('member.create')" :title="$t('commons.member')"/> :create-permission="['ORGANIZATION_WORKSPACE:READ+CREATE', 'ORGANIZATION_WORKSPACE:READ+EDIT']"
:create-tip="$t('member.create')" :title="$t('commons.member')"/>
</template>
<!-- organization member table --> <!-- organization member table -->
<el-table :data="memberLineData" style="width: 100%;margin-top: 5px;"> <el-table :data="memberLineData" style="width: 100%;margin-top: 5px;">
<el-table-column prop="name" :label="$t('commons.username')"/> <el-table-column prop="name" :label="$t('commons.username')"/>
@ -418,7 +421,7 @@ export default {
pageSize: 10, pageSize: 10,
total: 0, total: 0,
dialogCurrentPage: 1, dialogCurrentPage: 1,
dialogPageSize: 10, dialogPageSize: 5,
dialogTotal: 0, dialogTotal: 0,
memberLineData: [], memberLineData: [],
memberForm: {}, memberForm: {},
@ -481,9 +484,9 @@ export default {
font-size: 13px; font-size: 13px;
} }
.dialog-css >>> .el-dialog__header { /*.dialog-css >>> .el-dialog__header {*/
padding: 0px; /* padding: 0px;*/
} /*}*/
.input-with-autocomplete { .input-with-autocomplete {
width: 100%; width: 100%;

View File

@ -40,8 +40,10 @@
<el-dialog :close-on-click-modal="false" :visible.sync="dialogOrgMemberVisible" width="70%" :destroy-on-close="true" <el-dialog :close-on-click-modal="false" :visible.sync="dialogOrgMemberVisible" width="70%" :destroy-on-close="true"
@close="closeFunc" @close="closeFunc"
class="dialog-css"> class="dialog-css">
<ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch" <template v-slot:title>
:create-tip="$t('member.create')" :title="$t('commons.member')"/> <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch"
:create-tip="$t('member.create')" :title="$t('commons.member')"/>
</template>
<!-- organization member table --> <!-- organization member table -->
<el-table :border="true" class="adjust-table" :data="memberLineData" style="width: 100%;margin-top:5px;"> <el-table :border="true" class="adjust-table" :data="memberLineData" style="width: 100%;margin-top:5px;">
<el-table-column prop="id" label="ID"/> <el-table-column prop="id" label="ID"/>
@ -211,7 +213,7 @@ export default {
pageSize: 10, pageSize: 10,
total: 0, total: 0,
dialogCurrentPage: 1, dialogCurrentPage: 1,
dialogPageSize: 10, dialogPageSize: 5,
dialogTotal: 0, dialogTotal: 0,
currentRow: {}, currentRow: {},
screenHeight: 'calc(100vh - 195px)', screenHeight: 'calc(100vh - 195px)',
@ -467,8 +469,8 @@ export default {
width: 100%; width: 100%;
} }
.dialog-css >>> .el-dialog__header { /*.dialog-css >>> .el-dialog__header {*/
padding: 0; /* padding: 0;*/
} /*}*/
</style> </style>

View File

@ -98,8 +98,10 @@
<!-- dialog of workspace member --> <!-- dialog of workspace member -->
<el-dialog :close-on-click-modal="false" :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" <el-dialog :close-on-click-modal="false" :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true"
@close="closeWsMemberDialog" class="dialog-css"> @close="closeWsMemberDialog" class="dialog-css">
<ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch" <template v-slot:title>
:create-tip="$t('member.create')" :title="$t('commons.member')"/> <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch"
:create-tip="$t('member.create')" :title="$t('commons.member')"/>
</template>
<!-- organization member table --> <!-- organization member table -->
<el-table :data="memberLineData" style="width: 100%;margin-top: 5px;"> <el-table :data="memberLineData" style="width: 100%;margin-top: 5px;">
<el-table-column prop="id" label="ID"/> <el-table-column prop="id" label="ID"/>
@ -445,7 +447,7 @@ export default {
pageSize: 10, pageSize: 10,
total: 0, total: 0,
dialogCurrentPage: 1, dialogCurrentPage: 1,
dialogPageSize: 10, dialogPageSize: 5,
dialogTotal: 0, dialogTotal: 0,
memberLineData: [], memberLineData: [],
memberForm: {}, memberForm: {},
@ -512,9 +514,9 @@ export default {
width: 100%; width: 100%;
} }
.dialog-css >>> .el-dialog__header { /*.dialog-css >>> .el-dialog__header {*/
padding: 0; /* padding: 0;*/
} /*}*/
</style> </style>

View File

@ -4,8 +4,10 @@
:destroy-on-close="true" @close="close" v-loading="result.loading" :destroy-on-close="true" @close="close" v-loading="result.loading"
class="group-member" class="group-member"
> >
<ms-table-header :condition.sync="condition" @create="addMemberBtn" @search="search" <template v-slot:title>
:create-tip="$t('member.create')" :title="$t('commons.member')"/> <ms-table-header :condition.sync="condition" @create="addMemberBtn" @search="search"
:create-tip="$t('member.create')" :title="$t('commons.member')"/>
</template>
<el-table :border="true" class="adjust-table" :data="memberData" style="width: 100%;margin-top:5px;"> <el-table :border="true" class="adjust-table" :data="memberData" style="width: 100%;margin-top:5px;">
<el-table-column prop="id" label="ID"/> <el-table-column prop="id" label="ID"/>
<el-table-column prop="name" :label="$t('commons.username')" show-overflow-tooltip/> <el-table-column prop="name" :label="$t('commons.username')" show-overflow-tooltip/>
@ -291,9 +293,9 @@ export default {
</script> </script>
<style scoped> <style scoped>
.group-member >>> .el-dialog__header { /*.group-member >>> .el-dialog__header {*/
padding: 0; /* padding: 0;*/
} /*}*/
.user-select-left { .user-select-left {
float: left; float: left;

View File

@ -142,9 +142,11 @@
<el-dialog :close-on-click-modal="false" :visible.sync="memberVisible" width="70%" :destroy-on-close="true" <el-dialog :close-on-click-modal="false" :visible.sync="memberVisible" width="70%" :destroy-on-close="true"
@close="close" @close="close"
class="dialog-css"> class="dialog-css">
<div style="height: 60vh;overflow: auto"> <template v-slot:title>
<ms-table-header :condition.sync="dialogCondition" @create="open" @search="list" :have-search="false" <ms-table-header :condition.sync="dialogCondition" @create="open" @search="list" :have-search="false"
:create-tip="$t('member.create')" :title="$t('commons.member')"/> :create-tip="$t('member.create')" :title="$t('commons.member')"/>
</template>
<div>
<!-- organization member table --> <!-- organization member table -->
<el-table :data="memberLineData" style="width: 100%;margin-top: 5px;"> <el-table :data="memberLineData" style="width: 100%;margin-top: 5px;">
<el-table-column prop="name" :label="$t('commons.username')"/> <el-table-column prop="name" :label="$t('commons.username')"/>
@ -302,7 +304,7 @@ export default {
memberLineData: [], memberLineData: [],
memberForm: {}, memberForm: {},
dialogCurrentPage: 1, dialogCurrentPage: 1,
dialogPageSize: 10, dialogPageSize: 5,
dialogTotal: 0, dialogTotal: 0,
currentProjectId: "", currentProjectId: "",
userList: [], userList: [],
@ -629,9 +631,9 @@ pre {
font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
} }
.dialog-css >>> .el-dialog__header { /*.dialog-css >>> .el-dialog__header {*/
padding: 0px; /* padding: 0px;*/
} /*}*/
.select-width { .select-width {
width: 100%; width: 100%;