drip-public/iview
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct logic when manually inputing disabledDates

Browse source
This commit is contained in:
Sergio Crisostomo 2018-01-19 13:11:38 +01:00
parent 77e43f2b87
commit 4863a75d92
2 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/components/date-picker/picker.vue
View file

@ -3,6 +3,7 @@
<div ref="reference" :class="[prefixCls + '-rel']"> <div ref="reference" :class="[prefixCls + '-rel']">
<slot> <slot>
<i-input <i-input
:key="forceInputRerender"
:element-id="elementId" :element-id="elementId"
:class="[prefixCls + '-editor']" :class="[prefixCls + '-editor']"
:readonly="!editable || readonly" :readonly="!editable || readonly"
@ -264,6 +265,10 @@
return val === '' || val === null || !isNaN(date.getTime()); return val === '' || val === null || !isNaN(date.getTime());
} }
} }
},
options: {
type: Object,
default: () => ({})
} }
}, },
data(){ data(){
@ -274,7 +279,8 @@
internalValue: this.parseDate(this.value), internalValue: this.parseDate(this.value),
disableClickOutSide: false, // fixed when click a date,trigger clickoutside to close picker disableClickOutSide: false, // fixed when click a date,trigger clickoutside to close picker
disableCloseUnderTransfer: false, // transfer 模式下，点击Drop也会触发关闭, disableCloseUnderTransfer: false, // transfer 模式下，点击Drop也会触发关闭,
selectionMode: this.onSelectionModeChange(this.type) selectionMode: this.onSelectionModeChange(this.type),
forceInputRerender: 1
}; };
}, },
computed: { computed: {
@ -287,7 +293,6 @@
return (isRange || this.multiple) ? val : val[0]; return (isRange || this.multiple) ? val : val[0];
} }
}, },
opened () { opened () {
return this.open === null ? this.visible : this.open; return this.open === null ? this.visible : this.open;
}, },
@ -341,12 +346,21 @@
this.visible = false; this.visible = false;
}, },
handleInputChange (event) { handleInputChange (event) {
const isArrayValue = this.type.includes('range') || this.multiple;
const oldValue = this.visualValue; const oldValue = this.visualValue;
const newValue = event.target.value; const newValue = event.target.value;
const newDate = this.parseDate(newValue);
const disabledDateFn =
this.options &&
typeof this.options.disabledDate === 'function' &&
this.options.disabledDate;
const valueToTest = isArrayValue ? newDate : newDate[0];
if (newValue !== oldValue) { if (newValue !== oldValue && !disabledDateFn(valueToTest)) {
this.emitChange(); this.emitChange();
this.internalValue = this.parseDate(newValue); this.internalValue = newDate;
} else {
this.forceInputRerender++;
} }
}, },
handleInputMouseenter () { handleInputMouseenter () {
@ -393,7 +407,7 @@
if (val && type === 'time' && !(val instanceof Date)) { if (val && type === 'time' && !(val instanceof Date)) {
val = parser(val, this.format || DEFAULT_FORMATS[type]); val = parser(val, this.format || DEFAULT_FORMATS[type]);
} else if (type.match(/range$/)) { } else if (isRange) {
if (!val){ if (!val){
val = [null, null]; val = [null, null];
} else { } else {
@ -403,8 +417,7 @@
} else if (typeof val === 'string' && type.indexOf('time') !== 0){ } else if (typeof val === 'string' && type.indexOf('time') !== 0){
val = parser(val, this.format || DEFAULT_FORMATS[type]) || val; val = parser(val, this.format || DEFAULT_FORMATS[type]) || val;
} }
return (isRange || this.multiple) ? val : [val];
return isRange ? val : [val];
}, },
formatDate(value){ formatDate(value){
const {formatter} = ( const {formatter} = (

13
src/components/date-picker/picker/date-picker.js
View file

@ -21,18 +21,7 @@ export default {
return isRange ? 'RangeDatePickerPanel' : 'DatePickerPanel'; return isRange ? 'RangeDatePickerPanel' : 'DatePickerPanel';
}, },
ownPickerProps(){ ownPickerProps(){
return {}; return this.options;
} }
}, },
/*
created () {
if (!this.currentValue) {
if (this.type === 'daterange' || this.type === 'datetimerange') {
this.currentValue = ['',''];
} else {
this.currentValue = '';
}
}
}
*/
}; };