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

This commit is contained in:
Fine 2023-06-26 09:21:56 +08:00
commit 3753b64ca0
4 changed files with 33 additions and 15 deletions

View File

@ -399,7 +399,7 @@ const msg = {
uriRegex: "URI Regex",
uriList: "URI List",
processes: "Processes",
monitorInstances: "Monitor Instances",
monitorInstances: "Monitoring Instances",
processDashboards: "Process Dashboards",
instanceDashboards: "Instance Dashboards",
detailLabel: "Detail Label",

View File

@ -26,14 +26,21 @@ limitations under the License. -->
/>
</div>
<div>{{ t("metrics") }}</div>
<el-switch
v-model="isExpression"
class="mb-5"
active-text="Expressions"
inactive-text="General"
size="small"
@change="changeMetricMode"
/>
<div class="flex-h">
<el-switch
v-model="isExpression"
class="mb-5"
active-text="Expressions"
inactive-text="General"
size="small"
@change="changeMetricMode"
/>
<div class="ml-5 link">
<a target="_blank" href="https://skywalking.apache.org/docs/main/next/en/api/metrics-query-expression/">
<Icon iconName="info_outline" size="middle" />
</a>
</div>
</div>
<div v-if="isExpression && states.isList">
<span class="title">{{ t("summary") }}</span>
<span>{{ t("detail") }}</span>
@ -641,4 +648,9 @@ limitations under the License. -->
display: inline-block;
width: 410px;
}
.link {
cursor: pointer;
color: #409eff;
}
</style>

View File

@ -56,7 +56,7 @@ limitations under the License. -->
<div>
<div class="label">
<span class="mr-5">{{ t("threshold") }}</span>
<span>({{ getNotice(item.type) }} )</span>
<span>{{ getNotice(item.type) }}</span>
</div>
<el-input
type="number"
@ -68,11 +68,17 @@ limitations under the License. -->
</div>
<div>
<div class="label">{{ t("count") }}</div>
<el-input-number size="small" class="profile-input" :min="0" v-model="item.count" @change="changeParam" />
<div class="flex-h">
<el-input-number size="small" class="profile-input" :min="0" v-model="item.count" @change="changeParam" />
<span class="ml-5">s</span>
</div>
</div>
<div>
<div class="label">{{ t("period") }}</div>
<el-input-number size="small" class="profile-input" :min="0" v-model="item.period" @change="changeParam" />
<div class="flex-h">
<el-input-number size="small" class="profile-input" :min="0" v-model="item.period" @change="changeParam" />
<span class="ml-5">s</span>
</div>
</div>
<div v-show="TYPES.includes(item.type)">
<div class="label">{{ t("uriRegex") }}</div>
@ -196,7 +202,7 @@ limitations under the License. -->
HTTP_AVG_RESPONSE_TIME: "It is a response time in milliseconds",
};
return map[type];
return map[type] ? `(${map[type]})` : "";
}
</script>
<style lang="scss" scoped>

View File

@ -107,8 +107,8 @@ limitations under the License. -->
@change="addLabels('excludingKeywordsOfContent')"
/>
<el-tooltip :content="t('keywordsOfContentLogTips')">
<span class="log-tips" v-show="!logStore.supportQueryLogsByKeywords">
<Icon icon="help" class="mr-5" />
<span v-show="!logStore.supportQueryLogsByKeywords">
<Icon iconName="help" class="mr-5" />
</span>
</el-tooltip>
</div>