From d5d8c54d98db8ed1373a30eb7716fe9ee8c78ca8 Mon Sep 17 00:00:00 2001 From: AllenFang Date: Sat, 28 Jul 2018 15:57:52 +0800 Subject: [PATCH] fix React doesn't allow Date Object as children --- .../examples/column-filter/custom-date-filter.js | 1 + .../examples/column-filter/date-filter-default-value.js | 1 + .../examples/column-filter/date-filter.js | 1 + .../examples/column-filter/programmatically-date-filter.js | 1 + packages/react-bootstrap-table2-filter/README.md | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/react-bootstrap-table2-example/examples/column-filter/custom-date-filter.js b/packages/react-bootstrap-table2-example/examples/column-filter/custom-date-filter.js index 226708d..bb04522 100644 --- a/packages/react-bootstrap-table2-example/examples/column-filter/custom-date-filter.js +++ b/packages/react-bootstrap-table2-example/examples/column-filter/custom-date-filter.js @@ -15,6 +15,7 @@ const columns = [{ }, { dataField: 'inStockDate', text: 'InStock Date', + formatter: cell => cell.toString(), filter: dateFilter({ delay: 400, placeholder: 'custom placeholder', diff --git a/packages/react-bootstrap-table2-example/examples/column-filter/date-filter-default-value.js b/packages/react-bootstrap-table2-example/examples/column-filter/date-filter-default-value.js index c292531..2fcba33 100644 --- a/packages/react-bootstrap-table2-example/examples/column-filter/date-filter-default-value.js +++ b/packages/react-bootstrap-table2-example/examples/column-filter/date-filter-default-value.js @@ -15,6 +15,7 @@ const columns = [{ }, { dataField: 'inStockDate', text: 'InStock Date', + formatter: cell => cell.toString(), filter: dateFilter({ defaultValue: { date: new Date(2018, 0, 1), comparator: Comparator.GT } }) diff --git a/packages/react-bootstrap-table2-example/examples/column-filter/date-filter.js b/packages/react-bootstrap-table2-example/examples/column-filter/date-filter.js index 24cd05b..85bcb89 100644 --- a/packages/react-bootstrap-table2-example/examples/column-filter/date-filter.js +++ b/packages/react-bootstrap-table2-example/examples/column-filter/date-filter.js @@ -15,6 +15,7 @@ const columns = [{ }, { dataField: 'inStockDate', text: 'InStock Date', + formatter: cell => cell.toString(), filter: dateFilter() }]; diff --git a/packages/react-bootstrap-table2-example/examples/column-filter/programmatically-date-filter.js b/packages/react-bootstrap-table2-example/examples/column-filter/programmatically-date-filter.js index d620120..7b25667 100644 --- a/packages/react-bootstrap-table2-example/examples/column-filter/programmatically-date-filter.js +++ b/packages/react-bootstrap-table2-example/examples/column-filter/programmatically-date-filter.js @@ -17,6 +17,7 @@ const columns = [{ }, { dataField: 'inStockDate', text: 'InStock Date', + formatter: cell => cell.toString(), filter: dateFilter({ getFilter: (filter) => { // inStockDateFilter was assigned once the component has been mounted. diff --git a/packages/react-bootstrap-table2-filter/README.md b/packages/react-bootstrap-table2-filter/README.md index 38c278e..05c7c9e 100644 --- a/packages/react-bootstrap-table2-filter/README.md +++ b/packages/react-bootstrap-table2-filter/README.md @@ -214,7 +214,7 @@ const columns = [..., { ``` -> **Notes:** date filter accept a Javascript Date object in your raw data. +> **Notes:** date filter accept a Javascript Date object in your raw data and you have to use `column.formatter` to make it as your prefer string result Date filter is same as other filter, you can custom the date filter via `dateFilter` factory function: