Merge branch 'master' of https://github.com/frappe/datatable
This commit is contained in:
commit
b8a407ab73
2
.gitignore
vendored
2
.gitignore
vendored
@ -32,3 +32,5 @@ node_modules
|
|||||||
|
|
||||||
# npm debug logs
|
# npm debug logs
|
||||||
npm-debug.log.*
|
npm-debug.log.*
|
||||||
|
|
||||||
|
.DS_Store
|
||||||
|
|||||||
11
README.md
11
README.md
@ -1,6 +1,11 @@
|
|||||||
# Frappé DataTable
|
<div align="center">
|
||||||
|
<img src="https://github.com/frappe/design/blob/master/logos/data-table-logo.svg" height="128">
|
||||||
A modern datatable library for the web
|
<h2>Frappe DataTables</h2>
|
||||||
|
<p align="center">
|
||||||
|
<p>
|
||||||
|
A modern datatable library for the web
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
|
|||||||
2
dist/frappe-datatable.cjs.js
vendored
2
dist/frappe-datatable.cjs.js
vendored
@ -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.format || cell.format || null;
|
const customFormatter = (cell.column && cell.column.format) || cell.format || null;
|
||||||
|
|
||||||
let contentHTML;
|
let contentHTML;
|
||||||
if (isHeader || isFilter || !customFormatter) {
|
if (isHeader || isFilter || !customFormatter) {
|
||||||
|
|||||||
2
dist/frappe-datatable.js
vendored
2
dist/frappe-datatable.js
vendored
@ -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.format || cell.format || null;
|
const customFormatter = (cell.column && cell.column.format) || cell.format || null;
|
||||||
|
|
||||||
let contentHTML;
|
let contentHTML;
|
||||||
if (isHeader || isFilter || !customFormatter) {
|
if (isHeader || isFilter || !customFormatter) {
|
||||||
|
|||||||
@ -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.format || cell.format || null;
|
const customFormatter = (cell.column && cell.column.format) || cell.format || null;
|
||||||
|
|
||||||
let contentHTML;
|
let contentHTML;
|
||||||
if (isHeader || isFilter || !customFormatter) {
|
if (isHeader || isFilter || !customFormatter) {
|
||||||
|
|||||||
@ -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.format || cell.format || null;
|
const customFormatter = (cell.column && cell.column.format) || cell.format || null;
|
||||||
|
|
||||||
let contentHTML;
|
let contentHTML;
|
||||||
if (isHeader || isFilter || !customFormatter) {
|
if (isHeader || isFilter || !customFormatter) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user