mirror of https://github.com/ElemeFE/element
date-picker: support array for name attr
parent
a76865fdf4
commit
c856d9268b
|
@ -47,6 +47,7 @@
|
||||||
:placeholder="startPlaceholder"
|
:placeholder="startPlaceholder"
|
||||||
:value="displayValue && displayValue[0]"
|
:value="displayValue && displayValue[0]"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
|
:name="name && name[0]"
|
||||||
@input="handleStartInput"
|
@input="handleStartInput"
|
||||||
@change="handleStartChange"
|
@change="handleStartChange"
|
||||||
@focus="handleFocus"
|
@focus="handleFocus"
|
||||||
|
@ -56,6 +57,7 @@
|
||||||
:placeholder="endPlaceholder"
|
:placeholder="endPlaceholder"
|
||||||
:value="displayValue && displayValue[1]"
|
:value="displayValue && displayValue[1]"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
|
:name="name && name[1]"
|
||||||
@input="handleEndInput"
|
@input="handleEndInput"
|
||||||
@change="handleEndChange"
|
@change="handleEndChange"
|
||||||
@focus="handleFocus"
|
@focus="handleFocus"
|
||||||
|
@ -266,6 +268,10 @@ const valueEquals = function(a, b) {
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const isString = function(val) {
|
||||||
|
return typeof val === 'string' || val instanceof String;
|
||||||
|
};
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
mixins: [Emitter, NewPopper, Focus('reference')],
|
mixins: [Emitter, NewPopper, Focus('reference')],
|
||||||
|
|
||||||
|
@ -283,7 +289,18 @@ export default {
|
||||||
placeholder: String,
|
placeholder: String,
|
||||||
startPlaceholder: String,
|
startPlaceholder: String,
|
||||||
endPlaceholder: String,
|
endPlaceholder: String,
|
||||||
name: String,
|
name: {
|
||||||
|
default: '',
|
||||||
|
validator(val) {
|
||||||
|
// either: String, Array of String, null / undefined
|
||||||
|
return (
|
||||||
|
val === null ||
|
||||||
|
val === undefined ||
|
||||||
|
isString(val) ||
|
||||||
|
(Array.isArray(val) && val.length === 2 && val.every(isString))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
},
|
||||||
disabled: Boolean,
|
disabled: Boolean,
|
||||||
clearable: {
|
clearable: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
|
|
Loading…
Reference in New Issue