Panels with campaign statistics and some fixes in computation of clicks.
This commit is contained in:
parent
ba996d845d
commit
d103a2cc79
18 changed files with 811 additions and 96 deletions
|
|
@ -288,10 +288,12 @@ class InputField extends Component {
|
|||
let type = 'text';
|
||||
if (props.type === 'password') {
|
||||
type = 'password';
|
||||
} else if (props.type === 'hidden') {
|
||||
type = 'hidden';
|
||||
}
|
||||
|
||||
return wrapInput(id, htmlId, owner, props.format, '', props.label, props.help,
|
||||
<input type={type} value={owner.getFormValue(id) || ''} placeholder={props.placeholder} id={htmlId} className="form-control" aria-describedby={htmlId + '_help'} onChange={evt => owner.updateFormValue(id, evt.target.value)}/>
|
||||
<input type={type} value={owner.getFormValue(id)} placeholder={props.placeholder} id={htmlId} className="form-control" aria-describedby={htmlId + '_help'} onChange={evt => owner.updateFormValue(id, evt.target.value)}/>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -736,12 +738,15 @@ class TableSelect extends Component {
|
|||
label: PropTypes.string,
|
||||
help: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
|
||||
format: PropTypes.string,
|
||||
disabled: PropTypes.bool
|
||||
disabled: PropTypes.bool,
|
||||
|
||||
pageLength: PropTypes.number
|
||||
}
|
||||
|
||||
static defaultProps = {
|
||||
selectMode: TableSelectMode.SINGLE,
|
||||
selectionLabelIndex: 0
|
||||
selectionLabelIndex: 0,
|
||||
pageLength: 10
|
||||
}
|
||||
|
||||
static contextTypes = {
|
||||
|
|
@ -814,7 +819,7 @@ class TableSelect extends Component {
|
|||
return wrapInput(id, htmlId, owner, props.format, '', props.label, props.help,
|
||||
<div>
|
||||
<div>
|
||||
<Table ref={node => this.table = node} data={props.data} dataUrl={props.dataUrl} columns={props.columns} selectMode={props.selectMode} selectionAsArray={this.props.selectionAsArray} withHeader={props.withHeader} selectionKeyIndex={props.selectionKeyIndex} selection={owner.getFormValue(id)} onSelectionChangedAsync={::this.onSelectionChangedAsync}/>
|
||||
<Table ref={node => this.table = node} data={props.data} dataUrl={props.dataUrl} columns={props.columns} pageLength={props.pageLength} selectMode={props.selectMode} selectionAsArray={this.props.selectionAsArray} withHeader={props.withHeader} selectionKeyIndex={props.selectionKeyIndex} selection={owner.getFormValue(id)} onSelectionChangedAsync={::this.onSelectionChangedAsync}/>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ class Breadcrumb extends Component {
|
|||
const params = this.props.params;
|
||||
let title;
|
||||
if (typeof entry.title === 'function') {
|
||||
title = entry.title(this.props.resolved);
|
||||
title = entry.title(this.props.resolved, params);
|
||||
} else {
|
||||
title = entry.title;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,12 +48,14 @@ class Table extends Component {
|
|||
onSelectionChangedAsync: PropTypes.func,
|
||||
onSelectionDataAsync: PropTypes.func,
|
||||
withHeader: PropTypes.bool,
|
||||
refreshInterval: PropTypes.number
|
||||
refreshInterval: PropTypes.number,
|
||||
pageLength: PropTypes.number
|
||||
}
|
||||
|
||||
static defaultProps = {
|
||||
selectMode: TableSelectMode.NONE,
|
||||
selectionKeyIndex: 0
|
||||
selectionKeyIndex: 0,
|
||||
pageLength: 50
|
||||
}
|
||||
|
||||
refresh() {
|
||||
|
|
@ -262,7 +264,8 @@ class Table extends Component {
|
|||
}
|
||||
|
||||
const dtOptions = {
|
||||
columns
|
||||
columns,
|
||||
pageLength: this.props.pageLength
|
||||
};
|
||||
|
||||
const self = this;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue