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
d6265daf
Commit
d6265daf
authored
May 03, 2017
by
Leopoldthecoder
Committed by
杨奕
May 03, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix datepicker test, revert emitter-removing attempt
parent
0da3967d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
13 deletions
+17
-13
build/release.sh
build/release.sh
+12
-2
examples/docs/zh-CN/tag.md
examples/docs/zh-CN/tag.md
+1
-1
packages/theme-default/src/input.css
packages/theme-default/src/input.css
+3
-3
packages/theme-default/src/table-column.css
packages/theme-default/src/table-column.css
+1
-1
test/unit/specs/date-picker.spec.js
test/unit/specs/date-picker.spec.js
+0
-6
No files found.
build/release.sh
View file @
d6265daf
...
...
@@ -19,7 +19,12 @@ then
echo
"Releasing theme-default
$VERSION
..."
cd
packages/theme-default
npm version
$VERSION
--message
"[release]
$VERSION
"
npm publish
--tag
beta
if
[[
$VERSION
=
~
"beta"
]]
then
npm publish
--tag
beta
else
npm publish
fi
cd
../..
# commit
...
...
@@ -34,5 +39,10 @@ then
git rebase master
git push eleme dev
npm publish
--tag
beta
if
[[
$VERSION
=
~
"beta"
]]
then
npm publish
--tag
beta
else
npm publish
fi
fi
examples/docs/zh-CN/tag.md
View file @
d6265daf
...
...
@@ -87,7 +87,7 @@
```
html
<el-tag
v-for=
"tag in tags"
:key=
"
item
.name"
:key=
"
tag
.name"
:closable=
"true"
:type=
"tag.type"
>
...
...
packages/theme-default/src/input.css
View file @
d6265daf
...
...
@@ -143,9 +143,9 @@
margin
:
-10px
;
}
&
.el-button
,
&
.el-select
.el-input__inner
,
&
.el-select
:hover
.el-input__inner
{
&
button
.el-button
,
&
div
.el-select
.el-input__inner
,
&
div
.el-select
:hover
.el-input__inner
{
border-color
:
transparent
;
background-color
:
transparent
;
color
:
inherit
;
...
...
packages/theme-default/src/table-column.css
View file @
d6265daf
...
...
@@ -78,7 +78,7 @@
@e
checkbox-group
{
padding
:
10px
;
.el-checkbox
{
label
.el-checkbox
{
display
:
block
;
margin-bottom
:
8px
;
margin-left
:
5px
;
...
...
test/unit/specs/date-picker.spec.js
View file @
d6265daf
...
...
@@ -702,7 +702,6 @@ describe('DatePicker', () => {
const
currentMonth
=
new
Date
(
new
Date
().
getTime
());
currentMonth
.
setDate
(
1
);
const
FirstDayOfCurrentMonth
=
currentMonth
.
getDay
();
const
chineseWeek
=
[
'
一
'
,
'
二
'
,
'
三
'
,
'
四
'
,
'
五
'
,
'
六
'
,
'
日
'
];
const
testWeek
=
(
i
)
=>
it
(
'
picker-options:firstDayOfWeek
'
+
i
,
done
=>
{
...
...
@@ -718,13 +717,8 @@ describe('DatePicker', () => {
input
.
focus
();
setTimeout
(
_
=>
{
const
prevMonthLen
=
vm
.
picker
.
$el
.
querySelectorAll
(
'
.prev-month
'
).
length
;
const
firstWeek
=
vm
.
picker
.
$el
.
querySelector
(
'
tr th
'
);
const
offset
=
i
>
3
?
7
-
i
:
-
i
;
const
day
=
FirstDayOfCurrentMonth
===
0
?
7
:
FirstDayOfCurrentMonth
;
expect
(
firstWeek
.
innerText
).
to
.
equal
(
chineseWeek
[
i
-
1
]);
expect
(
prevMonthLen
-
day
).
to
.
equal
(
offset
);
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