add 左菜单增加 icon font 大小的配置

wangxiang · wangxiang · commit 238daabd1188 · 2017-12-23T17:56:32.000+08:00
add 简单表格页面增加 mockData 源码
fix 推荐的三方库页面在 ie 上，初次加载显示错误的问题
diff --git a/dist/index.html b/dist/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"/><meta name="format-detection" content="telephone=no,address=no,email=no"/><title>Angular4 Seed</title><base href="/angular-seed/dist/"><link rel="icon" type="image/x-icon" href="favicon.ico"><link href="styles.d7f22c5de6b34a401df7.bundle.css" rel="stylesheet"/></head><body><app-root></app-root><script type="text/javascript" src="inline.1456daa4ec51a747397d.bundle.js"></script><script type="text/javascript" src="polyfills.99784301f069f50af5f5.bundle.js"></script><script type="text/javascript" src="scripts.084e0d1bda4f8bbf8824.bundle.js"></script><script type="text/javascript" src="vendor.3969bacb185732e9cc36.bundle.js"></script><script type="text/javascript" src="main.91da89e01c969e1956f8.bundle.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"/><meta name="format-detection" content="telephone=no,address=no,email=no"/><title>Angular4 Seed</title><base href="/"><link rel="icon" type="image/x-icon" href="favicon.ico"><link href="styles.d7f22c5de6b34a401df7.bundle.css" rel="stylesheet"/></head><body><app-root></app-root><script type="text/javascript" src="inline.1456daa4ec51a747397d.bundle.js"></script><script type="text/javascript" src="polyfills.99784301f069f50af5f5.bundle.js"></script><script type="text/javascript" src="scripts.084e0d1bda4f8bbf8824.bundle.js"></script><script type="text/javascript" src="vendor.3969bacb185732e9cc36.bundle.js"></script><script type="text/javascript" src="main.91da89e01c969e1956f8.bundle.js"></script></body></html>
diff --git a/src/app/layout/menu/menu.component.html b/src/app/layout/menu/menu.component.html
@@ -3,7 +3,8 @@
         <li class="menu-item level1" [class.folded]="level1.isFolded"
             [class.active]="activePath.indexOf(level1.path) === 0" *ngFor="let level1 of menus">
             <a href="javascript: void(0)" class="menu-text" (click)="handleMenuItemClick(level1)"><i
-                    [class]="'icon iconfont ' + level1.icon"></i>{{ level1.text}}</a>
+                    [class]="'icon iconfont ' + level1.icon" [style.font-size]="level1.iconFontSize || 'inherit'"></i>{{
+                level1.text}}</a>
             <ul class="level2" *ngIf="level1?.children?.length > 0">
                 <li class="menu-item level2" [class.active]="activePath.indexOf(level2.path) === 0"
                     *ngFor="let level2 of level1.children">
diff --git a/src/app/routes/simple-ui/table/source-code/index.component.html b/src/app/routes/simple-ui/table/source-code/index.component.html
@@ -6,5 +6,8 @@
         <tab heading="component" id="component">
             <pre class="prettyprint linenums lang-js">{{ sourceCode.component }}</pre>
         </tab>
+        <tab heading="mockData" id="mockData">
+            <pre class="prettyprint linenums lang-js">{{ sourceCode.mockData }}</pre>
+        </tab>
     </tabset>
 </div>
diff --git a/src/app/routes/simple-ui/table/source-code/index.component.ts b/src/app/routes/simple-ui/table/source-code/index.component.ts
@@ -10,7 +10,8 @@ import { PageScrollInstance, PageScrollService } from 'ngx-page-scroll'
 export class SourceCodeComponent implements OnInit {
     sourceCode = {
         template: require('!raw-loader!../demo/index.component.html'),
-        component: require('!raw-loader!../demo/index.component')
+        component: require('!raw-loader!../demo/index.component'),
+        mockData: require('!raw-loader!../demo/mock')
     }
 
     constructor (private pageScrollService: PageScrollService, @Inject(DOCUMENT) private document: any) {
diff --git a/src/app/routes/third-library-list/index.page.scss b/src/app/routes/third-library-list/index.page.scss
@@ -8,8 +8,13 @@
   @include page;
   flex-direction: column;
 
+  & > /deep/ * {
+    flex: 0 0 auto;
+  }
+
   /deep/ h2 {
     margin-bottom: 20px;
+    line-height: 32px;
 
     &:not(:first-child) {
       margin-top: 20px;
diff --git a/src/app/routes/third-library-list/index.page.ts b/src/app/routes/third-library-list/index.page.ts
@@ -7,6 +7,7 @@ import { Component, OnInit } from '@angular/core'
 })
 export class ThirdLibraryListPageComponent implements OnInit {
     listContent = require('html-loader!markdown-loader!./third-library-list.md')
+
     constructor () {
     }
 
diff --git a/src/app/store/app/model.ts b/src/app/store/app/model.ts
@@ -29,6 +29,7 @@ export const initialState: IAppState = {
             queryParams: { pageType: 'sideMenu' },
             type: 'level1',
             isFolded: true,
+            iconFontSize: '14px',
             icon: 'icon-login'
         }
     ]

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"/><meta name="format-detection" content="telephone=no,address=no,email=no"/><title>Angular4 Seed</title><base href="/angular-seed/dist/"><link rel="icon" type="image/x-icon" href="favicon.ico"><link href="styles.d7f22c5de6b34a401df7.bundle.css" rel="stylesheet"/></head><body><app-root></app-root><script type="text/javascript" src="inline.1456daa4ec51a747397d.bundle.js"></script><script type="text/javascript" src="polyfills.99784301f069f50af5f5.bundle.js"></script><script type="text/javascript" src="scripts.084e0d1bda4f8bbf8824.bundle.js"></script><script type="text/javascript" src="vendor.3969bacb185732e9cc36.bundle.js"></script><script type="text/javascript" src="main.91da89e01c969e1956f8.bundle.js"></script></body></html>
	`1`	+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"/><meta name="format-detection" content="telephone=no,address=no,email=no"/><title>Angular4 Seed</title><base href="/"><link rel="icon" type="image/x-icon" href="favicon.ico"><link href="styles.d7f22c5de6b34a401df7.bundle.css" rel="stylesheet"/></head><body><app-root></app-root><script type="text/javascript" src="inline.1456daa4ec51a747397d.bundle.js"></script><script type="text/javascript" src="polyfills.99784301f069f50af5f5.bundle.js"></script><script type="text/javascript" src="scripts.084e0d1bda4f8bbf8824.bundle.js"></script><script type="text/javascript" src="vendor.3969bacb185732e9cc36.bundle.js"></script><script type="text/javascript" src="main.91da89e01c969e1956f8.bundle.js"></script></body></html>
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@ import { PageScrollInstance, PageScrollService } from 'ngx-page-scroll'`
`10`	`10`	`export class SourceCodeComponent implements OnInit {`
`11`	`11`	`sourceCode = {`
`12`	`12`	`template: require('!raw-loader!../demo/index.component.html'),`
`13`		`- component: require('!raw-loader!../demo/index.component')`
	`13`	`+ component: require('!raw-loader!../demo/index.component'),`
	`14`	`+ mockData: require('!raw-loader!../demo/mock')`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`constructor (private pageScrollService: PageScrollService, @Inject(DOCUMENT) private document: any) {`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import { Component, OnInit } from '@angular/core'`
`7`	`7`	`})`
`8`	`8`	`export class ThirdLibraryListPageComponent implements OnInit {`
`9`	`9`	`listContent = require('html-loader!markdown-loader!./third-library-list.md')`
	`10`	`+`
`10`	`11`	`constructor () {`
`11`	`12`	`}`
`12`	`13`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ export const initialState: IAppState = {`
`29`	`29`	`queryParams: { pageType: 'sideMenu' },`
`30`	`30`	`type: 'level1',`
`31`	`31`	`isFolded: true,`
	`32`	`+ iconFontSize: '14px',`
`32`	`33`	`icon: 'icon-login'`
`33`	`34`	`}`
`34`	`35`	`]`