From 3551e894c6c02dc7f44fd6975bd0fb5c7743f68b Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 10 Oct 2018 17:59:30 +0530 Subject: [PATCH] fix: Update datatable - New DataTable uses hyperlist instead of clusterize to render large number of rows --- .../js/frappe/views/reports/query_report.js | 3 ++- .../js/frappe/views/reports/report_view.js | 1 + frappe/public/less/frappe-datatable.less | 4 ---- package.json | 2 +- yarn.lock | 20 +++++++++---------- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 9dbc70c152..998df1488c 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -344,7 +344,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { data: this.data, inlineFilters: true, treeView: this.tree_report, - layout: 'fixed' + layout: 'fixed', + cellHeight: 33 }; if (this.report_settings.get_datatable_options) { diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index 72990a66dc..911ecba83b 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -170,6 +170,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { getEditor: this.get_editing_object.bind(this), dynamicRowHeight: !this.fixed_row_height.get_value(), checkboxColumn: true, + cellHeight: 37, events: { onRemoveColumn: (column) => { this.remove_column_from_datatable(column); diff --git a/frappe/public/less/frappe-datatable.less b/frappe/public/less/frappe-datatable.less index ae9c648bf9..21b435a3de 100644 --- a/frappe/public/less/frappe-datatable.less +++ b/frappe/public/less/frappe-datatable.less @@ -54,10 +54,6 @@ table td.dt-cell { --dt-header-cell-bg: @panel-bg; --dt-cell-bg: @panel-bg; --dt-text-color: @text-muted; - - .dt-row[data-is-filter] { - display: table-row !important; - } } .dt-row.row-update { diff --git a/package.json b/package.json index 3285cf180d..b797453053 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "awesomplete": "^1.1.2", "cookie": "^0.3.1", "express": "^4.16.2", - "frappe-datatable": "^1.3.2", + "frappe-datatable": "^1.4.2", "frappe-gantt": "^0.1.0", "fuse.js": "^3.2.0", "highlight.js": "^9.12.0", diff --git a/yarn.lock b/yarn.lock index 82d1078d52..6352f5a0bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -534,11 +534,6 @@ clone@^2.1.1: resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= -clusterize.js@^0.18.0: - version "0.18.1" - resolved "https://registry.yarnpkg.com/clusterize.js/-/clusterize.js-0.18.1.tgz#a286a9749bd1fa9c2fe21b7fabd8780a590dd836" - integrity sha512-UsLhW2lG3TaTnE8LI7ninvovua3FLrlsbksb9uzx0fVzzV2WFScO5FU/4yFwdM8RW8iuYVWFraBpDjsosReFlg== - co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" @@ -1224,12 +1219,12 @@ forwarded@~0.1.2: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= -frappe-datatable@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.3.2.tgz#0c4a5cb3e169962dc6b05f023b97b817006590a8" - integrity sha512-c7l4T7F1FFrHgLxlBoCdaV0/AFBFASLbdw5TH/lSoh6rlUqYGIsaqpF4Nr7j/9ItG4WbNRrjGCrYnMiy44ijnw== +frappe-datatable@^1.4.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.4.2.tgz#1b6dc401cf3aa72a9b6d12547d4f2aa0b6a95ab3" + integrity sha512-+V2+rD3tpciWmAzor6Mu/tl9nlgg0Y1VajNwWKkM5q0degmSVyS9moC5IzmlmgPogBWlYF6XOUC/xHKrHJij1A== dependencies: - clusterize.js "^0.18.0" + hyperlist "^1.0.0-beta" lodash "^4.17.5" sortablejs "^1.7.0" @@ -1560,6 +1555,11 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" +hyperlist@^1.0.0-beta: + version "1.0.0-beta" + resolved "https://registry.yarnpkg.com/hyperlist/-/hyperlist-1.0.0-beta.tgz#2cbbd77f4498c2ecc290b7f3c6745b3f0288247e" + integrity sha1-LLvXf0SYwuzCkLfzxnRbPwKIJH4= + iconv-lite@0.4.19: version "0.4.19" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"