overflow_backup_2018_0455/overflow_app
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simple

Browse Source
This commit is contained in:
snoop 2017-09-05 10:48:38 +09:00
parent 763ef41384
commit 6d2e01fa2d
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ts/@overflow/app/views/layout/SensorDetailLayout.tsx
View File

@ -34,10 +34,6 @@ class SensorDetailLayout extends React.Component<Props, State> {
'name': 'Items', 'name': 'Items',
'path': '/items', 'path': '/items',
}, },
{
'name': 'Setup',
'path': '/setup',
},
{ {
'name': 'History', 'name': 'History',
'path': '/history', 'path': '/history',
@ -55,9 +51,6 @@ class SensorDetailLayout extends React.Component<Props, State> {
<Route exact={true} path={`${this.props.match.url}/:id/`} component={SensorDetailInfo} /> <Route exact={true} path={`${this.props.match.url}/:id/`} component={SensorDetailInfo} />
<Route exact={true} path={`${this.props.match.url}/:id/info`} component={SensorDetailInfo} /> <Route exact={true} path={`${this.props.match.url}/:id/info`} component={SensorDetailInfo} />
<Route exact={true} path={`${this.props.match.url}/:id/items`} component={SensorDetailItems} /> <Route exact={true} path={`${this.props.match.url}/:id/items`} component={SensorDetailItems} />
{/*<Route path={`${this.props.match.url}/:id/history/`} component={EmailConfirm}/>*/}
<Route exact={true} path={`${this.props.match.url}/:id/setup`} component={SensorSetup} />
<Route exact={true} path={`${this.props.match.url}/setup`} component={SensorSetup} />
<Route exact={true} path={`${this.props.match.url}/:id/tree`} component={SensorItemTree} /> <Route exact={true} path={`${this.props.match.url}/:id/tree`} component={SensorItemTree} />
<Route exact={true} path={`${this.props.match.url}/:id/history`} component={HistoryView} /> <Route exact={true} path={`${this.props.match.url}/:id/history`} component={HistoryView} />
</Switch> </Switch>

9
src/ts/@overflow/sensor/react/components/SensorConfigTargetSelect.tsx
View File

@ -105,11 +105,11 @@ export class SensorConfigTargetSelect extends React.Component<Props, State> {
selectionOptions.push(this.createOption(this.props.infra)); selectionOptions.push(this.createOption(this.props.infra));
this.selectOptions = selectionOptions; this.selectOptions = selectionOptions;
let sd = this.props.getSensor(); // let sd = this.props.getSensor();
// sd.targetId = this.props.infra.target.id; // sd.targetId = this.props.infra.target.id;
// sd.type = this.props.infra.infraType.name; // sd.type = this.props.infra.infraType.name;
sd.infra = this.props.infra; // sd.infra = this.props.infra;
this.props.setSensor(sd); // this.props.setSensor(sd);
} }
public createOption(infra: Infra): DropdownItemProps { public createOption(infra: Infra): DropdownItemProps {
@ -148,7 +148,8 @@ export class SensorConfigTargetSelect extends React.Component<Props, State> {
} }
return (<Dropdown return (<Dropdown
placeholder='Select Target' selection options={this.selectOptions} defaultValue={this.defaultValue()} placeholder='Select Target' selection options={this.selectOptions}
// defaultValue={this.defaultValue()}
onChange={this.onChangeTarget.bind(this)} />); onChange={this.onChangeTarget.bind(this)} />);
} }