Skip to content

Commit 1ca27cc

Browse files
quanquan2100quanquan2100
authored
Merge branch 'develop' into feature/avatar
2 parents a4eb2ef + 35dc776 commit 1ca27cc

File tree

9 files changed

+2188
-19
lines changed

9 files changed

+2188
-19
lines changed

‎package-lock.json

Lines changed: 1687 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ thead tr {
313313
}
314314

315315
.el-tabs__item {
316-
color: #333;
316+
color: #45526b;
317317
}
318318

319319
// menu

‎src/config/index.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
const Config = {
2+
baseUrl: 'localhost:5000/',
3+
stagnateTime: 1 * 60 * 60 * 1000, // 无操作停滞时间 默认1小时
4+
openAutoJumpOut: true, // 是否开启无操作跳出
5+
notLoginRoute: ['login'], // 无需登录即可访问的路由 name,
6+
sideBarLevel: 3, // 侧边栏层级限制, 3表示三级, 可设置 2 和 3
7+
defaultRoute: '/about', // 默认打开的路由
8+
}
9+
10+
export default Config

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,36 @@ const LinCmsUiRouter = {
2828
icon: 'iconfont icon-jiemiansheji',
2929
right: null,
3030
},
31+
{
32+
title: 'Switch 开关',
33+
type: 'view',
34+
name: null,
35+
route: '/lin-cms-ui/switch',
36+
filePath: 'plugins/LinCmsUi/views/switch/Switch.vue',
37+
inNav: true,
38+
icon: 'iconfont icon-jiemiansheji',
39+
right: null,
40+
},
41+
{
42+
title: 'Rate 评分',
43+
type: 'view',
44+
name: null,
45+
route: '/lin-cms-ui/rate',
46+
filePath: 'plugins/LinCmsUi/views/rate/Rate.vue',
47+
inNav: true,
48+
icon: 'iconfont icon-jiemiansheji',
49+
right: null,
50+
},
51+
{
52+
title: 'Tabs 标签页',
53+
type: 'view',
54+
name: null,
55+
route: '/lin-cms-ui/tab',
56+
filePath: 'plugins/LinCmsUi/views/tab/Tab.vue',
57+
inNav: true,
58+
icon: 'iconfont icon-jiemiansheji',
59+
right: null,
60+
},
3161
{
3262
title: 'Table 表格',
3363
type: 'folder',

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -295,17 +295,17 @@ export default {
295295
</el-option>
296296
</el-select>`,
297297
disabled: `
298-
<el-select size="medium" v-model="value" placeholder="请选择">
298+
<el-select size="medium" v-model="value2" placeholder="请选择">
299299
<el-option
300-
v-for="item in options"
300+
v-for="item in options2"
301301
:key="item.value"
302302
:label="item.label"
303303
:value="item.value"
304304
:disabled="item.disabled">
305305
</el-option>
306306
</el-select>`,
307307
clearable: `
308-
<el-select size="medium" clearable v-model="value" placeholder="请选择">
308+
<el-select size="medium" clearable v-model="value3" placeholder="请选择">
309309
<el-option
310310
v-for="item in options"
311311
:key="item.value"
@@ -315,7 +315,7 @@ export default {
315315
</el-option>
316316
</el-select>`,
317317
multiple: `
318-
<el-select size="medium" multiple v-model="value" placeholder="请选择">
318+
<el-select size="medium" multiple v-model="value4" placeholder="请选择">
319319
<el-option
320320
v-for="item in options"
321321
:key="item.value"
@@ -325,7 +325,7 @@ export default {
325325
</el-option>
326326
</el-select>`,
327327
template: `
328-
<el-select v-model="value" placeholder="请选择">
328+
<el-select v-model="value5" placeholder="请选择">
329329
<el-option
330330
v-for="item in cities"
331331
:key="item.value"
@@ -336,7 +336,7 @@ export default {
336336
</el-option>
337337
</el-select>`,
338338
group: `
339-
<el-select v-model="value" placeholder="请选择">
339+
<el-select v-model="value6" placeholder="请选择">
340340
<el-option-group v-for="group in options" :key="group.label" :label="group.label">
341341
<el-option
342342
v-for="item in group.options"
@@ -347,7 +347,7 @@ export default {
347347
</el-option-group>
348348
</el-select>`,
349349
filterable: `
350-
<el-select size="medium" filterable v-model="value" placeholder="请选择">
350+
<el-select size="medium" filterable v-model="value7" placeholder="请选择">
351351
<el-option
352352
v-for="item in options"
353353
:key="item.value"
@@ -357,7 +357,7 @@ export default {
357357
</el-select>`,
358358
create: `
359359
<el-select
360-
v-model="value"
360+
v-model="value8"
361361
multiple
362362
filterable
363363
allow-create

‎src/plugins/LinCmsUi/views/rate/Rate.vue

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
<template>
2+
<div class="lin-container">
3+
<div class="lin-title">Rate 评分</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 class="block">
11+
<span class="demonstration">默认不区分颜色</span>
12+
<el-rate v-model="value1" :colors="colors1" :max="6"></el-rate>
13+
</div>
14+
<div class="block">
15+
<span class="demonstration">区分颜色</span>
16+
<el-rate v-model="value2" :colors="colors2"></el-rate>
17+
</div>
18+
</el-row>
19+
20+
<el-collapse>
21+
<el-collapse-item title="查看代码" name="2">
22+
<div style="white-space: pre-wrap;">{{base}}</div>
23+
</el-collapse-item>
24+
</el-collapse>
25+
</el-card>
26+
27+
<el-card style="margin-bottom:50px;">
28+
<div slot="header">
29+
<span>辅助文字</span>
30+
</div>
31+
<el-row>
32+
<el-rate
33+
v-model="value3"
34+
show-text
35+
:texts="texts"
36+
:colors="colors3">
37+
</el-rate>
38+
</el-row>
39+
40+
<el-collapse>
41+
<el-collapse-item title="查看代码" name="2">
42+
<div style="white-space: pre-wrap;">{{withText}}</div>
43+
</el-collapse-item>
44+
</el-collapse>
45+
</el-card>
46+
47+
<el-card style="margin-bottom:50px;">
48+
<div slot="header">
49+
<span>只读</span>
50+
</div>
51+
<el-row>
52+
<el-rate
53+
v-model="value4"
54+
disabled
55+
show-score
56+
text-color="#ff9900"
57+
score-template="{value}分">
58+
</el-rate>
59+
</el-row>
60+
61+
<el-collapse>
62+
<el-collapse-item title="查看代码" name="2">
63+
<div style="white-space: pre-wrap;">{{disabled}}</div>
64+
</el-collapse-item>
65+
</el-collapse>
66+
</el-card>
67+
</div>
68+
</div>
69+
</template>
70+
71+
<script>
72+
export default {
73+
data() {
74+
return {
75+
value1: null,
76+
value2: null,
77+
value3: null,
78+
value4: 3.7,
79+
colors1: { 6: '#FFBE4D' },
80+
colors2: { 2: '#8C98AE', 4: { value: '#FFDD55', excluded: true }, 5: '#FFBE4D' },
81+
colors3: { 5: '#FFDD55' },
82+
texts: ['极差', '失望', '一般', '满意', '惊喜'],
83+
iconClasses: { 2: 'icon-rate-face-1', 4: { value: 'icon-rate-face-2', excluded: true }, 5: 'icon-rate-face-3' },
84+
base: `
85+
<el-rate v-model="value1" :colors="colors1" :max="6"></el-rate>
86+
<el-rate v-model="value2" :colors="colors2"></el-rate>`,
87+
withText: `
88+
<el-rate v-model="value3" show-text :texts="texts" :colors="colors3">
89+
</el-rate>`,
90+
disabled: `
91+
<el-rate
92+
v-model="value4"
93+
disabled
94+
show-score
95+
text-color="#ff9900"
96+
score-template="{value}分">
97+
</el-rate>`,
98+
}
99+
},
100+
components: {
101+
102+
},
103+
}
104+
</script>
105+
106+
<style lang="scss" scoped>
107+
@import '../../assets/style/container.scss';
108+
109+
.block {
110+
padding: 30px 0;
111+
text-align: center;
112+
border-right: 1px solid #eff2f6;
113+
display: inline-block;
114+
width: 49%;
115+
box-sizing: border-box;
116+
117+
&:last-child {
118+
border-right: none;
119+
}
120+
}
121+
122+
.demonstration {
123+
display: block;
124+
color: #8492a6;
125+
font-size: 14px;
126+
margin-bottom: 20px;
127+
}
128+
</style>

‎src/plugins/LinCmsUi/views/switch/Switch.vue

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
<template>
2+
<div class="lin-container">
3+
<div class="lin-title">Switch 开关</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+
<el-switch v-model="value2" active-color="#3963bc" style="margin-right:20px">
11+
</el-switch>
12+
<el-switch v-model="value1" active-color="#00C292" inactive-color="#E46A76">
13+
</el-switch>
14+
</el-row>
15+
16+
<el-collapse>
17+
<el-collapse-item title="查看代码" name="2">
18+
<div style="white-space: pre-wrap;">{{base}}</div>
19+
</el-collapse-item>
20+
</el-collapse>
21+
</el-card>
22+
23+
<el-card style="margin-bottom:50px;">
24+
<div slot="header">
25+
<span>文字描述</span>
26+
</div>
27+
<el-row>
28+
<el-switch
29+
v-model="value3"
30+
active-color="#00C292"
31+
inactive-color="#E46A76"
32+
active-text="按月付费"
33+
inactive-text="按年付费">
34+
</el-switch>
35+
</el-row>
36+
37+
<el-collapse>
38+
<el-collapse-item title="查看代码" name="2">
39+
<div style="white-space: pre-wrap;">{{withText}}</div>
40+
</el-collapse-item>
41+
</el-collapse>
42+
</el-card>
43+
44+
<el-card style="margin-bottom:50px;">
45+
<div slot="header">
46+
<span>扩展的 value 类型</span>
47+
</div>
48+
<el-row>
49+
<el-tooltip :content="'Switch value: ' + value4" placement="top">
50+
<el-switch
51+
v-model="value5"
52+
active-color="#00C292"
53+
inactive-color="#E46A76"
54+
active-value="100"
55+
inactive-value="0">
56+
</el-switch>
57+
</el-tooltip>
58+
</el-row>
59+
60+
<el-collapse>
61+
<el-collapse-item title="查看代码" name="2">
62+
<div style="white-space: pre-wrap;">{{extendValue}}</div>
63+
</el-collapse-item>
64+
</el-collapse>
65+
</el-card>
66+
67+
<el-card style="margin-bottom:50px;">
68+
<div slot="header">
69+
<span>禁用</span>
70+
</div>
71+
<el-row>
72+
<el-switch v-model="value6" active-color="#3963bc" disabled style="margin-right:20px">
73+
</el-switch>
74+
<el-switch v-model="value7" active-color="#3963bc" disabled>
75+
</el-switch>
76+
</el-row>
77+
78+
<el-collapse>
79+
<el-collapse-item title="查看代码" name="2">
80+
<div style="white-space: pre-wrap;">{{forbidden}}</div>
81+
</el-collapse-item>
82+
</el-collapse>
83+
</el-card>
84+
</div>
85+
</div>
86+
</template>
87+
88+
<script>
89+
export default {
90+
data() {
91+
return {
92+
value1: true,
93+
value2: true,
94+
value3: true,
95+
value4: 100,
96+
value5: true,
97+
value6: true,
98+
value7: false,
99+
base: `
100+
<el-switch v-model="value2" active-color="#3963bc">
101+
</el-switch>
102+
<el-switch v-model="value1" active-color="#00C292" inactive-color="#E46A76">
103+
</el-switch>`,
104+
withText: `
105+
<el-switch
106+
v-model="value3"
107+
active-color="#00C292"
108+
inactive-color="#E46A76"
109+
active-text="按月付费"
110+
inactive-text="按年付费">
111+
</el-switch>`,
112+
extendValue: `
113+
<el-tooltip :content="'Switch value: ' + value4" placement="top">
114+
<el-switch
115+
v-model="value5"
116+
active-color="#00C292"
117+
inactive-color="#E46A76"
118+
active-value="100"
119+
inactive-value="0">
120+
</el-switch>
121+
</el-tooltip>`,
122+
forbidden: `
123+
<el-switch v-model="value6" active-color="#3963bc" disabled>
124+
</el-switch>`,
125+
}
126+
},
127+
components: {
128+
129+
},
130+
}
131+
</script>
132+
133+
<style lang="scss" scoped>
134+
@import '../../assets/style/container.scss'
135+
</style>

0 commit comments

Comments
 (0)