Skip to content

Commit 1c17f09

Browse files
chore(release): release 11.4.0 (#125)
Co-authored-by: huaweidevcloud <devcloudmobile@huawei.com>
1 parent cc77ca4 commit 1c17f09

File tree

358 files changed

+7533
-1320
lines changed

Some content is hidden

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

358 files changed

+7533
-1320
lines changed

angular.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
"assets": [
3232
"src/favicon.ico",
3333
"src/assets",
34-
"src/assets/i18n"
34+
"src/assets/i18n",
35+
"src/assets/overview/**/*"
3536
],
3637
"styles": [
3738
"node_modules/highlight.js/styles/an-old-hope.css",

devui-commons/src/sidebar/sidebar.component.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@
1414
</li>
1515
</ul>
1616
<nav class="sidebar-nav">
17-
<d-accordion [data]="componentsDataDisplay" [linkType]="linkType"></d-accordion>
17+
<d-accordion [data]="componentsDataDisplay" [linkType]="linkType" [itemTemplate]="itemtemplate"></d-accordion>
18+
19+
<ng-template #itemtemplate let-item="item">
20+
{{ item.title }}
21+
<d-tag *ngIf="item.newChange" [tag]="text.new" [labelStyle]="'orange-w98'"></d-tag>
22+
<d-tag *ngIf="item.sunset" [tag]="text.sunset" [labelStyle]="'yellow-w98'"></d-tag>
23+
</ng-template>
1824
</nav>
1925
</div>

devui-commons/src/sidebar/sidebar.component.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,12 @@
7474

7575
d-accordion ::ng-deep .devui-accordion-menu {
7676
box-shadow: none !important;
77+
}
78+
79+
d-tag {
80+
text-indent: 0;
81+
82+
& + d-tag {
83+
margin-left: 4px;
84+
}
7785
}

devui-commons/src/sidebar/sidebar.component.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ import { DevuiCommonsService } from '../devui-commons.service';
1010
export class SidebarComponent implements OnInit {
1111
@Input() sideMenuList;
1212
@Input() linkType = 'routerLink';
13+
@Input() text = {
14+
new: 'New',
15+
sunset: 'Sunset'
16+
};
1317
_navData;
1418
componentsDataDisplay;
1519

devui/alert/alert.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</g>
1818
</svg>
1919
</button>
20-
<span class="devui-alert-icon" *ngIf="showIcon !== false">
20+
<span class="devui-alert-icon" *ngIf="showIcon !== false && type !== 'simple'">
2121
<svg
2222
width="16px"
2323
height="16px"

devui/alert/alert.component.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,17 @@
8282
}
8383
}
8484

85+
&.devui-alert-simple {
86+
border-color: $devui-line;
87+
color: $devui-text;
88+
89+
button.devui-close {
90+
& > svg path {
91+
fill: $devui-text-weak;
92+
}
93+
}
94+
}
95+
8596
svg.devui-icon {
8697
width: 16px;
8798
height: 16px;

devui/alert/alert.types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export type AlertType = 'success' | 'danger' | 'warning' | 'info';
1+
export type AlertType = 'success' | 'danger' | 'warning' | 'info' | 'simple';

devui/alert/demo/basic/basic.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
<d-alert [type]="'danger'" [closeable]="false"> danger </d-alert>
33
<d-alert [type]="'warning'" [closeable]="false"> warning </d-alert>
44
<d-alert [type]="'info'" [closeable]="false"> info </d-alert>
5+
<d-alert [type]="'simple'" [closeable]="false"> simple </d-alert>

devui/alert/demo/close/close.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
<d-alert [type]="'danger'" (closeEvent)="handleClose($event)"> danger </d-alert>
33
<d-alert [type]="'warning'" (closeEvent)="handleClose($event)"> warning </d-alert>
44
<d-alert [type]="'info'" (closeEvent)="handleClose($event)"> info </d-alert>
5+
<d-alert [type]="'simple'" (closeEvent)="handleClose($event)"> simple </d-alert>

devui/alert/demo/withoutIcon/withoutIcon.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
<d-alert [type]="'danger'" [showIcon]="false"> danger</d-alert>
33
<d-alert [type]="'warning'" [showIcon]="false"> warning</d-alert>
44
<d-alert [type]="'info'" [showIcon]="false"> info</d-alert>
5+
<d-alert [type]="'simple'" [showIcon]="false"> simple</d-alert>

0 commit comments

Comments
 (0)