Skip to content

Commit

Permalink
fix: copy paste from Excel (issue #24371)
Browse files Browse the repository at this point in the history
(cherry picked from commit a1e1a32)
  • Loading branch information
treasuryesc authored and mergify[bot] committed Apr 9, 2024
1 parent f441328 commit 8d3d2e9
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions frappe/public/js/frappe/form/controls/table.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ frappe.ui.form.ControlTable = class ControlTable extends frappe.ui.form.Control
const doctype = grid.doctype;
const row_docname = $(e.target).closest(".grid-row").data("name");
const in_grid_form = $(e.target).closest(".form-in-grid").length;
const value_formatter_map = {
Date: (val) => (val ? frappe.datetime.user_to_str(val) : val),
Int: (val) => cint(val),
Check: (val) => cint(val),
Float: (val) => flt(val),
Currency: (val) => flt(val),
};

let pasted_data = frappe.utils.get_clipboard_data(e);

Expand All @@ -34,10 +41,13 @@ frappe.ui.form.ControlTable = class ControlTable extends frappe.ui.form.Control
if (data.length === 1 && data[0].length === 1) return;

let fieldnames = [];
let fieldtypes = [];
// for raw data with column header
if (this.get_field(data[0][0])) {
data[0].forEach((column) => {
fieldnames.push(this.get_field(column));
var df = frappe.meta.get_docfield(doctype, this.get_field(column));
fieldtypes.push(df.fieldtype);
});
data.shift();
} else {
Expand All @@ -51,6 +61,8 @@ frappe.ui.form.ControlTable = class ControlTable extends frappe.ui.form.Control
column.fieldname === $(e.target).data("fieldname")
) {
fieldnames.push(column.fieldname);
var df = frappe.meta.get_docfield(doctype, column.fieldname);
fieldtypes.push(df.fieldtype);
target_column_matched = true;
}
});
Expand All @@ -73,6 +85,10 @@ frappe.ui.form.ControlTable = class ControlTable extends frappe.ui.form.Control
const row_name = grid_rows[row_idx - 1].doc.name;
row.forEach((value, data_index) => {
if (fieldnames[data_index]) {
// format value before setting
value = value_formatter_map[fieldtypes[data_index]]
? value_formatter_map[fieldtypes[data_index]](value)
: value;
frappe.model.set_value(
doctype,
row_name,
Expand Down

0 comments on commit 8d3d2e9

Please sign in to comment.