From 76b8440971955fa1ad27f37d263746baa6dca3a2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 14 十一月 2024 15:36:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 33db589..5131082 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,
@@ -121,6 +122,7 @@
Object.assign(this.form, this.initValue);
}
},
+ deep:true,
immediate: true,
},
formData: {
@@ -185,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,
@@ -221,8 +224,7 @@
required: item.required|| false,
message: `璇疯緭鍏�${item.text}!`,
trigger: "submit"
- }]):[],
- ...item
+ }]):[]
};
if(!this.isEdit){
col.placeholder=col.label;
--
Gitblit v1.9.3