feat: add a title and a description for trace segments (#332)

This commit is contained in:
Fine0830 2023-10-23 17:42:02 +08:00 committed by GitHub
parent d9064e8b45
commit d2eae87957
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 16 deletions

View File

@ -37,7 +37,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
node-version: [14.x, 16.x, 18.x] node-version: [16.x, 18.x, 20.x]
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }} - name: Use Node.js ${{ matrix.node-version }}

View File

@ -382,5 +382,7 @@ const msg = {
addExpressions: "Add Expressions", addExpressions: "Add Expressions",
expressions: "Expression", expressions: "Expression",
unhealthyExpression: "Unhealthy Expression", unhealthyExpression: "Unhealthy Expression",
traceDesc:
"The trace segment serves as a representation of a trace portion executed within one single OS process, such as a JVM. It comprises a collection of spans, typically associated with and collected from a single request or execution context.",
}; };
export default msg; export default msg;

View File

@ -382,5 +382,7 @@ const msg = {
addExpressions: "Add Expressions", addExpressions: "Add Expressions",
expressions: "Expression", expressions: "Expression",
unhealthyExpression: "Unhealthy Expression", unhealthyExpression: "Unhealthy Expression",
traceDesc:
"The trace segment serves as a representation of a trace portion executed within one single OS process, such as a JVM. It comprises a collection of spans, typically associated with and collected from a single request or execution context.",
}; };
export default msg; export default msg;

View File

@ -380,5 +380,7 @@ const msg = {
addExpressions: "添加表达式", addExpressions: "添加表达式",
expressions: "表达式", expressions: "表达式",
unhealthyExpression: "非健康表达式", unhealthyExpression: "非健康表达式",
traceDesc:
"Trace Segment代表在单一操作系统进程例如JVM中执行的追踪部分。它包含了一组跨度spans这些跨度通常与单一请求或执行上下文关联。",
}; };
export default msg; export default msg;

View File

@ -13,15 +13,21 @@ limitations under the License. -->
<template> <template>
<div class="trace-t flex-v"> <div class="trace-t flex-v">
<div class="trace-t-tool flex-h"> <div class="trace-t-tool flex-h">
<el-pagination <div class="title">
v-model="traceStore.conditions.paging.pageNum" <span class="mr-5">Trace Segments</span>
:page-size="pageSize" <el-popover
:small="true" :width="310"
layout="prev, pager, next" placement="right"
:pager-count="5" :content="t('traceDesc')"
:total="total" :popper-style="{ 'word-break': 'keep-all', 'word-wrap': 'break-word' }"
@current-change="updatePage" >
/> <template #reference>
<span class="cp">
<Icon iconName="info_outline" size="small" />
</span>
</template>
</el-popover>
</div>
<div class="selectors"> <div class="selectors">
<Selector <Selector
size="small" size="small"
@ -61,6 +67,16 @@ limitations under the License. -->
</table> </table>
<div class="no-data" v-else>{{ t("noData") }}</div> <div class="no-data" v-else>{{ t("noData") }}</div>
</div> </div>
<div class="trace-t-tool flex-h">
<el-pagination
v-model="traceStore.conditions.paging.pageNum"
:page-size="pageSize"
:small="true"
layout="prev, pager, next"
:total="total"
@current-change="updatePage"
/>
</div>
</div> </div>
</template> </template>
@ -78,11 +94,11 @@ limitations under the License. -->
const traceStore = useTraceStore(); const traceStore = useTraceStore();
const loading = ref<boolean>(false); const loading = ref<boolean>(false);
const selectedKey = ref<string>(""); const selectedKey = ref<string>("");
const pageSize = ref<number>(20); const pageSize = 20;
const total = computed(() => const total = computed(() =>
traceStore.traceList.length === pageSize.value traceStore.traceList.length === pageSize
? pageSize.value * traceStore.conditions.paging.pageNum + 1 ? pageSize * traceStore.conditions.paging.pageNum + 1
: pageSize.value * traceStore.conditions.paging.pageNum, : pageSize * traceStore.conditions.paging.pageNum,
); );
function searchTrace() { function searchTrace() {
@ -93,7 +109,7 @@ limitations under the License. -->
function updatePage(p: number) { function updatePage(p: number) {
traceStore.setTraceCondition({ traceStore.setTraceCondition({
paging: { pageNum: p, pageSize: pageSize.value }, paging: { pageNum: p, pageSize },
}); });
searchTrace(); searchTrace();
} }
@ -101,7 +117,7 @@ limitations under the License. -->
function changeSort(opt: Option[]) { function changeSort(opt: Option[]) {
traceStore.setTraceCondition({ traceStore.setTraceCondition({
queryOrder: opt[0].value, queryOrder: opt[0].value,
paging: { pageNum: 1, pageSize: pageSize.value }, paging: { pageNum: 1, pageSize },
}); });
searchTrace(); searchTrace();
} }
@ -133,6 +149,12 @@ limitations under the License. -->
border-bottom: 1px solid #c1c5ca41; border-bottom: 1px solid #c1c5ca41;
border-right: 1px solid #c1c5ca41; border-right: 1px solid #c1c5ca41;
height: 35px; height: 35px;
align-items: center;
}
.title {
font-weight: bold;
padding-left: 10px;
} }
.selectors { .selectors {