update dependencies;

Author: weihomechen

README.md

@@ -47,6 +47,8 @@ ng serve
 
 # 效果图
 
+![0.0.1_alpha](http://oqtn5nfde.bkt.clouddn.com/0.0.1_alpha.gif)
+
 #### 人员管理
 ![person-list](http://oqtn5nfde.bkt.clouddn.com/person-list.png)
 
@@ -71,10 +73,6 @@ ng serve
 #### 地图
 ![amap](http://oqtn5nfde.bkt.clouddn.com/amap.png)
 
-#### 奇怪的报错
-如果运行时遇到下面这个错误，请到`share.module`下将`CKEditorModule`剪切后再黏贴，目前没搞明白为什么还有这种操作，如果你知道还请告诉我一下~
-![error](http://oqtn5nfde.bkt.clouddn.com/error.png) 
-
 PS： 个人项目，一些琐碎的细节没有实现；与后台交互使用的是mock-data，增删改也是模拟成功返回；
 
 

package.json

@@ -12,17 +12,17 @@
   },
   "private": true,
   "dependencies": {
-    "@angular-mdl/core": "^4.0.3",
-    "@angular/animations": "^4.1.3",
-    "@angular/common": "^4.0.0",
-    "@angular/compiler": "^4.0.0",
-    "@angular/core": "^4.0.0",
-    "@angular/forms": "^4.0.0",
-    "@angular/http": "^4.0.0",
+    "@angular-mdl/core": "4.0.8",
+    "@angular/animations": "^4.2.2",
+    "@angular/common": "^4.2.2",
+    "@angular/compiler": "^4.2.2",
+    "@angular/core": "^4.2.2",
+    "@angular/forms": "^4.2.2",
+    "@angular/http": "^4.2.2",
     "@angular/material": "^2.0.0-beta.6",
-    "@angular/platform-browser": "^4.0.0",
-    "@angular/platform-browser-dynamic": "^4.0.0",
-    "@angular/router": "^4.0.0",
+    "@angular/platform-browser": "^4.2.2",
+    "@angular/platform-browser-dynamic": "^4.2.2",
+    "@angular/router": "^4.2.2",
     "@types/hammerjs": "^2.0.34",
     "@types/jquery": "^2.0.45",
     "core-js": "^2.4.1",
@@ -34,17 +34,17 @@
     "material-design-icons": "^3.0.1",
     "material-design-lite": "^1.3.0",
     "moment": "^2.18.1",
-    "ng2-ckeditor": "^1.1.7",
-    "ng2-toastr": "^4.0.1",
+    "ng2-ckeditor": "^1.1.8",
+    "ng2-toastr": "^4.1.0",
     "ng2-translate": "^5.0.0",
-    "ngx-echarts": "^1.2.0",
+    "ngx-echarts": "^1.2.1",
     "rxjs": "^5.1.0",
     "zone.js": "^0.8.4",
     "ztree": "^3.5.24"
   },
   "devDependencies": {
-    "@angular/cli": "1.0.3",
-    "@angular/compiler-cli": "^4.0.0",
+    "@angular/cli": "^1.1.1",
+    "@angular/compiler-cli": "^4.2.2",
     "@types/jasmine": "2.5.38",
     "@types/node": "~6.0.60",
     "codelyzer": "~2.0.0",
@@ -59,6 +59,6 @@
     "protractor": "~5.1.0",
     "ts-node": "~2.0.0",
     "tslint": "~4.5.0",
-    "typescript": "~2.2.0"
+    "typescript": "^2.3.4"
   }
 }

src/app/app.routing.ts

@@ -13,7 +13,7 @@ import { UserInfoComponent } from './user/user-info/user-info.component';
 import { UserChangePwdComponent } from './user/user-change-pwd/user-change-pwd.component';
 import { UserService } from './user/user.service';
 
-// import { AppCkeditorComponent } from './share/app-ckeditor/app-ckeditor.component';
+import { AppCkeditorComponent } from './share/app-ckeditor/app-ckeditor.component';
 import { AppChartsComponent } from './share/app-charts/app-charts.component';
 import { AmapDemoComponent } from './share/app-amap/amap-demo.component';
 import { CalendarDemoComponent } from './share/app-calendar/calendar-demo.component';
@@ -66,10 +66,10 @@ const appRoutes: Routes = [
         path: 'charts',
         component: AppChartsComponent
     },
-    // {
-    //     path: 'ckeditor',
-    //     component: AppCkeditorComponent
-    // },
+    {
+        path: 'ckeditor',
+        component: AppCkeditorComponent
+    },
     {
         path: 'amap',
         component: AmapDemoComponent

src/app/share/share.module.ts

@@ -6,14 +6,14 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
 import { MdlModule } from '@angular-mdl/core';
 import { ToastModule } from 'ng2-toastr/ng2-toastr';
-// import { CKEditorModule } from 'ng2-ckeditor';
+import { CKEditorModule } from 'ng2-ckeditor';
 
 import { AmapComponent } from './app-amap/amap/amap.component';
 import { CalendarComponent } from './app-calendar/calendar/calendar.component';
 import { AngularEchartsModule } from 'ngx-echarts';
 
 import { FormControlComponent } from '../user/user-info/dynamic-form/form-control.component';
-// import { AppCkeditorComponent } from './app-ckeditor/app-ckeditor.component';
+import { AppCkeditorComponent } from './app-ckeditor/app-ckeditor.component';
 import { AppChartsComponent } from './app-charts/app-charts.component';
 import { AmapDemoComponent } from './app-amap/amap-demo.component';
 import { CalendarDemoComponent } from './app-calendar/calendar-demo.component';
@@ -31,13 +31,13 @@ import { AppJsplumbComponent } from './app-jsplumb/app-jsplumb.component';
         ReactiveFormsModule,
         MdlModule,
         ToastModule.forRoot(),
-        // CKEditorModule,
+        CKEditorModule,
         AngularEchartsModule,
         // RouterModule.forChild(shareRoutes)
     ],
     declarations: [
         FormControlComponent,
-        // AppCkeditorComponent,
+        AppCkeditorComponent,
         AppChartsComponent,
         AmapComponent,
         AmapDemoComponent,
@@ -50,7 +50,7 @@ import { AppJsplumbComponent } from './app-jsplumb/app-jsplumb.component';
     exports: [
         MdlModule,
         FormControlComponent,
-        // AppCkeditorComponent
+        AppCkeditorComponent
     ]
 })
 export class ShareModule { }

src/assets/mock-data/menu.json

@@ -1,16 +1,19 @@
-[{
+[
+    {
         "name": "首页",
         "icon": "home",
         "link": "/home"
     },
     {
         "name": "增改查删Demo",
         "icon": "star",
-        "submenu": [{
-            "name": "人员管理",
-            "icon": "person",
-            "link": "/person-list"
-        }]
+        "submenu": [
+            {
+                "name": "人员管理",
+                "icon": "person",
+                "link": "/person-list"
+            }
+        ]
     },
     {
         "name": "一些工具",
@@ -45,6 +48,11 @@
                 "name": "流程图",
                 "icon": "widgets",
                 "link": "/jsplumb"
+            },
+            {
+                "name": "文本编辑器",
+                "icon": "mode_edit",
+                "link": "/ckeditor"
             }
         ]
     }