From aa059ff617f0902a1c15443aa517f07bdbc64bea Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期五, 27 九月 2024 15:50:03 +0800
Subject: [PATCH] Merge branch 'hc-evalution' of ssh://114.215.109.124:29418/supervision-vue into hc-evalution
---
src/components/form/FYForm.vue | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/src/components/form/FYForm.vue b/src/components/form/FYForm.vue
index 1b9625f..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: {
@@ -62,29 +67,15 @@
_locations: [
{
required: true,
- // message: '琛屾斂鍖哄垝涓嶈兘涓虹┖',
- trigger: 'change',
- validator: (rule, value, callback) => {
- if (!value) {
- callback(new Error('Please input the age'));
- } else {
- callback()
- }
- }
+ message: '琛屾斂鍖哄垝涓嶈兘涓虹┖',
+ 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,11 +141,22 @@
);
//鐩戝惉琛ㄥ崟缂栬緫鐘舵��
-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({ onSubmit, onCancel, onReset });
+defineExpose({ formObj, onSubmit, onCancel, onReset });
</script>
<style scoped></style>
--
Gitblit v1.9.3