chore: set proper option to PieChart config & etc... (#5299)

* chore: add optional Signed-off-by: yuda <[email protected]> * chore: set proper option to PieChart config Signed-off-by: yuda <[email protected]> * chore: hide position dropdown when legend option is disabled Signed-off-by: yuda <[email protected]> --------- Signed-off-by: yuda <[email protected]>
cloudforet-io · Dec 23, 2024 · 58e081f · 58e081f
1 parent 9aa7983
commit 58e081f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/apps/web/src/common/modules/widgets/_widget-fields/legend/WidgetFieldLegend.vue b/apps/web/src/common/modules/widgets/_widget-fields/legend/WidgetFieldLegend.vue
@@ -59,7 +59,7 @@ const handleSelectPosition = (val: 'right'|'bottom'|'left'|'top') => {
                              @update:value="handleUpdateToggleValue"
             />
         </div>
-        <p-field-group v-if="props.widgetFieldSchema?.options?.showPositionField"
+        <p-field-group v-if="state.fieldValue?.toggleValue && props.widgetFieldSchema?.options?.showPositionField"
                        :label="$t('COMMON.WIDGETS.LEGEND.POSITION')"
                        style-type="secondary"
                        class="position-wrapper"

diff --git a/apps/web/src/common/modules/widgets/_widgets/heatmap/Heatmap.vue b/apps/web/src/common/modules/widgets/_widgets/heatmap/Heatmap.vue
@@ -187,7 +187,7 @@ const queryKey = computed(() => [
         dataTableId: state.dataTable?.data_table_id,
         dataTableOptions: JSON.stringify(sortObjectByKeys(state.dataTable?.options) ?? {}),
         groupBy: [widgetOptionsState.xAxisInfo?.data as string],
-        count: widgetOptionsState.xAxisInfo.count,
+        count: widgetOptionsState.xAxisInfo?.count,
     },
 ]);
 

diff --git a/apps/web/src/common/modules/widgets/_widgets/pie-chart/widget-config.ts b/apps/web/src/common/modules/widgets/_widgets/pie-chart/widget-config.ts
@@ -31,7 +31,7 @@ const pieChart: WidgetConfig = {
     optionalFieldsSchema: {
         legend: {
             options: {
-                default: true,
+                toggle: true,
                 showPositionField: true,
             },
         },