From 5bfa9eb9e5d7289c77fc33923d8e5e5e8291bdf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Fri, 10 Jan 2025 16:37:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/custom-config/index.vue            | 15 ++++++++++++++-
 .../components/custom-dialog/index.vue            |  3 ++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/components/model-custom/components/custom-config/index.vue b/src/components/model-custom/components/custom-config/index.vue
index fed22c7b..e8752ffd 100644
--- a/src/components/model-custom/components/custom-config/index.vue
+++ b/src/components/model-custom/components/custom-config/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <Dialog v-model:visible="dialogVisible" :title="configType == 'custom' ? '编辑自定义' : '编辑自定义组'" @accomplish="accomplish">
+    <Dialog v-model:visible="dialogVisible" :title="configType == 'custom' ? '编辑自定义' : '编辑自定义组'" @accomplish="accomplish" @close_event="close_event">
         <div class="flex-row h w">
             <!-- 左侧和中间区域 -->
             <DragIndex ref="draglist" :key="dragkey" v-model:height="center_height" v-model:width="center_width" :config-type="configType" :source-list="sourceList" :custom-group-field-id="customGroupFieldId" :is-custom="configType == 'custom'? isCustom : false" :show-data="showData" :list="new_list" @right-update="right_update" @operation_end="operation_end"></DragIndex>
@@ -107,6 +107,19 @@ const right_update = (item: any) => {
 };
 const draglist = ref<diy_data | null>(null);
 const emits = defineEmits(['accomplish', 'custom_edit']);
+// 点击取消按钮显示逻辑
+const close_event = () => {
+    // 如果是自定点击完成，需要将数据传递给父组件
+    if (props.configType == 'custom') {
+        // 点击完成的时候，清除历史数据
+        data_source_store.set_custom_records([]);
+        data_source_store.set_custom_records_index(-1);
+    } else {
+        // 点击完成的时候，清除历史数据
+        data_source_store.set_custom_group_records([]);
+        data_source_store.set_custom_group_records_index(-1);
+    }
+}
 // 点击完成按钮
 const accomplish = () => {
     // 如果没有数据，直接返回
diff --git a/src/components/model-custom/components/custom-dialog/index.vue b/src/components/model-custom/components/custom-dialog/index.vue
index f137c9c2..b5d21cf0 100644
--- a/src/components/model-custom/components/custom-dialog/index.vue
+++ b/src/components/model-custom/components/custom-dialog/index.vue
@@ -74,9 +74,10 @@ const table_select = (val: any) => {
     }
     select_data.value = val;
 };
-const emit = defineEmits(['confirm_event']);
+const emit = defineEmits(['confirm_event', 'close_event']);
 const close_event = () => {
     dialogVisible.value = false;
+    emit('close_event');
 };
 const confirm_event = () => {
     if (init_data()) {