diff --git a/build/deploy-faas.sh b/build/deploy-faas.sh index 0e1f08f10..dc8ab9919 100644 --- a/build/deploy-faas.sh +++ b/build/deploy-faas.sh @@ -8,9 +8,7 @@ git clone -b gh-pages https://github.com/ElemeFE/element.git && cd element SUB_FOLDER='1.4' mkdir $SUB_FOLDER -# rm -rf *.js *.css *.map static rm -rf $SUB_FOLDER/** -# cp -rf ../../examples/element-ui/** . cp -rf ../../examples/element-ui/** $SUB_FOLDER/ cd ../.. diff --git a/examples/components/side-nav.vue b/examples/components/side-nav.vue index 7f716cc2f..575c6f06b 100644 --- a/examples/components/side-nav.vue +++ b/examples/components/side-nav.vue @@ -259,11 +259,7 @@ const xhr = new XMLHttpRequest(); xhr.onreadystatechange = _ => { if (xhr.readyState === 4 && xhr.status === 200) { - const versions = JSON.parse(xhr.responseText); - this.versions = Object.keys(versions).slice(-2).reduce((prev, next) => { - prev[next] = versions[next]; - return prev; - }, {}); + this.versions = JSON.parse(xhr.responseText); } }; xhr.open('GET', '/versions.json'); diff --git a/examples/docs/en-US/quickstart.md b/examples/docs/en-US/quickstart.md index 6c39627de..ade252102 100644 --- a/examples/docs/en-US/quickstart.md +++ b/examples/docs/en-US/quickstart.md @@ -42,8 +42,8 @@ Typical configurations for these config files are: "build": "cross-env NODE_ENV=production webpack --progress --hide-modules" }, "dependencies": { - "element-ui": "^1.4.0", - "vue": "^2.3.0" + "element-ui": "legacy", + "vue": "2.5.2" }, "devDependencies": { "babel-core": "^6.0.0", diff --git a/examples/docs/zh-CN/quickstart.md b/examples/docs/zh-CN/quickstart.md index 10e7591b8..da3136ab7 100644 --- a/examples/docs/zh-CN/quickstart.md +++ b/examples/docs/zh-CN/quickstart.md @@ -42,8 +42,8 @@ "build": "cross-env NODE_ENV=production webpack --progress --hide-modules" }, "dependencies": { - "element-ui": "^1.4.0", - "vue": "^2.3.0" + "element-ui": "legacy", + "vue": "2.5.2" }, "devDependencies": { "babel-core": "^6.0.0", diff --git a/packages/date-picker/src/panel/date-range.vue b/packages/date-picker/src/panel/date-range.vue index 3255e6760..ea2bb2d3e 100644 --- a/packages/date-picker/src/panel/date-range.vue +++ b/packages/date-picker/src/panel/date-range.vue @@ -387,6 +387,13 @@ this.onPick && this.onPick(val); this.maxDate = val.maxDate; this.minDate = val.minDate; + + // workaround for https://github.com/ElemeFE/element/issues/7539, should remove this block when we don't have to care about Chromium 55 - 57 + setTimeout(() => { + this.maxDate = val.maxDate; + this.minDate = val.minDate; + }, 10); + if (!close || this.showTime) return; this.handleConfirm(); },