diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index 9bed54dc..ad757cdc 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -326,7 +326,7 @@ const msg = { addExcludingKeywordsOfContent: "Please input a keyword of excluding content", noticeTag: "Please press Enter after inputting a tag(key=value).", conditionNotice: - "Notice: Please press Enter after inputting a tag, key of content, exclude key of content(key=value).", + "Notice: Please press Enter after inputting a key of content, exclude key of content(key=value).", language: "Language", }; export default msg; diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts index 3e222342..a2d9ecd5 100644 --- a/src/locales/lang/zh.ts +++ b/src/locales/lang/zh.ts @@ -327,7 +327,7 @@ const msg = { addExcludingKeywordsOfContent: "请输入一个内容不包含的关键词", noticeTag: "请输入一个标签(key=value)之后回车", conditionNotice: - "请输入一个标签、内容关键词或者内容不包含的关键词(key=value)之后回车", + "请输入一个内容关键词或者内容不包含的关键词(key=value)之后回车", language: "语言", }; export default msg; diff --git a/src/views/components/ConditionTags.vue b/src/views/components/ConditionTags.vue index e34ac5f6..6b7a16b2 100644 --- a/src/views/components/ConditionTags.vue +++ b/src/views/components/ConditionTags.vue @@ -38,7 +38,6 @@ limitations under the License. --> size="small" v-model="tags" class="trace-new-tag" - :placeholder="t('addTags')" @click="showClick" /> > @@ -159,10 +162,10 @@ function selectTag(item: string) { if (tags.value.includes("=")) { tags.value += item; addLabels(); - tagArr.value = tagKeys.value; return; } tags.value = item + "="; + tagArr.value = tagKeys.value; fetchTagValues(); dropdownTag.value.handleOpen(); } @@ -180,10 +183,6 @@ function showClick() { vertical-align: top; } -.link-tips { - margin-right: 120px; -} - .selected { display: inline-block; padding: 0 3px; @@ -210,13 +209,16 @@ function showClick() { .tag-item { display: inline-block; - width: 210px; + min-width: 210px; } .tags-tip { color: #a7aebb; +} + +.link-tips { display: inline-block; - margin-right: 130px; + margin-left: 130px; } .light { diff --git a/src/views/dashboard/related/log/Header.vue b/src/views/dashboard/related/log/Header.vue index 05494e27..b03c84e9 100644 --- a/src/views/dashboard/related/log/Header.vue +++ b/src/views/dashboard/related/log/Header.vue @@ -50,9 +50,14 @@ limitations under the License. --> @query="searchEndpoints" /> - -
- {{ t("conditionNotice") }} + + {{ t("search") }} +
@@ -61,6 +66,9 @@ limitations under the License. -->
+
+ {{ t("conditionNotice") }} +
{{ t("keywordsOfContent") }}: @@ -109,14 +117,6 @@ limitations under the License. -->
- - {{ t("search") }} -