Skip to content

Commit 73bf780

Browse files
vanoneangvanoneang
authored
Merge pull request #185 from TaleLin/feature/linCmsUi
新增面包屑导航， Notification 通知， 下拉框组件展示
2 parents c032506 + 9120f78 commit 73bf780

File tree

12 files changed

+1078
-19
lines changed

12 files changed

+1078
-19
lines changed

‎src/assets/styles/realize/element-variables.scss‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -626,10 +626,6 @@ thead tr {
626626
}
627627

628628
// Link
629-
.el-link+.el-link {
630-
margin-left: 30px;
631-
}
632-
633629
.el-link {
634630
font-weight: 400;
635631
font-size: 14px;
@@ -821,8 +817,3 @@ $typeMap: (primary:#3963BC,
821817
}
822818
}
823819
}
824-
825-
/* alert */
826-
.el-alert+.el-alert {
827-
margin-top: 20px;
828-
}

‎src/plugins/LinCmsUi/stage-config.js‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ const LinCmsUiRouter = {
9696
title: 'Navigation',
9797
type: 'folder',
9898
name: null,
99-
route: '/lin-cms-ui/navigation/',
99+
route: '/lin-cms-ui/navigation',
100100
filePath: 'plugins/LinCmsUi/views/navigation/',
101101
inNav: true,
102102
icon: 'iconfont icon-jiemiansheji',
@@ -112,6 +112,26 @@ const LinCmsUiRouter = {
112112
icon: 'iconfont icon-jiemiansheji',
113113
right: null,
114114
},
115+
{
116+
title: 'Breadcrumb 面包屑',
117+
type: 'view',
118+
name: null,
119+
route: '/lin-cms-ui/navigation/breadcrumb',
120+
filePath: 'plugins/LinCmsUi/views/navigation/Breadcrumb.vue',
121+
inNav: true,
122+
icon: 'iconfont icon-jiemiansheji',
123+
right: null,
124+
},
125+
{
126+
title: 'Dropdown 下拉菜单',
127+
type: 'view',
128+
name: null,
129+
route: '/lin-cms-ui/navigation/dropdown',
130+
filePath: 'plugins/LinCmsUi/views/navigation/Dropdown.vue',
131+
inNav: true,
132+
icon: 'iconfont icon-jiemiansheji',
133+
right: null,
134+
},
115135
],
116136
},
117137
{
@@ -257,6 +277,16 @@ const LinCmsUiRouter = {
257277
icon: 'iconfont icon-jiemiansheji',
258278

259279
},
280+
{
281+
title: 'Notification 通知',
282+
type: 'view',
283+
name: null,
284+
route: '/lin-cms-ui/notice/notification',
285+
filePath: 'plugins/LinCmsUi/views/notice/Notification.vue',
286+
inNav: true,
287+
icon: 'iconfont icon-jiemiansheji',
288+
289+
},
260290
],
261291
},
262292
],

‎src/plugins/LinCmsUi/views/basic/icon/Icon.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,10 @@
8888

8989
<script>
9090
export default {
91-
name: 'LinCmsUiButton',
91+
name: '',
9292
components: {},
9393
data() {
9494
return {
95-
text: '',
9695
color: '#3963bc',
9796
width: '30px',
9897
height: '30px',

‎src/plugins/LinCmsUi/views/basic/link/Link.vue‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ export default {
8585
components: {},
8686
data() {
8787
return {
88-
text: '',
8988
base: `
9089
<el-link>默认链接</el-link>
9190
<el-link type="primary" disabled>主要链接</el-link>
@@ -124,5 +123,8 @@ export default {
124123
</script>
125124

126125
<style lang="scss" scoped>
127-
@import '../../../assets/style/container'
126+
@import '../../../assets/style/container';
127+
.el-link+.el-link {
128+
margin-left: 30px;
129+
}
128130
</style>

‎src/plugins/LinCmsUi/views/data/tag/Tag.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102

103103
<script>
104104
export default {
105-
name: 'LinCmsUiButton',
105+
name: '',
106106
components: {},
107107
data() {
108108
return {

‎src/plugins/LinCmsUi/views/form/Checkbox.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<script>
139139
const cityOptions = ['上海', '北京', '广州', '深圳']
140140
export default {
141-
name: 'LinCmsUiButton',
141+
name: '',
142142
components: {},
143143
data() {
144144
return {

‎src/plugins/LinCmsUi/views/form/Input.vue‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ export default {
128128
components: {},
129129
data() {
130130
return {
131-
text: '',
132131
input: '',
133132
select: '',
134133
base: `

‎src/plugins/LinCmsUi/views/form/MultipleInput.vue‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
</div>
2020
</el-row>
2121
</div>
22+
<el-collapse>
23+
<el-collapse-item title="查看代码" name="2">
24+
<div style="white-space: pre-wrap;">{{base}}</div>
25+
</el-collapse-item>
26+
</el-collapse>
2227
</el-card>
2328
</div>
2429
</div>
@@ -28,6 +33,38 @@
2833
export default {
2934
data() {
3035
return {
36+
/* eslint-disable */
37+
base: `
38+
<div class="block-box">
39+
<i class="iconfont icon-jia plus" v-if="!list.length" @click="addContent"></i>
40+
<el-row class="input-row" v-for="(item,index) in list" :key="index">
41+
<el-input
42+
v-model="item.text"
43+
placeholder="请输入内容"
44+
size="medium"
45+
class="input-detail"
46+
></el-input>
47+
<div class="function">
48+
<i class="iconfont icon-jian1 minus" @click="removeContent(index)"></i>
49+
<i class="iconfont icon-jia plus" v-if="index === list.length-1" @click="addContent"></i>
50+
</div>
51+
</el-row>
52+
</div>
53+
<script>
54+
export default {
55+
methods: {
56+
addContent() {
57+
this.list.push({
58+
text: '',
59+
type: 'plus',
60+
})
61+
},
62+
removeContent(index) {
63+
this.list.splice(index, 1)
64+
}
65+
},
66+
}
67+
<\/script>`,
3168
list: [
3269
3370
],

‎src/plugins/LinCmsUi/views/form/Radio.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,10 @@
144144

145145
<script>
146146
export default {
147-
name: 'LinCmsUiButton',
147+
name: '',
148148
components: {},
149149
data() {
150150
return {
151-
text: '',
152151
radio: '1',
153152
radio0: 3,
154153
radio1: '上海',

‎src/plugins/LinCmsUi/views/navigation/Breadcrumb.vue‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
<template>
2+
<div class="lin-container">
3+
<div class="lin-title">Breadcrumb 面包屑</div>
4+
<div class="lin-wrap-ui">
5+
<el-card style="margin-bottom:50px;">
6+
<div slot="header">
7+
<span>基础用法</span>
8+
</div>
9+
<el-row>
10+
<div>
11+
<el-breadcrumb separator="/">
12+
<el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
13+
<el-breadcrumb-item><a href="/">活动管理</a></el-breadcrumb-item>
14+
<el-breadcrumb-item>活动列表</el-breadcrumb-item>
15+
<el-breadcrumb-item>活动详情</el-breadcrumb-item>
16+
</el-breadcrumb>
17+
</div>
18+
</el-row>
19+
<el-collapse>
20+
<el-collapse-item title="查看代码" name="2">
21+
<div style="white-space: pre-wrap;">{{base}}</div>
22+
</el-collapse-item>
23+
</el-collapse>
24+
</el-card>
25+
<el-card style="margin-bottom:50px;">
26+
<div slot="header">
27+
<span>图标分隔符</span>
28+
</div>
29+
<el-row>
30+
<div>
31+
<el-breadcrumb separator-class="el-icon-arrow-right">
32+
<el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
33+
<el-breadcrumb-item>活动管理</el-breadcrumb-item>
34+
<el-breadcrumb-item>活动列表</el-breadcrumb-item>
35+
<el-breadcrumb-item>活动详情</el-breadcrumb-item>
36+
</el-breadcrumb>
37+
</div>
38+
</el-row>
39+
<el-collapse class="test" style="color:red;">
40+
<el-collapse-item title="查看代码" name="2">
41+
<div style="white-space: pre-wrap;">{{separatorClass}}</div>
42+
</el-collapse-item>
43+
</el-collapse>
44+
</el-card>
45+
</div>
46+
</div>
47+
</template>
48+
49+
<script>
50+
export default {
51+
name: '',
52+
components: {},
53+
data() {
54+
return {
55+
base: `
56+
<el-breadcrumb separator="/">
57+
<el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
58+
<el-breadcrumb-item><a href="/">活动管理</a></el-breadcrumb-item>
59+
<el-breadcrumb-item>活动列表</el-breadcrumb-item>
60+
<el-breadcrumb-item>活动详情</el-breadcrumb-item>
61+
</el-breadcrumb>`,
62+
separatorClass: `
63+
<el-breadcrumb separator-class="el-icon-arrow-right">
64+
<el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
65+
<el-breadcrumb-item>活动管理</el-breadcrumb-item>
66+
<el-breadcrumb-item>活动列表</el-breadcrumb-item>
67+
<el-breadcrumb-item>活动详情</el-breadcrumb-item>
68+
</el-breadcrumb`,
69+
}
70+
},
71+
// 计算属性设置
72+
computed: {},
73+
// 数据变更监听
74+
watch: {},
75+
mounted() {
76+
this.init()
77+
},
78+
methods: {
79+
// 执行获取数据等初始化动作
80+
init() {},
81+
},
82+
}
83+
</script>
84+
85+
<style lang="scss" scoped>
86+
@import '../../assets/style/container';
87+
.el-link+.el-link {
88+
margin-left: 30px;
89+
}
90+
</style>

0 commit comments

Comments
 (0)