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
62bd4b2b
Commit
62bd4b2b
authored
Aug 17, 2016
by
qingwei.li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update style & rename fecha.js to date.js
parent
e0a62416
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
20 deletions
+33
-20
examples/docs/card.md
examples/docs/card.md
+32
-19
packages/date-picker/src/util/index.js
packages/date-picker/src/util/index.js
+1
-1
src/utils/date.js
src/utils/date.js
+0
-0
No files found.
examples/docs/card.md
View file @
62bd4b2b
<script>
import
fecha from 'packages/date-picker/src/util/fecha.js
'
import
dateUtil from 'main/utils/date
'
export default {
data() {
return {
currentDate:
fecha
.format(new Date(), 'yyyy-MM-dd HH:mm')
currentDate:
dateUtil
.format(new Date(), 'yyyy-MM-dd HH:mm')
};
}
}
...
...
@@ -17,8 +17,11 @@
.time {
font-size: 13px;
color: #999;
display: block;
}
.bottom {
margin-top: 13px;
line-height: 12px;
}
.item {
...
...
@@ -27,6 +30,16 @@
.button {
padding: 0;
float: right;
}
.image {
width: 100%;
display: block;
}
.clearfix {
@utils-clearfix;
}
</style>
...
...
@@ -36,9 +49,9 @@
<el-row>
<el-col
:span=
"12"
>
<el-card>
<div
slot=
"header"
style=
"display: flex; align-items: center;
"
>
<
div
style=
"flex: 1; color: #20a0ff;"
>
卡片名称
</div
>
<el-button
type=
"primary"
>
操作按钮
</el-button>
<div
slot=
"header"
class=
"clearfix
"
>
<
span
style=
"line-height: 36px;"
>
卡片名称
</span
>
<el-button
style=
"float: right;"
type=
"primary"
>
操作按钮
</el-button>
</div>
<div
v-for=
"o in 4"
class=
"text item"
>
{{'列表内容 ' + o }}
...
...
@@ -49,9 +62,9 @@
```
html
<el-card>
<div
slot=
"header"
style=
"display: flex; align-items: center;
"
>
<
div
style=
"flex: 1; color: #20a0ff;"
>
卡片名称
</div
>
<el-button
type=
"primary"
>
操作按钮
</el-button>
<div
slot=
"header"
class=
"clearfix
"
>
<
span
style=
"line-height: 36px;"
>
卡片名称
</span
>
<el-button
style=
"float: right;"
type=
"primary"
>
操作按钮
</el-button>
</div>
<div
v-for=
"o in 4"
class=
"text item"
>
{{'列表内容 ' + o }}
...
...
@@ -87,13 +100,13 @@
<el-row>
<el-col
:span=
"8"
v-for=
"(o, index) in 2"
:offset=
"index >
0 ? 2 : 0">
<el-card :body-style="
{
padding:
'
0px
'
}"
>
<img
src=
"~examples/assets/images/hamburger.png"
width=
"100%"
style=
"display: block;
"
>
<div
style=
"padding: 14px;
display: flex; align-items: flex-end;
"
>
<
div
style=
"flex: 1"
>
<span>
好吃的汉堡
</span
>
<img
src=
"~examples/assets/images/hamburger.png"
class=
"image
"
>
<div
style=
"padding: 14px;"
>
<
span>
好吃的汉堡
</span
>
<div
class=
"bottom clearfix"
>
<time
class=
"time"
>
{{ currentDate }}
</time>
<el-button
type=
"text"
class=
"button"
>
操作按钮
</el-button>
</div>
<el-button
type=
"text"
class=
"button"
>
操作按钮
</el-button>
</div>
</el-card>
</el-col>
...
...
@@ -101,13 +114,13 @@
```
html
<el-card
:body-style=
"{ padding: '0px' }"
>
<img
src=
"~examples/assets/images/hamburger.png"
width=
"100%"
style=
"display: block;
"
>
<div
style=
"padding: 14px;
display: flex; align-items: flex-end;
"
>
<
div
style=
"flex: 1"
>
<span>
好吃的汉堡
</span
>
<img
src=
"~examples/assets/images/hamburger.png"
class=
"image
"
>
<div
style=
"padding: 14px;"
>
<
span>
好吃的汉堡
</span
>
<div
class=
"bottom clearfix"
>
<time
class=
"time"
>
{{ currentDate }}
</time>
<el-button
type=
"text"
class=
"button"
>
操作按钮
</el-button>
</div>
<el-button
type=
"text"
class=
"button"
>
操作按钮
</el-button>
</div>
</el-card>
```
...
...
packages/date-picker/src/util/index.js
View file @
62bd4b2b
import
dateUtil
from
'
./fecha
'
;
import
dateUtil
from
'
main/utils/date
'
;
const
newArray
=
function
(
start
,
end
)
{
let
result
=
[];
...
...
packages/date-picker/src/util/fecha
.js
→
src/utils/date
.js
View file @
62bd4b2b
File moved
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