From d2908487d7d96a2a8a6c9cb66eadcdef0734f270 Mon Sep 17 00:00:00 2001 From: Chris Anderson Date: Wed, 25 Oct 2017 16:15:39 -0500 Subject: [PATCH 1/3] Fixes #7728 --- packages/date-picker/src/picker.vue | 2 ++ packages/select/src/select.vue | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packages/date-picker/src/picker.vue b/packages/date-picker/src/picker.vue index 8de9d2ce2..7c5af0395 100644 --- a/packages/date-picker/src/picker.vue +++ b/packages/date-picker/src/picker.vue @@ -5,6 +5,7 @@ :readonly="!editable || readonly" :disabled="disabled" :size="size" + :id="id" v-clickoutside="handleClose" :placeholder="placeholder" @focus="handleFocus" @@ -209,6 +210,7 @@ export default { type: Boolean, default: true }, + id: String, popperClass: String, editable: { type: Boolean, diff --git a/packages/select/src/select.vue b/packages/select/src/select.vue index a4e363859..4e320b0da 100644 --- a/packages/select/src/select.vue +++ b/packages/select/src/select.vue @@ -47,6 +47,7 @@ :placeholder="currentPlaceholder" :name="name" :size="size" + :id="id" :disabled="disabled" :readonly="!filterable || multiple" :validate-event="false" @@ -171,6 +172,7 @@ value: { required: true }, + id: String, size: String, disabled: Boolean, clearable: Boolean, From e2932fd781d39421d6ae70c481ef1a73d2d9ef88 Mon Sep 17 00:00:00 2001 From: John Heiner Date: Wed, 25 Oct 2017 13:59:47 -0400 Subject: [PATCH 2/3] date-picker: added name attr support --- packages/date-picker/src/picker.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/date-picker/src/picker.vue b/packages/date-picker/src/picker.vue index 7c5af0395..3b03c2304 100644 --- a/packages/date-picker/src/picker.vue +++ b/packages/date-picker/src/picker.vue @@ -8,6 +8,7 @@ :id="id" v-clickoutside="handleClose" :placeholder="placeholder" + :name="name" @focus="handleFocus" @blur="handleBlur" @keydown.native="handleKeydown" @@ -206,6 +207,7 @@ export default { readonly: Boolean, placeholder: String, disabled: Boolean, + name: String, clearable: { type: Boolean, default: true From 4aff63826c25a0de42d3f87b2f59917e431f9676 Mon Sep 17 00:00:00 2001 From: Leopoldthecoder Date: Thu, 26 Oct 2017 11:54:27 +0800 Subject: [PATCH 3/3] misc updates --- build/deploy-faas.sh | 18 ++++++++++++++++++ examples/app.vue | 29 ----------------------------- examples/components/side-nav.vue | 6 +++++- package.json | 6 +++++- 4 files changed, 28 insertions(+), 31 deletions(-) create mode 100644 build/deploy-faas.sh diff --git a/build/deploy-faas.sh b/build/deploy-faas.sh new file mode 100644 index 000000000..5a645eb02 --- /dev/null +++ b/build/deploy-faas.sh @@ -0,0 +1,18 @@ +#! /bin/sh +mkdir temp_web +npm run deploy:build +cd temp_web +git clone -b gh-pages https://github.com/ElemeFE/element.git && cd element + +# build sub folder +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 ../.. + +# deploy domestic site +faas deploy alpha \ No newline at end of file diff --git a/examples/app.vue b/examples/app.vue index bf1521398..0087eaab5 100644 --- a/examples/app.vue +++ b/examples/app.vue @@ -199,35 +199,6 @@ this.localize(); this.renderAnchorHref(); this.goAnchor(); - setTimeout(() => { - const notified = localStorage.getItem('BETA_NOTIFIED'); - if (!notified) { - const h = this.$createElement; - const title = this.lang === 'zh-CN' - ? '2.0.0 Beta 发布' - : '2.0.0 Beta released'; - const messages = this.lang === 'zh-CN' - ? ['点击', '这里', '查看详情'] - : ['Click ', 'here', ' to learn more']; - this.$notify.success({ - title, - duration: 0, - message: h('span', [ - messages[0], - h('a', { - attrs: { - target: '_blank', - href: `https://github.com/ElemeFE/element/issues/${ this.lang === 'zh-CN' ? '7612' : '7613' }` - } - }, messages[1]), - messages[2] - ]), - onClose() { - localStorage.setItem('BETA_NOTIFIED', 1); - } - }); - } - }, 3500); }, created() { diff --git a/examples/components/side-nav.vue b/examples/components/side-nav.vue index 575c6f06b..7f716cc2f 100644 --- a/examples/components/side-nav.vue +++ b/examples/components/side-nav.vue @@ -259,7 +259,11 @@ const xhr = new XMLHttpRequest(); xhr.onreadystatechange = _ => { if (xhr.readyState === 4 && xhr.status === 200) { - this.versions = JSON.parse(xhr.responseText); + const 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'); diff --git a/package.json b/package.json index 37f95750a..48cd62a9a 100644 --- a/package.json +++ b/package.json @@ -23,11 +23,15 @@ "dist:all": "node build/bin/build-all.js && npm run build:theme", "i18n": "node build/bin/i18n.js", "lint": "eslint src/**/* test/**/* packages/**/*.{js,vue} build/**/* --quiet", - "pub": "npm run bootstrap && sh build/git-release.sh && sh build/release.sh", + "pub": "npm run bootstrap && sh build/git-release.sh && sh build/release.sh && sh build/deploy-faas.sh", "pub:all": "npm run dist:all && lerna publish --skip-git && git commit -am 'publish independent packages' && git push eleme dev", "test": "npm run lint && cross-env CI_ENV=/dev/ karma start test/unit/karma.conf.js --single-run", "test:watch": "karma start test/unit/karma.conf.js" }, + "faas": { + "domain": "element", + "public": "temp_web/element" + }, "repository": { "type": "git", "url": "git@github.com:ElemeFE/element.git"