Merge branch '2.0' of https://github.com/iview/iview into 2.0

types/iview.components.d.ts

@@ -37,7 +37,7 @@ export { Scroll } from './scroll';
 export { Split } from './split';
 export { Layout } from './layout';
 export { LoadingBar, LoadingBarConfig } from './loading-bar';
-export { Menu, MenuGroup, MenuItem, MenuSub } from './menu';
+export { Menu, MenuGroup, MenuItem, Submenu } from './menu';
 export { Message, MessageConfig } from './message';
 export { Modal, ModalInstance, ModalConfig } from './modal';
 export { Notice, NoticeConfig, NoticeGlobalConfig } from './notice';

types/menu.d.ts

@@ -38,7 +38,7 @@ export declare class Menu extends Vue {
    */
   $emit(eventName: 'on-select', name?: string | number): this;
   /**
-   * 当 展开/收起 子菜单时触发	
+   * 当 展开/收起 子菜单时触发
    * @default 当前展开的 Submenu 的 name 值数组
    */
   $emit(eventName: 'on-open-change', names: string[] | number[]): this;
@@ -78,7 +78,7 @@ export declare class MenuItem extends Vue {
   append?: boolean;
 }
 
-export declare class MenuSub extends Vue {
+export declare class Submenu extends Vue {
   /**
    * 子菜单的唯一标识，必填
    */
@@ -104,4 +104,4 @@ export declare class MenuGroup extends Vue {
    * @default 空
    */
   title?: string;
-}
+}