vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix: handle active tab (geolocation field issue)

Browse source
This commit is contained in:
git-avc 2025-11-29 20:34:31 +01:00
parent b7cb1cacce
commit 8723ec27f1
2 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
frappe/public/js/frappe/form/grid_row_form.js
View file

@ -43,6 +43,19 @@ export default class GridRowForm {
this.set_focus();
}
set_active_tab(tab) {
// When switching tabs in grid row forms, update field display for Geolocation/Signature fields
// This is similar to the fix in frappe/frappe#27441 for regular forms
let in_tab = false;
for (const df of this.layout.fields) {
const field = this.fields_dict[df.fieldname];
if (df?.fieldtype === "Tab Break") {
in_tab = df === tab?.df;
} else if (typeof field?.on_section_collapse === "function") {
field.on_section_collapse(!in_tab); // hide = !in_tab
}
}
}
make_form() {
if (!this.form_area) {
let template = `<div class="grid-form-heading">

37
frappe/public/js/frappe/form/tab.js
View file

@ -88,7 +88,14 @@ export default class Tab {
// Ensure the wrapper has the correct classes
this.wrapper.addClass("show active");
this.frm?.set_active_tab?.(this);
// Call set_active_tab on the appropriate form object
if (this.layout?.grid_row_form) {
// For child tables, call grid_row_form's set_active_tab
this.layout.grid_row_form.set_active_tab?.(this);
} else {
// For regular forms, call frm's set_active_tab
this.frm?.set_active_tab?.(this);
}
}
is_active() {
@ -101,7 +108,12 @@ export default class Tab {
setup_listeners() {
this.tab_link.find(".nav-link").on("shown.bs.tab", () => {
this.frm?.set_active_tab?.(this);
// Call set_active_tab on the appropriate form object
if (this.layout?.grid_row_form) {
this.layout.grid_row_form.set_active_tab?.(this);
} else {
this.frm?.set_active_tab?.(this);
}
});
// For child tables, add explicit click handler to ensure tab switching works
@ -122,24 +134,11 @@ export default class Tab {
this.tab_link.find(".nav-link").addClass("active");
this.wrapper.addClass("show active");
// Notify fields to update their display (fixes Geolocation/Signature fields)
this.update_fields_on_tab_change();
// Notify grid_row_form about tab change
if (this.layout.grid_row_form) {
this.layout.grid_row_form.set_active_tab?.(this);
}
});
}
}
update_fields_on_tab_change() {
// When switching tabs in child tables, notify fields like Geolocation and Signature
// to update their display using the on_section_collapse method
if (!this.layout?.fields_list) return;
let in_tab = false;
for (const fieldobj of this.layout.fields_list) {
if (fieldobj.df?.fieldtype === "Tab Break") {
in_tab = fieldobj.df === this.df;
} else if (typeof fieldobj.on_section_collapse === "function") {
fieldobj.on_section_collapse(!in_tab); // hide = !in_tab
}
}
}
}