JLNTV_IPD/tmagic-editor
4
0
Fork 0
mirror of https://github.com/Tencent/tmagic-editor.git synced 2025-04-06 03:57:56 +08:00
Code Issues Projects Releases Wiki Activity

fix(form): tooltip丢失

Browse Source
This commit is contained in:
roymondchen 2022-04-07 17:42:32 +08:00 committed by jia000
parent 57e815940b
commit 2e12812aac
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/form/src/containers/Container.vue
View File

@ -1,5 +1,10 @@
<template> <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 <m-fields-hidden
v-if="type === 'hidden'" v-if="type === 'hidden'"
:model="model" :model="model"
@ -65,8 +70,8 @@
<div v-if="extra" v-html="extra" class="m-form-tip"></div> <div v-if="extra" v-html="extra" class="m-form-tip"></div>
</el-form-item> </el-form-item>
<el-tooltip v-if="config.tip" placement="top" style="line-height: 40px; margin-left: 5px"> <el-tooltip v-if="config.tip" placement="top">
<i class="el-icon-warning"></i> <el-icon style="line-height: 40px; margin-left: 5px"><warning-filled /></el-icon>
<template #content> <template #content>
<div v-html="config.tip"></div> <div v-html="config.tip"></div>
</template> </template>
@ -98,6 +103,7 @@
<script lang="ts"> <script lang="ts">
import { computed, defineComponent, inject, PropType, ref, resolveComponent, watchEffect } from 'vue'; import { computed, defineComponent, inject, PropType, ref, resolveComponent, watchEffect } from 'vue';
import { WarningFilled } from '@element-plus/icons';
import { ChildConfig, ContainerCommonConfig, FormState, FormValue } from '../schema'; import { ChildConfig, ContainerCommonConfig, FormState, FormValue } from '../schema';
import { display as displayFunction, filterFunction, getRules } from '../utils/form'; 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({ export default defineComponent({
name: 'm-form-container', name: 'm-form-container',
components: { WarningFilled },
props: { props: {
labelWidth: String, labelWidth: String,
expandMore: Boolean, expandMore: Boolean,

2
packages/form/src/fields/Text.vue
View File

@ -14,7 +14,7 @@
<el-button <el-button
v-if="typeof config.append === 'object' && config.append.type === 'button'" v-if="typeof config.append === 'object' && config.append.type === 'button'"
style="color: #409eff" style="color: #409eff"
@click="buttonClickHandler" @click.prevent="buttonClickHandler"
> >
{{ config.append.text }} {{ config.append.text }}
</el-button> </el-button>