Merge branch 'dev' into dev

CHANGELOG.en-US.md

@@ -1,7 +1,72 @@
 ## Changelog
 
+### 2.11.1
+
+*2019-07-26*
+
+#### Bug fixes
+
+- Image
+  - Fix Image component SSR compatibility (#16737 by @luckyCao)
+- Chore
+  - Update dart-sass compatibility by @LewisChennnnn)
+
+### 2.11.0
+
+*2019-07-25*
+
+#### New features
+
+- Drawer
+  - Add drawer component (#16577 by @JeremyWuuuuu)
+
+#### Bug fixes
+
+- Checkbox
+  - Enhance css selector (#16006 by @Hazlank)
+- Tree
+  - Make el-tree generic (#15934 by @JeremyWuuuuu)
+  - Set isCurrent prop to False (#15870 by @kkkisme)
+- Dropdown
+  - Fix split-button caret default color (#15931 by @JuniorTour)
+- Cascader
+  - Fix level 1 children is empty update problem (#16399 by @luckyCao)
+  - Display correct header when range is specified (#16354 by @ziyoung)
+  - Add sets default values when lazy is true (#16420 by @luckyCao)
+  - Fix display errors (#15935 by @junyiz)
+  - Expose getCheckedNodes and fix options change bug (#16709 by @SimonaliaChen)
+- Submenu
+  - Fix prop append-to-body (#16289 by @a631807682)
+- Table 
+  - Fix tree table when updating data (#16481 by @island205)
+- Select
+  - Fix memory leak issue (#16463 by @island205)
+- InfiniteScroll
+  - Update naming & doc (#16698 by @iamkun)
+- Avatar
+  - Fix image not center vertically issue (#16489 by @luckyCao)
+- Dialog
+  - Add destroyOnClose attribute (#16455 by @ziyoung)
+- Image
+  - Add big Image preview feature (#16333 by @luckyCao)
+
+#### Optimization
+
+- Docs
+  - Fix dropdown demo (#16193 by @webxmsj)
+  - Fix typo in table documents (#15971 by @howiefh)
+- I18n
+  - Update translation of Thai language (#16689 by @ponkrit)
+- Chore
+  - Update theme base api (#16607 by @iamkun)
+  - Add form theme token (#16699 by @iamkun)
+  - Mark ali inner user's access (#16609 by @iamkun)
+  - Fix doc anchor bug (#16692 by @iamkun)
+
 ### 2.10.1
 
+*2019-07-02*
+
 #### Bug fixes
 
 - Table

CHANGELOG.es.md

@@ -1,9 +1,75 @@
 ## Changelog
 
+### 2.11.1
+
+*2019-07-26*
+
+#### Bug fixes
+
+- Image
+  - Fix Image component SSR compatibility (#16737 by @luckyCao)
+- Chore
+  - Update dart-sass compatibility by @LewisChennnnn)
+
+### 2.11.0
+
+*2019-07-25*
+
+#### New features
+
+- Drawer
+  - Add drawer component (#16577 by @JeremyWuuuuu)
+
+#### Bug fixes
+
+- Checkbox
+  - Enhance css selector (#16006 by @Hazlank)
+- Tree
+  - Make el-tree generic (#15934 by @JeremyWuuuuu)
+  - Set isCurrent prop to False (#15870 by @kkkisme)
+- Dropdown
+  - Fix split-button caret default color (#15931 by @JuniorTour)
+- Cascader
+  - Fix level 1 children is empty update problem (#16399 by @luckyCao)
+  - Display correct header when range is specified (#16354 by @ziyoung)
+  - Add sets default values when lazy is true (#16420 by @luckyCao)
+  - Fix display errors (#15935 by @junyiz)
+  - Expose getCheckedNodes and fix options change bug (#16709 by @SimonaliaChen)
+- Submenu
+  - Fix prop append-to-body (#16289 by @a631807682)
+- Table 
+  - Fix tree table when updating data (#16481 by @island205)
+- Select
+  - Fix memory leak issue (#16463 by @island205)
+- InfiniteScroll
+  - Update naming & doc (#16698 by @iamkun)
+- Avatar
+  - Fix image not center vertically issue (#16489 by @luckyCao)
+- Dialog
+  - Add destroyOnClose attribute (#16455 by @ziyoung)
+- Image
+  - Add big Image preview feature (#16333 by @luckyCao)
+
+#### Optimization
+
+- Docs
+  - Fix dropdown demo (#16193 by @webxmsj)
+  - Fix typo in table documents (#15971 by @howiefh)
+- I18n
+  - Update translation of Thai language (#16689 by @ponkrit)
+- Chore
+  - Update theme base api (#16607 by @iamkun)
+  - Add form theme token (#16699 by @iamkun)
+  - Mark ali inner user's access (#16609 by @iamkun)
+  - Fix doc anchor bug (#16692 by @iamkun)
+
 ### 2.10.1
 
+*2019-07-02*
+
 #### Corrección de errores
 
+
 - Table
   - Corregido el icono de ordenación  (#15439 by @bezany)
   - Corregidas las rupturas del layout cuando existía un slot (#16332 by @ziyoung)

CHANGELOG.fr-FR.md

@@ -1,7 +1,72 @@
 ## Changelog
 
+### 2.11.1
+
+*2019-07-26*
+
+#### Bug fixes
+
+- Image
+  - Fix Image component SSR compatibility (#16737 by @luckyCao)
+- Chore
+  - Update dart-sass compatibility by @LewisChennnnn)
+
+### 2.11.0
+
+*2019-07-25*
+
+#### New features
+
+- Drawer
+  - Add drawer component (#16577 by @JeremyWuuuuu)
+
+#### Bug fixes
+
+- Checkbox
+  - Enhance css selector (#16006 by @Hazlank)
+- Tree
+  - Make el-tree generic (#15934 by @JeremyWuuuuu)
+  - Set isCurrent prop to False (#15870 by @kkkisme)
+- Dropdown
+  - Fix split-button caret default color (#15931 by @JuniorTour)
+- Cascader
+  - Fix level 1 children is empty update problem (#16399 by @luckyCao)
+  - Display correct header when range is specified (#16354 by @ziyoung)
+  - Add sets default values when lazy is true (#16420 by @luckyCao)
+  - Fix display errors (#15935 by @junyiz)
+  - Expose getCheckedNodes and fix options change bug (#16709 by @SimonaliaChen)
+- Submenu
+  - Fix prop append-to-body (#16289 by @a631807682)
+- Table 
+  - Fix tree table when updating data (#16481 by @island205)
+- Select
+  - Fix memory leak issue (#16463 by @island205)
+- InfiniteScroll
+  - Update naming & doc (#16698 by @iamkun)
+- Avatar
+  - Fix image not center vertically issue (#16489 by @luckyCao)
+- Dialog
+  - Add destroyOnClose attribute (#16455 by @ziyoung)
+- Image
+  - Add big Image preview feature (#16333 by @luckyCao)
+
+#### Optimization
+
+- Docs
+  - Fix dropdown demo (#16193 by @webxmsj)
+  - Fix typo in table documents (#15971 by @howiefh)
+- I18n
+  - Update translation of Thai language (#16689 by @ponkrit)
+- Chore
+  - Update theme base api (#16607 by @iamkun)
+  - Add form theme token (#16699 by @iamkun)
+  - Mark ali inner user's access (#16609 by @iamkun)
+  - Fix doc anchor bug (#16692 by @iamkun)
+
 ### 2.10.1
 
+*2019-07-02*
+
 #### Bug fixes
 
 - Table

CHANGELOG.zh-CN.md

@@ -1,7 +1,72 @@
 ## 更新日志
 
+### 2.11.1
+
+*2019-07-26*
+
+#### Bug 修复
+
+- Image
+  - 修复 Image 组件 SSR 兼容性 (#16737 by @luckyCao)
+- Chore
+  - 更新 dart-sass 的兼容性 by @LewisChennnnn)
+
+### 2.11.0
+
+*2019-07-25*
+
+#### 新特性
+
+- Drawer
+  - 新增抽屉组件 (#16577 by @JeremyWuuuuu)
+
+#### Bug 修复
+
+- Checkbox
+  - 修复 CSS 样式问题 (#16006 by @Hazlank)
+- Tree
+  - 更新类型定义为泛类型 (#15934 by @JeremyWuuuuu)
+  - 修复设置节点 isCurrent 的为 false 的问题 (#15870 by @kkkisme)
+- Dropdown
+  - 更新 split-button 默认颜色 (#15931 by @JuniorTour)
+- Cascader
+  - 修复一级菜单更新问题 (#16399 by @luckyCao)
+  - 更新显示正确的 header 的逻辑 (#16354 by @ziyoung)
+  - 懒加载时设默认值 (#16420 by @luckyCao)
+  - 修复显示问题 (#15935 by @junyiz)
+  - 对外暴露 getCheckedNodes 和修复 option 问题 (#16709 by @SimonaliaChen)
+- Submenu
+  - 修复 append-to-body 问题 (#16289 by @a631807682)
+- Table 
+  - 修复 tree table 数据更新问题 (#16481 by @island205)
+- Select
+  - 修复内存泄漏问题 (#16463 by @island205)
+- InfiniteScroll
+  - 更新命名和说明 (#16698 by @iamkun)
+- Avatar
+  - 修复图片不居中的问题 (#16489 by @luckyCao)
+- Dialog
+  - 增加 destroyOnClose 属性 (#16455 by @ziyoung)
+- Image
+  - 增加大图预览 (#16333 by @luckyCao)
+
+#### 优化
+
+- Docs
+  - 修复 dropdown 示例 (#16193 by @webxmsj)
+  - 修正笔误 (#15971 by @howiefh)
+- I18n
+  - 更新泰文翻译 (#16689 by @ponkrit)
+- Chore
+  - 更新基础 API 地址 (#16607 by @iamkun)
+  - 增加 Form 的主题 token (#16699 by @iamkun)
+  - 更新统计 (#16609 by @iamkun)
+  - 修复文档锚点问题 (#16692 by @iamkun)
+
 ### 2.10.1
 
+*2019-07-02*
+
 #### Bug 修复
 
 - Table

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', '2.1.0': '2.1', '2.2.2': '2.2', '2.3.9': '2.3', '2.4.11': '2.4', '2.5.4': '2.5', '2.6.3': '2.6', '2.7.2': '2.7', '2.8.2': '2.8', '2.9.2': '2.9' };
-if (!content[version]) content[version] = '2.10';
+var content = { '1.4.13': '1.4', '2.0.11': '2.0', '2.1.0': '2.1', '2.2.2': '2.2', '2.3.9': '2.3', '2.4.11': '2.4', '2.5.4': '2.5', '2.6.3': '2.6', '2.7.2': '2.7', '2.8.2': '2.8', '2.9.2': '2.9', '2.10.1': '2.10' };
+if (!content[version]) content[version] = '2.11';
 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.10'
+  SUB_FOLDER='2.11'
   mkdir $SUB_FOLDER
   rm -rf *.js *.css *.map static
   rm -rf $SUB_FOLDER/**

build/deploy-faas.sh

@@ -6,7 +6,7 @@ cd temp_web
 git clone --depth 1 -b gh-pages --single-branch https://github.com/ElemeFE/element.git && cd element
 
 # build sub folder
-SUB_FOLDER='2.10'
+SUB_FOLDER='2.11'
 mkdir -p $SUB_FOLDER
 rm -rf *.js *.css *.map static
 rm -rf $SUB_FOLDER/**

components.json

@@ -78,5 +78,6 @@
   "infinite-scroll": "./packages/infinite-scroll/index.js",
   "page-header": "./packages/page-header/index.js",
   "cascader-panel": "./packages/cascader-panel/index.js",
-  "avatar": "./packages/avatar/index.js"
+  "avatar": "./packages/avatar/index.js",
+  "drawer": "./packages/drawer/index.js"
 }

examples/components/header.vue

@@ -428,11 +428,23 @@
       getTestEle()
         .then(() => {
           this.$isEle = true;
-          ga('send', 'event', 'DocView', 'Inner');
+          ga('send', 'event', 'DocView', 'Ele', 'Inner');
         })
         .catch((err) => {
+          ga('send', 'event', 'DocView', 'Ele', 'Outer');
           console.error(err);
         });
+  
+      const testInnerImg = new Image();
+      testInnerImg.onload = () => {
+        this.$isEle = true;
+        ga('send', 'event', 'DocView', 'Ali', 'Inner');
+      };
+      testInnerImg.onerror = (err) => {
+        ga('send', 'event', 'DocView', 'Ali', 'Outer');
+        console.error(err);
+      };
+      testInnerImg.src = `https://private-alipayobjects.alipay.com/alipay-rmsdeploy-image/rmsportal/VmvVUItLdPNqKlNGuRHi.png?t=${Date.now()}`;
     },
     methods: {
       switchVersion(version) {

examples/components/theme/loader/api.js

@@ -5,8 +5,8 @@ const { version } = Element;
 
 const hostList = {
   local: 'http://localhost:3008/',
-  alpha: 'https://ssr.alpha.elenet.me/element-theme-server/',
-  production: 'https://ssr.ele.me/element-theme-server/'
+  alpha: 'https://element-api.ar.elenet.me/element/theme/',
+  production: 'https://element-api.ele.me/element/theme/'
 };
 
 const host = hostList[process.env.FAAS_ENV] || hostList.production;
@@ -16,7 +16,7 @@ export const getVars = () => {
 };
 
 export const getTestEle = () => {
-  return get(`${hostList.alpha}getVariable?version=${version}`);
+  return get(`${hostList.alpha}getVariable`);
 };
 
 export const updateVars = (data, cb) => {

examples/demo-styles/drawer.scss

@@ -0,0 +1,21 @@
+.demo-drawer {
+  &__content {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    form {
+      flex: 1;
+    }
+  }
+
+  &__footer {
+    display: flex;
+    button {
+      flex: 1;
+    }
+  }
+}
+
+.el-drawer__body {
+  padding: 20px;
+}