From 3b8eb6c197885faba45faf064e5b034a9cc853bf Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 03 七月 2026 11:58:29 +0800
Subject: [PATCH] 配置调整
---
src/components/Table/lims-table.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index 146e6ab..769e168 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -39,7 +39,7 @@
<div v-else-if="item.dataType == 'tag'">
<el-tag v-if="
typeof dataTypeFn(scope.row[item.prop], item.formatData) ==
- 'string'
+ 'string' && item.formatType!=null
" :title="scope.row[item.prop] | formatters(item.formatData)"
:type="formatType(scope.row[item.prop], item.formatType)">{{ scope.row[item.prop] |
formatters(item.formatData) }}</el-tag>
@@ -48,7 +48,7 @@
item.formatData
)" v-else-if="
typeof dataTypeFn(scope.row[item.prop], item.formatData) ==
- 'object'
+ 'object' && item.formatType!=null
" :key="index" :title="scope.row[item.prop] | formatters(item.formatData)"
:type="formatType(tag, item.formatType)">{{
item.tagGroup
@@ -57,9 +57,10 @@
: tag
: tag
}}</el-tag>
- <el-tag v-else :title="scope.row[item.prop] | formatters(item.formatData)"
+ <el-tag v-else-if="item.formatType!=null" :title="scope.row[item.prop] | formatters(item.formatData)"
:type="formatType(scope.row[item.prop], item.formatType)">{{ scope.row[item.prop] |
formatters(item.formatData) }}</el-tag>
+ <span v-else>{{scope.row[item.prop] | formatters(item.formatData)}}</span>
</div>
<!-- 鎸夐挳 -->
@@ -315,6 +316,7 @@
this.tableData.forEach((_, index) => {
this.$set(this.uploadKeys, index, Date.now());
});
+ this.calculateSpanInfo();
this.refreshTableLayout();
},
immediate: true
@@ -470,13 +472,15 @@
calculateSpanInfo() {
// 鍒濆鍖栨瘡鍒楃殑鍚堝苟淇℃伅
this.spanList = [];
+ // 璁＄畻鏁版嵁鍒楀湪el-table涓殑鐪熷疄璧峰绱㈠紩锛氬簭鍙峰垪(1鍒�) + 鍙�夌殑閫夋嫨鍒�(1鍒�)
+ const colOffset = this.isSelection ? 2 : 1;
this.column.forEach((m, i) => {
if (m.mergeCol) {
this.spanList.push({
arr: [],
position: 0,
name: m.prop,
- index: i + 1,
+ index: i + colOffset,
});
}
});
--
Gitblit v1.9.3