Skip to content

Commit 358165f

Browse files
authored
Merge pull request Project-HAMi#63 from Shenhan11/fix/text-overflow
fix(web): improve table column width and text overflow handling
2 parents 5f1c000 + d0da5c5 commit 358165f

4 files changed

Lines changed: 15 additions & 2 deletions

File tree

packages/web/projects/vgpu/views/card/admin/index.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ const columns = [
9292
{
9393
title: '算力(已分配/总量)',
9494
dataIndex: 'used',
95+
minWidth: 100,
9596
render: ({ coreTotal, coreUsed, isExternal }) => (
9697
<span>
9798
{isExternal ? '--' : coreUsed}/{coreTotal}
@@ -101,6 +102,7 @@ const columns = [
101102
{
102103
title: '显存(已分配/总量)',
103104
dataIndex: 'w',
105+
minWidth: 100,
104106
render: ({ memoryTotal, memoryUsed, isExternal }) => (
105107
<span>
106108
{isExternal ? '--' : roundToDecimal(memoryUsed / 1024, 1)}/

packages/web/projects/vgpu/views/node/admin/index.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ const columns = [
103103
{
104104
title: '算力(已分配/总量)',
105105
dataIndex: 'used',
106+
minWidth: 100,
106107
render: ({ coreTotal, coreUsed, isExternal }) => (
107108
<span>
108109
{isExternal ? '--' : coreUsed}/{coreTotal}
@@ -112,6 +113,7 @@ const columns = [
112113
{
113114
title: '显存(已分配/总量)',
114115
dataIndex: 'w',
116+
minWidth: 100,
115117
render: ({ memoryTotal, memoryUsed, isExternal }) => (
116118
<span>
117119
{isExternal ? '--' : roundToDecimal(memoryUsed / 1024, 1)}/

packages/web/src/components/TablePlus/index.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
dataIndex,
6868
render,
6969
width,
70+
minWidth,
7071
fixed,
7172
sort,
7273
filters,
@@ -79,6 +80,7 @@
7980
:label="title"
8081
:formatter="render"
8182
:width="width"
83+
:min-width="minWidth"
8284
:fixed="fixed"
8385
:sortable="sort && 'custom'"
8486
:filters="isFunction(filters) ? filters(state.list) : filters"
@@ -94,7 +96,7 @@
9496

9597
<el-table-column
9698
fixed="right"
97-
:min-width="180"
99+
:min-width="120"
98100
label="操作"
99101
v-if="rowAction.length"
100102
>

packages/web/src/components/TextPlus.vue

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div class="text-plus">
3-
<span :class="{ link: !!to }" @click="handleClick"> {{ text }}</span>
3+
<span :class="{ link: !!to }" @click="handleClick">{{ text }}</span>
44
<div v-if="copy && text" class="copy-ico" @click="handleCopy">
55
<svg-icon icon="copy" />
66
</div>
@@ -42,6 +42,13 @@ const handleClick = () => {
4242
display: inline-flex;
4343
gap: 10px;
4444
// width: 100%;
45+
max-width: 100%;
46+
47+
span {
48+
overflow: hidden;
49+
text-overflow: ellipsis;
50+
}
51+
4552
.link {
4653
color: var(--el-color-primary);
4754
cursor: pointer;

0 commit comments

Comments
 (0)