界面改回多项编辑模式，实现较简单

portal/src/app/main/main-routing.module.ts

@@ -7,21 +7,21 @@ import {TunnelComponent} from './tunnel/tunnel.component';
 import {PluginComponent} from './plugin/plugin.component';
 import {LinkMonitorComponent} from './link-monitor/link-monitor.component';
 import {ProjectComponent} from './project/project.component';
-import {ModelAdapterComponent} from './project-detail/adapter/model-adapter.component';
-import {ModelVariableComponent} from './project-detail/variable/model-variable.component';
-import {ModelBatchComponent} from './project-detail/batch/model-batch.component';
-import {ModelJobComponent} from './project-detail/job/model-job.component';
-import {ModelStrategyComponent} from './project-detail/strategy/model-strategy.component';
+import {ModelAdapterComponent} from './project-adapter/model-adapter.component';
+import {ModelVariableComponent} from './project-variable/model-variable.component';
+import {ModelBatchComponent} from './project-batch/model-batch.component';
+import {ModelJobComponent} from './project-job/model-job.component';
+import {ModelStrategyComponent} from './project-strategy/model-strategy.component';
 import {ProjectEditComponent} from './project-edit/project-edit.component';
 import {TunnelEditComponent} from './tunnel-edit/tunnel-edit.component';
 import {LinkEditComponent} from './link-edit/link-edit.component';
-import {ModelStrategyEditComponent} from './project-detail/strategy-edit/model-strategy-edit.component';
-import {ModelJobEditComponent} from './project-detail/job-edit/model-job-edit.component';
-import {ModelBatchEditComponent} from './project-detail/batch-edit/model-batch-edit.component';
-import {ModelVariableEditComponent} from './project-detail/variable-edit/model-variable-edit.component';
-import {ModelAdapterEditComponent} from './project-detail/adapter-edit/model-adapter-edit.component';
+import {ModelStrategyEditComponent} from './project-strategy-edit/model-strategy-edit.component';
+import {ModelJobEditComponent} from './project-job-edit/model-job-edit.component';
+import {ModelBatchEditComponent} from './project-batch-edit/model-batch-edit.component';
+import {ModelVariableEditComponent} from './project-variable-edit/model-variable-edit.component';
+import {ModelAdapterEditComponent} from './project-adapter-edit/model-adapter-edit.component';
 import {PluginEditComponent} from './plugin-edit/plugin-edit.component';
-import {ProjectDetailComponent} from "./project-detail/project-detail.component";
+import {ProjectDetailComponent} from './project-detail/project-detail.component';
 
 const routes: Routes = [
   {
@@ -31,18 +31,35 @@ const routes: Routes = [
       {path: '', redirectTo: 'dash'},
       {path: 'dash', component: DashComponent},
       {path: 'tunnel', component: TunnelComponent},
-      {path: 'tunnel-create', component: TunnelEditComponent},
-      {path: 'tunnel-edit/:id', component: TunnelEditComponent},
+      {path: 'tunnel/create', component: TunnelEditComponent},
+      {path: 'tunnel/:id/edit', component: TunnelEditComponent},
+      {path: 'tunnel/:id/link', component: LinkComponent},
       {path: 'link', component: LinkComponent},
-      {path: 'link-edit/:id', component: LinkEditComponent},
-      {path: 'link-monitor/:id', component: LinkMonitorComponent},
+      {path: 'link/:id/edit', component: LinkEditComponent},
+      {path: 'link/:id/monitor', component: LinkMonitorComponent},
       {path: 'plugin', component: PluginEditComponent},
-      {path: 'plugin-create', component: PluginEditComponent},
-      {path: 'plugin-edit/:id', component: PluginComponent},
-      {path: 'model', component: ProjectComponent},
-      {path: 'project-create', component: ProjectEditComponent},
-      {path: 'project-edit/:id', component: ProjectEditComponent},
-      {path: 'project-detail/:id', component: ProjectDetailComponent},
+      {path: 'plugin/create', component: PluginEditComponent},
+      {path: 'plugin/:id/edit', component: PluginComponent},
+      {path: 'project', component: ProjectComponent},
+      {path: 'project/create', component: ProjectEditComponent},
+      {path: 'project/:id/edit', component: ProjectEditComponent},
+      {path: 'project/:id/detail', component: ProjectDetailComponent},
+      {path: 'project/:id/adapter', component: ModelAdapterComponent},
+      {path: 'project/:id/adapter/create', component: ModelAdapterEditComponent},
+      {path: 'project/:id/adapter/:id/edit', component: ModelAdapterEditComponent},
+      {path: 'project/:id/variable', component: ModelVariableComponent},
+      {path: 'project/:id/variable/create', component: ModelVariableEditComponent},
+      {path: 'project/:id/variable/:id/edit', component: ModelVariableEditComponent},
+      {path: 'project/:id/batch', component: ModelBatchComponent},
+      {path: 'project/:id/batch/create', component: ModelBatchEditComponent},
+      {path: 'project/:id/batch/:id/edit', component: ModelBatchEditComponent},
+      {path: 'project/:id/job', component: ModelJobComponent},
+      {path: 'project/:id/job/create', component: ModelJobEditComponent},
+      {path: 'project/:id/job/:id/edit', component: ModelJobEditComponent},
+      {path: 'project/:id/strategy', component: ModelStrategyComponent},
+      {path: 'project/:id/strategy/create', component: ModelStrategyEditComponent},
+      {path: 'project/:id/strategy/:id/edit', component: ModelStrategyEditComponent},
+
       {path: '**', redirectTo: 'dash'},
     ]
   },

portal/src/app/main/main.component.ts

@@ -72,11 +72,15 @@ export class MainComponent implements OnInit {
         {
           title: '邮件通知',
           router: 'alert-email'
+        },
+        {
+          title: '短信通知',
+          router: 'alert-email'
         }
       ]
     },
     {
-      title: '数据通道',
+      title: '通道管理',
       icon: 'api',
       children: [
         {
@@ -104,7 +108,7 @@ export class MainComponent implements OnInit {
         },
         {
           title: '协议管理',
-          router: 'adapter'
+          router: 'project-adapter'
         },
       ]
     },

portal/src/app/main/main.module.ts

@@ -33,16 +33,16 @@ import {PluginEditComponent} from './plugin-edit/plugin-edit.component';
 import {TabsComponent} from './tabs/tabs.component';
 import {ProjectComponent} from './project/project.component';
 import {ProjectEditComponent} from './project-edit/project-edit.component';
-import {ModelVariableComponent} from './project-detail/variable/model-variable.component';
-import {ModelVariableEditComponent} from './project-detail/variable-edit/model-variable-edit.component';
-import {ModelBatchComponent} from './project-detail/batch/model-batch.component';
-import {ModelBatchEditComponent} from './project-detail/batch-edit/model-batch-edit.component';
-import {ModelJobComponent} from './project-detail/job/model-job.component';
-import {ModelJobEditComponent} from './project-detail/job-edit/model-job-edit.component';
-import {ModelStrategyComponent} from './project-detail/strategy/model-strategy.component';
-import {ModelStrategyEditComponent} from './project-detail/strategy-edit/model-strategy-edit.component';
-import {ModelAdapterComponent} from './project-detail/adapter/model-adapter.component';
-import {ModelAdapterEditComponent} from './project-detail/adapter-edit/model-adapter-edit.component';
+import {ModelVariableComponent} from './project-variable/model-variable.component';
+import {ModelVariableEditComponent} from './project-variable-edit/model-variable-edit.component';
+import {ModelBatchComponent} from './project-batch/model-batch.component';
+import {ModelBatchEditComponent} from './project-batch-edit/model-batch-edit.component';
+import {ModelJobComponent} from './project-job/model-job.component';
+import {ModelJobEditComponent} from './project-job-edit/model-job-edit.component';
+import {ModelStrategyComponent} from './project-strategy/model-strategy.component';
+import {ModelStrategyEditComponent} from './project-strategy-edit/model-strategy-edit.component';
+import {ModelAdapterComponent} from './project-adapter/model-adapter.component';
+import {ModelAdapterEditComponent} from './project-adapter-edit/model-adapter-edit.component';
 import {ProjectDetailComponent} from './project-detail/project-detail.component';
 
 

portal/src/app/main/project-detail/adapter-edit/model-adapter-edit.component.ts → portal/src/app/main/project-adapter-edit/model-adapter-edit.component.ts

 import {Component, OnInit} from '@angular/core';
-import {ApiService} from '../../../api.service';
+import {ApiService} from '../../api.service';
 import {ActivatedRoute} from '@angular/router';
-import {TabRef} from '../../tabs/tabs.component';
+import {TabRef} from '../tabs/tabs.component';
 
 @Component({
   selector: 'app-model-adapter-edit',
@@ -9,7 +9,7 @@ import {TabRef} from '../../tabs/tabs.component';
   styleUrls: ['./model-adapter-edit.component.scss']
 })
 export class ModelAdapterEditComponent implements OnInit {
-  target = 'adapter';
+  target = 'project-adapter';
   id = 0;
 
   data: any = {};

portal/src/app/main/project-detail/adapter/model-adapter.component.ts → portal/src/app/main/project-adapter/model-adapter.component.ts

 import { Component, OnInit } from '@angular/core';
-import {ApiService} from '../../../api.service';
+import {ApiService} from '../../api.service';
 import {NzTableQueryParams} from 'ng-zorro-antd';
 import {Router} from '@angular/router';
-import {TabRef} from '../../tabs/tabs.component';
+import {TabRef} from '../tabs/tabs.component';
 
 @Component({
   selector: 'app-model-adapter',
@@ -58,11 +58,11 @@ export class ModelAdapterComponent implements OnInit {
   }
 
   create(): void {
-    this.router.navigate(['/admin/adapter-create']);
+    this.router.navigate(['/admin/project-adapter-create']);
   }
 
   edit(c): void {
-    this.router.navigate(['/admin/adapter-edit/' + c.id]);
+    this.router.navigate(['/admin/project-project-adapter-edit/' + c.id]);
   }
 
   onTableQuery(params: NzTableQueryParams): void {

portal/src/app/main/project-detail/batch-edit/model-batch-edit.component.ts → portal/src/app/main/project-batch-edit/model-batch-edit.component.ts

 import {Component, OnInit} from '@angular/core';
-import {ApiService} from '../../../api.service';
+import {ApiService} from '../../api.service';
 import {ActivatedRoute} from '@angular/router';
-import {TabRef} from '../../tabs/tabs.component';
+import {TabRef} from '../tabs/tabs.component';
 
 @Component({
   selector: 'app-model-batch-edit',
@@ -9,7 +9,7 @@ import {TabRef} from '../../tabs/tabs.component';
   styleUrls: ['./model-batch-edit.component.scss']
 })
 export class ModelBatchEditComponent implements OnInit {
-  target = 'batch';
+  target = 'project-batch';
   id = 0;
 
   data: any = {};

portal/src/app/main/project-detail/batch/model-batch.component.ts → portal/src/app/main/project-batch/model-batch.component.ts

 import { Component, OnInit } from '@angular/core';
-import {ApiService} from '../../../api.service';
+import {ApiService} from '../../api.service';
 import {NzTableQueryParams} from 'ng-zorro-antd';
 import {Router} from '@angular/router';
-import {TabRef} from '../../tabs/tabs.component';
+import {TabRef} from '../tabs/tabs.component';
 
 @Component({
   selector: 'app-model-batch',
@@ -58,11 +58,11 @@ export class ModelBatchComponent implements OnInit {
   }
 
   create(): void {
-    this.router.navigate(['/admin/batch-create']);
+    this.router.navigate(['/admin/project-batch-create']);
   }
 
   edit(c): void {
-    this.router.navigate(['/admin/batch-edit/' + c.id]);
+    this.router.navigate(['/admin/project-project-batch-edit/' + c.id]);
   }
 
   onTableQuery(params: NzTableQueryParams): void {

portal/src/app/main/project-detail/project-detail.component.html

 <p>基本信息</p>
 <nz-collapse>
   <nz-collapse-panel nzHeader="基本信息">
-    <app-model-edit></app-model-edit>
   </nz-collapse-panel>
   <nz-collapse-panel nzHeader="协议">
-    <app-model-adapter></app-model-adapter>
   </nz-collapse-panel>
   <nz-collapse-panel nzHeader="变量">
   </nz-collapse-panel>

portal/src/app/main/project-detail/job-edit/model-job-edit.component.ts → portal/src/app/main/project-job-edit/model-job-edit.component.ts

 import {Component, OnInit} from '@angular/core';
-import {ApiService} from '../../../api.service';
+import {ApiService} from '../../api.service';
 import {ActivatedRoute, Router} from '@angular/router';
-import {TabRef} from "../../tabs/tabs.component";
+import {TabRef} from "../tabs/tabs.component";
 
 @Component({
   selector: 'app-model-job-edit',
@@ -9,7 +9,7 @@ import {TabRef} from "../../tabs/tabs.component";
   styleUrls: ['./model-job-edit.component.scss']
 })
 export class ModelJobEditComponent implements OnInit {
-  target = 'job';
+  target = 'project-job';
   id = 0;
 
   data: any = {};

portal/src/app/main/project-detail/job/model-job.component.ts → portal/src/app/main/project-job/model-job.component.ts

 import { Component, OnInit } from '@angular/core';
-import {ApiService} from '../../../api.service';
+import {ApiService} from '../../api.service';
 import {NzTableQueryParams} from 'ng-zorro-antd';
 import {Router} from '@angular/router';
-import {TabRef} from '../../tabs/tabs.component';
+import {TabRef} from '../tabs/tabs.component';
 
 @Component({
   selector: 'app-model-job',
@@ -58,11 +58,11 @@ export class ModelJobComponent implements OnInit {
   }
 
   create(): void {
-    this.router.navigate(['/admin/job-create']);
+    this.router.navigate(['/admin/project-job-create']);
   }
 
   edit(c): void {
-    this.router.navigate(['/admin/job-edit/' + c.id]);
+    this.router.navigate(['/admin/project-project-job-edit/' + c.id]);
   }
 
   onTableQuery(params: NzTableQueryParams): void {

portal/src/app/main/project-detail/strategy-edit/model-strategy-edit.component.ts → portal/src/app/main/project-strategy-edit/model-strategy-edit.component.ts

 import {Component, OnInit} from '@angular/core';
-import {ApiService} from '../../../api.service';
+import {ApiService} from '../../api.service';
 import {ActivatedRoute} from '@angular/router';
-import {TabRef} from '../../tabs/tabs.component';
+import {TabRef} from '../tabs/tabs.component';
 
 @Component({
   selector: 'app-model-strategy-edit',

portal/src/app/main/project-detail/strategy/model-strategy.component.ts → portal/src/app/main/project-strategy/model-strategy.component.ts

 import { Component, OnInit } from '@angular/core';
-import {ApiService} from '../../../api.service';
+import {ApiService} from '../../api.service';
 import {NzTableQueryParams} from 'ng-zorro-antd';
 import {Router} from '@angular/router';
-import {TabRef} from '../../tabs/tabs.component';
+import {TabRef} from '../tabs/tabs.component';
 
 @Component({
   selector: 'app-model-strategy',
@@ -58,11 +58,11 @@ export class ModelStrategyComponent implements OnInit {
   }
 
   create(): void {
-    this.router.navigate(['/admin/strategy-create']);
+    this.router.navigate(['/admin/project-strategy-create']);
   }
 
   edit(c): void {
-    this.router.navigate(['/admin/strategy-edit/' + c.id]);
+    this.router.navigate(['/admin/project-project-strategy-edit/' + c.id]);
   }
 
   onTableQuery(params: NzTableQueryParams): void {

portal/src/app/main/project-detail/variable-edit/model-variable-edit.component.ts → portal/src/app/main/project-variable-edit/model-variable-edit.component.ts

 import {Component, OnInit} from '@angular/core';
-import {ApiService} from '../../../api.service';
+import {ApiService} from '../../api.service';
 import {ActivatedRoute} from '@angular/router';
-import {TabRef} from '../../tabs/tabs.component';
+import {TabRef} from '../tabs/tabs.component';
 
 @Component({
   selector: 'app-model-variable-edit',
@@ -9,7 +9,7 @@ import {TabRef} from '../../tabs/tabs.component';
   styleUrls: ['./model-variable-edit.component.scss']
 })
 export class ModelVariableEditComponent implements OnInit {
-  target = 'variable';
+  target = 'project-variable';
   id = 0;
 
   data: any = {};

portal/src/app/main/project-detail/variable/model-variable.component.ts → portal/src/app/main/project-variable/model-variable.component.ts

 import { Component, OnInit } from '@angular/core';
-import {ApiService} from '../../../api.service';
+import {ApiService} from '../../api.service';
 import {NzTableQueryParams} from 'ng-zorro-antd';
 import {Router} from '@angular/router';
-import {TabRef} from '../../tabs/tabs.component';
+import {TabRef} from '../tabs/tabs.component';
 
 @Component({
   selector: 'app-model-variable',
@@ -58,11 +58,11 @@ export class ModelVariableComponent implements OnInit {
   }
 
   create(): void {
-    this.router.navigate(['/admin/variable-create']);
+    this.router.navigate(['/admin/project-variable-create']);
   }
 
   edit(c): void {
-    this.router.navigate(['/admin/variable-edit/' + c.id]);
+    this.router.navigate(['/admin/project-project-variable-edit/' + c.id]);
   }
 
   onTableQuery(params: NzTableQueryParams): void {