From af75a6d0da5ec8fc86d34bba29d21b55e5b411f0 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 19 十二月 2023 09:06:27 +0800
Subject: [PATCH] 解决冲突
---
src/components/form/FYForm.vue | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/components/form/FYForm.vue b/src/components/form/FYForm.vue
index 7509183..42cf198 100644
--- a/src/components/form/FYForm.vue
+++ b/src/components/form/FYForm.vue
@@ -1,4 +1,3 @@
-<!-- 鍦烘櫙鍩烘湰淇℃伅缂栬緫 -->
<template>
<el-form
:inline="false"
@@ -9,16 +8,12 @@
label-width="150px"
>
<slot name="form-item" :formObj="formObj"></slot>
- <el-form-item>
- <el-button
- :disabled="!edit"
- type="primary"
- @click="onSubmit"
- :loading="loading"
+ <el-form-item v-if="showButtons">
+ <el-button :disabled="!edit" type="primary" @click="onSubmit" :loading="loading"
>鎻愪氦</el-button
>
- <el-button :disabled="!edit" @click="onReset">閲嶇疆</el-button>
- <el-button v-if="enableCancelBtn" @click="onCancel">鍙栨秷</el-button>
+ <el-button v-if="useReset" :disabled="!edit" @click="onReset">閲嶇疆</el-button>
+ <el-button v-if="useCancel" @click="onCancel">鍙栨秷</el-button>
</el-form-item>
</el-form>
</template>
@@ -39,25 +34,31 @@
formInfo: Object,
//琛ㄥ崟妫�楠岃鍒�
rules: Object,
+ showButtons: {
+ type: Boolean,
+ default: true
+ },
//鍙栨秷鎸夐挳鏄惁鍙敤
- enableCancelBtn: Boolean,
+ useCancel: Boolean,
+ //閲嶇疆鎸夐挳鏄惁鍙敤
+ useReset: Boolean,
//瑙﹀彂閲嶇疆
reset: Boolean,
//閫氱煡缂栬緫鐘舵��
- isEdit: Boolean,
+ isEdit: Boolean
});
//瑙﹀彂鍑芥暟锛屾彁浜ゅ拰鍙栨秷
const emit = defineEmits(['submit', 'cancel', 'update:isEdit']);
//琛ㄥ崟鎿嶄綔鍑芥暟
-const { formObj, formRef, edit, onSubmit, onCancel, onReset } = useFormConfirm({
+const { formObj, formRef, edit, onSubmit, onCancel, onReset, formProps } = useFormConfirm({
submit: {
- do: submit,
+ do: submit
},
cancel: {
- do: cancel,
- },
+ do: cancel
+ }
});
//鍔犺浇鐘舵��
@@ -70,6 +71,9 @@
emit('submit', formObj, () => {
loading.value = false;
resolve();
+ },(err)=>{
+ loading.value = false;
+ reject(err);
});
});
}
@@ -84,7 +88,8 @@
() => props.formInfo,
(nValue) => {
formObj.value = nValue;
- }
+ },
+ { deep: false, immediate: false }
);
//鐩戝惉琛ㄥ崟閲嶇疆鍔熻兘瑙﹀彂
--
Gitblit v1.9.3