From 3d3e7f45086799fdd7a412e2079710a6cdf8dc2b Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 24 十月 2024 08:30:04 +0800
Subject: [PATCH] Merge branch 'lsf-dataproduct-1018'
---
src/components/form/FYForm.vue | 91 +++++++++++++++++++++++++++------------------
1 files changed, 55 insertions(+), 36 deletions(-)
diff --git a/src/components/form/FYForm.vue b/src/components/form/FYForm.vue
index a305bde..ef4cbb8 100644
--- a/src/components/form/FYForm.vue
+++ b/src/components/form/FYForm.vue
@@ -9,10 +9,16 @@
>
<slot name="form-item" :formObj="formObj"></slot>
<el-form-item v-if="showButtons">
- <el-button :disabled="!edit" type="primary" @click="onSubmit" :loading="loading"
- >鎻愪氦</el-button
+ <el-button
+ :disabled="!edit"
+ type="primary"
+ @click="onSubmit"
+ :loading="loading"
+ >{{ submitName }}</el-button
>
- <el-button v-if="useReset" :disabled="!edit" @click="onReset">閲嶇疆</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>
@@ -26,17 +32,34 @@
* 鍙紶鍏ュ垵濮嬭〃鍗曟暟鎹甪ormInfo锛岃〃鍗曟牎楠岃鍒檙ules
* 瀹炵幇submit鍜宑ancel瑙﹀彂鍑芥暟
*/
-import { defineProps, defineEmits, reactive, ref, watch, computed, defineExpose } from 'vue';
+import {
+ defineProps,
+ defineEmits,
+ reactive,
+ ref,
+ watch,
+ computed,
+ defineExpose
+} from 'vue';
import { useFormConfirm } from '@/composables/formConfirm';
const props = defineProps({
//琛ㄥ崟鍩烘湰淇℃伅
- formInfo: Object,
+ formInfo: {
+ type: Object,
+ default: () => {
+ return {};
+ }
+ },
//琛ㄥ崟妫�楠岃鍒�
rules: Object,
showButtons: {
type: Boolean,
default: true
+ },
+ submitName: {
+ type: String,
+ default: '鎻愪氦'
},
//鍙栨秷鎸夐挳鏄惁鍙敤
useCancel: Boolean,
@@ -63,41 +86,28 @@
{
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'
}
]
});
//琛ㄥ崟鎿嶄綔鍑芥暟
-const { formObj, formRef, edit, onSubmit, onCancel, onReset, clear } = useFormConfirm({
- submit: {
- do: submit
- },
- cancel: {
- do: cancel
- }
-});
+const { formObj, formRef, edit, onSubmit, onCancel, onReset, clear } =
+ useFormConfirm({
+ submit: {
+ do: submit
+ },
+ cancel: {
+ do: cancel
+ }
+ });
//鍔犺浇鐘舵��
const loading = ref(false);
@@ -110,15 +120,13 @@
'submit',
formObj,
() => {
- loading.value = false;
resolve();
},
(err) => {
- loading.value = false;
- reject(err);
+ reject(err ? err : '');
}
);
- });
+ }).finally(() => (loading.value = false));
}
//鍙栨秷鎸夐挳瑙﹀彂
@@ -136,7 +144,7 @@
(nValue) => {
formObj.value = nValue;
},
- { deep: true, immediate: true }
+ { deep: false, immediate: true }
);
//鐩戝惉琛ㄥ崟閲嶇疆鍔熻兘瑙﹀彂
@@ -150,8 +158,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