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

fix: remove empty sections while loading and saving

Browse source
This commit is contained in:
Shariq Ansari 2022-11-08 13:09:39 +05:30
parent e79156e748
commit 8a252d237c
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frappe/public/js/form_builder/components/FieldTypes.vue
View file

@ -66,6 +66,7 @@ let fields = computed(() => {
gap: 8px;
padding: 8px;
grid-template-columns: 1fr 1fr;
grid-auto-rows: max-content;
.field {
background-color: var(--bg-light-gray);

12
frappe/public/js/form_builder/store.js
View file

@ -131,6 +131,11 @@ export const useStore = defineStore("form-builder-store", {
}
tab.sections.forEach((section, j) => {
// data before section is added
let fields_copy = JSON.parse(JSON.stringify(fields));
let old_idx = idx;
section.has_fields = false;
// do not consider first section if label is not set
if ((j == 0 && section.df.label) || j > 0) {
idx++;
@ -150,8 +155,15 @@ export const useStore = defineStore("form-builder-store", {
idx++;
field.df.idx = idx;
fields.push(field.df);
section.has_fields = true;
});
});
// restore data back to data before section is added.
if (!section.has_fields) {
fields = fields_copy || [];
idx = old_idx;
}
});
});

3
frappe/public/js/form_builder/utils.js
View file

@ -88,7 +88,8 @@ export function create_layout(fields) {
// remove empty sections
for (let tab of layout.tabs) {
for (let section of tab.sections) {
for (let i = tab.sections.length - 1; i >= 0; --i) {
let section = tab.sections[i];
if (!section.has_fields) {
tab.sections.splice(tab.sections.indexOf(section), 1);
}