Merge branch 'dev'

This commit is contained in:
奔跑的面条 2022-06-01 23:08:54 +08:00
commit c149ea9449
2 changed files with 53 additions and 45 deletions

View File

@ -26,11 +26,12 @@
</div> </div>
</div> </div>
<template #action> <template #action>
<n-space class="list-footer" justify="space-between"> <div class="go-flex-items-center list-footer" justify="space-between">
<n-text> <n-text class="go-ellipsis-1">
{{ cardData.title || '' }} {{ cardData.title || '' }}
</n-text> </n-text>
<!-- 工具 --> <!-- 工具 -->
<div class="go-flex-items-center list-footer-ri">
<n-space> <n-space>
<n-text> <n-text>
<n-badge <n-badge
@ -74,8 +75,9 @@
</n-tooltip> </n-tooltip>
</template> </template>
</n-space> </n-space>
</div>
<!-- end --> <!-- end -->
</n-space> </div>
</template> </template>
</n-card> </n-card>
</div> </div>
@ -227,7 +229,13 @@ $contentHeight: 180px;
} }
} }
.list-footer { .list-footer {
flex-wrap: nowrap;
justify-content: space-between;
line-height: 30px; line-height: 30px;
&-ri {
justify-content: flex-end;
min-width: 160px;
}
} }
} }
</style> </style>

View File

@ -129,7 +129,7 @@ $contentWidth: calc(82vw);
@include go('modal-box') { @include go('modal-box') {
width: $contentWidth; width: $contentWidth;
.list-content { .list-content {
margin-top: 20px; margin-top: 28px;
border-radius: $--border-radius-base; border-radius: $--border-radius-base;
overflow: hidden; overflow: hidden;
@include background-image('background-point'); @include background-image('background-point');