Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Element
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
林焕东
Element
Commits
1f58f4f8
Commit
1f58f4f8
authored
Jan 17, 2018
by
wacky6.AriesMBP
Committed by
杨奕
Jan 29, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
date-picker: add timestamp format
parent
fa643a55
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
74 additions
and
2 deletions
+74
-2
packages/date-picker/src/picker.vue
packages/date-picker/src/picker.vue
+4
-2
test/unit/specs/date-picker.spec.js
test/unit/specs/date-picker.spec.js
+70
-0
No files found.
packages/date-picker/src/picker.vue
View file @
1f58f4f8
...
@@ -122,9 +122,11 @@ const HAVE_TRIGGER_TYPES = [
...
@@ -122,9 +122,11 @@ const HAVE_TRIGGER_TYPES = [
'
datetimerange
'
'
datetimerange
'
];
];
const
DATE_FORMATTER
=
function
(
value
,
format
)
{
const
DATE_FORMATTER
=
function
(
value
,
format
)
{
if
(
format
===
'
timestamp
'
)
return
value
.
getTime
();
return
formatDate
(
value
,
format
);
return
formatDate
(
value
,
format
);
};
};
const
DATE_PARSER
=
function
(
text
,
format
)
{
const
DATE_PARSER
=
function
(
text
,
format
)
{
if
(
format
===
'
timestamp
'
)
return
new
Date
(
Number
(
text
));
return
parseDate
(
text
,
format
);
return
parseDate
(
text
,
format
);
};
};
const
RANGE_FORMATTER
=
function
(
value
,
format
)
{
const
RANGE_FORMATTER
=
function
(
value
,
format
)
{
...
@@ -133,7 +135,7 @@ const RANGE_FORMATTER = function(value, format) {
...
@@ -133,7 +135,7 @@ const RANGE_FORMATTER = function(value, format) {
const
end
=
value
[
1
];
const
end
=
value
[
1
];
if
(
start
&&
end
)
{
if
(
start
&&
end
)
{
return
[
formatDate
(
start
,
format
),
formatDate
(
end
,
format
)];
return
[
DATE_FORMATTER
(
start
,
format
),
DATE_FORMATTER
(
end
,
format
)];
}
}
}
}
return
''
;
return
''
;
...
@@ -146,7 +148,7 @@ const RANGE_PARSER = function(array, format, separator) {
...
@@ -146,7 +148,7 @@ const RANGE_PARSER = function(array, format, separator) {
const
range1
=
array
[
0
];
const
range1
=
array
[
0
];
const
range2
=
array
[
1
];
const
range2
=
array
[
1
];
return
[
parseDate
(
range1
,
format
),
parseDate
(
range2
,
format
)];
return
[
DATE_PARSER
(
range1
,
format
),
DATE_PARSER
(
range2
,
format
)];
}
}
return
[];
return
[];
};
};
...
...
test/unit/specs/date-picker.spec.js
View file @
1f58f4f8
...
@@ -500,6 +500,76 @@ describe('DatePicker', () => {
...
@@ -500,6 +500,76 @@ describe('DatePicker', () => {
},
DELAY
);
},
DELAY
);
},
DELAY
);
},
DELAY
);
});
});
it
(
'
is timestamp
'
,
done
=>
{
vm
=
createVue
({
template
:
`
<el-date-picker
ref="compo"
v-model="value"
type="date"
format="yyyy-MM-dd"
value-format="timestamp" />`
,
data
()
{
return
{
value
:
Date
.
now
()
};
}
},
true
);
const
input
=
vm
.
$refs
.
compo
.
$el
.
querySelector
(
'
input
'
);
input
.
focus
();
setTimeout
(
_
=>
{
// check timestamp is parsed internally
expect
(
vm
.
$refs
.
compo
.
parsedValue
.
getTime
()).
to
.
equal
(
vm
.
value
);
input
.
value
=
'
2000-10-01
'
;
triggerEvent
(
input
,
'
input
'
);
keyDown
(
input
,
ENTER
);
setTimeout
(
_
=>
{
expect
(
vm
.
value
).
to
.
equal
(
new
Date
(
2000
,
9
,
1
).
getTime
());
done
();
},
DELAY
);
},
DELAY
);
});
it
(
'
works for daterange, is timestamp
'
,
done
=>
{
vm
=
createVue
({
template
:
`
<el-date-picker
ref="compo"
v-model="value"
type="daterange"
format="yyyy-MM-dd"
value-format="timestamp" />`
,
data
()
{
return
{
value
:
[
Date
.
now
(),
Date
.
now
()
+
86400
*
1000
]
};
}
},
true
);
const
inputs
=
vm
.
$refs
.
compo
.
$el
.
querySelectorAll
(
'
input
'
);
inputs
[
0
].
focus
();
setTimeout
(
_
=>
{
// check timestamp is parsed internally
expect
(
vm
.
$refs
.
compo
.
parsedValue
[
0
].
getTime
()).
to
.
equal
(
vm
.
value
[
0
]);
expect
(
vm
.
$refs
.
compo
.
parsedValue
[
1
].
getTime
()).
to
.
equal
(
vm
.
value
[
1
]);
inputs
[
0
].
value
=
'
2000-10-01
'
;
triggerEvent
(
inputs
[
0
],
'
input
'
);
keyDown
(
inputs
[
0
],
TAB
);
setTimeout
(
_
=>
{
inputs
[
1
].
focus
();
inputs
[
1
].
value
=
'
2000-10-02
'
;
triggerEvent
(
inputs
[
1
],
'
input
'
);
keyDown
(
inputs
[
0
],
ENTER
);
setTimeout
(
_
=>
{
expect
(
vm
.
value
).
to
.
eql
([
new
Date
(
2000
,
9
,
1
).
getTime
(),
new
Date
(
2000
,
9
,
2
).
getTime
()
]);
done
();
},
DELAY
);
},
DELAY
);
},
DELAY
);
});
});
});
describe
(
'
default value
'
,
done
=>
{
describe
(
'
default value
'
,
done
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment