From 29a93c3e4dbc332e7b3bd76c1fd15f10c62dd3a7 Mon Sep 17 00:00:00 2001 From: msidolphin Date: Mon, 29 Jul 2019 14:46:11 +0800 Subject: [PATCH 1/5] fix#6129 --- src/components/date-picker/panel/Date/date-range.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/date-picker/panel/Date/date-range.vue b/src/components/date-picker/panel/Date/date-range.vue index f7b4cf1e..07bbdef4 100644 --- a/src/components/date-picker/panel/Date/date-range.vue +++ b/src/components/date-picker/panel/Date/date-range.vue @@ -296,7 +296,11 @@ }, changePanelDate(panel, type, increment, updateOtherPanel = true){ const current = new Date(this[`${panel}PanelDate`]); - current[`set${type}`](current[`get${type}`]() + increment); + if (panel === 'left') { + current[`set${type}`](current[`get${type}`](), 0); + } else { + current[`set${type}`](current[`get${type}`]() + increment); + } this[`${panel}PanelDate`] = current; if (!updateOtherPanel) return; From b3d1fe2855bf632698615f7da5c205425d9f7ddc Mon Sep 17 00:00:00 2001 From: Wang Chenguang Date: Fri, 27 Sep 2019 14:21:04 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E9=9C=80=E6=B1=82=20select=20?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD=E6=83=85=E5=86=B5=E4=B8=8B?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8Clabel=E5=92=8Cvalue=E9=83=BD?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BA=86=E5=8C=B9=E9=85=8D=20=E5=8F=AA?= =?UTF-8?q?=E5=8C=B9=E9=85=8Dlabel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 ea5c7189..786174ee 100644 --- a/src/components/select/select.vue +++ b/src/components/select/select.vue @@ -496,7 +496,7 @@ const nodeText = node.elm ? node.elm.textContent : node.text; return `${str} ${nodeText}`; }, '') || ''; - const stringValues = JSON.stringify([value, label, textContent]); + const stringValues = JSON.stringify([label, textContent]); const query = this.query.toLowerCase().trim(); return stringValues.toLowerCase().includes(query); }, From 8900570c5b49808c24df1a35466dc0a26cfa9234 Mon Sep 17 00:00:00 2001 From: Wang Chenguang Date: Fri, 27 Sep 2019 14:30:21 +0800 Subject: [PATCH 3/5] test: error 'value' is assigned a value but never used --- src/components/select/select.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/select/select.vue b/src/components/select/select.vue index 786174ee..84283317 100644 --- a/src/components/select/select.vue +++ b/src/components/select/select.vue @@ -490,7 +490,6 @@ }, validateOption({children, elm, propsData}){ - const value = propsData.value; const label = propsData.label || ''; const textContent = (elm && elm.textContent) || (children || []).reduce((str, node) => { const nodeText = node.elm ? node.elm.textContent : node.text; From 242ab8c8b53c22e7aa60cc27c969cac872b06a3d Mon Sep 17 00:00:00 2001 From: yangd Date: Mon, 30 Sep 2019 12:45:21 +0800 Subject: [PATCH 4/5] =?UTF-8?q?tabs=E6=B7=BB=E5=8A=A0custContentClass?= =?UTF-8?q?=E5=92=8CcustContentStyle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tabs/tabs.vue | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/components/tabs/tabs.vue b/src/components/tabs/tabs.vue index ed816aa1..160beae0 100644 --- a/src/components/tabs/tabs.vue +++ b/src/components/tabs/tabs.vue @@ -100,6 +100,14 @@ name: { type: String }, + custContentClass: { + type: String, + default: '' + }, + custContentStyle: { + type: Object, + default: {} + } }, data () { return { @@ -133,7 +141,8 @@ `${prefixCls}-content`, { [`${prefixCls}-content-animated`]: this.animated - } + }, + this.custContentClass ]; }, barClasses () { @@ -154,6 +163,10 @@ transform: `translateX(${p}) translateZ(0px)` }; } + const { custContentStyle } = this; + for (const key in custContentStyle){ + style[key] = custContentStyle[key]; + } return style; }, barStyle () { From 46363dbca36d369b16afcc73911b1a56fe4b1ef5 Mon Sep 17 00:00:00 2001 From: yangd Date: Mon, 30 Sep 2019 23:04:53 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8DcustContentStyle=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tabs/tabs.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/tabs/tabs.vue b/src/components/tabs/tabs.vue index 160beae0..47e31484 100644 --- a/src/components/tabs/tabs.vue +++ b/src/components/tabs/tabs.vue @@ -106,7 +106,6 @@ }, custContentStyle: { type: Object, - default: {} } }, data () { @@ -164,8 +163,10 @@ }; } const { custContentStyle } = this; - for (const key in custContentStyle){ - style[key] = custContentStyle[key]; + if (custContentStyle) { + for (const key in custContentStyle){ + style[key] = custContentStyle[key]; + } } return style; },