Skip to content

Commit

Permalink
chore(release): release 11.4.0 (#125)
Browse files Browse the repository at this point in the history
Co-authored-by: huaweidevcloud <devcloudmobile@huawei.com>
  • Loading branch information
wangyaju and huaweidevcloud authored Jul 12, 2021
1 parent cc77ca4 commit 1c17f09
Show file tree
Hide file tree
Showing 358 changed files with 7,533 additions and 1,320 deletions.
3 changes: 2 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
"assets": [
"src/favicon.ico",
"src/assets",
"src/assets/i18n"
"src/assets/i18n",
"src/assets/overview/**/*"
],
"styles": [
"node_modules/highlight.js/styles/an-old-hope.css",
Expand Down
8 changes: 7 additions & 1 deletion devui-commons/src/sidebar/sidebar.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
</li>
</ul>
<nav class="sidebar-nav">
<d-accordion [data]="componentsDataDisplay" [linkType]="linkType"></d-accordion>
<d-accordion [data]="componentsDataDisplay" [linkType]="linkType" [itemTemplate]="itemtemplate"></d-accordion>

<ng-template #itemtemplate let-item="item">
{{ item.title }}
<d-tag *ngIf="item.newChange" [tag]="text.new" [labelStyle]="'orange-w98'"></d-tag>
<d-tag *ngIf="item.sunset" [tag]="text.sunset" [labelStyle]="'yellow-w98'"></d-tag>
</ng-template>
</nav>
</div>
8 changes: 8 additions & 0 deletions devui-commons/src/sidebar/sidebar.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,12 @@

d-accordion ::ng-deep .devui-accordion-menu {
box-shadow: none !important;
}

d-tag {
text-indent: 0;

& + d-tag {
margin-left: 4px;
}
}
4 changes: 4 additions & 0 deletions devui-commons/src/sidebar/sidebar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ import { DevuiCommonsService } from '../devui-commons.service';
export class SidebarComponent implements OnInit {
@Input() sideMenuList;
@Input() linkType = 'routerLink';
@Input() text = {
new: 'New',
sunset: 'Sunset'
};
_navData;
componentsDataDisplay;

Expand Down
2 changes: 1 addition & 1 deletion devui/alert/alert.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</g>
</svg>
</button>
<span class="devui-alert-icon" *ngIf="showIcon !== false">
<span class="devui-alert-icon" *ngIf="showIcon !== false && type !== 'simple'">
<svg
width="16px"
height="16px"
Expand Down
11 changes: 11 additions & 0 deletions devui/alert/alert.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,17 @@
}
}

&.devui-alert-simple {
border-color: $devui-line;
color: $devui-text;

button.devui-close {
& > svg path {
fill: $devui-text-weak;
}
}
}

svg.devui-icon {
width: 16px;
height: 16px;
Expand Down
2 changes: 1 addition & 1 deletion devui/alert/alert.types.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export type AlertType = 'success' | 'danger' | 'warning' | 'info';
export type AlertType = 'success' | 'danger' | 'warning' | 'info' | 'simple';
1 change: 1 addition & 0 deletions devui/alert/demo/basic/basic.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
<d-alert [type]="'danger'" [closeable]="false"> danger </d-alert>
<d-alert [type]="'warning'" [closeable]="false"> warning </d-alert>
<d-alert [type]="'info'" [closeable]="false"> info </d-alert>
<d-alert [type]="'simple'" [closeable]="false"> simple </d-alert>
1 change: 1 addition & 0 deletions devui/alert/demo/close/close.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
<d-alert [type]="'danger'" (closeEvent)="handleClose($event)"> danger </d-alert>
<d-alert [type]="'warning'" (closeEvent)="handleClose($event)"> warning </d-alert>
<d-alert [type]="'info'" (closeEvent)="handleClose($event)"> info </d-alert>
<d-alert [type]="'simple'" (closeEvent)="handleClose($event)"> simple </d-alert>
1 change: 1 addition & 0 deletions devui/alert/demo/withoutIcon/withoutIcon.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
<d-alert [type]="'danger'" [showIcon]="false"> danger</d-alert>
<d-alert [type]="'warning'" [showIcon]="false"> warning</d-alert>
<d-alert [type]="'info'" [showIcon]="false"> info</d-alert>
<d-alert [type]="'simple'" [showIcon]="false"> simple</d-alert>
2 changes: 1 addition & 1 deletion devui/alert/doc/api-cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ import { AlertModule } from 'ng-devui/alert';
默认值为'info', 指定alert警告提示的类型

```ts
export type AlertType = 'success' | 'danger' | 'warning' | 'info';
export type AlertType = 'success' | 'danger' | 'warning' | 'info' | 'simple';
```
2 changes: 1 addition & 1 deletion devui/alert/doc/api-en.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ In the page:
The default value is 'info', which specifies the type of alert warning.

```ts
export type AlertType = 'success' | 'danger' | 'warning' | 'info';
export type AlertType = 'success' | 'danger' | 'warning' | 'info' | 'simple';
```
3 changes: 3 additions & 0 deletions devui/anchor/anchor-link.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ export class AnchorLinkDirective implements OnInit, OnDestroy {

@HostListener('click')
scrollToAnchor(activeChangeBy?: AnchorActiveChangeSource) {
if (typeof document === 'undefined') {
return;
}
if (!this.anchorBlock) {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion devui/anchor/anchor.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export class AnchorDirective implements AfterViewInit, OnDestroy {
if (this.scrollListenTarget) {
return;
}
if (this.boxElement) {
if (this.boxElement && typeof window !== 'undefined') {
this.scrollListenTarget = this.boxElement.scrollTarget || window; // window有scroll事件,document.documentElement没有scroll事件
}
this.scrollListenTarget.addEventListener('scroll', this.throttle, { passive: true });
Expand Down
8 changes: 4 additions & 4 deletions devui/anchor/demo/async/async.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@
</div>
<div class="mycontent" *ngIf="loadContent">
<div [dAnchor]="'base-info'" class="section-block">
<h3>Basic Infomation</h3>
<h3 class="devui-h3-title">Basic Infomation</h3>
Show basic infomation here.
</div>
<div [dAnchor]="'issue-list'" class="section-block">
<h3>Demand List</h3>
<h3 class="devui-h3-title">Demand List</h3>
Show demand list here.
</div>
<div [dAnchor]="'case-list'" class="section-block">
<h3>Case List</h3>
<h3 class="devui-h3-title">Case List</h3>
Show case list here.
</div>
<div [dAnchor]="'quarlity-result'" class="section-block">
<h3>Quality Assessment</h3>
<h3 class="devui-h3-title">Quality Assessment</h3>
Show quality assessment here.
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions devui/anchor/demo/basic/basic.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@
</div>
<div class="mycontent">
<div [dAnchor]="'base-info'" class="section-block">
<h3>Basic Infomation</h3>
<h3 class="devui-h3-title">Basic Infomation</h3>
Show basic infomation here.
</div>
<div [dAnchor]="'issue-list'" class="section-block">
<h3>Demand List</h3>
<h3 class="devui-h3-title">Demand List</h3>
Show demand list here.
</div>
<div [dAnchor]="'case-list'" class="section-block">
<h3>Case List</h3>
<h3 class="devui-h3-title">Case List</h3>
Show case list here.
</div>
<div [dAnchor]="'quarlity-result'" class="section-block">
<h3>Quality Assessment</h3>
<h3 class="devui-h3-title">Quality Assessment</h3>
Show quality assessment here.
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions devui/anchor/demo/hash/hash.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@
</div>
<div class="mycontent">
<div [dAnchor]="'base-info'" class="section-block">
<h3>Basic Infomation</h3>
<h3 class="devui-h3-title">Basic Infomation</h3>
Show basic infomation here.
</div>
<div [dAnchor]="'issue-list'" class="section-block">
<h3>Demand List</h3>
<h3 class="devui-h3-title">Demand List</h3>
Show demand list here.
</div>
<div [dAnchor]="'case-list'" class="section-block">
<h3>Case List</h3>
<h3 class="devui-h3-title">Case List</h3>
Show case list here.
</div>
<div [dAnchor]="'quality-result'" class="section-block" id="quality_result">
<h3>Quality Assessment</h3>
<h3 class="devui-h3-title">Quality Assessment</h3>
Show quality assessment here.
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions devui/anchor/demo/scroll-target/scroll-target.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@
</div>
<div class="mycontent">
<div [dAnchor]="'base-info'" class="section-block">
<h3>Basic Infomation</h3>
<h3 class="devui-h3-title">Basic Infomation</h3>
Show basic infomation here.
</div>
<div [dAnchor]="'issue-list'" class="section-block">
<h3>Demand List</h3>
<h3 class="devui-h3-title">Demand List</h3>
Show demand list here.
</div>
<div [dAnchor]="'case-list'" class="section-block">
<h3>Case List</h3>
<h3 class="devui-h3-title">Case List</h3>
Show case list here.
</div>
<div [dAnchor]="'quality-result'" class="section-block">
<h3>Quality Assessment</h3>
<h3 class="devui-h3-title">Quality Assessment</h3>
Show quality assessment here.
</div>
</div>
Expand Down
14 changes: 9 additions & 5 deletions devui/back-top/back-top.component.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { DOCUMENT } from '@angular/common';
import {
ChangeDetectionStrategy, ChangeDetectorRef, Component,
ElementRef, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, TemplateRef
ElementRef, EventEmitter, Inject, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, TemplateRef
} from '@angular/core';
import { fromEvent, Subscription } from 'rxjs';
import { debounceTime } from 'rxjs/operators';
Expand All @@ -25,7 +26,10 @@ export class BackTopComponent implements OnInit, OnChanges, OnDestroy {
SCROLL_REFRESH_INTERVAL = 100;
target: HTMLElement | Window;
subs: Subscription = new Subscription();
constructor(private cdr: ChangeDetectorRef, private el: ElementRef) {}
document: Document;
constructor(private cdr: ChangeDetectorRef, private el: ElementRef, @Inject(DOCUMENT) private doc: any) {
this.document = this.doc;
}

ngOnInit() {
this.addScrollEvent();
Expand Down Expand Up @@ -64,16 +68,16 @@ export class BackTopComponent implements OnInit, OnChanges, OnDestroy {

showButton() {
this.currScrollTop = this.target === window ?
(window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop) : this.scrollTarget.scrollTop;
(window.pageYOffset || this.document.documentElement.scrollTop || this.document.body.scrollTop) : this.scrollTarget.scrollTop;
if (this.isVisible !== (this.currScrollTop >= this.visibleHeight)) {
this.isVisible = !this.isVisible;
}
}

goTop() {
if (this.target === window) {
document.documentElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'nearest' });
document.body.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'nearest' });
this.document.documentElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'nearest' });
this.document.body.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'nearest' });
} else {
this.scrollTarget.style.scrollBehavior = 'smooth';
this.scrollTarget.scrollTop = 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { DOCUMENT } from '@angular/common';
import { Component, Inject, OnInit } from '@angular/core';

@Component({
selector: 'd-back-top-scroll-container',
Expand All @@ -10,13 +11,13 @@ export class ScrollContainerComponent implements OnInit {
scrollElement;
list = [];
sentence = 'You know some birds are not meant to be caged, their feathers are just too bright.';
constructor() {}
constructor(@Inject(DOCUMENT) private doc: any) {}

ngOnInit() {
for (let i = 0; i < 20; i++) {
this.list.push(this.sentence);
}
this.scrollElement = document.querySelector('.devui-scroll-content');
this.scrollElement = this.doc.querySelector('.devui-scroll-content');
}

backTop(event) {
Expand Down
2 changes: 1 addition & 1 deletion devui/button/button.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ $devui-btn-pseudo-config: (
&.devui-btn-danger {
border-color: $devui-danger;
color: $devui-danger;
background-color: $devui-block;
background-color: $devui-danger;
}
}

Expand Down
5 changes: 3 additions & 2 deletions devui/button/button.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
Input,
Output,
TemplateRef,
ViewChild,
ViewChild
} from '@angular/core';
export type IButtonType = 'button' | 'submit' | 'reset';
export type IButtonStyle = 'common' | 'primary' | 'text' | 'text-dark' | 'danger';
Expand Down Expand Up @@ -47,7 +47,8 @@ export class ButtonComponent implements AfterContentChecked {
}
}

constructor(private cd: ChangeDetectorRef) {}
constructor(private cd: ChangeDetectorRef) {
}

// 新增click事件,解决直接在host上使用click,在disabled状态下还能触发事件
onClick(event) {
Expand Down
2 changes: 1 addition & 1 deletion devui/button/demo/autofocus/autofocus.component.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<d-button bsStyle="primary" bordered="true" [autofocus]="true" style="margin-right: 4px"> Confirm </d-button>
<d-button bsStyle="primary" bordered="true" [autofocus]="true" style="margin-right: 8px"> Confirm </d-button>
<d-button bsStyle="common"> Cancel </d-button>
2 changes: 1 addition & 1 deletion devui/button/demo/combination/combination.component.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
d-button:not(:last-child) {
margin-right: 4px;
margin-right: 8px;
}
2 changes: 1 addition & 1 deletion devui/button/demo/common/common.component.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<d-button bsStyle="common" style="margin-right: 4px">Common</d-button> <d-button bsStyle="common" [disabled]="true">Disabled</d-button>
<d-button bsStyle="common" style="margin-right: 8px">Common</d-button> <d-button bsStyle="common" [disabled]="true">Disabled</d-button>
6 changes: 3 additions & 3 deletions devui/button/demo/groups/groups.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</d-button-group>
<d-button-group size="sm">
<d-button bsStyle="primary">Left</d-button>
<d-button bsStyle="primary">Middle</d-button>
<d-button bsStyle="primary">Right</d-button>
<d-button bsStyle="common">Middle</d-button>
<d-button bsStyle="common">Right</d-button>
</d-button-group>
<d-button-group>
<d-button bsStyle="primary" icon="icon-filter">Filter</d-button>
Expand All @@ -21,7 +21,7 @@
<div class="btn-group">
<d-button-group size="">
<d-button bsStyle="primary" icon="icon-add">New</d-button>
<d-button bsStyle="primary">Delete</d-button>
<d-button bsStyle="common">Delete</d-button>
<div dDropDown [closeScope]="'blank'">
<d-button bsStyle="common" dDropDownToggle class="devui-dropdown-origin border-remove">
Click me
Expand Down
2 changes: 1 addition & 1 deletion devui/button/demo/icon/icon.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
}

.btn-group d-button {
margin-right: 4px;
margin-right: 8px;
}

.icon-chevron-down {
Expand Down
2 changes: 1 addition & 1 deletion devui/button/demo/left-right/left-right.component.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<d-button bsStyle="primary" bsPosition="left">Left</d-button>
<d-button bsStyle="primary" bsPosition="right">Right</d-button>
<d-button bsStyle="common" bsPosition="right">Right</d-button>
2 changes: 1 addition & 1 deletion devui/button/demo/primary/primary.component.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<d-button id="primaryBtn" style="margin-right: 4px">Primary</d-button>
<d-button id="primaryBtn" style="margin-right: 8px">Primary</d-button>
<d-button [disabled]="true">Disabled</d-button>
6 changes: 3 additions & 3 deletions devui/button/demo/size/size.component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<d-button bsStyle="common" bsSize="xs" style="margin-right: 4px"> Extra small</d-button>
<d-button bsStyle="common" bsSize="sm" style="margin-right: 4px"> Small </d-button>
<d-button bsStyle="common" style="margin-right: 4px"> Middle </d-button>
<d-button bsStyle="primary" bsSize="xs" style="margin-right: 8px"> Extra small</d-button>
<d-button bsStyle="common" bsSize="sm" style="margin-right: 8px"> Small </d-button>
<d-button bsStyle="common" style="margin-right: 8px"> Middle </d-button>
<d-button bsStyle="common" bsSize="lg"> Large </d-button>
2 changes: 1 addition & 1 deletion devui/card/demo/basic/basic.component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<d-card style="width: 350px">
<d-card class="card-container">
<d-card-header>
<d-avatar dCardAvatar [name]="'DevUI'"></d-avatar>
<d-card-title>DEVUI Course</d-card-title>
Expand Down
10 changes: 10 additions & 0 deletions devui/card/demo/basic/basic.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,17 @@
}

d-card {
cursor: pointer;
transition:
box-shadow $devui-animation-duration-slow $devui-animation-ease-in-smooth,
transform $devui-animation-duration-slow $devui-animation-ease-in-smooth;

&:hover {
box-shadow: $devui-shadow-length-hover $devui-light-shadow;
transform: translateY(-5px);
}
}

.card-container {
width: 350px;
}
Loading

0 comments on commit 1c17f09

Please sign in to comment.