This is an automated email from the ASF dual-hosted git repository.
qiuxiafan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-booster-ui.git
The following commit(s) were added to refs/heads/main by this push:
new a37bf62 fix: add technology icons and update word contents (#58)
a37bf62 is described below
commit a37bf6250028d9e38ef2c8e4fa0ef9053109dedc
Author: Fine0830 <[email protected]>
AuthorDate: Wed Apr 6 12:05:07 2022 +0800
fix: add technology icons and update word contents (#58)
---
src/assets/img/technologies/EXPRESS.png | Bin 0 -> 17838 bytes
src/assets/img/technologies/SPRINGWEBFLUX.png | Bin 0 -> 1685 bytes
src/locales/lang/en.ts | 4 +++-
src/locales/lang/zh.ts | 4 +++-
src/views/Log.vue | 24 ------------------------
src/views/Settings.vue | 7 ++++---
src/views/dashboard/List.vue | 14 +++++++-------
tests/unit/example.spec.ts | 9 ++-------
8 files changed, 19 insertions(+), 43 deletions(-)
diff --git a/src/assets/img/technologies/EXPRESS.png
b/src/assets/img/technologies/EXPRESS.png
new file mode 100644
index 0000000..70c3144
Binary files /dev/null and b/src/assets/img/technologies/EXPRESS.png differ
diff --git a/src/assets/img/technologies/SPRINGWEBFLUX.png
b/src/assets/img/technologies/SPRINGWEBFLUX.png
new file mode 100755
index 0000000..92cbd91
Binary files /dev/null and b/src/assets/img/technologies/SPRINGWEBFLUX.png
differ
diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts
index a9b72b0..e634293 100644
--- a/src/locales/lang/en.ts
+++ b/src/locales/lang/en.ts
@@ -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",
diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts
index c24ae25..476dd47 100644
--- a/src/locales/lang/zh.ts
+++ b/src/locales/lang/zh.ts
@@ -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: "性能剖析",
diff --git a/src/views/Log.vue b/src/views/Log.vue
deleted file mode 100644
index af18889..0000000
--- a/src/views/Log.vue
+++ /dev/null
@@ -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>
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index fd71c90..53ccb04 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -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>
diff --git a/src/views/dashboard/List.vue b/src/views/dashboard/List.vue
index 14d1ac5..74e654c 100644
--- a/src/views/dashboard/List.vue
+++ b/src/views/dashboard/List.vue
@@ -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>
diff --git a/tests/unit/example.spec.ts b/tests/unit/example.spec.ts
index 5c783c4..9438cda 100644
--- a/tests/unit/example.spec.ts
+++ b/tests/unit/example.spec.ts
@@ -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);
});
});
