Skip to content

Commit 00a022b

Browse files
chore(release): release 9.1.0 (#55)
Co-authored-by: huaweidevcloud <[email protected]>
1 parent 7dfd431 commit 00a022b

File tree

363 files changed

+11229
-2123
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

363 files changed

+11229
-2123
lines changed

devui/accordion/AccordionBaseComponent.ts

Lines changed: 0 additions & 25 deletions
This file was deleted.
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1-
<d-accordion-list class="devui-accordion-menu devui-scrollbar" [data]="data" [deepth]="0" [parent]="null"> </d-accordion-list>
1+
<d-accordion-list
2+
class="devui-accordion-menu devui-scrollbar"
3+
[ngClass]="{ 'devui-accordion-menu-normal': accordionType === 'normal' }"
4+
[data]="data"
5+
[deepth]="0"
6+
[parent]="null"
7+
>
8+
</d-accordion-list>

devui/accordion/accordion.component.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,15 @@
1717
:host ::ng-deep .devui-accordion-menu {
1818
display: block;
1919
background: $bg-white;
20-
box-shadow: 0 2px 4px 0 $dark-1-boxshadow;
2120
width: 100%;
2221
overflow-y: auto;
2322
border-radius: 2px;
2423
height: 100%;
2524

25+
&.devui-accordion-menu-normal {
26+
box-shadow: 0 2px 4px 0 $dark-1-boxshadow;
27+
}
28+
2629
& > .devui-accordion-list {
2730
padding: 10px 0;
2831
}

devui/accordion/accordion.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ export class AccordionComponent implements AccordionOptions, OnChanges, OnInit,
4141
@Input() linkTargetKey = 'target'; // 链接目标窗口的key
4242
@Input() linkDefaultTarget = '_self'; // 不设置target的时候target默认值
4343

44+
@Input() accordionType: 'normal' | 'embed' = 'normal';
45+
4446
activeItem; // 记录用户点击的激活菜单项
4547
i18nCommonText: I18nInterface['common'];
4648
i18nSubscription: Subscription;

devui/accordion/demo/basic/basic.component.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,8 @@
44
[restrictOneOpen]="restrictOneOpen"
55
(itemClick)="itemClick($event)"
66
(menuToggle)="menuToggle($event)"
7+
(activeItemChange)="log($event)"
8+
[accordionType]="accordionTypeEmbed ? 'embed' : 'normal'"
79
></d-accordion>
810
<div class="option"><d-toggle [(ngModel)]="restrictOneOpen"></d-toggle> 限制只能展开一个一级菜单</div>
11+
<div class="option"><d-toggle [(ngModel)]="accordionTypeEmbed"></d-toggle> 内嵌菜单形式(无阴影)</div>

devui/accordion/demo/basic/basic.component.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { Component } from '@angular/core';
77
})
88
export class BasicComponent {
99
restrictOneOpen = false;
10+
accordionTypeEmbed = false;
1011
menu = [{
1112
title: '内容一',
1213
children: [
@@ -63,5 +64,8 @@ export class BasicComponent {
6364
}, 1000);
6465
}
6566
}
67+
log(...v) {
68+
console.log(...v);
69+
}
6670

6771
}

devui/accordion/demo/link/link.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</div>
55
<div class="menu-wrapper">
66
<div>原生超链接(涉及跨站场景使用)</div>
7-
<d-accordion [data]="menu2" class="menu" [linkType]="'hrefLink'"></d-accordion>
7+
<d-accordion [data]="menu2" class="menu" [linkType]="'hrefLink'" [linkDefaultTarget]="'_self'"></d-accordion>
88
</div>
99
<div class="menu-wrapper">
1010
<div>混合链接(部分涉及跨站场景使用)</div>

devui/accordion/doc/api.md

Lines changed: 26 additions & 25 deletions
Large diffs are not rendered by default.

devui/alert/alert.component.html

Lines changed: 6 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,18 @@
2525
version="1.1"
2626
xmlns="http://www.w3.org/2000/svg"
2727
xmlns:xlink="http://www.w3.org/1999/xlink"
28-
*ngIf="type === 'success'"
29-
class="devui-icon devui-icon-success"
28+
class="devui-icon"
29+
[ngClass]="type === 'danger'? 'devui-icon-error': 'devui-icon-' + type"
3030
>
31-
<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
31+
<g *ngIf="type === 'success'" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
3232
<path fill-rule="nonzero" d="M8,0 C3.6,0 0,3.6 0,8 C0,12.4 3.6,16 8,16 C12.4,16 16,12.4 16,8 C16,3.6 12.4,0 8,0 Z"></path>
3333
<polygon
3434
stroke-width="0.3"
3535
fill-rule="nonzero"
3636
points="6.82767602 11.5282799 3 7.24668779 3.89864233 6.37912367 6.82767602 9.04910002 12.2964408 4 13 4.64144383"
3737
></polygon>
3838
</g>
39-
</svg>
40-
<svg
41-
width="16px"
42-
height="16px"
43-
viewBox="0 0 16 16"
44-
version="1.1"
45-
xmlns="http://www.w3.org/2000/svg"
46-
xmlns:xlink="http://www.w3.org/1999/xlink"
47-
*ngIf="type === 'warning'"
48-
class="devui-icon devui-icon-warning"
49-
>
50-
<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
39+
<g *ngIf="type === 'warning'" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
5140
<path
5241
class="devui-icon-warning-outer"
5342
d="M8.96244623,0.57254229 L15.8714442,13.4101975 C16.1549662,13.9370117 15.9538562,14.5918482 15.4222523,14.8728158 C15.2642579,14.9563203 15.0879506,15 14.9088903,15 L1.09089441,15 C0.488410063,15 0,14.5159904 0,13.9189343 C0,13.7414873 0.0440768395,13.5667684 0.128340519,13.4101975 L7.03733844,0.57254229 C7.32086049,0.0457280838 7.98165058,-0.153569987 8.51325441,0.127397589 C8.70423071,0.228333932 8.8605922,0.383286648 8.96244623,0.57254229 Z"
@@ -59,18 +48,7 @@
5948
d="M8.87894737,13 L7.08947368,13 L7.08947368,11.2105263 L8.87894737,11.2105263 L8.87894737,13 Z M8.62102372,9.86842105 L7.32800539,9.86842105 L7,4.5 L8.96842105,4.5 L8.62102372,9.86842105 Z"
6049
></path>
6150
</g>
62-
</svg>
63-
<svg
64-
width="16px"
65-
height="16px"
66-
viewBox="0 0 16 16"
67-
version="1.1"
68-
xmlns="http://www.w3.org/2000/svg"
69-
xmlns:xlink="http://www.w3.org/1999/xlink"
70-
*ngIf="type === 'info'"
71-
class="devui-icon devui-icon-info"
72-
>
73-
<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
51+
<g *ngIf="type === 'info'" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
7452
<g fill-rule="nonzero">
7553
<path
7654
class="devui-icon-info-outer"
@@ -83,18 +61,7 @@
8361
></path>
8462
</g>
8563
</g>
86-
</svg>
87-
<svg
88-
width="16px"
89-
height="16px"
90-
viewBox="0 0 16 16"
91-
version="1.1"
92-
xmlns="http://www.w3.org/2000/svg"
93-
xmlns:xlink="http://www.w3.org/1999/xlink"
94-
*ngIf="type === 'danger'"
95-
class="devui-icon devui-icon-error"
96-
>
97-
<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
64+
<g *ngIf="type === 'danger'" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
9865
<g fill-rule="nonzero">
9966
<path
10067
class="devui-icon-error-outer"

devui/alert/alert.component.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ export class AlertComponent {
2626

2727
hide = false;
2828

29-
constructor() {
30-
}
31-
3229
close() {
3330
this.closeEvent.emit(this);
3431
this.hide = true;

0 commit comments

Comments
 (0)