From f78741278ead24b8dd4807ba2cb989bd2d41b03e Mon Sep 17 00:00:00 2001 From: yuda Date: Fri, 3 Jan 2025 20:26:02 +0900 Subject: [PATCH 1/2] chore: set proper code Signed-off-by: yuda --- .../modules/widgets/_widgets/gauge/Gauge.vue | 5 +---- .../widgets/_widgets/number-card/NumberCard.vue | 14 ++------------ 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/apps/web/src/common/modules/widgets/_widgets/gauge/Gauge.vue b/apps/web/src/common/modules/widgets/_widgets/gauge/Gauge.vue index 61eda4b7a8..aa801dd6df 100644 --- a/apps/web/src/common/modules/widgets/_widgets/gauge/Gauge.vue +++ b/apps/web/src/common/modules/widgets/_widgets/gauge/Gauge.vue @@ -178,10 +178,7 @@ const errorMessage = computed(() => { /* Util */ const drawChart = (rawData: WidgetLoadResponse|null) => { if (isEmpty(rawData)) return; - // HACK: Change the code below when the backend data is modified - // state.chartData = rawData?.results?.[0]?.[widgetOptionsState.dataFieldInfo?.data as string] || 0; - const _targetData = state.data?.results?.find((d) => !!d[widgetOptionsState.dataFieldInfo?.data as string]); - state.chartData = _targetData?.[widgetOptionsState.dataFieldInfo?.data as string] || 0; + state.chartData = rawData?.results?.[0]?.[widgetOptionsState.dataFieldInfo?.data as string] || 0; }; const loadWidget = () => { state.runQueries = true; diff --git a/apps/web/src/common/modules/widgets/_widgets/number-card/NumberCard.vue b/apps/web/src/common/modules/widgets/_widgets/number-card/NumberCard.vue index 58cbb9c295..ff62f5d214 100644 --- a/apps/web/src/common/modules/widgets/_widgets/number-card/NumberCard.vue +++ b/apps/web/src/common/modules/widgets/_widgets/number-card/NumberCard.vue @@ -64,18 +64,8 @@ const state = reactive({ data: computed(() => queryResults.value?.[0].data || null), previousData: computed(() => queryResults.value?.[1]?.data || null), unit: computed(() => widgetFrameProps.value.unitMap?.[widgetOptionsState.dataFieldInfo?.data as string]), - previousValue: computed(() => { - // HACK: Change the code below when the backend data is modified - // return state.previousData?.results?.[0]?.[widgetOptionsState.dataFieldInfo?.data as string] ?? 0; - const _targetData = state.previousData?.results?.find((d) => !!d[widgetOptionsState.dataFieldInfo?.data as string]); - return _targetData?.[widgetOptionsState.dataFieldInfo?.data as string] || 0; - }), - currentValue: computed(() => { - // HACK: Change the code below when the backend data is modified - // return state.data?.results?.[0]?.[widgetOptionsState.dataFieldInfo?.data as string] ?? 0; - const _targetData = state.data?.results?.find((d) => !!d[widgetOptionsState.dataFieldInfo?.data as string]); - return _targetData?.[widgetOptionsState.dataFieldInfo?.data as string] || 0; - }), + previousValue: computed(() => state.previousData?.results?.[0]?.[widgetOptionsState.dataFieldInfo?.data as string] ?? 0), + currentValue: computed(() => state.data?.results?.[0]?.[widgetOptionsState.dataFieldInfo?.data as string] ?? 0), valueText: computed(() => getFormattedNumber(state.currentValue, widgetOptionsState.numberFormatInfo?.[widgetOptionsState.dataFieldInfo?.data as string], state.unit)), iconName: computed(() => widgetOptionsState.iconInfo?.icon?.name), From 6c5cd4e62a7996b4991bfcc819df1f0cdbe23d96 Mon Sep 17 00:00:00 2001 From: yuda Date: Fri, 3 Jan 2025 20:45:55 +0900 Subject: [PATCH 2/2] fix: fix dataField Signed-off-by: yuda --- apps/web/src/common/modules/widgets/_widgets/gauge/Gauge.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/web/src/common/modules/widgets/_widgets/gauge/Gauge.vue b/apps/web/src/common/modules/widgets/_widgets/gauge/Gauge.vue index aa801dd6df..ed4431edcb 100644 --- a/apps/web/src/common/modules/widgets/_widgets/gauge/Gauge.vue +++ b/apps/web/src/common/modules/widgets/_widgets/gauge/Gauge.vue @@ -57,7 +57,10 @@ const state = reactive({ isPrivateWidget: computed(() => props.widgetId.startsWith('private')), dataTable: undefined as PublicDataTableModel|PrivateDataTableModel|undefined, - unit: computed(() => widgetFrameProps.value.unitMap?.[state.dataField]), + unit: computed(() => { + if (!widgetOptionsState.dataFieldInfo?.data) return undefined; + return widgetFrameProps.value.unitMap?.[widgetOptionsState.dataFieldInfo.data as string]; + }), data: computed(() => queryResult?.data?.value || null), chart: null as EChartsType | null, chartData: undefined as undefined|number,