From f96c623b3371d0f4f354cffc6645513e24509de7 Mon Sep 17 00:00:00 2001 From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> Date: Thu, 9 Jun 2022 14:33:08 +0530 Subject: [PATCH] fix: added text editor dialog on hide action (#17117) * fix: added text editor dialog on hide action When we edit text editor field and close the dialog the cell in datatable is empty * chore: bump datatable to 1.16.4 --- frappe/public/js/frappe/views/reports/report_view.js | 4 +++- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index 4c545d1ce7..6880d472d3 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -624,9 +624,11 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { title: __('Edit {0}', [col.docfield.label]), fields: [col.docfield], primary_action: () => { - this.datatable.cellmanager.submitEditing(); this.datatable.cellmanager.deactivateEditing(); d.hide(); + }, + on_hide: () => { + this.datatable.cellmanager.deactivateEditing(false); } }); d.show(); diff --git a/package.json b/package.json index d198b597cb..e144c76e89 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "express": "^4.17.1", "fast-deep-equal": "^2.0.1", "frappe-charts": "^2.0.0-rc13", - "frappe-datatable": "^1.16.1", + "frappe-datatable": "^1.16.4", "frappe-gantt": "^0.6.0", "fuse.js": "^3.4.6", "highlight.js": "^10.4.1", diff --git a/yarn.lock b/yarn.lock index 2e90cbcb40..ec908cbb11 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1780,10 +1780,10 @@ frappe-charts@^2.0.0-rc13: resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc13.tgz#fdb251d7ae311c41e38f90a3ae108070ec6b9072" integrity sha512-Bv7IfllIrjRbKWHn5b769dOSenqdBixAr6m5kurf8ZUOJSLOgK4HOXItJ7BA8n9PvviH9/k5DaloisjLM2Bm1w== -frappe-datatable@^1.16.1: - version "1.16.1" - resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.16.1.tgz#a5844b7ad8259ef45606608f492ca4b343006818" - integrity sha512-TRj3459YWyJdoP9MgHfOAEq7ylyoT3TVkwxLQGEmn5Xj6UAJOFa7F9j4TaWnFXW8tuoy69z/TktDclOurMeT2w== +frappe-datatable@^1.16.4: + version "1.16.4" + resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.16.4.tgz#cb26f197c3cd404a5b13f016ef81c394e06f56fe" + integrity sha512-VoiTLnkuObMa3FxITrvP32UYN9v4WQ0j4qlCiDuqdXha9/BVSxwDt2BTK+cvaRloGcds5G2Hm9IRbltRRGGhxA== dependencies: hyperlist "^1.0.0-beta" lodash "^4.17.5"