Skip to content

feat(release-20250423-4) #5816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
piggggggggy merged 3 commits into from
Apr 23, 2025
Merged

feat(release-20250423-4) #5816

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27bbc1a
chore: merge master into develop after 2.0.dev354 version tagging
admin-cloudforet Apr 23, 2025
cf976b4
fix(widget): solve widget field data bug
piggggggggy Apr 23, 2025
a400f56
Merge pull request #5815 from piggggggggy/widget-field-bug
piggggggggy Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions apps/web/src/common/modules/widgets/_components/WidgetFormOverlayStep2.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,21 +99,26 @@ const {
widgetId: computed(() => widgetGenerateState.widgetId),
});

let fieldManager: WidgetFieldValueManager;

const state = reactive({
isPrivate: computed<boolean>(() => !!widgetGenerateState.widgetId?.startsWith('private')),
selectedDataTable: computed<DataTableModel|undefined>(() => dataTableList.value.find((d) => d.data_table_id === widgetGenerateState.selectedDataTableId)),
mounted: false,
fieldManager: computed<WidgetFieldValueManager>(() => {
if (!fieldManager) {
fieldManager = new WidgetFieldValueManager(
getWidgetConfig(widgetGenerateState.selectedWidgetName),
state.selectedDataTable,
cloneDeep(widget.value?.options) || {},
);
}
return fieldManager;
fieldManager: computed<WidgetFieldValueManager|undefined>(() => {
const _widgetConfig = getWidgetConfig(widgetGenerateState.selectedWidgetName);

if (
!widgetGenerateState.selectedWidgetName
|| widgetLoading.value
|| !widget.value
|| !state.selectedDataTable
|| !_widgetConfig
) return undefined;

return new WidgetFieldValueManager(
_widgetConfig,
state.selectedDataTable,
cloneDeep(widget.value?.options) || {},
);
}),
value: computed(() => state.fieldManager?.data?.granularity),
widgetConfig: computed(() => getWidgetConfig(widgetGenerateState.selectedWidgetName)),
Expand All @@ -136,6 +141,7 @@ const state = reactive({
return WIDGET_WIDTH_RANGE_LIST[state.widgetSize]?.[0] || 0;
}),
isWidgetFieldChanged: computed<boolean>(() => {
if (!state.fieldManager) return false;
const _isOptionsChanged = !isEqual(cloneDeep(state.fieldManager.data), widget.value?.options);
const _isTypeChanged = widgetGenerateState.selectedWidgetName !== widget.value?.widget_type;
emit('watch-options-changed', _isOptionsChanged || _isTypeChanged);
Expand Down Expand Up @@ -385,7 +391,7 @@ onUnmounted(() => {
/>
</div>
</div>
<widget-form-overlay-step2-widget-form v-if="widgetGenerateState.overlayType !== 'EXPAND' && !!state.fieldManager && !widgetLoading"
<widget-form-overlay-step2-widget-form v-if="widgetGenerateState.overlayType !== 'EXPAND' && !!widget && !!state.fieldManager && !widgetLoading"
:widget-validation-invalid="widgetOptionsInvalid"
:widget-validation-invalid-text="widgetOptionsInvalidText"
:field-manager="state.fieldManager"
Expand Down
Loading