feat: Section Break without border

This commit is contained in:
Nabin Hait 2020-04-27 16:51:31 +05:30
parent b4e5df62d3
commit 76db5e11c8
8 changed files with 55 additions and 5 deletions

View file

@ -43,6 +43,7 @@
"report_hide",
"remember_last_selected_value",
"ignore_xss_filter",
"hide_border",
"property_depends_on_section",
"mandatory_depends_on",
"column_break_38",
@ -448,12 +449,19 @@
{
"fieldname": "column_break_38",
"fieldtype": "Column Break"
},
{
"default": "0",
"depends_on": "eval:doc.fieldtype=='Section Break'",
"fieldname": "hide_border",
"fieldtype": "Check",
"label": "Hide Border"
}
],
"idx": 1,
"istable": 1,
"links": [],
"modified": "2020-04-19 21:54:13.783908",
"modified": "2020-04-27 11:38:21.223185",
"modified_by": "Administrator",
"module": "Core",
"name": "DocField",

View file

@ -48,6 +48,7 @@
"allow_in_quick_entry",
"ignore_xss_filter",
"translatable",
"hide_border",
"description",
"permlevel",
"width",
@ -378,12 +379,19 @@
"fieldname": "in_preview",
"fieldtype": "Check",
"label": "In Preview"
},
{
"default": "0",
"depends_on": "eval:doc.fieldtype=='Section Break'",
"fieldname": "hide_border",
"fieldtype": "Check",
"label": "Hide Border"
}
],
"icon": "fa fa-glass",
"idx": 1,
"links": [],
"modified": "2020-04-10 11:57:10.392218",
"modified": "2020-04-27 11:40:48.325481",
"modified_by": "Administrator",
"module": "Custom",
"name": "Custom Field",

View file

@ -76,7 +76,8 @@ docfield_properties = {
'remember_last_selected_value': 'Check',
'allow_bulk_edit': 'Check',
'auto_repeat': 'Link',
'allow_in_quick_entry': 'Check'
'allow_in_quick_entry': 'Check',
'hide_border': 'Check'
}
allowed_fieldtype_change = (('Currency', 'Float', 'Percent'), ('Small Text', 'Data'),

View file

@ -39,6 +39,7 @@
"allow_on_submit",
"report_hide",
"remember_last_selected_value",
"hide_border",
"property_depends_on_section",
"mandatory_depends_on",
"column_break_33",
@ -388,12 +389,19 @@
"fieldname": "in_preview",
"fieldtype": "Check",
"label": "In Preview"
},
{
"default": "0",
"depends_on": "eval:doc.fieldtype=='Section Break'",
"fieldname": "hide_border",
"fieldtype": "Check",
"label": "Hide Border"
}
],
"idx": 1,
"istable": 1,
"links": [],
"modified": "2020-04-10 11:58:44.573537",
"modified": "2020-04-27 11:39:26.389300",
"modified_by": "Administrator",
"module": "Custom",
"name": "Customize Form Field",

View file

@ -63,6 +63,7 @@ CREATE TABLE `tabDocField` (
`precision` varchar(255) DEFAULT NULL,
`length` int(11) NOT NULL DEFAULT 0,
`translatable` int(1) NOT NULL DEFAULT 0,
`hide_border` int(1) NOT NULL DEFAULT 0,
PRIMARY KEY (`name`),
KEY `parent` (`parent`),
KEY `label` (`label`),

View file

@ -63,6 +63,7 @@ CREATE TABLE "tabDocField" (
"precision" varchar(255) DEFAULT NULL,
"length" bigint NOT NULL DEFAULT 0,
"translatable" smallint NOT NULL DEFAULT 0,
"hide_border" smallint NOT NULL DEFAULT 0,
PRIMARY KEY ("name")
) ;

View file

@ -236,6 +236,7 @@ frappe.ui.form.Layout = Class.extend({
// collapse sections
if(this.frm) {
this.refresh_section_collapse();
this.refresh_section_border();
}
},
@ -307,6 +308,16 @@ frappe.ui.form.Layout = Class.extend({
}
},
refresh_section_border: function() {
if(!this.doc) return;
this.sections.forEach(section => {
const df = section.df;
if (df && cint(df.hide_border)) {
section.hide_border(true);
}
})
},
attach_doc_and_docfields: function(refresh) {
var me = this;
for(var i=0, l=this.fields_list.length; i<l; i++) {
@ -663,6 +674,9 @@ frappe.ui.form.Section = Class.extend({
}
});
},
hide_border(hide) {
this.body.parent().toggleClass("hide-border", hide);
},
is_collapsed() {
return this.body.hasClass('hide');
},

View file

@ -314,11 +314,20 @@ h6.uppercase, .h6.uppercase {
}
}
.form-section:not(:last-child),
.hide-border {
border-top: none !important;
padding-top: 0px;
}
.form-section:not(:first-child) {
border-top: 1px solid @border-color;
}
.form-inner-toolbar {
border-bottom: 1px solid @border-color;
}
.empty-section {
display: none !important;
}