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; diff --git a/src/components/select/select.vue b/src/components/select/select.vue index 523b114b..f853d30b 100644 --- a/src/components/select/select.vue +++ b/src/components/select/select.vue @@ -490,13 +490,12 @@ }, 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; 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); }, diff --git a/src/components/tabs/tabs.vue b/src/components/tabs/tabs.vue index 4ff7531c..a3fd64bb 100644 --- a/src/components/tabs/tabs.vue +++ b/src/components/tabs/tabs.vue @@ -100,6 +100,13 @@ name: { type: String }, + custContentClass: { + type: String, + default: '' + }, + custContentStyle: { + type: Object, + } }, data () { return { @@ -133,7 +140,8 @@ `${prefixCls}-content`, { [`${prefixCls}-content-animated`]: this.animated - } + }, + this.custContentClass ]; }, barClasses () { @@ -154,6 +162,12 @@ transform: `translateX(${p}) translateZ(0px)` }; } + const { custContentStyle } = this; + if (custContentStyle) { + for (const key in custContentStyle){ + style[key] = custContentStyle[key]; + } + } return style; }, barStyle () {