From 2e12812aace958fd8367578232a48680f4fccb2c Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Thu, 7 Apr 2022 17:42:32 +0800
Subject: [PATCH] =?UTF-8?q?fix(form):=20tooltip=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/form/src/containers/Container.vue | 14 +++++++++++---
 packages/form/src/fields/Text.vue          |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/form/src/containers/Container.vue b/packages/form/src/containers/Container.vue
index aca4a053..5189ce58 100644
--- a/packages/form/src/containers/Container.vue
+++ b/packages/form/src/containers/Container.vue
@@ -1,5 +1,10 @@
 <template>
-  <div v-if="config" :style="config.tip ? 'display: flex' : ''" :class="config.className" class="m-form-container">
+  <div
+    v-if="config"
+    :style="config.tip ? 'display: flex;align-items: baseline;' : ''"
+    :class="config.className"
+    class="m-form-container"
+  >
     <m-fields-hidden
       v-if="type === 'hidden'"
       :model="model"
@@ -65,8 +70,8 @@
         <div v-if="extra" v-html="extra" class="m-form-tip"></div>
       </el-form-item>
 
-      <el-tooltip v-if="config.tip" placement="top" style="line-height: 40px; margin-left: 5px">
-        <i class="el-icon-warning"></i>
+      <el-tooltip v-if="config.tip" placement="top">
+        <el-icon style="line-height: 40px; margin-left: 5px"><warning-filled /></el-icon>
         <template #content>
           <div v-html="config.tip"></div>
         </template>
@@ -98,6 +103,7 @@
 
 <script lang="ts">
 import { computed, defineComponent, inject, PropType, ref, resolveComponent, watchEffect } from 'vue';
+import { WarningFilled } from '@element-plus/icons';
 
 import { ChildConfig, ContainerCommonConfig, FormState, FormValue } from '../schema';
 import { display as displayFunction, filterFunction, getRules } from '../utils/form';
@@ -105,6 +111,8 @@ import { display as displayFunction, filterFunction, getRules } from '../utils/f
 export default defineComponent({
   name: 'm-form-container',
 
+  components: { WarningFilled },
+
   props: {
     labelWidth: String,
     expandMore: Boolean,
diff --git a/packages/form/src/fields/Text.vue b/packages/form/src/fields/Text.vue
index c6f74c74..fc1a8020 100644
--- a/packages/form/src/fields/Text.vue
+++ b/packages/form/src/fields/Text.vue
@@ -14,7 +14,7 @@
       <el-button
         v-if="typeof config.append === 'object' && config.append.type === 'button'"
         style="color: #409eff"
-        @click="buttonClickHandler"
+        @click.prevent="buttonClickHandler"
       >
         {{ config.append.text }}
       </el-button>