From 9900d07ca84f9a1718f8b8781c567ecae9f232b6 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 30 八月 2024 15:48:06 +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, 10 insertions(+), 6 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..8591918 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
@@ -184,8 +184,8 @@
},
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,
@@ -206,22 +206,23 @@
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;
@@ -340,6 +341,9 @@
},
clearValidate(props){
this.$refs.form.clearValidate(props)
+ },
+ updateDic(prop,data){
+ this.$refs.form.updateDic(prop,data)
}
},
};
--
Gitblit v1.9.3