From b9f3e4a899013ce21de3fc1ac127d137c7494595 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 02 九月 2024 15:21:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue | 20 +++++++++++++-------
1 files changed, 13 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 ca5e5b4..7d15766 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
@@ -121,6 +121,7 @@
Object.assign(this.form, this.initValue);
}
},
+ deep:true,
immediate: true,
},
formData: {
@@ -184,14 +185,14 @@
},
initItem(item){
const type=this.columnType[item.type] || item.type;
+ item.text=item.text || item.label;
const col= {
- ...item,
label: item.text,
prop: item.field,
showProp:item.showField,
type: type,
labelWidth: this.labelWidth || (item.text.length >= 6 ? 115 : 90),
- disabled: !this.isEdit || item.readOnly || this.disabled,
+ disabled: item.readOnly || this.disabled,
span: item.span
? item.span
: item.type === "textarea"
@@ -206,25 +207,27 @@
valueFormat: item.dateFormate || "yyyy-MM-dd HH:mm:ss",
format: item.dateFormate,
rules: this.isEdit?(type=="select" || type=="refer" || type=="date" || type=="datetime"?[{
- required: item.required,
+ required: item.required || false,
message: `璇烽�夋嫨${item.text}!`,
trigger: "change"
},{
- required: item.required,
+ required: item.required|| false,
message: `璇烽�夋嫨${item.text}!`,
trigger: "submit"
}]:[{
- required: item.required,
+ required: item.required|| false,
message: `璇疯緭鍏�${item.text}!`,
trigger: "blur"
},{
- required: item.required,
+ required: item.required|| false,
message: `璇疯緭鍏�${item.text}!`,
trigger: "submit"
- }]):[]
+ }]):[],
+ ...item
};
if(!this.isEdit){
col.placeholder=col.label;
+ col.disabled=true;
}
if(col.type === 'richText'){
this.subitemName = col.field;
@@ -340,6 +343,9 @@
},
clearValidate(props){
this.$refs.form.clearValidate(props)
+ },
+ updateDic(prop,data){
+ this.$refs.form.updateDic(prop,data)
}
},
};
--
Gitblit v1.9.3