From dc4ba8076aebd30f33282121a414262b4d4919f4 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 09 九月 2024 10:40:34 +0800
Subject: [PATCH] 1. 编写设备匹配功能
---
src/components/form/FYForm.vue | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/src/components/form/FYForm.vue b/src/components/form/FYForm.vue
index 5bfa1b8..9c5405e 100644
--- a/src/components/form/FYForm.vue
+++ b/src/components/form/FYForm.vue
@@ -26,12 +26,17 @@
* 鍙紶鍏ュ垵濮嬭〃鍗曟暟鎹甪ormInfo锛岃〃鍗曟牎楠岃鍒檙ules
* 瀹炵幇submit鍜宑ancel瑙﹀彂鍑芥暟
*/
-import { defineProps, defineEmits, reactive, ref, watch, computed } 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: {
@@ -62,8 +67,8 @@
_locations: [
{
required: true,
- message: '鐪�/甯�/鍖�/闀囦笉鑳戒负绌�',
- trigger: 'change',
+ message: '琛屾斂鍖哄垝涓嶈兘涓虹┖',
+ trigger: 'change'
}
],
_scenetype: [
@@ -92,13 +97,18 @@
function submit() {
loading.value = true;
return new Promise((resolve, reject) => {
- emit('submit', formObj, () => {
- loading.value = false;
- resolve();
- },(err)=>{
- loading.value = false;
- reject(err);
- });
+ emit(
+ 'submit',
+ formObj,
+ () => {
+ loading.value = false;
+ resolve();
+ },
+ (err) => {
+ loading.value = false;
+ reject(err);
+ }
+ );
});
}
@@ -107,9 +117,9 @@
emit('cancel');
}
-const allRules = computed(()=>{
- return {...baseRules.value, ...props.rules}
-})
+const allRules = computed(() => {
+ return { ...baseRules, ...props.rules };
+});
//鐩戝惉琛ㄥ崟鍒濆鏁版嵁浼犲叆
watch(
@@ -131,9 +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({ formObj, onSubmit, onCancel, onReset });
</script>
<style scoped></style>
--
Gitblit v1.9.3