From abd8c11af83c756324a16ac94c24fbb253ef12a8 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 13 Mar 2024 16:36:40 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=AE=B1-=E6=93=8D=E4=BD=9C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=20icon=E4=B8=8D=E5=AF=B9=EF=BC=9B=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=92=8Chover=E6=80=81=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/drawer-filter/src/DrawerTimeFilter.vue    | 9 +++++++--
 .../src/components/drawer-main/src/DrawerMain.vue        | 2 +-
 core/core-frontend/src/style/index.less                  | 4 ++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/components/drawer-filter/src/DrawerTimeFilter.vue b/core/core-frontend/src/components/drawer-filter/src/DrawerTimeFilter.vue
index 68ef025353..2a73bbd82d 100644
--- a/core/core-frontend/src/components/drawer-filter/src/DrawerTimeFilter.vue
+++ b/core/core-frontend/src/components/drawer-filter/src/DrawerTimeFilter.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import { propTypes } from '@/utils/propTypes'
-import { computed, PropType, reactive, toRefs } from 'vue'
+import { computed, PropType, reactive, toRefs, h } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
+import { Icon } from '@/components/icon-custom'
 
 const { t } = useI18n()
 
@@ -31,12 +32,13 @@ const props = defineProps({
   title: propTypes.string
 })
 const { property } = toRefs(props)
+const prefixIcon = h(Icon, { name: 'icon_calendar_outlined' })
 const timeConfig = computed(() => {
   let obj = Object.assign(
     {
       showType: 'datetime',
       rangeSeparator: '-',
-      prefixIcon: 'Calendar',
+      prefixIcon,
       startPlaceholder: t('datasource.start_time'),
       endPlaceholder: t('datasource.end_time'),
       format: 'YYYY-MM-DD HH:mm:ss',
@@ -104,6 +106,9 @@ defineExpose({
 
   .filter-item {
     flex: 1;
+    .ed-date-editor {
+      width: 100%;
+    }
   }
 }
 </style>
diff --git a/core/core-frontend/src/components/drawer-main/src/DrawerMain.vue b/core/core-frontend/src/components/drawer-main/src/DrawerMain.vue
index 50270eae54..293382d1e1 100644
--- a/core/core-frontend/src/components/drawer-main/src/DrawerMain.vue
+++ b/core/core-frontend/src/components/drawer-main/src/DrawerMain.vue
@@ -135,7 +135,7 @@ defineExpose({
     </div>
 
     <template #footer>
-      <el-button @click="reset">{{ t('commons.reset') }}</el-button>
+      <el-button secondary @click="reset">{{ t('commons.reset') }}</el-button>
       <el-button @click="trigger" type="primary">{{ t('common.sure') }}</el-button>
     </template>
   </el-drawer>
diff --git a/core/core-frontend/src/style/index.less b/core/core-frontend/src/style/index.less
index 5f4a23b210..ea9f076a7d 100644
--- a/core/core-frontend/src/style/index.less
+++ b/core/core-frontend/src/style/index.less
@@ -394,3 +394,7 @@ em {
 strong {
   font-synthesis: weight;
 }
+
+.ed-date-editor .ed-range__icon {
+  font-size: 16px !important;
+}