fix(merge): merge tree view component

This commit is contained in:
nixa 2016-07-12 12:15:25 +03:00
parent 3244131e14
commit 4e5d682ae8
2 changed files with 26 additions and 10 deletions

View file

@ -1,6 +1,4 @@
import {Component} from '@angular/core';
import {RouteConfig} from '@angular/router-deprecated';
import {TreeView} from "./components/treeView";
@Component({
selector: 'components',
@ -9,14 +7,6 @@ import {TreeView} from "./components/treeView";
styles: [],
template: `<router-outlet></router-outlet>`
})
@RouteConfig([
{
name: 'TreeView',
component: TreeView,
path: '/tree-view',
useAsDefault: true
}
])
export class Components {
constructor() {

View file

@ -20,6 +20,8 @@ import {BubbleMaps} from './maps/components/bubbleMaps/bubbleMaps.component';
import {LineMaps} from './maps/components/lineMaps/lineMaps.component';
import {Editors} from './editors/editors.component';
import {Ckeditor} from './editors/components/ckeditor/ckeditor.component';
import {Components} from './components/components.component';
import {TreeView} from './components/components/treeView/treeView.component';
//noinspection TypeScriptValidateTypes
export const PagesRoutes:RouterConfig = [
@ -64,6 +66,30 @@ export const PagesRoutes:RouterConfig = [
}
]
},
{
path: 'components',
component: Components,
data: {
menu: {
title: 'Components',
icon: 'ion-gear-a',
selected: false,
expanded: false,
order: 250,
}
},
children: [
{
path: 'treeview',
component: TreeView,
data: {
menu: {
title: 'Tree View',
}
}
}
]
},
{
path: 'charts',
component: Charts,