From 6c2236c7d7079539047608e70b84a52f9c362c24 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 9 Apr 2018 11:23:54 +0530 Subject: [PATCH] Update frappe-datatable (#5404) - dynamic row height - fixes #5293 --- frappe/public/js/frappe/views/reports/report_view.js | 1 + package.json | 2 +- yarn.lock | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index 0d45da914f..0cc333b939 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -148,6 +148,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { columns: this.columns, data: this.get_data(values), getEditor: this.get_editing_object.bind(this), + dynamicRowHeight: true, events: { onRemoveColumn: (column) => { this.remove_column_from_datatable(column); diff --git a/package.json b/package.json index 4d9e2c6266..7ecc0477db 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "dependencies": { "cookie": "^0.3.1", "express": "^4.16.2", - "frappe-datatable": "^0.0.4", + "frappe-datatable": "frappe/datatable", "frappe-gantt": "^0.1.0", "fuse": "^0.4.0", "fuse.js": "^3.2.0", diff --git a/yarn.lock b/yarn.lock index 6f7da6ea55..f4b1924311 100644 --- a/yarn.lock +++ b/yarn.lock @@ -870,6 +870,14 @@ frappe-datatable@^0.0.4: lodash "^4.17.5" sortablejs "^1.7.0" +frappe-datatable@frappe/datatable: + version "0.0.4" + resolved "https://codeload.github.com/frappe/datatable/tar.gz/4bb400230087fbf97e8587a34916e14f77fa01cd" + dependencies: + clusterize.js "^0.18.0" + lodash "^4.17.5" + sortablejs "^1.7.0" + frappe-gantt@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/frappe-gantt/-/frappe-gantt-0.1.0.tgz#0532d7f10bc4c905ad7dd1ef8e65c7457d13355f"