jingrow/datatable
1
0
Fork 0
Code Pull Requests Activity

[fix] allow cell formatter

Browse Source
This commit is contained in:
Faris Ansari 2018-04-04 17:01:08 +05:30
parent b8a407ab73
commit 55e35e140e
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/frappe-datatable.cjs.js vendored
View File

@ -2583,7 +2583,7 @@ class CellManager {
const hasDropdown = isHeader && cell.dropdown !== false; const hasDropdown = isHeader && cell.dropdown !== false;
const dropdown = hasDropdown ? `<div class="data-table-dropdown">${getDropdownHTML()}</div>` : ''; const dropdown = hasDropdown ? `<div class="data-table-dropdown">${getDropdownHTML()}</div>` : '';
const customFormatter = (cell.column && cell.column.format) || cell.format || null; const customFormatter = cell.format || (cell.column && cell.column.format) || null;
let contentHTML; let contentHTML;
if (isHeader || isFilter || !customFormatter) { if (isHeader || isFilter || !customFormatter) {

2
dist/frappe-datatable.js vendored
View File

@ -2582,7 +2582,7 @@ class CellManager {
const hasDropdown = isHeader && cell.dropdown !== false; const hasDropdown = isHeader && cell.dropdown !== false;
const dropdown = hasDropdown ? `<div class="data-table-dropdown">${getDropdownHTML()}</div>` : ''; const dropdown = hasDropdown ? `<div class="data-table-dropdown">${getDropdownHTML()}</div>` : '';
const customFormatter = (cell.column && cell.column.format) || cell.format || null; const customFormatter = cell.format || (cell.column && cell.column.format) || null;
let contentHTML; let contentHTML;
if (isHeader || isFilter || !customFormatter) { if (isHeader || isFilter || !customFormatter) {

2
docs/assets/frappe-datatable.js
View File

@ -2582,7 +2582,7 @@ class CellManager {
const hasDropdown = isHeader && cell.dropdown !== false; const hasDropdown = isHeader && cell.dropdown !== false;
const dropdown = hasDropdown ? `<div class="data-table-dropdown">${getDropdownHTML()}</div>` : ''; const dropdown = hasDropdown ? `<div class="data-table-dropdown">${getDropdownHTML()}</div>` : '';
const customFormatter = (cell.column && cell.column.format) || cell.format || null; const customFormatter = cell.format || (cell.column && cell.column.format) || null;
let contentHTML; let contentHTML;
if (isHeader || isFilter || !customFormatter) { if (isHeader || isFilter || !customFormatter) {

2
src/cellmanager.js
View File

@ -695,7 +695,7 @@ export default class CellManager {
const hasDropdown = isHeader && cell.dropdown !== false; const hasDropdown = isHeader && cell.dropdown !== false;
const dropdown = hasDropdown ? `<div class="data-table-dropdown">${getDropdownHTML()}</div>` : ''; const dropdown = hasDropdown ? `<div class="data-table-dropdown">${getDropdownHTML()}</div>` : '';
const customFormatter = (cell.column && cell.column.format) || cell.format || null; const customFormatter = cell.format || (cell.column && cell.column.format) || null;
let contentHTML; let contentHTML;
if (isHeader || isFilter || !customFormatter) { if (isHeader || isFilter || !customFormatter) {