Merge branch 'main' of github.com:apache/skywalking-booster-ui into bugfix/topo

This commit is contained in:
Qiuxia Fan 2022-07-13 10:25:27 +08:00
commit 93ae3bba5c
2 changed files with 4 additions and 3 deletions

View File

@ -46,6 +46,7 @@ limitations under the License. -->
:hide-on-click="false" :hide-on-click="false"
style="margin: 20px 0 0 -130px" style="margin: 20px 0 0 -130px"
v-if="tagArr.length" v-if="tagArr.length"
:max-height="400"
> >
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
@ -68,12 +69,12 @@ limitations under the License. -->
> >
{{ t("tagsLink") }} {{ t("tagsLink") }}
</a> </a>
<el-tooltip :content="t(tipsMap[type])"> <el-tooltip :content="t((tipsMap as any)[type])">
<span> <span>
<Icon class="icon-help mr-5" iconName="help" size="middle" /> <Icon class="icon-help mr-5" iconName="help" size="middle" />
</span> </span>
</el-tooltip> </el-tooltip>
<b v-if="type === 'AL'">{{ t("noticeTag") }}</b> <b v-if="type === 'ALARM'">{{ t("noticeTag") }}</b>
</span> </span>
</div> </div>
</template> </template>

View File

@ -48,7 +48,7 @@ limitations under the License. -->
<span class="g-sm-8 wba"> <span class="g-sm-8 wba">
{{ i.value }} {{ i.value }}
<span <span
v-if="i.key === 'db.statement'" v-if="i.key === 'db.statement' && i.value"
class="grey link-hover cp ml-5" class="grey link-hover cp ml-5"
@click="copy(i.value)" @click="copy(i.value)"
> >