From 9c44f559a30d246ae0e83a1b1e98c4af8cfa4986 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 6 Nov 2024 09:52:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E7=BC=BA=E5=B0=91=E6=98=8E?=
 =?UTF-8?q?=E6=96=87=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/custom-password/src/CustomPassword.vue | 8 ++------
 .../components/editor/editor-style/VQueryChartStyle.vue   | 6 +++---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/core/core-frontend/src/components/custom-password/src/CustomPassword.vue b/core/core-frontend/src/components/custom-password/src/CustomPassword.vue
index 0feec96f3c..0f151ad3c5 100644
--- a/core/core-frontend/src/components/custom-password/src/CustomPassword.vue
+++ b/core/core-frontend/src/components/custom-password/src/CustomPassword.vue
@@ -2,7 +2,6 @@
 import { useAttrs, computed } from 'vue'
 import icon_visible_outlined from '@/assets/svg/icon_visible_outlined.svg'
 import icon_invisible_outlined from '@/assets/svg/icon_invisible_outlined.svg'
-import { hIcon } from '@/components/icon-custom'
 const attrs = useAttrs()
 const props = defineProps(['modelValue'])
 const emits = defineEmits(['update:modelValue'])
@@ -14,15 +13,12 @@ const value = computed({
     emits('update:modelValue', value)
   }
 })
-
-const iconView = hIcon(icon_visible_outlined)
-const iconHide = hIcon(icon_invisible_outlined)
 </script>
 
 <template>
   <el-input
-    :icon-view-custom="iconView"
-    :icon-hide-custom="iconHide"
+    :icon-view-custom="icon_visible_outlined"
+    :icon-hide-custom="icon_invisible_outlined"
     v-bind="attrs"
     v-model="value"
   />
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
index cb43a43d29..074b835942 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
@@ -256,7 +256,7 @@ initParams()
     <el-row class="de-collapse-style">
       <el-collapse v-model="styleActiveNames" class="style-collapse">
         <el-collapse-item :effect="themes" name="basicStyle" :title="t('chart.basic_style')">
-          <el-form label-position="top">
+          <el-form @keydown.stop.prevent.enter label-position="top">
             <el-form-item class="form-item margin-bottom-8" :class="'form-item-' + themes">
               <el-checkbox
                 :effect="themes"
@@ -394,7 +394,7 @@ initParams()
           </el-form>
         </el-collapse-item>
         <el-collapse-item :effect="themes" name="addition" title="查询条件">
-          <el-form label-position="top">
+          <el-form @keydown.stop.prevent.enter label-position="top">
             <el-form-item class="form-item margin-bottom-8" :class="'form-item-' + themes">
               <el-checkbox
                 :effect="themes"
@@ -638,7 +638,7 @@ initParams()
           </el-form>
         </collapse-switch-item>
         <el-collapse-item :effect="themes" name="button" :title="t('commons.button')">
-          <el-form label-position="top">
+          <el-form @keydown.stop.prevent.enter label-position="top">
             <el-form-item
               :effect="themes"
               class="form-item"