diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index cbc02622c..986183207 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -39,7 +39,7 @@
#### Breaking changes
- Switch
- Attributes starting with `on-*` will be parsed to events in JSX, making all `on-*` attributes of Switch not
-able to work in JSX. So `on-*` attributes are renamed to `active-*`, and accordingly `off-*` attributes are renamed to `inactive-*`. This changes affects the following attributes: `on-icon-class`, `off-icon-class`, `on-text`, `off-text`, `on-color`, `off-color`, `on-value`, `off-value`
+able to work in JSX. So `on-*` attributes are renamed to `active-*`, and accordingly `off-*` attributes are renamed to `inactive-*`. This change affects the following attributes: `on-icon-class`, `off-icon-class`, `on-text`, `off-text`, `on-color`, `off-color`, `on-value`, `off-value`
- Table
- `sort-method` now aligns with `Array.sort`. It should return a number instead of a boolean
diff --git a/examples/assets/images/banner-bg.svg b/examples/assets/images/banner-bg.svg
deleted file mode 100755
index 1963922b9..000000000
--- a/examples/assets/images/banner-bg.svg
+++ /dev/null
@@ -1,556 +0,0 @@
-
-
\ No newline at end of file
diff --git a/examples/assets/images/cloud-1.png b/examples/assets/images/cloud-1.png
new file mode 100644
index 000000000..1f221b5d6
Binary files /dev/null and b/examples/assets/images/cloud-1.png differ
diff --git a/examples/assets/images/cloud-2.png b/examples/assets/images/cloud-2.png
new file mode 100644
index 000000000..651f30ef7
Binary files /dev/null and b/examples/assets/images/cloud-2.png differ
diff --git a/examples/assets/images/compo-1.png b/examples/assets/images/compo-1.png
new file mode 100644
index 000000000..6264c030f
Binary files /dev/null and b/examples/assets/images/compo-1.png differ
diff --git a/examples/assets/images/compo-2.png b/examples/assets/images/compo-2.png
new file mode 100644
index 000000000..202dbdec6
Binary files /dev/null and b/examples/assets/images/compo-2.png differ
diff --git a/examples/assets/images/compo-3.png b/examples/assets/images/compo-3.png
new file mode 100644
index 000000000..c018f4f87
Binary files /dev/null and b/examples/assets/images/compo-3.png differ
diff --git a/examples/assets/images/element-logo-small-white.svg b/examples/assets/images/element-logo-small-white.svg
deleted file mode 100644
index 08a4b8405..000000000
--- a/examples/assets/images/element-logo-small-white.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/examples/assets/images/element-logo-white.svg b/examples/assets/images/element-logo-white.svg
deleted file mode 100644
index 7820e2278..000000000
--- a/examples/assets/images/element-logo-white.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/examples/assets/images/figure-1.png b/examples/assets/images/figure-1.png
new file mode 100644
index 000000000..7a8041570
Binary files /dev/null and b/examples/assets/images/figure-1.png differ
diff --git a/examples/assets/images/figure-2.png b/examples/assets/images/figure-2.png
new file mode 100644
index 000000000..dc7e48213
Binary files /dev/null and b/examples/assets/images/figure-2.png differ
diff --git a/examples/assets/images/plant-1.png b/examples/assets/images/plant-1.png
new file mode 100644
index 000000000..458563ae0
Binary files /dev/null and b/examples/assets/images/plant-1.png differ
diff --git a/examples/assets/images/plant-2.png b/examples/assets/images/plant-2.png
new file mode 100644
index 000000000..7f58ed699
Binary files /dev/null and b/examples/assets/images/plant-2.png differ
diff --git a/examples/assets/images/resource-placeholder.svg b/examples/assets/images/resource-placeholder.svg
new file mode 100755
index 000000000..dd335ee23
--- /dev/null
+++ b/examples/assets/images/resource-placeholder.svg
@@ -0,0 +1,23 @@
+
+
\ No newline at end of file
diff --git a/examples/assets/images/stars.png b/examples/assets/images/stars.png
deleted file mode 100644
index 19a245bb9..000000000
Binary files a/examples/assets/images/stars.png and /dev/null differ
diff --git a/examples/assets/images/web.png b/examples/assets/images/web.png
new file mode 100644
index 000000000..8f85521d5
Binary files /dev/null and b/examples/assets/images/web.png differ
diff --git a/examples/components/footer.vue b/examples/components/footer.vue
index 9d4e9bd0c..94a058c3c 100644
--- a/examples/components/footer.vue
+++ b/examples/components/footer.vue
@@ -2,12 +2,23 @@
@@ -28,83 +42,79 @@
-
+
-
+
-
-
-
-
@@ -409,8 +346,6 @@
data() {
return {
active: '',
- isHome: true,
- headerStyle: {},
versions: [],
version,
dropdownVisible: true
@@ -422,15 +357,6 @@
AlgoliaSearch
},
- watch: {
- '$route.path': {
- immediate: true,
- handler() {
- this.handlePathChange();
- }
- }
- },
-
computed: {
lang() {
return this.$route.path.split('/')[1] || 'zh-CN';
@@ -457,22 +383,10 @@
handleDropdownToggle(visible) {
this.dropdownVisible = visible;
- },
-
- handlePathChange() {
- const routerName = this.$route.name;
- this.isHome = /^home/.test(routerName);
- if (!this.isHome) {
- this.headerStyle.backgroundColor = '#fff';
- return;
- }
- this.headerStyle.backgroundColor = 'rgba(32, 160, 255, 0)';
}
},
created() {
- this.handlePathChange();
-
const xhr = new XMLHttpRequest();
xhr.onreadystatechange = _ => {
if (xhr.readyState === 4 && xhr.status === 200) {
@@ -481,19 +395,6 @@
};
xhr.open('GET', '/versions.json');
xhr.send();
- },
-
- mounted() {
- function scroll(fn) {
- window.addEventListener('scroll', fn, false);
- }
- scroll(() => {
- if (this.isHome) {
- const threshold = 200;
- let alpha = Math.min((document.documentElement.scrollTop || document.body.scrollTop), threshold) / threshold;
- this.$refs.header.style.backgroundColor = `rgba(32, 160, 255, ${ alpha })`;
- }
- });
}
};
diff --git a/examples/docs/en-US/table.md b/examples/docs/en-US/table.md
index c0560fe0a..44a5ff65f 100644
--- a/examples/docs/en-US/table.md
+++ b/examples/docs/en-US/table.md
@@ -1896,8 +1896,8 @@ Configuring rowspan and colspan allows you to merge cells
| clearSelection | used in multiple selection Table, clear selection, might be useful when `reserve-selection` is on | selection |
| toggleRowSelection | used in multiple selection Table, toggle if a certain row is selected. With the second parameter, you can directly set if this row is selected | row, selected |
| setCurrentRow | used in single selection Table, set a certain row selected. If called without any parameter, it will clear selection. | row |
-| clearSort | clear sorting, restore data to the original order | - |
-| clearFilter | clear filter | - |
+| clearSort | clear sorting, restore data to the original order | — |
+| clearFilter | clear filter | — |
### Table Slot
| Name | Description |
diff --git a/examples/docs/zh-CN/table.md b/examples/docs/zh-CN/table.md
index ca92e8870..9bbf834ee 100644
--- a/examples/docs/zh-CN/table.md
+++ b/examples/docs/zh-CN/table.md
@@ -1959,8 +1959,8 @@
| clearSelection | 用于多选表格，清空用户的选择，当使用 reserve-selection 功能的时候，可能会需要使用此方法 | selection |
| toggleRowSelection | 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中） | row, selected |
| setCurrentRow | 用于单选表格，设定某一行为选中行，如果调用时不加参数，则会取消目前高亮行的选中状态。 | row |
-| clearSort | 用于清空排序条件，数据会恢复成未排序的状态 | - |
-| clearFilter | 用于清空过滤条件，数据会恢复成未过滤的状态 | - |
+| clearSort | 用于清空排序条件，数据会恢复成未排序的状态 | — |
+| clearFilter | 用于清空过滤条件，数据会恢复成未过滤的状态 | — |
### Table Slot
| name | 说明 |
diff --git a/examples/entry.js b/examples/entry.js
index ee9b2baac..4e127584e 100644
--- a/examples/entry.js
+++ b/examples/entry.js
@@ -1,9 +1,9 @@
import Vue from 'vue';
import entry from './app';
import VueRouter from 'vue-router';
-import routes from './route.config';
import Element from 'main/index.js';
import 'packages/theme-chalk/src/index.scss';
+import routes from './route.config';
import demoBlock from './components/demo-block.vue';
import MainFooter from './components/footer.vue';
import MainHeader from './components/header.vue';
diff --git a/examples/i18n/component.json b/examples/i18n/component.json
index f40b96910..4c60318e4 100644
--- a/examples/i18n/component.json
+++ b/examples/i18n/component.json
@@ -8,6 +8,13 @@
"tooltip-text": "前往 jsfiddle.net 运行此示例"
},
"footer": {
+ "links": "链接",
+ "repo": "代码仓库",
+ "community": "社区",
+ "changelog": "更新日志",
+ "faq": "常见问题",
+ "gitter": "在线讨论",
+ "starter": "脚手架",
"feedback": "反馈建议",
"contribution": "贡献指南",
"eleme": "饿了么"
@@ -30,6 +37,13 @@
"tooltip-text": "Run this demo on jsfiddle.net"
},
"footer": {
+ "links": "Links",
+ "repo": "GitHub",
+ "community": "Community",
+ "changelog": "Changelog",
+ "faq": "FAQ",
+ "gitter": "Gitter",
+ "starter": "Starter kit",
"feedback": "Feedback",
"contribution": "Contribution",
"eleme": "Eleme"
diff --git a/examples/i18n/page.json b/examples/i18n/page.json
index 5b303165b..a273e482b 100644
--- a/examples/i18n/page.json
+++ b/examples/i18n/page.json
@@ -4,14 +4,10 @@
"pages": {
"index": {
"lang": "zh-CN",
- "titleSize": "46",
- "theatreSize": "46",
- "paraHeight": "1.8",
- "theatreParam": "",
- "typingFunc": ".addScene('产品设计师', 1800, -5, 800)\n .addScene('交互设计师', 1800, -5, 500)\n .addScene('视觉设计师', 1800, -5, 700)\n .addScene('产品经理', 1800, -4, 600)\n .addScene('前端工程师', 1800, -5, 800)",
- "typingInvoke": ".addActor('line2', { speed: 0.5, accuracy: 1 })\n .addScene(2600)\n .addScene('line2:只为守护世界和平', 300, -6, 1000)\n .addScene('让你少加班', 300, -5)\n .addScene('line2:只为这样的你: ', 400)",
+ "titleSize": "34",
+ "paraSize": "20",
"1": "网站快速成型工具",
- "2": "Element，一套为开发者、设计师和产品经理准备的基于 Vue 2.0 的组件库，提供了配套设计资源，帮助你的网站快速成型。",
+ "2": "Element，一套为开发者、设计师和产品经理准备的基于 Vue 2.0 的桌面端组件库",
"3": "指南",
"4": "了解设计指南，帮助产品设计人员搭建逻辑清晰、结构合理且高效易用的产品。",
"5": "查看详情",
@@ -81,6 +77,8 @@
},
"resource": {
"paraHeight": "1.8",
+ "placeholder1": "整理中",
+ "placeholder2": "设计资源正在整理和完善中",
"1": "资源",
"2": "整理中",
"3": "Axure Components",
@@ -98,9 +96,8 @@
"pages": {
"index": {
"lang": "en-US",
- "titleSize": "50",
- "theatreSize": "42",
- "paraHeight": "1.6",
+ "titleSize": "34",
+ "paraSize": "20",
"theatreParam": "{ maxSpeed: 100 }",
"typingFunc": ".addScene('product designers', 1800, -17, 800)\n .addScene('UI designers', 1800, -12, 800)\n .addScene('UX designers', 1800, -12, 800)\n .addScene('product managers', 1800, -16, 800)\n .addScene('FE developers', 1800, -13, 800)",
"typingInvoke": ".addActor('line2', { speed: 1, accuracy: 1 })\n .addScene(2600)\n .addScene('line2:For ', 500)",
@@ -175,6 +172,8 @@
},
"resource": {
"paraHeight": "1.6",
+ "placeholder1": "Under construction",
+ "placeholder2": "Please wait while we prepare the design resources",
"1": "Resource",
"2": "Under construction.",
"3": "Axure Components",
diff --git a/examples/icon.json b/examples/icon.json
index 7ff4bdfad..ca82c4098 100644
--- a/examples/icon.json
+++ b/examples/icon.json
@@ -1 +1 @@
-["upload","error","success","warning","sort-down","sort-up","arrow-left","circle-plus","circle-plus-outline","arrow-down","arrow-right","arrow-up","back","circle-close","date","circle-close-outline","caret-left","caret-bottom","caret-top","caret-right","close","d-arrow-left","check","delete","d-arrow-right","document","d-caret","edit-outline","download","goods","search","info","message","edit","location","loading","location-outline","menu","minus","bell","moblie-phone","news","more","phone","phone-outline","picture","picture-outline","plus","printer","rank","refresh","question","remove","share","star-on","setting","circle-check","service","sold-out","remove-outline","star-off","circle-check-outline","tickets","sort","zoom-in","time","view","upload2","zoom-out"]
\ No newline at end of file
+["upload","error","success","warning","sort-down","sort-up","arrow-left","circle-plus","circle-plus-outline","arrow-down","arrow-right","arrow-up","back","circle-close","date","circle-close-outline","caret-left","caret-bottom","caret-top","caret-right","close","d-arrow-left","check","delete","d-arrow-right","document","d-caret","edit-outline","download","goods","search","info","message","edit","location","loading","location-outline","menu","minus","bell","moblie-phone","news","more","more-outline","phone","phone-outline","picture","picture-outline","plus","printer","rank","refresh","question","remove","share","star-on","setting","circle-check","service","sold-out","remove-outline","star-off","circle-check-outline","tickets","sort","zoom-in","time","view","upload2","zoom-out"]
\ No newline at end of file
diff --git a/examples/index.tpl b/examples/index.tpl
index 08e90e289..11cfea252 100644
--- a/examples/index.tpl
+++ b/examples/index.tpl
@@ -3,13 +3,18 @@
-
+
Element
<% if (process.env.NODE_ENV === 'production') { %>
+
<% } %>
diff --git a/examples/pages/template/index.tpl b/examples/pages/template/index.tpl
index 67adad2fa..83360ee16 100644
--- a/examples/pages/template/index.tpl
+++ b/examples/pages/template/index.tpl
@@ -1,68 +1,101 @@
- 
-