diff --git a/dist/frappe-datatable.cjs.js b/dist/frappe-datatable.cjs.js index abf345f..8d8405f 100644 --- a/dist/frappe-datatable.cjs.js +++ b/dist/frappe-datatable.cjs.js @@ -898,7 +898,7 @@ class DataManager { sortable: false, focusable: false, dropdown: false, - width: 25 + width: 32 }; this.columns.push(cell); } @@ -1344,6 +1344,10 @@ class DataManager { return this.columns.find(col => col.colIndex === colIndex); } + getColumnById(id) { + return this.columns.find(col => col.id === id); + } + getRow(rowIndex) { rowIndex = +rowIndex; return this.rows[rowIndex]; @@ -2957,7 +2961,8 @@ class Style { linkProperties(this, this.instance, [ 'options', 'datamanager', 'columnmanager', - 'header', 'bodyScrollable', 'getColumn' + 'header', 'bodyScrollable', 'datatableWrapper', + 'getColumn' ]); this.scopeClass = 'datatable-instance-' + instance.constructor.instances; @@ -3078,6 +3083,7 @@ class Style { if (column.id === '_rowIndex') { naturalWidth = this.getRowIndexColumnWidth(naturalWidth); + column.width = naturalWidth; } column.naturalWidth = naturalWidth; @@ -3085,15 +3091,50 @@ class Style { } setupColumnWidth() { - this.datamanager.getColumns() - .map(column => { - if (!column.width) { - column.width = column.naturalWidth; - } - if (column.width < column.minWidth) { - column.width = column.minWidth; - } - }); + if (this.options.layout === 'ratio') { + let totalWidth = $.style(this.datatableWrapper, 'width'); + + if (this.options.addSerialNoColumn) { + const rowIndexColumn = this.datamanager.getColumnById('_rowIndex'); + totalWidth = totalWidth - rowIndexColumn.width - 1; + } + + if (this.options.addCheckboxColumn) { + const rowIndexColumn = this.datamanager.getColumnById('_checkbox'); + totalWidth = totalWidth - rowIndexColumn.width - 1; + } + + const totalParts = this.datamanager.getColumns() + .map(column => { + if (column.id === '_rowIndex' || column.id === '_checkbox') { + return 0; + } + if (!column.width) { + column.width = 1; + } + column.ratioWidth = parseInt(column.width, 10); + return column.ratioWidth; + }) + .reduce((a, c) => a + c); + + const onePart = totalWidth / totalParts; + + this.datamanager.getColumns() + .map(column => { + if (column.id === '_rowIndex' || column.id === '_checkbox') return; + column.width = Math.floor(onePart * column.ratioWidth) - 1; + }); + } else { + this.datamanager.getColumns() + .map(column => { + if (!column.width) { + column.width = column.naturalWidth; + } + if (column.width < column.minWidth) { + column.width = column.minWidth; + } + }); + } } distributeRemainingWidth() { @@ -3295,7 +3336,7 @@ var DEFAULT_OPTIONS = { addCheckboxColumn: false, enableClusterize: true, enableLogs: false, - layout: 'fixed', // fixed, fluid + layout: 'ratio', // fixed, fluid, ratio noDataMessage: 'No Data', cellHeight: null, enableInlineFilters: false diff --git a/dist/frappe-datatable.js b/dist/frappe-datatable.js index d7c9795..f3cc2aa 100644 --- a/dist/frappe-datatable.js +++ b/dist/frappe-datatable.js @@ -897,7 +897,7 @@ class DataManager { sortable: false, focusable: false, dropdown: false, - width: 25 + width: 32 }; this.columns.push(cell); } @@ -1343,6 +1343,10 @@ class DataManager { return this.columns.find(col => col.colIndex === colIndex); } + getColumnById(id) { + return this.columns.find(col => col.id === id); + } + getRow(rowIndex) { rowIndex = +rowIndex; return this.rows[rowIndex]; @@ -2956,7 +2960,8 @@ class Style { linkProperties(this, this.instance, [ 'options', 'datamanager', 'columnmanager', - 'header', 'bodyScrollable', 'getColumn' + 'header', 'bodyScrollable', 'datatableWrapper', + 'getColumn' ]); this.scopeClass = 'datatable-instance-' + instance.constructor.instances; @@ -3077,6 +3082,7 @@ class Style { if (column.id === '_rowIndex') { naturalWidth = this.getRowIndexColumnWidth(naturalWidth); + column.width = naturalWidth; } column.naturalWidth = naturalWidth; @@ -3084,15 +3090,50 @@ class Style { } setupColumnWidth() { - this.datamanager.getColumns() - .map(column => { - if (!column.width) { - column.width = column.naturalWidth; - } - if (column.width < column.minWidth) { - column.width = column.minWidth; - } - }); + if (this.options.layout === 'ratio') { + let totalWidth = $.style(this.datatableWrapper, 'width'); + + if (this.options.addSerialNoColumn) { + const rowIndexColumn = this.datamanager.getColumnById('_rowIndex'); + totalWidth = totalWidth - rowIndexColumn.width - 1; + } + + if (this.options.addCheckboxColumn) { + const rowIndexColumn = this.datamanager.getColumnById('_checkbox'); + totalWidth = totalWidth - rowIndexColumn.width - 1; + } + + const totalParts = this.datamanager.getColumns() + .map(column => { + if (column.id === '_rowIndex' || column.id === '_checkbox') { + return 0; + } + if (!column.width) { + column.width = 1; + } + column.ratioWidth = parseInt(column.width, 10); + return column.ratioWidth; + }) + .reduce((a, c) => a + c); + + const onePart = totalWidth / totalParts; + + this.datamanager.getColumns() + .map(column => { + if (column.id === '_rowIndex' || column.id === '_checkbox') return; + column.width = Math.floor(onePart * column.ratioWidth) - 1; + }); + } else { + this.datamanager.getColumns() + .map(column => { + if (!column.width) { + column.width = column.naturalWidth; + } + if (column.width < column.minWidth) { + column.width = column.minWidth; + } + }); + } } distributeRemainingWidth() { @@ -3294,7 +3335,7 @@ var DEFAULT_OPTIONS = { addCheckboxColumn: false, enableClusterize: true, enableLogs: false, - layout: 'fixed', // fixed, fluid + layout: 'ratio', // fixed, fluid, ratio noDataMessage: 'No Data', cellHeight: null, enableInlineFilters: false diff --git a/docs/assets/frappe-datatable.js b/docs/assets/frappe-datatable.js index d7c9795..f3cc2aa 100644 --- a/docs/assets/frappe-datatable.js +++ b/docs/assets/frappe-datatable.js @@ -897,7 +897,7 @@ class DataManager { sortable: false, focusable: false, dropdown: false, - width: 25 + width: 32 }; this.columns.push(cell); } @@ -1343,6 +1343,10 @@ class DataManager { return this.columns.find(col => col.colIndex === colIndex); } + getColumnById(id) { + return this.columns.find(col => col.id === id); + } + getRow(rowIndex) { rowIndex = +rowIndex; return this.rows[rowIndex]; @@ -2956,7 +2960,8 @@ class Style { linkProperties(this, this.instance, [ 'options', 'datamanager', 'columnmanager', - 'header', 'bodyScrollable', 'getColumn' + 'header', 'bodyScrollable', 'datatableWrapper', + 'getColumn' ]); this.scopeClass = 'datatable-instance-' + instance.constructor.instances; @@ -3077,6 +3082,7 @@ class Style { if (column.id === '_rowIndex') { naturalWidth = this.getRowIndexColumnWidth(naturalWidth); + column.width = naturalWidth; } column.naturalWidth = naturalWidth; @@ -3084,15 +3090,50 @@ class Style { } setupColumnWidth() { - this.datamanager.getColumns() - .map(column => { - if (!column.width) { - column.width = column.naturalWidth; - } - if (column.width < column.minWidth) { - column.width = column.minWidth; - } - }); + if (this.options.layout === 'ratio') { + let totalWidth = $.style(this.datatableWrapper, 'width'); + + if (this.options.addSerialNoColumn) { + const rowIndexColumn = this.datamanager.getColumnById('_rowIndex'); + totalWidth = totalWidth - rowIndexColumn.width - 1; + } + + if (this.options.addCheckboxColumn) { + const rowIndexColumn = this.datamanager.getColumnById('_checkbox'); + totalWidth = totalWidth - rowIndexColumn.width - 1; + } + + const totalParts = this.datamanager.getColumns() + .map(column => { + if (column.id === '_rowIndex' || column.id === '_checkbox') { + return 0; + } + if (!column.width) { + column.width = 1; + } + column.ratioWidth = parseInt(column.width, 10); + return column.ratioWidth; + }) + .reduce((a, c) => a + c); + + const onePart = totalWidth / totalParts; + + this.datamanager.getColumns() + .map(column => { + if (column.id === '_rowIndex' || column.id === '_checkbox') return; + column.width = Math.floor(onePart * column.ratioWidth) - 1; + }); + } else { + this.datamanager.getColumns() + .map(column => { + if (!column.width) { + column.width = column.naturalWidth; + } + if (column.width < column.minWidth) { + column.width = column.minWidth; + } + }); + } } distributeRemainingWidth() { @@ -3294,7 +3335,7 @@ var DEFAULT_OPTIONS = { addCheckboxColumn: false, enableClusterize: true, enableLogs: false, - layout: 'fixed', // fixed, fluid + layout: 'ratio', // fixed, fluid, ratio noDataMessage: 'No Data', cellHeight: null, enableInlineFilters: false diff --git a/index.html b/index.html index 48a23d0..a435af3 100644 --- a/index.html +++ b/index.html @@ -49,7 +49,15 @@ }); function buildData() { - columns = ["Name", {content: "Position", width: 120}, "Office", "Extn.", "Start Date", "Salary", { content: "Blank", focusable: false, resizable: false }]; + columns = [ + { content: "Name" }, + { content: "Position" }, + { content: "Office" }, + { content: "Extn." }, + { content: "Start Date" }, + { content: "Salary" }, + { content: "Blank", focusable: false, resizable: false } + ]; data = [[ "Tiger Nixon", {content: "System Architect", editable: false}, "Edinburgh", "5421", "2011/04/25", "$320,800", "" ], [ "Garrett Winters", "Accountant", "Tokyo", "8422", "2011/07/25", "$170,750", "" ], [ "Ashton Cox", "Junior Technical Author", "San Francisco", "1562", "2009/01/12", "$86,000", "" ], [ "Cedric Kelly", "Senior Javascript Developer", "Edinburgh", "6224", "2012/03/29", "$433,060", "" ], [ "Airi Satou", "Accountant", "Tokyo", "5407", "2008/11/28", "$162,700", "" ], [ "Brielle Williamson", "Integration Specialist", "New York", "4804", "2012/12/02", "$372,000", "" ], [ "Herrod Chandler", "Sales Assistant", "San Francisco", "9608", "2012/08/06", "$137,500", "" ], [ "Rhona Davidson", "Integration Specialist", "Tokyo", "6200", "2010/10/14", "$327,900", "" ], [ "Colleen Hurst", "Javascript Developer", "San Francisco", "2360", "2009/09/15", "$205,500", "" ], [ "Sonya Frost", "Software Engineer", "Edinburgh", "1667", "2008/12/13", "$103,600", "" ], [ "Jena Gaines", "Office Manager", "London", "3814", "2008/12/19", "$90,560", "" ], [ "Quinn Flynn", "Support Lead", "Edinburgh", "9497", "2013/03/03", "$342,000", "" ], [ "Charde Marshall", "Regional Director", "San Francisco", "6741", "2008/10/16", "$470,600", "" ], [ "Haley Kennedy", "Senior Marketing Designer", "London", "3597", "2012/12/18", "$313,500", "" ], [ "Tatyana Fitzpatrick", "Regional Director", "London", "1965", "2010/03/17", "$385,750", "" ], [ "Michael Silva", "Marketing Designer", "London", "1581", "2012/11/27", "$198,500", "" ], [ "Paul Byrd", "Chief Financial Officer (CFO)", "New York", "3059", "2010/06/09", "$725,000", "" ], [ "Gloria Little", "Systems Administrator", "New York", "1721", "2009/04/10", "$237,500", "" ], [ "Bradley Greer", "Software Engineer", "London", "2558", "2012/10/13", "$132,000", "" ], [ "Dai Rios", "Personnel Lead", "Edinburgh", "2290", "2012/09/26", "$217,500", "" ], [ "Jenette Caldwell", "Development Lead", "New York", "1937", "2011/09/03", "$345,000", "" ], [ "Yuri Berry", "Chief Marketing Officer (CMO)", "New York", "6154", "2009/06/25", "$675,000", "" ], [ "Caesar Vance", "Pre-Sales Support", "New York", "8330", "2011/12/12", "$106,450", "" ], [ "Doris Wilder", "Sales Assistant", "Sidney", "3023", "2010/09/20", "$85,600", "" ], [ "Angelica Ramos", "Chief Executive Officer (CEO)", "London", "5797", "2009/10/09", "$1,200,000", "" ], [ "Gavin Joyce", "Developer", "Edinburgh", "8822", "2010/12/22", "$92,575", "" ], [ "Jennifer Chang", "Regional Director", "Singapore", "9239", "2010/11/14", "$357,650", "" ], [ "Brenden Wagner", "Software Engineer", "San Francisco", "1314", "2011/06/07", "$206,850", "" ], [ "Fiona Green", "Chief Operating Officer (COO)", "San Francisco", "2947", "2010/03/11", "$850,000", "" ], [ "Shou Itou", "Regional Marketing", "Tokyo", "8899", "2011/08/14", "$163,000", "" ], [ "Michelle House", "Integration Specialist", "Sidney", "2769", "2011/06/02", "$95,400", "" ], [ "Suki Burks", "Developer", "London", "6832", "2009/10/22", "$114,500", "" ], [ "Prescott Bartlett", "Technical Author", "London", "3606", "2011/05/07", "$145,000", "" ], [ "Gavin Cortez", "Team Leader", "San Francisco", "2860", "2008/10/26", "$235,500", "" ], [ "Martena Mccray", "Post-Sales support", "Edinburgh", "8240", "2011/03/09", "$324,050", "" ], [ "Unity Butler", "Marketing Designer", "San Francisco", "5384", "2009/12/09", "$85,675", "" ], [ "Howard Hatfield", "Office Manager", "San Francisco", "7031", "2008/12/16", "$164,500", "" ], [ "Hope Fuentes", "Secretary", "San Francisco", "6318", "2010/02/12", "$109,850", "" ], [ "Vivian Harrell", "Financial Controller", "San Francisco", "9422", "2009/02/14", "$452,500", "" ], [ "Timothy Mooney", "Office Manager", "London", "7580", "2008/12/11", "$136,200", "" ], [ "Jackson Bradshaw", "Director", "New York", "1042", "2008/09/26", "$645,750", "" ], [ "Olivia Liang", "Support Engineer", "Singapore", "2120", "2011/02/03", "$234,500", "" ], [ "Bruno Nash", "Software Engineer", "London", "6222", "2011/05/03", "$163,500", "" ], [ "Sakura Yamamoto", "Support Engineer", "Tokyo", "9383", "2009/08/19", "$139,575", "" ], [ "Thor Walton", "Developer", "New York", "8327", "2013/08/11", "$98,540", "" ], [ "Finn Camacho", "Support Engineer", "San Francisco", "2927", "2009/07/07", "$87,500", "" ], [ "Serge Baldwin", "Data Coordinator", "Singapore", "8352", "2012/04/09", "$138,575", "" ], [ "Zenaida Frank", "Software Engineer", "New York", "7439", "2010/01/04", "$125,250", "" ], [ "Zorita Serrano", "Software Engineer", "San Francisco", "4389", "2012/06/01", "$115,000", "" ], [ "Jennifer Acosta", "Junior Javascript Developer", "Edinburgh", "3431", "2013/02/01", "$75,650", "" ], [ "Cara Stevens", "Sales Assistant", "New York", "3990", "2011/12/06", "$145,600", "" ], [ "Hermione Butler", "Regional Director", "London", "1016", "2011/03/21", "$356,250", "" ], [ "Lael Greer", "Systems Administrator", "London", "6733", "2009/02/27", "$103,500", "" ], [ "Jonas Alexander", "Developer", "San Francisco", "8196", "2010/07/14", "$86,500", "" ], [ "Shad Decker", "Regional Director", "Edinburgh", "6373", "2008/11/13", "$183,000", "" ], [ "Michael Bruce", "Javascript Developer", "Singapore", "5384", "2011/06/27", "$183,000", "" ], [ "Donna Snider", "Customer Support", "New York", "4226", "2011/01/25", "$112,000", "" ]]; if (largeData) { diff --git a/src/datamanager.js b/src/datamanager.js index 742503a..9b46d2d 100644 --- a/src/datamanager.js +++ b/src/datamanager.js @@ -59,7 +59,7 @@ export default class DataManager { sortable: false, focusable: false, dropdown: false, - width: 25 + width: 32 }; this.columns.push(cell); } @@ -505,6 +505,10 @@ export default class DataManager { return this.columns.find(col => col.colIndex === colIndex); } + getColumnById(id) { + return this.columns.find(col => col.id === id); + } + getRow(rowIndex) { rowIndex = +rowIndex; return this.rows[rowIndex]; diff --git a/src/defaults.js b/src/defaults.js index 30f228e..df3d830 100644 --- a/src/defaults.js +++ b/src/defaults.js @@ -44,7 +44,7 @@ export default { addCheckboxColumn: false, enableClusterize: true, enableLogs: false, - layout: 'fixed', // fixed, fluid + layout: 'ratio', // fixed, fluid, ratio noDataMessage: 'No Data', cellHeight: null, enableInlineFilters: false diff --git a/src/style.js b/src/style.js index 24117c8..2efb6ca 100644 --- a/src/style.js +++ b/src/style.js @@ -11,7 +11,8 @@ export default class Style { linkProperties(this, this.instance, [ 'options', 'datamanager', 'columnmanager', - 'header', 'bodyScrollable', 'getColumn' + 'header', 'bodyScrollable', 'datatableWrapper', + 'getColumn' ]); this.scopeClass = 'datatable-instance-' + instance.constructor.instances; @@ -132,6 +133,7 @@ export default class Style { if (column.id === '_rowIndex') { naturalWidth = this.getRowIndexColumnWidth(naturalWidth); + column.width = naturalWidth; } column.naturalWidth = naturalWidth; @@ -139,15 +141,50 @@ export default class Style { } setupColumnWidth() { - this.datamanager.getColumns() - .map(column => { - if (!column.width) { - column.width = column.naturalWidth; - } - if (column.width < column.minWidth) { - column.width = column.minWidth; - } - }); + if (this.options.layout === 'ratio') { + let totalWidth = $.style(this.datatableWrapper, 'width'); + + if (this.options.addSerialNoColumn) { + const rowIndexColumn = this.datamanager.getColumnById('_rowIndex'); + totalWidth = totalWidth - rowIndexColumn.width - 1; + } + + if (this.options.addCheckboxColumn) { + const rowIndexColumn = this.datamanager.getColumnById('_checkbox'); + totalWidth = totalWidth - rowIndexColumn.width - 1; + } + + const totalParts = this.datamanager.getColumns() + .map(column => { + if (column.id === '_rowIndex' || column.id === '_checkbox') { + return 0; + } + if (!column.width) { + column.width = 1; + } + column.ratioWidth = parseInt(column.width, 10); + return column.ratioWidth; + }) + .reduce((a, c) => a + c); + + const onePart = totalWidth / totalParts; + + this.datamanager.getColumns() + .map(column => { + if (column.id === '_rowIndex' || column.id === '_checkbox') return; + column.width = Math.floor(onePart * column.ratioWidth) - 1; + }); + } else { + this.datamanager.getColumns() + .map(column => { + if (!column.width) { + column.width = column.naturalWidth; + } + if (column.width < column.minWidth) { + column.width = column.minWidth; + } + }); + } } distributeRemainingWidth() {