Przeglądaj źródła

fix: Set first visible tab as active

version-14
Suraj Shetty 3 lat temu
rodzic
commit
05ea37c779
3 zmienionych plików z 7 dodań i 8 usunięć
  1. +0
    -2
      frappe/public/js/frappe/form/form.js
  2. +6
    -4
      frappe/public/js/frappe/form/layout.js
  3. +1
    -2
      frappe/public/js/frappe/form/tab.js

+ 0
- 2
frappe/public/js/frappe/form/form.js Wyświetl plik

@@ -575,8 +575,6 @@ frappe.ui.form.Form = class FrappeForm {

this.$wrapper.trigger('render_complete');

this.layout.set_first_tab_as_active(switched || this.cscript.is_onload);

if(!this.hidden) {
this.layout.show_empty_form_message();
}


+ 6
- 4
frappe/public/js/frappe/form/layout.js Wyświetl plik

@@ -123,7 +123,7 @@ frappe.ui.form.Layout = class Layout {

if (this.is_tabbed_layout()) {
// add a tab without `fieldname` to avoid conflicts
let default_tab = {label: __('Details'), fieldtype: "Tab Break"};
let default_tab = {label: __('Details'), fieldtype: "Tab Break", fieldname: "__details"};
let first_tab = this.fields[1].fieldtype === "Tab Break" ? this.fields[1] : null;
if (!first_tab) {
this.fields.splice(1, 0, default_tab);
@@ -336,12 +336,14 @@ frappe.ui.form.Layout = class Layout {
if (visible_tabs && visible_tabs.length == 1) {
visible_tabs[0].parent.toggleClass('hide show');
}
this.set_first_tab_as_active();
}

set_first_tab_as_active(switched) {
if (this.tabs.length && (switched || !this.frm.active_tab)) {
set_first_tab_as_active() {
if (this.tabs.length && !this.frm.active_tab) {
// set first tab as active when opening for first time, or new doc
this.tabs[0].set_active();
let first_visible_tab = this.tabs.find(tab => !tab.is_hidden());
first_visible_tab.set_active();
}
}



+ 1
- 2
frappe/public/js/frappe/form/tab.js Wyświetl plik

@@ -87,7 +87,6 @@ export default class Tab {
}

is_hidden() {
this.wrapper.hasClass('hide')
&& this.parent.hasClass('hide');
return this.wrapper.hasClass('hide');
}
}

Ładowanie…
Anuluj
Zapisz