Skip to content

新增 Dialog 组件及 Timeline 组件 #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 14, 2019
Merged

新增 Dialog 组件及 Timeline 组件 #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c456781
style(Progress): 修改Progress组件展示页的间距
lucienstar Jul 8, 2019
78f9dd0
Merge branch 'develop' of https://github.com/TaleLin/lin-cms-vue into…
lucienstar Jul 8, 2019
f6e58d0
Merge branch 'develop' of https://github.com/TaleLin/lin-cms-vue into…
lucienstar Jul 12, 2019
06c83c3
feat(linCmsUi): 新增时间线 展示页面
lucienstar Jul 12, 2019
28b1c73
feat(新增 Dialog 弹窗组件展示页):
lucienstar Jul 13, 2019
b789ed5
feat(UserList.vue): 将选择分组下拉选择框更改为支持筛选的下拉框
lucienstar Jul 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions src/assets/styles/realize/element-variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,27 +325,12 @@ thead tr {
font-size: 18px;
top: -5px;
}

// dialog
.el-dialog__footer {
text-align: left;
padding-left: 30px;
}

// el-dialog
.el-dialog__title {
color: $parent-title-color;
font-size: 16px;
font-weight: 500;
}

.el-dialog__header {
padding-left: 30px;
}

.el-dialog__body {
padding: 30px;
}

// tab
.el-tabs__item.is-active {
color: $theme;
Expand Down
4 changes: 2 additions & 2 deletions src/config/stage/plugins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// 本文件是自动生成, 请勿修改
import LinCmsUi from '@/plugins/LinCmsUi/stage-config'
import custom from '@/plugins/custom/stage-config'
import LinCmsUi from '@/plugins/LinCmsUi/stage-config'

const pluginsConfig = [
LinCmsUi,
custom,
LinCmsUi,
]

export default pluginsConfig
38 changes: 35 additions & 3 deletions src/plugins/LinCmsUi/stage-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ const LinCmsUiRouter = {
filePath: 'plugins/LinCmsUi/views/form/TimePicker.vue',
inNav: true,
icon: 'iconfont icon-jiemiansheji',

right: null,
},
{
title: 'DateTimePicker 日期时间选择器',
Expand All @@ -283,7 +283,7 @@ const LinCmsUiRouter = {
filePath: 'plugins/LinCmsUi/views/form/DateTimePicker.vue',
inNav: true,
icon: 'iconfont icon-jiemiansheji',

right: null,
},
{
title: 'DatePicker 日期选择器',
Expand All @@ -293,7 +293,7 @@ const LinCmsUiRouter = {
filePath: 'plugins/LinCmsUi/views/form/DatePicker.vue',
inNav: true,
icon: 'iconfont icon-jiemiansheji',

right: null,
},
],
},
Expand Down Expand Up @@ -339,6 +339,38 @@ const LinCmsUiRouter = {
},
],
},
{
title: 'Others',
type: 'folder',
name: null,
route: '/lin-cms-ui/others/base',
filePath: 'plugins/LinCmsUi/views/others/',
inNav: true,
icon: 'iconfont icon-jiemiansheji',
right: null,
children: [
{
title: 'Dialog 对话框',
type: 'view',
name: null,
route: '/lin-cms-ui/other/dialog',
filePath: 'plugins/LinCmsUi/views/other/Dialog.vue',
inNav: true,
icon: 'iconfont icon-jiemiansheji',
right: null,
},
{
title: 'Timeline 时间线',
type: 'view',
name: null,
route: '/lin-cms-ui/other/timeline',
filePath: 'plugins/LinCmsUi/views/other/Timeline.vue',
inNav: true,
icon: 'iconfont icon-jiemiansheji',
right: null,
},
],
},
],
}

Expand Down
4 changes: 4 additions & 0 deletions src/plugins/LinCmsUi/views/data/progress/Progress.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,8 @@ export default {

<style lang="scss" scoped>
@import '../../../assets/style/container';
.el-progress {
margin-top:20px;
margin-left: 20px;
}
</style>
Loading