diff --git a/dist/frappe-datatable.cjs.js b/dist/frappe-datatable.cjs.js index e9e98cc..9b5e8ad 100644 --- a/dist/frappe-datatable.cjs.js +++ b/dist/frappe-datatable.cjs.js @@ -2583,13 +2583,15 @@ class CellManager { const hasDropdown = isHeader && cell.dropdown !== false; const dropdown = hasDropdown ? `
${getDropdownHTML()}
` : ''; + const customFormatter = cell.column.format || cell.format || null; + let contentHTML; - if (isHeader || isFilter || !cell.column.format) { + if (isHeader || isFilter || !customFormatter) { contentHTML = cell.content; } else { const row = this.datamanager.getRow(cell.rowIndex); const data = this.datamanager.getData(cell.rowIndex); - contentHTML = cell.column.format(cell.content, row, cell.column, data); + contentHTML = customFormatter(cell.content, row, cell.column, data); } if (this.options.treeView && !(isHeader || isFilter) && cell.indent !== undefined) { diff --git a/dist/frappe-datatable.js b/dist/frappe-datatable.js index a17604f..4daf156 100644 --- a/dist/frappe-datatable.js +++ b/dist/frappe-datatable.js @@ -2582,13 +2582,15 @@ class CellManager { const hasDropdown = isHeader && cell.dropdown !== false; const dropdown = hasDropdown ? `
${getDropdownHTML()}
` : ''; + const customFormatter = cell.column.format || cell.format || null; + let contentHTML; - if (isHeader || isFilter || !cell.column.format) { + if (isHeader || isFilter || !customFormatter) { contentHTML = cell.content; } else { const row = this.datamanager.getRow(cell.rowIndex); const data = this.datamanager.getData(cell.rowIndex); - contentHTML = cell.column.format(cell.content, row, cell.column, data); + contentHTML = customFormatter(cell.content, row, cell.column, data); } if (this.options.treeView && !(isHeader || isFilter) && cell.indent !== undefined) { diff --git a/docs/assets/frappe-datatable.js b/docs/assets/frappe-datatable.js index a17604f..4daf156 100644 --- a/docs/assets/frappe-datatable.js +++ b/docs/assets/frappe-datatable.js @@ -2582,13 +2582,15 @@ class CellManager { const hasDropdown = isHeader && cell.dropdown !== false; const dropdown = hasDropdown ? `
${getDropdownHTML()}
` : ''; + const customFormatter = cell.column.format || cell.format || null; + let contentHTML; - if (isHeader || isFilter || !cell.column.format) { + if (isHeader || isFilter || !customFormatter) { contentHTML = cell.content; } else { const row = this.datamanager.getRow(cell.rowIndex); const data = this.datamanager.getData(cell.rowIndex); - contentHTML = cell.column.format(cell.content, row, cell.column, data); + contentHTML = customFormatter(cell.content, row, cell.column, data); } if (this.options.treeView && !(isHeader || isFilter) && cell.indent !== undefined) { diff --git a/src/cellmanager.js b/src/cellmanager.js index f939a2b..b9eb00f 100644 --- a/src/cellmanager.js +++ b/src/cellmanager.js @@ -695,13 +695,15 @@ export default class CellManager { const hasDropdown = isHeader && cell.dropdown !== false; const dropdown = hasDropdown ? `
${getDropdownHTML()}
` : ''; + const customFormatter = cell.column.format || cell.format || null; + let contentHTML; - if (isHeader || isFilter || !cell.column.format) { + if (isHeader || isFilter || !customFormatter) { contentHTML = cell.content; } else { const row = this.datamanager.getRow(cell.rowIndex); const data = this.datamanager.getData(cell.rowIndex); - contentHTML = cell.column.format(cell.content, row, cell.column, data); + contentHTML = customFormatter(cell.content, row, cell.column, data); } if (this.options.treeView && !(isHeader || isFilter) && cell.indent !== undefined) {