Changelog: update for 2.2.0 (#9793)

CHANGELOG.en-US.md

@@ -1,5 +1,34 @@
 ## Changelog
 
+### 2.2.0 Graphite
+
+*2018-02-12*
+
+### New features
+- Menu
+  - Added `popper-class` and `disabled` attributes for SubMenu, #9604 #9771
+  - Horizontal Menu now supports multi-layered SubMenu, #9741
+- Tree
+  - Added `node-contextmenu` event, #9678
+  - Now you can customize node template using scoped slot, #9686
+  - Added `getNode`, `remove`, `append`, `insertBefore`, `insertAfter`, `getCheckedKeys`, `getHalfCheckedNodes`, `getHalfCheckedKeys` methods and `check` event, #9718 #9730
+- Transfer
+  - Added `clearQuery` method, #9753
+- Select
+  - Added `popper-append-to-body` attribute, #9782
+
+### Bug fixes
+- Table
+  - Fixed clicking expanding icon of an expandable row triggers `row-click` event, #9654
+  - Fixed layout not update when column width is changed by user dragging, #9668
+  - Fixed style issue when summary row co-exists with fixed columns, #9667
+- Container
+  - Fixed container components not stretching in IE11, #9655
+- Loading
+  - Fixed Loading not showing when the value of `v-loading` is changed to true in the `mounted` hook, #9722
+- Switch
+  - Fixed two native click events are triggered when Switch is clicked, #9760
+
 ### 2.1.0 Charcoal
 
 *2018-01-31*

CHANGELOG.es.md

@@ -1,5 +1,34 @@
 ## Changelog
 
+### 2.2.0 Graphite
+
+*2018-02-12*
+
+### New features
+- Menu
+  - Added `popper-class` and `disabled` attributes for SubMenu, #9604 #9771
+  - Horizontal Menu now supports multi-layered SubMenu, #9741
+- Tree
+  - Added `node-contextmenu` event, #9678
+  - Now you can customize node template using scoped slot, #9686
+  - Added `getNode`, `remove`, `append`, `insertBefore`, `insertAfter`, `getCheckedKeys`, `getHalfCheckedNodes`, `getHalfCheckedKeys` methods and `check` event, #9718 #9730
+- Transfer
+  - Added `clearQuery` method, #9753
+- Select
+  - Added `popper-append-to-body` attribute, #9782
+
+### Bug fixes
+- Table
+  - Fixed clicking expanding icon of an expandable row triggers `row-click` event, #9654
+  - Fixed layout not update when column width is changed by user dragging, #9668
+  - Fixed style issue when summary row co-exists with fixed columns, #9667
+- Container
+  - Fixed container components not stretching in IE11, #9655
+- Loading
+  - Fixed Loading not showing when the value of `v-loading` is changed to true in the `mounted` hook, #9722
+- Switch
+  - Fixed two native click events are triggered when Switch is clicked, #9760
+
 ### 2.1.0 Charcoal
 
 *2018-01-31*

CHANGELOG.zh-CN.md

@@ -1,5 +1,34 @@
 ## 更新日志
 
+### 2.2.0 Graphite
+
+*2018-02-12*
+
+#### 新特性
+- Menu
+  - SubMenu 新增 `popper-class` 和 `disabled` 属性，#9604 #9771
+  - 现在水平模式下的 Menu 支持多级 SubMenu 了，#9741
+- Tree
+  - 新增 `node-contextmenu` 事件，#9678
+  - 现在可以使用 scoped slot 自定义树节点的模板了，#9686
+  - 新增 `getNode`、`remove`、`append`、`insertBefore`、`insertAfter`、`getCheckedKeys`、`getHalfCheckedNodes`、`getHalfCheckedKeys` 方法和 `check` 事件，#9718 #9730
+- Transfer
+  - 新增 `clearQuery` 方法，#9753
+- Select
+  - 新增 `popper-append-to-body` 属性，#9782
+
+#### 修复
+- Table
+  - 修复点击可展开行的展开图标会触发 `row-click` 事件的问题，#9654
+  - 修复某些情况下通过拖动改变列宽后，布局没有同步更新的问题，#9668
+  - 修复合计行与固定列并存时的样式问题，#9667
+- Container
+  - 修复布局组件在 IE11 中无法自动填充可用空间的问题，#9655
+- Loading
+  - 修复在 `mounted` 中修改 `v-loading` 的值为 true 时不能正确显示 Loading 的问题，#9722
+- Switch
+  - 修复点击时会触发两次原生 click 事件的问题，#9760
+
 ### 2.1.0 Charcoal
 
 *2018-01-31*

build/bin/version.js

@@ -1,6 +1,6 @@
 var fs = require('fs');
 var path = require('path');
 var version = process.env.VERSION || require('../../package.json').version;
-var content = { '1.4.13': '1.4', '2.0.11': '2.0' };
-if (!content[version]) content[version] = '2.1';
+var content = { '1.4.13': '1.4', '2.0.11': '2.0', '2.1.0': '2.1' };
+if (!content[version]) content[version] = '2.2';
 fs.writeFileSync(path.resolve(__dirname, '../../examples/versions.json'), JSON.stringify(content));

build/deploy-ci.sh

@@ -40,7 +40,7 @@ if [ "$TRAVIS_TAG" ]; then
   # build sub folder
   echo $TRAVIS_TAG
 
-  SUB_FOLDER='2.1'
+  SUB_FOLDER='2.2'
   mkdir $SUB_FOLDER
   rm -rf *.js *.css *.map static
   rm -rf $SUB_FOLDER/**

build/deploy-faas.sh

@@ -5,7 +5,7 @@ cd temp_web
 git clone -b gh-pages https://github.com/ElemeFE/element.git && cd element
 
 # build sub folder
-SUB_FOLDER='2.1'
+SUB_FOLDER='2.2'
 mkdir $SUB_FOLDER
 rm -rf *.js *.css *.map static
 rm -rf $SUB_FOLDER/**

examples/components/footer.vue

@@ -21,7 +21,7 @@
         <a href="https://github.com/ElementUI/awesome-element" class="footer-main-link" target="_blank">Awesome Element</a>
       </div>
       <div class="footer-social">
-        <p class="footer-social-title">Element {{ version && version.slice(0, 3) }} Charcoal</p>
+        <p class="footer-social-title">Element {{ version && version.slice(0, 3) }} Graphite</p>
         <el-popover
           ref="weixin"
           placement="top"

examples/docs/en-US/menu.md

@@ -334,7 +334,7 @@ Vertical NavMenu could be collapsed.
 | popper-class | custom class name for the popup menu | string | — | — |
 | show-timeout | timeout before showing a sub-menu | number | — | 300 |
 | hide-timeout | timeout before hiding a sub-menu | number | — | 300 |
-| disabled | whether disabled | boolean | — | false |
+| disabled | whether the sub-menu is disabled | boolean | — | false |
 
 ### Menu-Item Attribute
 | Attribute      | Description          | Type      | Accepted Values       | Default  |

examples/docs/en-US/quickstart.md

@@ -258,7 +258,6 @@ With the above config, the default size of all components that have size attribu
 Now you have implemented Vue and Element to your project, and it's time to write your code. Start development mode:
 
 ```bash
-# visit localhost:8086
 npm run dev
 ```
 

examples/docs/es/menu.md

@@ -337,7 +337,7 @@ NavMenu vertical puede ser colapsado.
 | popper-class | custom class name for the popup menu     | string | —                 | —           |
 | show-timeout | tiempo de espera antes de mostrar un submenú | number | —                 | 300         |
 | hide-timeout | tiempo de espera antes de ocultar un submenú | number | —                 | 300         |
-| disabled | whether disabled | boolean | — | false |
+| disabled | whether the sub-menu is disabled | boolean | — | false |
 
 ### Atributos Menu-Item 
 | Atributo | Descripción         | Tipo   | Valores aceptados | Por defecto |

examples/docs/es/quickstart.md

@@ -256,7 +256,6 @@ Con la anterior configuración, el tamaño por defecto de todos los componentes
 Ahora ha incorporado Vue y Element a su proyecto y es el momento para comenzar a programar. Inicie el modo de desarrollo:
 
 ```bash
-# visit localhost:8086
 npm run dev
 ```
 

examples/docs/zh-CN/quickstart.md

@@ -258,7 +258,6 @@ Vue.use(Button)
 至此，一个基于 Vue 和 Element 的开发环境已经搭建完毕，现在就可以编写代码了。启动开发模式：
 
 ```bash
-# 执行如下命令后访问 localhost:8086
 npm run dev
 ```