Skip to content

Commit bbeff3c

Browse files
kagolgitee-org
authored andcommitted
!13 feat: 给左侧组件导航增加已完成的标识
Merge pull request !13 from kagol/kagol/add-done
2 parents c7c7f35 + 4bd1054 commit bbeff3c

File tree

27 files changed

+423
-391
lines changed

27 files changed

+423
-391
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ node_modules
33
dist
44
dist-ssr
55
*.local
6+
package-lock.json

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ npm run build
6969
- Jest 单元测试环境搭建
7070
- Radio
7171
- CheckBox
72-
- Toggle
72+
- Switch
7373
- TagsInput
7474
- TextInput
7575

devui/accordion/accordion-list.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { defineComponent } from 'vue'
22
import { AccordionMenuItem } from './accordion.type'
33

44
export default defineComponent({
5-
name: 'd-accordion-list',
5+
name: 'DAccordionList',
66
inheritAttrs: false,
77
props: {
88
data: Array as () => Array<AccordionMenuItem>,
@@ -14,11 +14,9 @@ export default defineComponent({
1414
innerListTemplate: Boolean,
1515
},
1616
setup(props, ctx) {
17-
const { data, deepth, innerListTemplate } = props;
18-
1917
return () => {
20-
return (!innerListTemplate || deepth === 0) && <ul class="devui-accordion-list" {...ctx.attrs}>
21-
{ data.map(item => {
18+
return (!props.innerListTemplate || props.deepth === 0) && <ul class="devui-accordion-list" {...ctx.attrs}>
19+
{ props.data.map(item => {
2220
return <li class="devui-accordion-item" key={item.title}>
2321
{
2422
// TODO 菜单类型 d-accordion-menu
@@ -39,6 +37,7 @@ export default defineComponent({
3937
<router-link to={component.link}>
4038
<div class="devui-accordion-splitter" style="left: 30px;"></div>
4139
{ component.title }
40+
{ component.done && <span class="tag-done">已完成</span> }
4241
</router-link>
4342
</div>
4443
</li>

devui/accordion/accordion.scss

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@import '../style/mixins/index';
22
@import '../style/theme/color';
3+
@import '../style/theme/font';
34
@import '../style/theme/shadow';
45
@import '../style/theme/corner';
56

@@ -246,8 +247,24 @@ d-accordion-item-routerlink {
246247

247248
.devui-accordion-item > a {
248249
padding: 0 10px 0 20px;
249-
color: var(--devui-text-weak,#575d6c);
250+
color: var(--devui-text-weak, #575d6c);
250251
display: block;
251252
text-decoration: none;
252253
width: 100%;
253-
}
254+
}
255+
256+
.devui-accordion-item-title .tag-done {
257+
display: inline-block;
258+
height: 18px;
259+
min-height: 20px;
260+
padding: 0 10px;
261+
margin-left: 8px;
262+
line-height: 18px;
263+
color: #fa9841;
264+
border: solid 1px #fa9841;
265+
background: $devui-base-bg;
266+
font-size: $devui-font-size;
267+
border-radius: $devui-border-radius;
268+
text-indent: 0;
269+
cursor: default;
270+
}

devui/avatar/avatar.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
@import '../style/theme/color';
22

33
.devui-avatar-style {
4-
display: inline-block;
5-
text-align: center;
6-
color: $devui-light-text;
4+
display: inline-block;
5+
text-align: center;
6+
color: $devui-light-text;
77
}
88

99
.devui-avatar-background-0 {
10-
background-color: #ff8b87;
10+
background-color: #ff8b87;
1111
}
1212

1313
.devui-avatar-background-1 {
14-
background-color: #7693f5;
15-
}
14+
background-color: #7693f5;
15+
}

devui/avatar/demo/avatar-demo.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.devui-avatar {
2-
margin: 8px;
3-
}
2+
margin: 8px;
3+
}

devui/button/button.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,4 +387,4 @@ $devui-btn-pseudo-config: (
387387

388388
.clear-right-5 {
389389
margin-right: 5px;
390-
}
390+
}

0 commit comments

Comments
 (0)