From 0c7005a79b6dfccc2d25d98defb350de99c672d2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 18 十一月 2024 16:22:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 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 7d15766..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
@@ -1,6 +1,6 @@
<template>
<!--鍔ㄦ�佹ā鏉�-->
- <avue-form ref="form" :option="option" v-model="form">
+ <avue-form ref="form" :option="option" v-model="form" v-loading="loading">
<template v-for="item in allColumn" :slot="item.prop+ ''">
<vciWebRefer
v-if="item.type === 'refer'"
@@ -83,6 +83,7 @@
},
data() {
return {
+ loading:false,
form: this.formData,
option: {
menuBtn:false,
@@ -186,7 +187,8 @@
initItem(item){
const type=this.columnType[item.type] || item.type;
item.text=item.text || item.label;
- const col= {
+ let col= {
+ ...item,
label: item.text,
prop: item.field,
showProp:item.showField,
@@ -222,8 +224,7 @@
required: item.required|| false,
message: `璇疯緭鍏�${item.text}!`,
trigger: "submit"
- }]):[],
- ...item
+ }]):[]
};
if(!this.isEdit){
col.placeholder=col.label;
@@ -238,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;
@@ -260,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