From 29430960655432326c696a616a8d937ca201e65a Mon Sep 17 00:00:00 2001
From: zhangsiyu <q3183592900@qq.com>
Date: Mon, 21 Aug 2023 09:09:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B6=85=E5=87=BA=E9=9A=90?=
=?UTF-8?q?=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/tablecmt/tablecmt.vue | 19 +++++++++++++++++--
vite.config.js | 3 ++-
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index 3aad7195..f7cab58a 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -77,12 +77,16 @@
</template>
<template #default="scope">
- <el-text class="mx-2" v-if="Number(column.type)<6&&Number(column.type)>0">{{ scope.row[column.prop] }}</el-text>
+ <el-text class="mx-2" v-if="(Number(column.type)<6&&Number(column.type)>0)&&column.isextrahide">{{ scope.row[column.prop] }}</el-text>
<!-- <div v-if="Number(column.type)==8">
<div></div>
</div> -->
<slot v-if="column.type == 6" :scope="scope"></slot>
<el-image preview-teleported v-if="column.type==7" style="width: 60px; height: 60px;margin-left: 10px;" :initial-index="index" :z-index="100" v-for="(item,index) in scope.row[column.prop].split(',')" :src="item" :preview-src-list="scope.row[column.prop].split(',')"/>
+ <el-tooltip placement="top" v-if="(Number(column.type)<6&&Number(column.type)>0)&&!column.isextrahide">
+ <template #content>{{ scope.row[column.prop] }}</template>
+ <div class="on">{{ scope.row[column.prop] }}</div>
+ </el-tooltip>
<!-- <slot v-if="column.type == 7" name="test" :testdata="scope"></slot> -->
<!-- <el-button
v-if="column.type == 6"
@@ -169,7 +173,13 @@ interface TableColumnType {
/** 是否显示列
* true false 或者直接不写该参数
*/
- head?:boolean
+ head?:boolean;
+ /** 是否文字超出隐藏
+ * 默认超出隐藏
+ * true是不隐藏
+ * false 隐藏
+ */
+ isextrahide?:boolean
}
interface TableDataType {
[key: string]: any;
@@ -423,4 +433,9 @@ watchEffect(()=>{
.el-table .success-row {
--el-table-tr-bg-color: var(--el-color-success-light-9);
}
+.on{
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
</style>
diff --git a/vite.config.js b/vite.config.js
index 21de31f6..127d312e 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -12,7 +12,8 @@ export default ({ mode, command }) => {
port: 2888,
proxy: {
'/api': {
- target: 'http://192.168.10.126:8889',
+ // target: 'http://192.168.10.126:8889',
+ target: 'http://192.168.10.123:8889',
//target: 'http://test3.javablade.com',
changeOrigin: true,
rewrite: path => path.replace(/^\/api/, ''),