test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

style: 表格分页&批量操作样式调整

This commit is contained in:
RubyLiu 2023-09-25 15:17:42 +08:00 committed by 刘瑞斌
parent 3e4b1ffcf2
commit 7c25a87ef8
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/assets/style/arco-reset.less
View File

@ -630,11 +630,10 @@
}
}
&-total {
margin-right: 16px !important;
color: var(--color-text-2) !important;
color: var(--color-text-2);
}
&-options {
margin-left: 0 !important;
margin-left: 14px;
}
&-item {
display: flex;
@ -646,7 +645,7 @@
box-sizing: border-box;
cursor: pointer;
&-previous {
margin-left: 14px !important;
margin-left: 14px;
}
&-ellipsis {
padding: 5px 0;

2
frontend/src/components/pure/ms-pagination/pagination.tsx
View File

@ -399,7 +399,7 @@ export default defineComponent({
{slots.total?.({ total: props.total }) ?? t('msPagination.total', { total: props.total })}
</span>
)}
{props.showPageSize && (
{props.showPageSize && !props.simple && (
<PageOptions
disabled={props.disabled}
sizeOptions={props.pageSizeOptions}

2
frontend/src/components/pure/ms-table/base-table.vue
View File

@ -145,7 +145,7 @@
</template>
</a-table>
<div
class="mt-[16px] flex h-[32px] w-[100%] flex-row flex-nowrap items-center justify-end px-0"
class="mt-[16px] flex h-[32px] w-[100%] min-w-[952px] flex-row flex-nowrap items-center justify-end px-0"
:class="{ 'justify-between': showBatchAction }"
>
<batch-action

9
frontend/src/components/pure/ms-table/batchAction.vue
View File

@ -1,20 +1,21 @@
<template>
<div v-if="props.actionConfig" class="ms-table__patch-action">
<span class="title">{{ t('msTable.batch.selected', { count: props.selectRowCount }) }}</span>
<template v-for="element in props.actionConfig.baseAction" :key="element.label">
<template v-for="(element, idx) in props.actionConfig.baseAction" :key="element.label">
<a-divider v-if="element.isDivider" class="mx-0 my-[6px]" />
<a-button
v-else
class="ml-[12px]"
:class="{
'arco-btn-outline--danger': element.danger,
'ml-4': true,
'ml-[16px]': idx === 0,
}"
type="outline"
@click="handleSelect(element)"
>{{ t(element.label as string) }}</a-button
>
</template>
<div v-if="props.actionConfig.moreAction" class="relative top-[2px] ml-3 inline-block">
<div v-if="props.actionConfig.moreAction" class="relative top-[2px] ml-[16px] inline-block">
<a-dropdown position="tr" @select="handleSelect">
<a-button type="outline"><MsIcon type="icon-icon_more_outlined" /></a-button>
<template #content>
@ -27,7 +28,7 @@
</template>
</a-dropdown>
</div>
<a-button class="ml-3" type="text" @click="emit('clear')">{{ t('msTable.batch.clear') }}</a-button>
<a-button class="ml-[16px]" type="text" @click="emit('clear')">{{ t('msTable.batch.clear') }}</a-button>
</div>
</template>