Skip to content

Commit 97d7f20

Browse files
committed
fix: fix number card data
Signed-off-by: yuda <yuda@megazone.com>
1 parent f531241 commit 97d7f20

File tree

1 file changed

+12
-2
lines changed
  • apps/web/src/common/modules/widgets/_widgets/number-card

1 file changed

+12
-2
lines changed

apps/web/src/common/modules/widgets/_widgets/number-card/NumberCard.vue

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,18 @@ const state = reactive({
6464
data: computed<WidgetLoadResponse | null>(() => queryResults.value?.[0].data || null),
6565
previousData: computed<WidgetLoadResponse | null>(() => queryResults.value?.[1]?.data || null),
6666
unit: computed<string|undefined>(() => widgetFrameProps.value.unitMap?.[widgetOptionsState.dataFieldInfo?.data as string]),
67-
previousValue: computed<number>(() => state.previousData?.results?.[0]?.[widgetOptionsState.dataFieldInfo?.data as string] ?? 0),
68-
currentValue: computed<number>(() => state.data?.results?.[0]?.[widgetOptionsState.dataFieldInfo?.data as string] ?? 0),
67+
previousValue: computed<number>(() => {
68+
// HACK: Change the code below when the backend data is modified
69+
// return state.previousData?.results?.[0]?.[widgetOptionsState.dataFieldInfo?.data as string] ?? 0;
70+
const _targetData = state.previousData?.results?.find((d) => !!d[widgetOptionsState.dataFieldInfo?.data as string]);
71+
return _targetData?.[widgetOptionsState.dataFieldInfo?.data as string] || 0;
72+
}),
73+
currentValue: computed<number>(() => {
74+
// HACK: Change the code below when the backend data is modified
75+
// return state.data?.results?.[0]?.[widgetOptionsState.dataFieldInfo?.data as string] ?? 0;
76+
const _targetData = state.data?.results?.find((d) => !!d[widgetOptionsState.dataFieldInfo?.data as string]);
77+
return _targetData?.[widgetOptionsState.dataFieldInfo?.data as string] || 0;
78+
}),
6979
valueText: computed<string|undefined>(() => getFormattedNumber(state.currentValue, widgetOptionsState.dataFieldInfo?.data as string, widgetOptionsState.numberFormatInfo, state.unit)),
7080
7181
iconName: computed<string|undefined>(() => widgetOptionsState.iconInfo?.icon?.name),

0 commit comments

Comments
 (0)