Skip to content

Commit d4506d7

Browse files
fix: style
1 parent d76c85c commit d4506d7

File tree

5 files changed

+24
-7
lines changed

5 files changed

+24
-7
lines changed

ui/src/components/tag-group/index.vue

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
11
<template>
22
<div class="tag-group" v-if="props.tags.length">
3-
<el-tag :size="props.size" class="default-tag">
4-
<span class="ellipsis">{{ props.tags[0] }}</span>
3+
<el-tag :size="props.size" class="default-tag tag-ellipsis" :title="props.tags[0]">
4+
{{ props.tags[0] }}
55
</el-tag>
66
<el-tooltip effect="light" :disabled="tooltipDisabled">
77
<el-tag :size="props.size" class="info-tag ml-4 cursor" v-if="props.tags?.length > 1">
88
+{{ props.tags?.length - 1 }}
99
</el-tag>
1010
<template #content>
11-
<el-tag :size="props.size" v-for="item in props.tags.slice(1)" :key="item" class="default-tag mr-4">
11+
<el-tag
12+
:size="props.size"
13+
v-for="item in props.tags.slice(1)"
14+
:key="item"
15+
class="default-tag mr-4"
16+
>
1217
{{ item }}
1318
</el-tag>
1419
</template>
1520
</el-tooltip>
1621
</div>
1722
</template>
1823
<script setup lang="ts">
24+
1925
const props = defineProps<{
2026
tags: string[]
2127
size?: 'large' | 'default' | 'small'

ui/src/layout/layout-header/SystemHeader.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
<div class="flex-between w-full align-center">
99
<h4><el-divider class="ml-16 mr-16" direction="vertical" />{{ $t('views.system.title') }}</h4>
1010
<div class="flex align-center mr-8">
11-
<TopAbout class="mt-4"></TopAbout>
11+
<TopAbout></TopAbout>
1212
<el-divider class="ml-8 mr-8" direction="vertical" />
1313
<el-button link @click="router.push({ path: '/' })"
14-
v-if="hasPermission([RoleConst.USER.getWorkspaceRole,RoleConst.EXTENDS_USER.getWorkspaceRole,
14+
v-if="hasPermission([RoleConst.USER.getWorkspaceRole,RoleConst.EXTENDS_USER.getWorkspaceRole,
1515
RoleConst.EXTENDS_WORKSPACE_MANAGE.getWorkspaceRole, RoleConst.WORKSPACE_MANAGE.getWorkspaceRole
1616
],'OR')"
1717
>

ui/src/layout/layout-header/UserHeader.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
/>
2222
</div>
2323
<TopMenu></TopMenu>
24-
<TopAbout class="mt-4 mr-12"></TopAbout>
24+
<TopAbout class="mr-12"></TopAbout>
2525
</div>
2626
<Avatar></Avatar>
2727
</div>

ui/src/styles/component.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,3 +250,14 @@
250250
padding: 4px 16px 12px 12px;
251251
}
252252
}
253+
254+
/* tag超出省略号 */
255+
.tag-ellipsis {
256+
box-sizing: border-box;
257+
max-width: 130px;
258+
.el-tag__content {
259+
overflow: hidden;
260+
white-space: nowrap;
261+
text-overflow: ellipsis;
262+
}
263+
}

ui/src/views/system/user-manage/component/UserDrawer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<el-drawer v-model="visible" size="60%">
2+
<el-drawer v-model="visible" size="600">
33
<template #header>
44
<h4>{{ title }}</h4>
55
</template>

0 commit comments

Comments
 (0)