7x31/cmdb
1
0
Fork 0
mirror of https://github.com/veops/cmdb.git synced 2025-08-09 11:38:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

pref(ui)：some bugfix & some style (#369)

Browse Source
This commit is contained in:
wang-liang0615
2024-01-09 14:48:13 +08:00
committed by GitHub
parent 81a76a9632
commit fc113425cb
9 changed files with 171 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cmdb-ui/src/modules/acl/views/resource_types.vue
View File

@@ -57,17 +57,20 @@
</template>
</vxe-table-column>
</ops-table>
<vxe-pager
<a-pagination
size="small"
:layouts="['Total', 'PrevPage', 'JumpNumber', 'NextPage', 'Sizes']"
:current-page.sync="tablePage.currentPage"
:page-size.sync="tablePage.pageSize"
show-size-changer
show-quick-jumper
:current="tablePage.currentPage"
:total="tablePage.total"
:page-sizes="pageSizeOptions"
@page-change="handlePageChange"
:style="{ marginTop: '10px' }"
>
</vxe-pager>
:show-total="(total, range) => `当前展示 ${range[0]}-${range[1]} 条数据, 共 ${total} 条`"
:page-size="tablePage.pageSize"
:default-current="1"
:page-size-options="pageSizeOptions"
@change="pageOrSizeChange"
@showSizeChange="pageOrSizeChange"
:style="{ marginTop: '10px', textAlign: 'right' }"
/>
</a-spin>
<resourceTypeForm ref="resourceTypeForm" :handleOk="handleOk"> </resourceTypeForm>
@@ -89,7 +92,7 @@ export default {
loading: false,
groups: [],
id2perms: {},
pageSizeOptions: [10, 25, 50, 100],
pageSizeOptions: ['20', '50', '100', '200'],
tablePage: {
total: 0,
currentPage: 1,
@@ -176,7 +179,7 @@ export default {
this.handleOk()
})
},
handlePageChange({ currentPage, pageSize }) {
pageOrSizeChange(currentPage, pageSize) {
this.tablePage.currentPage = currentPage
this.tablePage.pageSize = pageSize
this.searchData()

51
cmdb-ui/src/modules/acl/views/resources.vue
View File

@@ -77,7 +77,7 @@
<!-- 2 -->
<vxe-table-column field="name" :title="$t('acl.resourceName')" :min-widh="150" fixed="left" show-overflow>
<template #title="{row}">
<template #title="{ row }">
{{ row.isGroup ? $t('acl.groupName') : $t('acl.resourceName') }}
</template>
</vxe-table-column>
@@ -86,10 +86,12 @@
<vxe-table-column field="user" :title="$t('acl.creator')" :min-widh="100"> </vxe-table-column>
<!-- 4 -->
<vxe-table-column field="created_at" :title="$t('created_at')" :min-widh="220" align="center"> </vxe-table-column>
<vxe-table-column field="created_at" :title="$t('created_at')" :min-widh="220" align="center">
</vxe-table-column>
<!-- 5 -->
<vxe-table-column field="updated_at" :title="$t('updated_at')" :min-widh="220" fixed="center"> </vxe-table-column>
<vxe-table-column field="updated_at" :title="$t('updated_at')" :min-widh="220" fixed="center">
</vxe-table-column>
<!-- 6 -->
@@ -99,8 +101,9 @@
:min-widh="200"
fixed="right"
align="center"
show-overflow>
<template #default="{row}">
show-overflow
>
<template #default="{ row }">
<span v-show="isGroup">
<a @click="handleDisplayMember(row)">{{ $t('acl.member') }}</a>
<a-divider type="vertical" />
@@ -117,27 +120,36 @@
</a>
</a-tooltip>
<a-divider type="vertical" />
<a-popconfirm :title="$t('confirmDelete')" @confirm="handleDelete(row)" @cancel="cancel" :okText="$t('yes')" :cancelText="$t('no')">
<a-popconfirm
:title="$t('confirmDelete')"
@confirm="handleDelete(row)"
@cancel="cancel"
:okText="$t('yes')"
:cancelText="$t('no')"
>
<a style="color: red"><a-icon type="delete"/></a>
</a-popconfirm>
</template>
</vxe-table-column>
</ops-table>
<vxe-pager
<a-pagination
size="small"
:layouts="['Total', 'PrevPage', 'JumpNumber', 'NextPage', 'Sizes']"
:current-page.sync="tablePage.currentPage"
:page-size.sync="tablePage.pageSize"
show-size-changer
show-quick-jumper
:current="tablePage.currentPage"
:total="tablePage.total"
:page-sizes="pageSizeOptions"
@page-change="handlePageChange"
:style="{ marginTop: '10px' }"
>
</vxe-pager>
:show-total="(total, range) => `当前展示 ${range[0]}-${range[1]} 条数据, 共 ${total} 条`"
:page-size="tablePage.pageSize"
:default-current="1"
:page-size-options="pageSizeOptions"
@change="pageOrSizeChange"
@showSizeChange="pageOrSizeChange"
:style="{ marginTop: '10px', textAlign: 'right' }"
/>
</a-spin>
</div>
<div v-else style="text-align: center;margin-top:20%">
<a-icon style="font-size:50px; margin-bottom: 20px; color: orange" type="info-circle" />
<div v-else style="text-align: center; margin-top: 20%">
<a-icon style="font-size: 50px; margin-bottom: 20px; color: orange" type="info-circle" />
<h3>{{ $t('acl.addTypeTips') }}</h3>
</div>
<resourceForm ref="resourceForm" @fresh="handleOk"> </resourceForm>
@@ -191,7 +203,7 @@ export default {
isGroup: false,
allResourceTypes: [],
currentType: { id: 0 },
pageSizeOptions: [10, 25, 50, 100],
pageSizeOptions: ['20', '50', '100', '200'],
searchName: '',
selectedRows: [],
}
@@ -291,7 +303,7 @@ export default {
}
},
cancel() {},
handlePageChange({ currentPage, pageSize }) {
pageOrSizeChange(currentPage, pageSize) {
this.tablePage.currentPage = currentPage
this.tablePage.pageSize = pageSize
this.searchData()
@@ -302,7 +314,6 @@ export default {
.getVxetableRef()
.getCheckboxRecords()
.concat(this.$refs.xTable.getVxetableRef().getCheckboxReserveRecords())
console.log(this.selectedRows)
},
onSelectRangeEnd({ records }) {
this.selectedRows = records

33
cmdb-ui/src/modules/acl/views/roles.vue
View File

@@ -42,13 +42,13 @@
<!-- 2 -->
<vxe-table-column field="is_app_admin" :title="$t('admin')" :min-width="100" align="center">
<template #default="{row}">
<template #default="{ row }">
<a-icon type="check" v-if="row.is_app_admin" />
</template>
</vxe-table-column>
<vxe-table-column field="id" :title="$t('acl.inheritedFrom')" :min-width="150">
<template #default="{row}">
<template #default="{ row }">
<a-tag color="cyan" v-for="role in id2parents[row.id]" :key="role.id">{{ role.name }}</a-tag>
</template>
</vxe-table-column>
@@ -69,13 +69,13 @@
}
"
>
<template #default="{row}">
<template #default="{ row }">
{{ row.uid ? $t('no') : $t('yes') }}
</template>
</vxe-table-column>
<vxe-table-column field="action" :title="$t('operation')" :width="120" fixed="right">
<template #default="{row}">
<template #default="{ row }">
<a-space>
<a-tooltip :title="$t('acl.resourceList')">
<a
@@ -104,17 +104,20 @@
</template>
</vxe-table-column>
</ops-table>
<vxe-pager
<a-pagination
size="small"
:layouts="['Total', 'PrevPage', 'JumpNumber', 'NextPage', 'Sizes']"
:current-page.sync="tablePage.currentPage"
:page-size.sync="tablePage.pageSize"
show-size-changer
show-quick-jumper
:current="tablePage.currentPage"
:total="tablePage.total"
:page-sizes="pageSizeOptions"
@page-change="handlePageChange"
:style="{ marginTop: '10px' }"
>
</vxe-pager>
:show-total="(total, range) => `当前展示 ${range[0]}-${range[1]} 条数据, 共 ${total} 条`"
:page-size="tablePage.pageSize"
:default-current="1"
:page-size-options="pageSizeOptions"
@change="pageOrSizeChange"
@showSizeChange="pageOrSizeChange"
:style="{ marginTop: '10px', textAlign: 'right' }"
/>
</a-spin>
<roleForm ref="roleForm" :allRoles="allRoles" :id2parents="id2parents" :handleOk="handleOk"></roleForm>
@@ -149,7 +152,7 @@ export default {
tableData: [],
allRoles: [],
id2parents: {},
pageSizeOptions: [10, 25, 50, 100],
pageSizeOptions: ['20', '50', '100', '200'],
searchName: '',
filterTableValue: { user_role: 1, user_only: 0 },
}
@@ -254,7 +257,7 @@ export default {
cancel(e) {
return false
},
handlePageChange({ currentPage, pageSize }) {
pageOrSizeChange(currentPage, pageSize) {
this.tablePage.currentPage = currentPage
this.tablePage.pageSize = pageSize
this.loadData()

2
cmdb-ui/src/modules/cmdb/views/preference/index.vue
View File

@@ -43,7 +43,7 @@
:class="{
'cmdb-preference-avatar': true,
'cmdb-preference-avatar-noicon': !ciType.icon,
'cmdb-preference-avatar-noicon-is_subscribed': !ciType.icon && ciType.is_subscribed,
'cmdb-preference-avatar-noicon-is_subscribed': !ciType.icon,
}"
:style="{ width: '30px', height: '30px', marginRight: '10px' }"
>