From ecfe66a0199606241c73a52519bbe800c9aa31f8 Mon Sep 17 00:00:00 2001
From: 雪忆 <1455668754@qq.com>
Date: 星期一, 29 七月 2024 15:10:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/components/Table/src/components/settings/ColumnSetting.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/Table/src/components/settings/ColumnSetting.vue b/src/components/Table/src/components/settings/ColumnSetting.vue
index 1a66513..63f6acb 100644
--- a/src/components/Table/src/components/settings/ColumnSetting.vue
+++ b/src/components/Table/src/components/settings/ColumnSetting.vue
@@ -540,13 +540,13 @@
label:
typeof col.title === 'string'
? col.title
- : col.customTitle === 'string'
+ : typeof col.customTitle === 'string'
? col.customTitle
: '',
value:
typeof col.dataIndex === 'string'
? col.dataIndex
- : col.title === 'string'
+ : typeof col.title === 'string'
? col.title
: '',
column: {
--
Gitblit v1.8.0