From b4138675d4ffd8aa2c95c387f87a688ad21ee553 Mon Sep 17 00:00:00 2001 From: luffyzhao Date: Fri, 25 May 2018 11:37:15 +0800 Subject: [PATCH 1/9] select-binding-0 --- src/components/select/select.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/select/select.vue b/src/components/select/select.vue index 89d8e658..a19dfb8b 100644 --- a/src/components/select/select.vue +++ b/src/components/select/select.vue @@ -410,8 +410,10 @@ getInitialValue(){ const {multiple, value} = this; let initialValue = Array.isArray(value) ? value : [value]; - if (!multiple && (typeof initialValue[0] === 'undefined' || String(initialValue[0]).trim() === '')) initialValue = []; - return initialValue.filter(Boolean); + if (!multiple && (typeof initialValue[0] === 'undefined' || (String(initialValue[0]).trim() === '' && !Number.isfinite(initialValue[0])) )) initialValue = []; + return initialValue.filter((item) => { + return Boolean(item) || item === 0 + }); }, processOption(option, values, isFocused){ if (!option.componentOptions) return option; From 861fe324b4307d222deb0520b7f10393ae13a64b Mon Sep 17 00:00:00 2001 From: luffyzhao Date: Fri, 25 May 2018 11:59:03 +0800 Subject: [PATCH 2/9] select-binding-0 --- package-lock.json | 2 +- package.json | 4 ++-- src/components/select/select.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 31a07540..d12204c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "iview", - "version": "2.14.0-rc.1", + "version": "2.14.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a2279f44..9fb347d4 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "cross-env": "^5.1.3", "css-loader": "^0.28.10", "eslint": "^3.19.0", - "eslint-plugin-vue": "^2.1.0", + "eslint-plugin-vue": "^4.5.0", "extract-text-webpack-plugin": "^2.1.2", "file-loader": "^1.1.11", "friendly-errors-webpack-plugin": "^1.6.1", @@ -109,7 +109,7 @@ "vue-router": "^3.0.1", "vue-style-loader": "^4.0.2", "vue-template-compiler": "^2.5.16", - "webpack": "^3.11.0", + "webpack": "^3.12.0", "webpack-dev-server": "^2.11.1", "webpack-merge": "^3.0.0" }, diff --git a/src/components/select/select.vue b/src/components/select/select.vue index a19dfb8b..578e3b31 100644 --- a/src/components/select/select.vue +++ b/src/components/select/select.vue @@ -410,7 +410,7 @@ getInitialValue(){ const {multiple, value} = this; let initialValue = Array.isArray(value) ? value : [value]; - if (!multiple && (typeof initialValue[0] === 'undefined' || (String(initialValue[0]).trim() === '' && !Number.isfinite(initialValue[0])) )) initialValue = []; + if (!multiple && (typeof initialValue[0] === 'undefined' || (String(initialValue[0]).trim() === '' && !Number.isFinite(initialValue[0])) )) initialValue = []; return initialValue.filter((item) => { return Boolean(item) || item === 0 }); From c32a7412e89b56401f00324043acd3d8d9fe5ef7 Mon Sep 17 00:00:00 2001 From: luffyzhao Date: Fri, 25 May 2018 11:59:36 +0800 Subject: [PATCH 3/9] select-binding-0 --- src/components/select/select.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/select/select.vue b/src/components/select/select.vue index 578e3b31..ce4a1868 100644 --- a/src/components/select/select.vue +++ b/src/components/select/select.vue @@ -410,7 +410,7 @@ getInitialValue(){ const {multiple, value} = this; let initialValue = Array.isArray(value) ? value : [value]; - if (!multiple && (typeof initialValue[0] === 'undefined' || (String(initialValue[0]).trim() === '' && !Number.isFinite(initialValue[0])) )) initialValue = []; + if (!multiple && (typeof initialValue[0] === 'undefined' || (String(initialValue[0]).trim() === '' && !Number.isFinite(initialValue[0])))) initialValue = []; return initialValue.filter((item) => { return Boolean(item) || item === 0 }); From 7468f04d8414c49a55322bb005d98feada23542e Mon Sep 17 00:00:00 2001 From: luffyzhao Date: Fri, 25 May 2018 12:07:43 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=BF=98=E5=8E=9Fpackage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9fb347d4..a2279f44 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "cross-env": "^5.1.3", "css-loader": "^0.28.10", "eslint": "^3.19.0", - "eslint-plugin-vue": "^4.5.0", + "eslint-plugin-vue": "^2.1.0", "extract-text-webpack-plugin": "^2.1.2", "file-loader": "^1.1.11", "friendly-errors-webpack-plugin": "^1.6.1", @@ -109,7 +109,7 @@ "vue-router": "^3.0.1", "vue-style-loader": "^4.0.2", "vue-template-compiler": "^2.5.16", - "webpack": "^3.12.0", + "webpack": "^3.11.0", "webpack-dev-server": "^2.11.1", "webpack-merge": "^3.0.0" }, From 4107d6c4a57cf48bddc50307d2e22df3f8f2f912 Mon Sep 17 00:00:00 2001 From: luffyzhao Date: Fri, 25 May 2018 13:45:16 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9select=E9=BB=98=E8=AE=A4v?= =?UTF-8?q?alue=E4=B8=BA0=E4=B8=8D=E8=83=BD=E9=80=89=E5=AE=9A=E7=9A=84Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- src/components/select/select.vue | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a2279f44..b5950044 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "cross-env": "^5.1.3", "css-loader": "^0.28.10", "eslint": "^3.19.0", - "eslint-plugin-vue": "^2.1.0", + "eslint-plugin-vue": "2.1.0", "extract-text-webpack-plugin": "^2.1.2", "file-loader": "^1.1.11", "friendly-errors-webpack-plugin": "^1.6.1", @@ -109,7 +109,7 @@ "vue-router": "^3.0.1", "vue-style-loader": "^4.0.2", "vue-template-compiler": "^2.5.16", - "webpack": "^3.11.0", + "webpack": "3.11.0", "webpack-dev-server": "^2.11.1", "webpack-merge": "^3.0.0" }, diff --git a/src/components/select/select.vue b/src/components/select/select.vue index ce4a1868..2792bc3c 100644 --- a/src/components/select/select.vue +++ b/src/components/select/select.vue @@ -410,7 +410,6 @@ getInitialValue(){ const {multiple, value} = this; let initialValue = Array.isArray(value) ? value : [value]; - if (!multiple && (typeof initialValue[0] === 'undefined' || (String(initialValue[0]).trim() === '' && !Number.isFinite(initialValue[0])))) initialValue = []; return initialValue.filter((item) => { return Boolean(item) || item === 0 }); From be83a68a29c809d4e4a368558f7d5c49f0ee301a Mon Sep 17 00:00:00 2001 From: luffyzhao Date: Fri, 25 May 2018 13:49:17 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E8=BF=98=E5=8E=9Fpackage-lock.json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b5950044..a2279f44 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "cross-env": "^5.1.3", "css-loader": "^0.28.10", "eslint": "^3.19.0", - "eslint-plugin-vue": "2.1.0", + "eslint-plugin-vue": "^2.1.0", "extract-text-webpack-plugin": "^2.1.2", "file-loader": "^1.1.11", "friendly-errors-webpack-plugin": "^1.6.1", @@ -109,7 +109,7 @@ "vue-router": "^3.0.1", "vue-style-loader": "^4.0.2", "vue-template-compiler": "^2.5.16", - "webpack": "3.11.0", + "webpack": "^3.11.0", "webpack-dev-server": "^2.11.1", "webpack-merge": "^3.0.0" }, From 5c24d42a3983dfbb2c26b6ec6004ade6c7a4ff9b Mon Sep 17 00:00:00 2001 From: luffyzhao Date: Fri, 25 May 2018 13:51:24 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E8=BF=98=E5=8E=9Fpackage-lock.json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index d12204c3..31a07540 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "iview", - "version": "2.14.0", + "version": "2.14.0-rc.1", "lockfileVersion": 1, "requires": true, "dependencies": { From 583e23a43c80370ea6d19605697da0637f829eaa Mon Sep 17 00:00:00 2001 From: luffyzhao Date: Fri, 25 May 2018 13:57:09 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20'multiple'=20is=20assi?= =?UTF-8?q?gned=20a=20value=20but=20never=20used=20=20no-unused-vars?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/select/select.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/select/select.vue b/src/components/select/select.vue index 2792bc3c..ed573b33 100644 --- a/src/components/select/select.vue +++ b/src/components/select/select.vue @@ -408,10 +408,10 @@ }; }, getInitialValue(){ - const {multiple, value} = this; + const {value} = this; let initialValue = Array.isArray(value) ? value : [value]; return initialValue.filter((item) => { - return Boolean(item) || item === 0 + return Boolean(item) || item === 0; }); }, processOption(option, values, isFocused){ From 31e4380d96344331c8ea9c0f64496c8ceb799e21 Mon Sep 17 00:00:00 2001 From: luffyzhao Date: Fri, 25 May 2018 14:01:53 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E8=BF=98=E6=98=AF=E8=A6=81=E4=BF=9D?= =?UTF-8?q?=E7=95=99multiple=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/select/select.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/select/select.vue b/src/components/select/select.vue index ed573b33..ce4a1868 100644 --- a/src/components/select/select.vue +++ b/src/components/select/select.vue @@ -408,10 +408,11 @@ }; }, getInitialValue(){ - const {value} = this; + const {multiple, value} = this; let initialValue = Array.isArray(value) ? value : [value]; + if (!multiple && (typeof initialValue[0] === 'undefined' || (String(initialValue[0]).trim() === '' && !Number.isFinite(initialValue[0])))) initialValue = []; return initialValue.filter((item) => { - return Boolean(item) || item === 0; + return Boolean(item) || item === 0 }); }, processOption(option, values, isFocused){