From 25750ab29ce4e243f4e4e17a796167f3a0f0697b Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周一, 05 5月 2025 16:33:49 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/components/BaseQueryDrawer/BaseQueryDrawer.tsx |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/web/src/components/BaseQueryDrawer/BaseQueryDrawer.tsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/web/src/components/BaseQueryDrawer/BaseQueryDrawer.tsx"
index 83ace70..9d144bb 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/web/src/components/BaseQueryDrawer/BaseQueryDrawer.tsx"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/web/src/components/BaseQueryDrawer/BaseQueryDrawer.tsx"
@@ -26,7 +26,7 @@
     //   default: false,
     // },
   },
-  emits: ['close', 'confirmQuery', 'update:modelValue', 'open', 'beforeClose'],
+  emits: ['close','reset', 'confirmQueryForBase', 'update:modelValue', 'open', 'beforeClose'],
   setup(props: any, { emit, slots, attrs }: any) {
     // const size = computed(() => {
     //   if (attrs.size.includes('px')) {
@@ -71,7 +71,18 @@
                       鍏抽棴
                     </el-button>
                     <el-button
-                      onClick={() => emit('confirmQuery')}
+                      onClick={() => emit('reset')}
+                      type="info"
+                      plain
+                      class={{
+                        [styles.dialogBtn]: true,
+                        [styles.csBaseBtn]: true,
+                      }}
+                    >
+                      閲嶇疆
+                    </el-button>
+                    <el-button
+                      onClick={() => emit('confirmQueryForBase')}
                       type="primary"
                       class={{
                         [styles.csBaseBtn]: true,

--
Gitblit v1.9.3