From c78889e71d16d26c03ff59746db47c6d4d2b98e0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 03 三月 2025 20:41:25 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
src/components/flow/Expression/index.vue | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/components/flow/Expression/index.vue b/src/components/flow/Expression/index.vue
index 7c9776c..973e5cb 100644
--- a/src/components/flow/Expression/index.vue
+++ b/src/components/flow/Expression/index.vue
@@ -54,7 +54,7 @@
props: {
// 鍥炴樉鏁版嵁浼犲��
selectValues: {
- type: Number | String,
+ type: Object,
default: null,
required: false
}
@@ -93,8 +93,10 @@
watch: {
selectValues: {
handler(newVal) {
- if (StrUtil.isNotBlank(newVal)) {
- this.radioSelected = newVal
+ if (newVal) {
+ this.radioSelected = newVal.id
+ } else {
+ this.radioSelected = null
}
},
immediate: true,
--
Gitblit v1.8.0