From 7e1d38f401555ac635c9ce10f63902d9a4c402e0 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 14 十月 2024 17:15:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervisionVue/hc-procheck-1014'
---
src/components/form/FYForm.vue | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/src/components/form/FYForm.vue b/src/components/form/FYForm.vue
index a305bde..9c5405e 100644
--- a/src/components/form/FYForm.vue
+++ b/src/components/form/FYForm.vue
@@ -31,7 +31,12 @@
const props = defineProps({
//琛ㄥ崟鍩烘湰淇℃伅
- formInfo: Object,
+ formInfo: {
+ type: Object,
+ default: () => {
+ return {};
+ }
+ },
//琛ㄥ崟妫�楠岃鍒�
rules: Object,
showButtons: {
@@ -63,28 +68,14 @@
{
required: true,
message: '琛屾斂鍖哄垝涓嶈兘涓虹┖',
- trigger: 'change',
- // validator: (rule, value, callback) => {
- // if (!value) {
- // callback(new Error('Please input the age'));
- // } else {
- // callback()
- // }
- // }
+ trigger: 'change'
}
],
_scenetype: [
{
required: true,
message: '鍦烘櫙绫诲瀷涓嶈兘涓虹┖',
- trigger: 'change',
- // validator: (rule, value, callback) => {
- // if (!value) {
- // callback(new Error('Please input the age'));
- // } else {
- // callback()
- // }
- // }
+ trigger: 'change'
}
]
});
@@ -136,7 +127,7 @@
(nValue) => {
formObj.value = nValue;
},
- { deep: true, immediate: true }
+ { deep: false, immediate: true }
);
//鐩戝惉琛ㄥ崟閲嶇疆鍔熻兘瑙﹀彂
@@ -150,8 +141,19 @@
);
//鐩戝惉琛ㄥ崟缂栬緫鐘舵��
-watch(edit, (nValue) => {
- emit('update:isEdit', nValue);
+watch(
+ () => props.isEdit,
+ (nV, oV) => {
+ if (nV != oV) {
+ edit.value = nV;
+ }
+ },
+ { immediate: true }
+);
+watch(edit, (nV, oV) => {
+ if (nV != oV) {
+ emit('update:isEdit', nV);
+ }
});
defineExpose({ formObj, onSubmit, onCancel, onReset });
--
Gitblit v1.9.3