Skip to content

Commit c69a3ca

Browse files
committed
Merge branch 'sekharp-datetime-cell-edit'
2 parents 2904133 + e805b93 commit c69a3ca

File tree

4 files changed

+34
-11
lines changed

4 files changed

+34
-11
lines changed

demo/js/demo.bundle.js

+26-9
Large diffs are not rendered by default.

examples/js/advance/demo.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Demo extends React.Component {
1414
render() {
1515
return (
1616
<Col md={ 8 } mdOffset={ 1 }>
17-
<Panel header={ 'Cell Edit Type Example(text, textarea, select, checkbox)' }>
17+
<Panel header={ 'Cell Edit Type Example(text, textarea, select, checkbox, datetime)' }>
1818
{ renderLinks('advance/edit-type-table.js') }
1919
<EditTypeTable/>
2020
</Panel>

examples/js/advance/edit-type-table.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ function addJobs(quantity) {
1414
id: id,
1515
name: 'Item name ' + id,
1616
type: 'B',
17-
active: i % 2 === 0 ? 'Y' : 'N'
17+
active: i % 2 === 0 ? 'Y' : 'N',
18+
datetime: '200' + i + '-12-28T14:57:00'
1819
});
1920
}
2021
}
@@ -34,6 +35,7 @@ export default class EditTypeTable extends React.Component {
3435
<TableHeaderColumn dataField='name' editable={ { type: 'textarea' } }>Job Name</TableHeaderColumn>
3536
<TableHeaderColumn dataField='type' editable={ { type: 'select', options: { values: jobTypes } } }>Job Type</TableHeaderColumn>
3637
<TableHeaderColumn dataField='active' editable={ { type: 'checkbox', options: { values: 'Y:N' } } }>Active</TableHeaderColumn>
38+
<TableHeaderColumn dataField='datetime' editable={ { type: 'datetime' } }>Date Time</TableHeaderColumn>
3739
</BootstrapTable>
3840
);
3941
}

src/Editor.js

+4
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ const editor = function(editable, attr, format, editorClass, defaultValue, ignor
9292
<input { ...attr } type='checkbox'
9393
value={ values } defaultChecked={ checked }/>
9494
);
95+
} else if (editable.type === 'datetime') {
96+
return (
97+
<input { ...attr } type='datetime-local' defaultValue={ defaultValue }/>
98+
);
9599
} else {// process other input type. as password,url,email...
96100
return (
97101
<input { ...attr } type='text' defaultValue={ defaultValue }/>

0 commit comments

Comments
 (0)