From 2ab9e3e914b6c29a3ab34d7b73113e751e113f0f Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 20 十月 2023 10:46:37 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/components/makepager/CommonFormTableView.vue | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 5bd8931..7c82937 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -148,7 +148,9 @@
<!-- 浣嶇疆 -->
<el-form-item v-else-if="item.location" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
<div class="custom-name">
- <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row[item.prop].label }}</span>
+ <span v-if="scope.row.isEdit || scope.row.editable">{{
+ scope.row[item.prop]?.label ?? scope.row[item.prop]
+ }}</span>
<el-select
v-else
v-model="scope.row[item.prop]"
--
Gitblit v1.8.0