From b095bf5b4cb2afeed064f4e46935eebf433d28f0 Mon Sep 17 00:00:00 2001 From: Qiuxia Fan Date: Wed, 30 Mar 2022 20:36:57 +0800 Subject: [PATCH] add tooltips for list charts --- src/assets/icons/arrow-down.svg | 16 --------- src/assets/icons/arrow_drop_down.svg | 17 --------- src/assets/icons/keyboard_control.svg | 18 ---------- src/assets/icons/library_add.svg | 18 ---------- src/layout/components/SideBar.vue | 2 +- src/locales/lang/en.ts | 2 +- src/locales/lang/zh.ts | 2 +- src/styles/reset.scss | 2 +- src/types/dashboard.ts | 1 + src/views/dashboard/controls/Tab.vue | 2 +- src/views/dashboard/graphs/EndpointList.vue | 9 +++-- src/views/dashboard/graphs/InstanceList.vue | 9 +++-- src/views/dashboard/graphs/Line.vue | 38 ++++++++++++++------- src/views/dashboard/graphs/ServiceList.vue | 9 +++-- src/views/dashboard/panel/Layout.vue | 2 +- 15 files changed, 53 insertions(+), 94 deletions(-) delete mode 100755 src/assets/icons/arrow-down.svg delete mode 100644 src/assets/icons/arrow_drop_down.svg delete mode 100644 src/assets/icons/keyboard_control.svg delete mode 100644 src/assets/icons/library_add.svg diff --git a/src/assets/icons/arrow-down.svg b/src/assets/icons/arrow-down.svg deleted file mode 100755 index f85e0b06..00000000 --- a/src/assets/icons/arrow-down.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - \ No newline at end of file diff --git a/src/assets/icons/arrow_drop_down.svg b/src/assets/icons/arrow_drop_down.svg deleted file mode 100644 index 63151de2..00000000 --- a/src/assets/icons/arrow_drop_down.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - diff --git a/src/assets/icons/keyboard_control.svg b/src/assets/icons/keyboard_control.svg deleted file mode 100644 index cf8d477c..00000000 --- a/src/assets/icons/keyboard_control.svg +++ /dev/null @@ -1,18 +0,0 @@ - - -keyboard_control - - diff --git a/src/assets/icons/library_add.svg b/src/assets/icons/library_add.svg deleted file mode 100644 index 382303c4..00000000 --- a/src/assets/icons/library_add.svg +++ /dev/null @@ -1,18 +0,0 @@ - - -library_add - - diff --git a/src/layout/components/SideBar.vue b/src/layout/components/SideBar.vue index ea047d45..6bb75048 100644 --- a/src/layout/components/SideBar.vue +++ b/src/layout/components/SideBar.vue @@ -165,7 +165,7 @@ span.collapse { .menu-control { position: absolute; - top: 8px; + top: 7px; left: 200px; cursor: pointer; transition: all 0.2s linear; diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index 0f198740..037377f5 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -311,7 +311,7 @@ const msg = { keywordsOfContentLogTips: "Current storage of SkyWalking OAP server does not support this.", setEvent: "Set Event", - viewAttributes: "View Attributes", + viewAttributes: "View", serviceEvents: "Service Events", select: "Select", eventID: "Event ID", diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts index a043ba23..12e182c6 100644 --- a/src/locales/lang/zh.ts +++ b/src/locales/lang/zh.ts @@ -310,7 +310,7 @@ const msg = { "只有core/default/searchableLogsTags中定义的标记才可搜索。查看配置词汇表页面上的更多详细信息。", keywordsOfContentLogTips: "SkyWalking OAP服务器的当前存储不支持此操作", setEvent: "设置事件", - viewAttributes: "实例属性", + viewAttributes: "查看", serviceEvents: "服务事件", select: "选择", eventID: "事件ID", diff --git a/src/styles/reset.scss b/src/styles/reset.scss index 9869e765..e414df03 100644 --- a/src/styles/reset.scss +++ b/src/styles/reset.scss @@ -139,5 +139,5 @@ pre { } .el-icon.menu-icons { - margin-right: 8px !important; + margin-top: -3px !important; } diff --git a/src/types/dashboard.ts b/src/types/dashboard.ts index d06213be..f4086d9d 100644 --- a/src/types/dashboard.ts +++ b/src/types/dashboard.ts @@ -72,6 +72,7 @@ export interface LineConfig extends AreaConfig { step?: boolean; showXAxis?: boolean; showYAxis?: boolean; + smallTips?: boolean; } export interface AreaConfig { diff --git a/src/views/dashboard/controls/Tab.vue b/src/views/dashboard/controls/Tab.vue index 9892f988..7d153960 100644 --- a/src/views/dashboard/controls/Tab.vue +++ b/src/views/dashboard/controls/Tab.vue @@ -320,7 +320,7 @@ export default defineComponent({ .vue-grid-item:not(.vue-grid-placeholder) { background: #fff; box-shadow: 0px 1px 4px 0px #00000029; - border-radius: 5px; + border-radius: 3px; } .tab-layout { diff --git a/src/views/dashboard/graphs/EndpointList.vue b/src/views/dashboard/graphs/EndpointList.vue index 91011379..a5d8d8f0 100644 --- a/src/views/dashboard/graphs/EndpointList.vue +++ b/src/views/dashboard/graphs/EndpointList.vue @@ -53,7 +53,12 @@ limitations under the License. --> v-if="config.metricTypes[index] === 'readMetricsValues'" :data="{ [metric]: scope.row[metric] }" :intervalTime="intervalTime" - :config="{ showXAxis: false, showYAxis: false }" + :config="{ + showXAxis: false, + showYAxis: false, + smallTips: true, + showSymbol: true, + }" /> v-if="config.metricTypes[index] === 'readMetricsValues'" :data="metric ? { [metric]: scope.row[metric] } : {}" :intervalTime="intervalTime" - :config="{ showXAxis: false, showYAxis: false }" + :config="{ + showXAxis: false, + showYAxis: false, + smallTips: true, + showSymbol: true, + }" /> v-if="config.metricTypes[index] === 'readMetricsValues'" :data="{ [metric]: scope.row[metric] }" :intervalTime="intervalTime" - :config="{ showXAxis: false, showYAxis: false }" + :config="{ + showXAxis: false, + showYAxis: false, + smallTips: true, + showSymbol: true, + }" />