From 2a225d84f5a14caddb853d3c07b26907d1cb1428 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 15 十一月 2024 10:11:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue b/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue
index 5131082..630a90e 100644
--- a/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue
+++ b/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue
@@ -239,20 +239,20 @@
col.display=false
}
}
- if (col.type === "select") {
- if(col.data && col.data.length>0){
+ if (col.type === "select" || col.type==='radio' || col.type==='checkbox') {
+ if (col.data && col.data.length > 0) {
col.dicData = col.data.map((d) => {
return {
label: d.key,
key: d.value,
value: d.value,
- attributes:d.attributes
+ attributes: d.attributes
};
});
- }else if(!validatenull(col.dictCode)) {
+ } else if (!validatenull(col.dictCode)) {
getDicts(col.dictCode).then((res) => {
- if (res.data.success){
- if(res.data.data && res.data.obj == null){
+ if (res.data.success) {
+ if (res.data.data && res.data.obj == null) {
res.data.obj = res.data.data
}
const dic = res.data.obj;
@@ -261,11 +261,13 @@
label: d.value,
key: d.key,
value: d.key,
- attributes:d.attributes
+ attributes: d.attributes
};
});
}
});
+ } else {
+ col.dicData = [];
}
}
if (col.type==='refer') {
--
Gitblit v1.9.3