fix: add technology icons and update word contents (#58)

This commit is contained in:
Fine0830 2022-04-06 12:05:07 +08:00 committed by GitHub
parent e955c91323
commit a37bf62500
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 19 additions and 43 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@ -111,6 +111,8 @@ const msg = {
noRoot: "Please set a root dashboard for",
noWidget: "Please add widgets.",
rename: "Rename",
deleteTitle: "Are you sure to delete this?",
rootTitle: "Are you sure to set this?",
selfObservability: "Self Observability",
satellite: "Satellite",
skyWalkingServer: "SkyWalking Server",
@ -197,7 +199,7 @@ const msg = {
dayCutTip: "Last 1 day",
weekCutTip: "Last 1 week",
monthCutTip: "Last 1 month",
serverZone: "Server Zone",
serverZone: "OAP Server Time Zone",
exportImage: "Export image",
object: "Object",
profile: "Profile",

View File

@ -109,6 +109,8 @@ const msg = {
showGroup: "显示分组",
noWidget: "请添加组件",
rename: "重命名",
deleteTitle: "确定删除吗?",
rootTitle: "确定设置为Root吗",
selfObservability: "自监控",
satellite: "Satellite",
skyWalkingServer: "SkyWalking服务",
@ -199,7 +201,7 @@ const msg = {
dayCutTip: "最近1天",
weekCutTip: "最近1周",
monthCutTip: "最近1月",
serverZone: "服务器时区",
serverZone: "OAP Server 时区",
exportImage: "导出为图片",
object: "粒度",
profile: "性能剖析",

View File

@ -1,24 +0,0 @@
<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. -->
<template>
<div class="about">{{ props.msg }}</div>
</template>
<script lang="ts" setup>
import { useAppStoreWithOut } from "@/store/modules/app";
const appStore = useAppStoreWithOut();
appStore.setPageTitle("Log");
/*global defineProps */
const props = defineProps({
msg: String,
});
</script>

View File

@ -177,8 +177,8 @@ const setUTCMin = () => {
}
.settings {
color: #222;
font-size: 14px;
color: #606266;
font-size: 13px;
padding: 20px;
.item {
@ -195,9 +195,10 @@ const setUTCMin = () => {
}
.label {
width: 100px;
width: 160px;
display: inline-block;
font-weight: 500;
color: #000;
}
}
</style>

View File

@ -51,12 +51,12 @@ limitations under the License. -->
<el-table-column type="selection" width="55" />
<el-table-column prop="name" label="Name">
<template #default="scope">
<span class="cp name" @click="handleView(scope.row)">{{
scope.row.name
}}</span>
<span class="cp name" @click="handleView(scope.row)">
{{ scope.row.name }}
</span>
</template>
</el-table-column>
<el-table-column prop="layer" label="Layer" width="200" />
<el-table-column prop="layer" label="Layer" width="120" />
<el-table-column prop="entity" label="Entity" width="200" />
<el-table-column prop="isRoot" label="Root" width="60">
<template #default="scope">
@ -74,7 +74,7 @@ limitations under the License. -->
{{ t("rename") }}
</el-button>
<el-popconfirm
title="Are you sure to delete this?"
:title="t('deleteTitle')"
@confirm="handleDelete(scope.row)"
>
<template #reference>
@ -84,7 +84,7 @@ limitations under the License. -->
</template>
</el-popconfirm>
<el-popconfirm
title="Are you sure to set this?"
:title="t('rootTitle')"
@confirm="setRoot(scope.row)"
v-if="
[EntityType[0].value, EntityType[1].value].includes(
@ -93,7 +93,7 @@ limitations under the License. -->
"
>
<template #reference>
<el-button size="small" style="width: 120px" type="danger">
<el-button size="small" style="width: 110px" type="danger">
{{ scope.row.isRoot ? t("setNormal") : t("setRoot") }}
</el-button>
</template>

View File

@ -14,15 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { shallowMount } from "@vue/test-utils";
import Log from "@/views/Log.vue";
describe("Log.vue", () => {
describe("My First Test", () => {
it("renders props.msg when passed", () => {
const msg = "new message";
const wrapper = shallowMount(Log, {
props: { msg },
});
expect(wrapper.text()).toMatch(msg);
console.log(msg);
});
});