From 6345c15f000f02f0b60e4eaa570a5b603009d461 Mon Sep 17 00:00:00 2001 From: Qiuxia Fan Date: Thu, 24 Mar 2022 19:53:36 +0800 Subject: [PATCH] update log --- src/hooks/useEcharts.ts | 1 - src/locales/lang/en.ts | 4 ++-- src/locales/lang/zh.ts | 4 ++-- src/views/dashboard/configuration/Widget.vue | 2 +- src/views/dashboard/graphs/EndpointList.vue | 8 +++++--- src/views/dashboard/graphs/InstanceList.vue | 6 ++---- src/views/dashboard/graphs/ServiceList.vue | 11 ++++------- .../dashboard/related/components/LogTable/Index.vue | 1 + .../related/components/LogTable/LogService.vue | 2 ++ .../dashboard/related/components/LogTable/data.ts | 4 ++++ 10 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/hooks/useEcharts.ts b/src/hooks/useEcharts.ts index 63cea634..16b505b2 100644 --- a/src/hooks/useEcharts.ts +++ b/src/hooks/useEcharts.ts @@ -96,7 +96,6 @@ export function useECharts( } function setOptions(options: ECOption, clear = true) { - console.log(options); cacheOptions.value = options; if (unref(elRef)?.offsetHeight === 0) { useTimeoutFn(() => { diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index 18fefeff..7a24c84b 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -122,8 +122,8 @@ const msg = { viewWarning: "You are entering view mode", virtualDatabase: "Virtual Database", reloadDashboards: "Reload dashboards", - kubernetesService: "Kubernetes Service", - kubernetesCluster: "Kubernetes Cluster", + kubernetesService: "Service", + kubernetesCluster: "Cluster", kubernetes: "Kubernetes", hourTip: "Select Hour", minuteTip: "Select Minute", diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts index 35b0c601..ad575085 100644 --- a/src/locales/lang/zh.ts +++ b/src/locales/lang/zh.ts @@ -122,8 +122,8 @@ const msg = { viewWarning: "你正在进入预览模式", virtualDatabase: "虚拟数据库", reloadDashboards: "重新加载仪表盘", - kubernetesService: "Kubernetes服务", - kubernetesCluster: "Kubernetes集群", + kubernetesService: "服务", + kubernetesCluster: "集群", kubernetes: "Kubernetes", hourTip: "选择小时", minuteTip: "选择分钟", diff --git a/src/views/dashboard/configuration/Widget.vue b/src/views/dashboard/configuration/Widget.vue index 70ccd038..d12693e9 100644 --- a/src/views/dashboard/configuration/Widget.vue +++ b/src/views/dashboard/configuration/Widget.vue @@ -136,7 +136,7 @@ export default defineComponent({ } function setStatus(p: boolean) { - isEdit.value = p; + isEdit.value = true; } function cancelConfig() { diff --git a/src/views/dashboard/graphs/EndpointList.vue b/src/views/dashboard/graphs/EndpointList.vue index d1ac24be..819885e7 100644 --- a/src/views/dashboard/graphs/EndpointList.vue +++ b/src/views/dashboard/graphs/EndpointList.vue @@ -111,7 +111,7 @@ const props = defineProps({ intervalTime: { type: Array as PropType, default: () => [] }, isEdit: { type: Boolean, default: false }, }); -const emit = defineEmits(["changeOpt"]); +// const emit = defineEmits(["changeOpt"]); const selectorStore = useSelectorStore(); const dashboardStore = useDashboardStore(); const chartLoading = ref(false); @@ -187,8 +187,10 @@ async function searchList() { watch( () => [props.config.metricTypes, props.config.metrics], async () => { - await queryEndpointMetrics(endpoints.value); - emit("changeOpt", false); + if (props.isEdit) { + queryEndpointMetrics(endpoints.value); + } + // emit("changeOpt", false); } ); watch( diff --git a/src/views/dashboard/graphs/InstanceList.vue b/src/views/dashboard/graphs/InstanceList.vue index c6bf8366..f7af803e 100644 --- a/src/views/dashboard/graphs/InstanceList.vue +++ b/src/views/dashboard/graphs/InstanceList.vue @@ -128,6 +128,7 @@ const props = defineProps({ }, intervalTime: { type: Array as PropType, default: () => [] }, needQuery: { type: Boolean, default: false }, + isEdit: { type: Boolean, default: false }, }); const selectorStore = useSelectorStore(); const dashboardStore = useDashboardStore(); @@ -151,14 +152,11 @@ async function queryInstance() { } searchInstances.value = selectorStore.pods; instances.value = searchInstances.value.splice(0, pageSize); - if (!instances.value.length || props.config.isEdit) { - return; - } queryInstanceMetrics(instances.value); } async function queryInstanceMetrics(currentInstances: Instance[]) { - if (!instances.value.length) { + if (!currentInstances.length) { return; } const { metrics } = props.config; diff --git a/src/views/dashboard/graphs/ServiceList.vue b/src/views/dashboard/graphs/ServiceList.vue index 64e76a8d..8eae2951 100644 --- a/src/views/dashboard/graphs/ServiceList.vue +++ b/src/views/dashboard/graphs/ServiceList.vue @@ -122,6 +122,7 @@ const props = defineProps({ default: () => ({ dashboardName: "", fontSize: 12 }), }, intervalTime: { type: Array as PropType, default: () => [] }, + isEdit: { type: Boolean, default: false }, }); const selectorStore = useSelectorStore(); const dashboardStore = useDashboardStore(); @@ -143,9 +144,6 @@ async function queryServices() { ElMessage.error(resp.errors); } setServices(selectorStore.services); - if (!services.value.length || props.config.isEdit) { - return; - } queryServiceMetrics(services.value); } @@ -182,7 +180,6 @@ function setServices(arr: (Service & { merge: boolean })[]) { services.value = sortServices.value.filter( (d: Service, index: number) => index < pageSize ); - console.log(services.value); } function clickService(scope: any) { @@ -200,6 +197,9 @@ function clickService(scope: any) { router.push(path); } async function queryServiceMetrics(currentServices: Service[]) { + if (!currentServices.length) { + return; + } const { metrics } = props.config; if (metrics.length && metrics[0]) { @@ -253,9 +253,6 @@ function searchList() { watch( () => [props.config.metricTypes, props.config.metrics], () => { - if (!services.value.length) { - return; - } queryServiceMetrics(services.value); } ); diff --git a/src/views/dashboard/related/components/LogTable/Index.vue b/src/views/dashboard/related/components/LogTable/Index.vue index e70707b8..c6d6fd90 100644 --- a/src/views/dashboard/related/components/LogTable/Index.vue +++ b/src/views/dashboard/related/components/LogTable/Index.vue @@ -114,6 +114,7 @@ function setCurrentLog(log: any) { } .serviceInstanceName, + .endpointName, .serviceName { width: 200px; } diff --git a/src/views/dashboard/related/components/LogTable/LogService.vue b/src/views/dashboard/related/components/LogTable/LogService.vue index 3f94af0f..c91b1efe 100644 --- a/src/views/dashboard/related/components/LogTable/LogService.vue +++ b/src/views/dashboard/related/components/LogTable/LogService.vue @@ -82,6 +82,7 @@ function showSelectSpan() { } .serviceInstanceName, + .endpointName, .serviceName { width: 200px; } @@ -98,6 +99,7 @@ function showSelectSpan() { border: 1px solid transparent; border-right: 1px dotted silver; overflow: hidden; + height: 30px; line-height: 30px; text-overflow: ellipsis; white-space: nowrap; diff --git a/src/views/dashboard/related/components/LogTable/data.ts b/src/views/dashboard/related/components/LogTable/data.ts index 9ddd3c50..58009b25 100644 --- a/src/views/dashboard/related/components/LogTable/data.ts +++ b/src/views/dashboard/related/components/LogTable/data.ts @@ -24,6 +24,10 @@ export const ServiceLogConstants = [ label: "serviceInstanceName", value: "instance", }, + { + label: "endpointName", + value: "endpoint", + }, { label: "timestamp", value: "time",