From c618c4d0a067c555b98ca06997dd085bb3d5cada Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期一, 29 一月 2024 17:09:16 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before --- src/views/common/ztt-remote-select.vue | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/views/common/ztt-remote-select.vue b/src/views/common/ztt-remote-select.vue index 72a4002..4eaed0b 100644 --- a/src/views/common/ztt-remote-select.vue +++ b/src/views/common/ztt-remote-select.vue @@ -20,7 +20,7 @@ value="title" disabled > - <span v-for="(col, j) in columns" :key="col.prop">{{ col.label }}</span> + <span v-for="(col, j) in columns" :key="col.prop"><span>{{ col.label }}</span></span> </el-option> <el-option class="lmes-select-body" @@ -29,13 +29,23 @@ :label="formatter(item)" :value="item[valueColumn]" > - <span v-for="(col, j) in columns" :key="col.prop + i">{{ - col.formatter - ? col.formatter(item[col.prop]) - : item[col.prop] - ? item[col.prop] - : '--' - }}</span> + <span v-for="(col, j) in columns" :key="col.prop + i"> + <el-tooltip :content="col.formatter + ? col.formatter(item[col.prop]) + : item[col.prop] + ? item[col.prop] + : '--'"> + <span style="overflow: hidden;"> + {{ + col.formatter + ? col.formatter(item[col.prop]) + : item[col.prop] + ? item[col.prop] + : '--' + }} + </span> + </el-tooltip> + </span> </el-option> </el-select> </div> @@ -111,6 +121,7 @@ text-align: center; font-size: 13px; line-height: 44px; + } .lmes-select-head span, @@ -121,6 +132,8 @@ padding: 0 10px !important; } + + .lmes-select-head, .lmes-select-body, .lmes-select-nodata { -- Gitblit v1.9.3