github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

DatePicker: fix range in Chromium 53 - 57

pull/7996/head
Leopoldthecoder 2017-11-01 12:25:01 +08:00 committed by 杨奕
parent 9b6a21073b
commit 4508f2a6c4
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/deploy-faas.sh
View File

@ -8,9 +8,7 @@ git clone -b gh-pages https://github.com/ElemeFE/element.git && cd element
SUB_FOLDER='1.4' SUB_FOLDER='1.4'
mkdir $SUB_FOLDER mkdir $SUB_FOLDER
# rm -rf *.js *.css *.map static
rm -rf $SUB_FOLDER/** rm -rf $SUB_FOLDER/**
# cp -rf ../../examples/element-ui/** .
cp -rf ../../examples/element-ui/** $SUB_FOLDER/ cp -rf ../../examples/element-ui/** $SUB_FOLDER/
cd ../.. cd ../..

6
examples/components/side-nav.vue
View File

@ -259,11 +259,7 @@
const xhr = new XMLHttpRequest(); const xhr = new XMLHttpRequest();
xhr.onreadystatechange = _ => { xhr.onreadystatechange = _ => {
if (xhr.readyState === 4 && xhr.status === 200) { if (xhr.readyState === 4 && xhr.status === 200) {
const versions = JSON.parse(xhr.responseText); this.versions = JSON.parse(xhr.responseText);
this.versions = Object.keys(versions).slice(-2).reduce((prev, next) => {
prev[next] = versions[next];
return prev;
}, {});
} }
}; };
xhr.open('GET', '/versions.json'); xhr.open('GET', '/versions.json');

4
examples/docs/en-US/quickstart.md
View File

@ -42,8 +42,8 @@ Typical configurations for these config files are:
"build": "cross-env NODE_ENV=production webpack --progress --hide-modules" "build": "cross-env NODE_ENV=production webpack --progress --hide-modules"
}, },
"dependencies": { "dependencies": {
"element-ui": "^1.4.0", "element-ui": "legacy",
"vue": "^2.3.0" "vue": "2.5.2"
}, },
"devDependencies": { "devDependencies": {
"babel-core": "^6.0.0", "babel-core": "^6.0.0",

4
examples/docs/zh-CN/quickstart.md
View File

@ -42,8 +42,8 @@
"build": "cross-env NODE_ENV=production webpack --progress --hide-modules" "build": "cross-env NODE_ENV=production webpack --progress --hide-modules"
}, },
"dependencies": { "dependencies": {
"element-ui": "^1.4.0", "element-ui": "legacy",
"vue": "^2.3.0" "vue": "2.5.2"
}, },
"devDependencies": { "devDependencies": {
"babel-core": "^6.0.0", "babel-core": "^6.0.0",

7
packages/date-picker/src/panel/date-range.vue
View File

@ -387,6 +387,13 @@
this.onPick && this.onPick(val); this.onPick && this.onPick(val);
this.maxDate = val.maxDate; this.maxDate = val.maxDate;
this.minDate = val.minDate; 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; if (!close || this.showTime) return;
this.handleConfirm(); this.handleConfirm();
}, },