Skip to content

Commit de24f29

Browse files
wangyajuhuaweidevcloud
wangyaju
and
huaweidevcloud
authored
chore(release): release 10.2.0 (#84)
Co-authored-by: huaweidevcloud <[email protected]>
1 parent e9f1821 commit de24f29

File tree

921 files changed

+25200
-6658
lines changed

Some content is hidden

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

921 files changed

+25200
-6658
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ testem.log
4040
.DS_Store
4141
Thumbs.db
4242
desktop.ini
43+
debug.log
4344

4445
# package-lock
4546
package-lock.json

‎devui/accordion/accordion-base-component.class.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Input, HostBinding, Directive } from '@angular/core';
1+
import { Directive, HostBinding, Input } from '@angular/core';
22
import { AccordionBase, AccordionOptions } from './accordion.type';
33

44
@Directive()

‎devui/accordion/accordion-base-item-component.class.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { HostBinding, Directive } from '@angular/core';
2-
import { AccordionBaseItem, AccordionOptions } from './accordion.type';
1+
import { Directive, HostBinding } from '@angular/core';
32
import { AccordionBaseComponent } from './accordion-base-component.class';
3+
import { AccordionBaseItem, AccordionOptions } from './accordion.type';
44

55
@Directive()
66
// tslint:disable-next-line: directive-class-suffix

‎devui/accordion/accordion-base-link-component.class.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { HostListener, Directive } from '@angular/core';
2-
import { AccordionLinkableItem, AccordionOptions } from './accordion.type';
1+
import { Directive, HostListener } from '@angular/core';
32
import { AccordionBaseItemComponent } from './accordion-base-item-component.class';
3+
import { AccordionLinkableItem, AccordionOptions } from './accordion.type';
44

55
@Directive()
66
// tslint:disable-next-line: directive-class-suffix

‎devui/accordion/accordion-item-hreflink.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, ViewEncapsulation, HostListener } from '@angular/core';
1+
import { Component, HostListener, ViewEncapsulation } from '@angular/core';
22
import { AccordionBaseLinkComponent } from './accordion-base-link-component.class';
33
import { AccordionComponent } from './accordion.component';
44

‎devui/accordion/accordion-item-routerlink.component.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { AccordionComponent } from './accordion.component';
2-
import { Component, ViewEncapsulation, HostBinding, ViewChild, HostListener, SimpleChanges, OnChanges} from '@angular/core';
1+
import { Component, HostBinding, HostListener, OnChanges, SimpleChanges, ViewChild, ViewEncapsulation} from '@angular/core';
2+
import { Params, Router, RouterLinkActive, UrlTree } from '@angular/router';
33
import { AccordionBaseLinkComponent } from './accordion-base-link-component.class';
4-
import { RouterLinkActive, Router, UrlTree, Params } from '@angular/router';
4+
import { AccordionComponent } from './accordion.component';
55

66
@Component({
77
selector: 'd-accordion-item-routerlink',

‎devui/accordion/accordion-item.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import { Component, HostListener, ViewEncapsulation } from '@angular/core';
2+
import { AccordionBaseItemComponent } from './accordion-base-item-component.class';
13
import { AccordionComponent } from './accordion.component';
2-
import { Component, ViewEncapsulation, HostListener } from '@angular/core';
34
import { AccordionBaseItem } from './accordion.type';
4-
import { AccordionBaseItemComponent } from './accordion-base-item-component.class';
55

66
@Component({
77
selector: 'd-accordion-item',

‎devui/accordion/accordion-list.component.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { AccordionComponent } from './accordion.component';
2-
import { Component, Input, ViewEncapsulation, ViewChildren, QueryList, Optional, Host, SkipSelf, OnInit, OnDestroy } from '@angular/core';
3-
import { AccordionMenuItem } from './accordion.type';
1+
import { Component, Host, Input, OnDestroy, OnInit, Optional, QueryList, SkipSelf, ViewChildren, ViewEncapsulation } from '@angular/core';
42
import { AccordionItemRouterlinkComponent } from './accordion-item-routerlink.component';
53
import { AccordionMenuComponent } from './accordion-menu.component';
4+
import { AccordionComponent } from './accordion.component';
5+
import { AccordionMenuItem } from './accordion.type';
66

77
@Component({
88
selector: 'd-accordion-list',
@@ -17,7 +17,7 @@ export class AccordionListComponent implements OnInit, OnDestroy {
1717
@ViewChildren(AccordionMenuComponent) accordionMenuQueryList: QueryList<AccordionMenuComponent>;
1818
@ViewChildren(AccordionItemRouterlinkComponent) accordionItemRouterlinkQueryList: QueryList<AccordionItemRouterlinkComponent>;
1919
constructor(@Optional() @Host() @SkipSelf() private parentComponent: AccordionMenuComponent,
20-
private accordion: AccordionComponent) {}
20+
private accordion: AccordionComponent) {}
2121

2222
ngOnInit(): void {
2323
if (this.parentComponent) {

‎devui/accordion/accordion-menu.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { Component, ViewEncapsulation, HostBinding } from '@angular/core';
1+
import { Component, HostBinding, ViewEncapsulation } from '@angular/core';
22
import { AccordionBaseComponent } from './accordion-base-component.class';
3-
import { AccordionBaseMenu, AccordionMenuItem } from './accordion.type';
43
import { AccordionListComponent } from './accordion-list.component';
54
import { AccordionComponent } from './accordion.component';
5+
import { AccordionBaseMenu, AccordionMenuItem } from './accordion.type';
66

77
@Component({
88
selector: 'd-accordion-menu',

‎devui/accordion/accordion.component.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, TemplateRef, OnDestroy } from '@angular/core';
2-
import { AccordionMenuType, AccordionMenuToggleEvent, AccordionItemClickEvent, AccordionOptions} from './accordion.type';
3-
import { I18nService, I18nInterface } from 'ng-devui/i18n';
1+
import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, TemplateRef } from '@angular/core';
2+
import { I18nInterface, I18nService } from 'ng-devui/i18n';
43
import { Subscription } from 'rxjs';
4+
import { AccordionItemClickEvent, AccordionMenuToggleEvent, AccordionMenuType, AccordionOptions} from './accordion.type';
55

66
@Component({
77
selector: 'd-accordion',
@@ -81,7 +81,7 @@ export class AccordionComponent implements AccordionOptions, OnChanges, OnInit,
8181
private flatten(arr: Array<any>, childrenKey = 'children', includeParent = false, includeLeaf = true) {
8282
return arr.reduce((acc, cur) => {
8383
const children = cur[childrenKey];
84-
if ( children === undefined) {
84+
if (children === undefined) {
8585
if (includeLeaf) {
8686
acc.push(cur);
8787
}

‎devui/accordion/accordion.module.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { NgModule } from '@angular/core';
21
import { CommonModule } from '@angular/common';
2+
import { NgModule } from '@angular/core';
33
import { RouterModule } from '@angular/router';
4-
import { AccordionComponent } from './accordion.component';
5-
import { AccordionListComponent } from './accordion-list.component';
6-
import { AccordionItemRouterlinkComponent } from './accordion-item-routerlink.component';
74
import { AccordionItemHreflinkComponent } from './accordion-item-hreflink.component';
5+
import { AccordionItemRouterlinkComponent } from './accordion-item-routerlink.component';
86
import { AccordionItemComponent } from './accordion-item.component';
7+
import { AccordionListComponent } from './accordion-list.component';
98
import { AccordionMenuComponent } from './accordion-menu.component';
9+
import { AccordionComponent } from './accordion.component';
1010

1111
@NgModule({
1212
imports: [

‎devui/accordion/accordion.type.ts

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ export interface AccordionMenuItem
4444

4545
export type AccordionMenuType = Array<AccordionMenuItem>;
4646

47-
4847
/* 基础事件类型 */
4948
export interface AccordionMenuToggleEvent {
5049
item: any;

‎devui/accordion/demo/accordion-demo.component.html

+11-24
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,45 @@
11
<div class="demo-container" dAnchorBox dAnchorHashSupport [view]="{ top: 60, bottom: 0 }">
22
<d-demo-nav [navItems]="navItems"></d-demo-nav>
33
<div [dAnchor]="'basic-usage'" class="demo-example">
4-
<div class="demo-title">基本用法</div>
4+
<div class="demo-title">{{ 'components.accordion.basicDemo.title' | translate }}</div>
55
<div class="demo-text">
6-
传入菜单，监听含子项的可展开菜单的开合事件(menuToggle)或可点击菜单的点击事件(itemClick)。<br />
7-
可展开菜单默认展开使用属性open，可点击菜单默认激活使用属性active，禁用项使用disabled。<br />
8-
通过restrictOneOpen设置是否限制只能展开一个一级菜单。
6+
{{ 'components.accordion.basicDemo.description' | translate }}
97
</div>
108
<d-codebox id="accordion-demo-basic" [sourceData]="AccordionDemoBasic">
119
<d-basic demo></d-basic>
1210
</d-codebox>
1311
</div>
1412
<div [dAnchor]="'use-built-in-routing-and-link-types'" class="demo-example">
15-
<div class="demo-title">使用内置路由和链接类型</div>
13+
<div class="demo-title">{{ 'components.accordion.linkDemo.title' | translate }}</div>
1614
<div class="demo-text">
17-
通过设置linkType切换不同的内置路由和链接类型：默认类型''；
18-
路由类型'routerLink'；外链类型：'hrefLink'；基于数据判断路由或链接类型：'dependOnLinkTypeKey'。
15+
{{ 'components.accordion.linkDemo.description' | translate }}
1916
</div>
2017
<d-codebox id="accordion-demo-link" [sourceData]="AccordionDemolink">
2118
<d-link demo></d-link>
2219
</d-codebox>
2320
</div>
2421
<div [dAnchor]="'using-templates'" class="demo-example">
25-
<div class="demo-title">使用模板</div>
26-
<div class="demo-text">
27-
可展开菜单和可点击菜单分别使用模板。可展开菜单指定menuItemTemplate，可点击菜单指定itemTemplate。<br />
28-
没有数据模板指定noContentTemplate，并可以通过showNoContent控制无数据的时候不展开。<br />
29-
加载中模板指定loadingTemplate，通过item的loadingKey对应的属性值控制是否显示加载中。<br />
30-
</div>
22+
<div class="demo-title">{{ 'components.accordion.templateDemo.title' | translate }}</div>
23+
<div class="demo-text">{{ 'components.accordion.templateDemo.description' | translate }}</div>
3124
<d-codebox id="accordion-demo-template" [sourceData]="AccordionDemoTemplate">
3225
<d-template demo></d-template>
3326
</d-codebox>
34-
<div class="demo-text">
35-
内部列表通过制定innerListTemplate使用模板
36-
</div>
27+
<div class="demo-text">{{ 'components.accordion.innerListTemplateDemo.description' | translate }}</div>
3728
<d-codebox id="accordion-demo-inner-list-template" [sourceData]="AccordionDemoInnerListTemplate">
3829
<d-inner-list-template demo></d-inner-list-template>
3930
</d-codebox>
4031
</div>
4132

4233
<div [dAnchor]="'compound-level-and-auto-expand'" class="demo-example">
43-
<div class="demo-title">复合层级和自动展开</div>
44-
<div class="demo-text">
45-
支持多层级和不限制嵌套层级。可以独立使用autoOpenActiveMenu使得激活的菜单的父层级自动展开。
46-
</div>
34+
<div class="demo-title">{{ 'components.accordion.multiLevelDemo.title' | translate }}</div>
35+
<div class="demo-text">{{ 'components.accordion.multiLevelDemo.description' | translate }}</div>
4736
<d-codebox id="accordion-demo-multi-level" [sourceData]="AccordionDemoMultiLevel">
4837
<d-multi-level demo></d-multi-level>
4938
</d-codebox>
5039
</div>
5140
<div [dAnchor]="'change-values'" class="demo-example">
52-
<div class="demo-title">改变键值</div>
53-
<div class="demo-text">
54-
通过titleKey, childrenKey, disabledKey, activeKey等等改变数组键值，适配不同的接口类型定义。
55-
</div>
41+
<div class="demo-title">{{ 'components.accordion.changeKeyDemo.title' | translate }}</div>
42+
<div class="demo-text">{{ 'components.accordion.changeKeyDemo.description' | translate }}</div>
5643
<d-codebox d="accordion-demo-change-key" [sourceData]="AccordionDemoChangeKey">
5744
<d-change-key demo></d-change-key>
5845
</d-codebox>

‎devui/accordion/demo/accordion-demo.component.ts

+57-33
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,78 @@
1+
import { Component, OnDestroy, OnInit } from '@angular/core';
12
import { DevuiSourceData } from 'ng-devui/shared/devui-codebox/devui-source-data';
2-
import { Component } from '@angular/core';
3+
import { TranslateService, TranslationChangeEvent } from '@ngx-translate/core';
4+
import { Subscription } from 'rxjs';
35
@Component({
46
selector: 'd-accordion-demo',
57
templateUrl: './accordion-demo.component.html',
68
})
7-
export class AccordionDemoComponent {
9+
export class AccordionDemoComponent implements OnInit, OnDestroy {
810
AccordionDemoBasic: Array<DevuiSourceData> = [
9-
{title: 'HTML', language: 'xml', code: require('!!raw-loader!./basic/basic.component.html')},
10-
{title: 'TS', language: 'typescript', code: require('!!raw-loader!./basic/basic.component.ts')},
11-
{title: 'SCSS', language: 'css', code: require('!!raw-loader!./basic/basic.component.css')}
11+
{ title: 'HTML', language: 'xml', code: require('!!raw-loader!./basic/basic.component.html') },
12+
{ title: 'TS', language: 'typescript', code: require('!!raw-loader!./basic/basic.component.ts') },
13+
{ title: 'SCSS', language: 'css', code: require('!!raw-loader!./basic/basic.component.css') },
1214
];
1315

1416
AccordionDemolink: Array<DevuiSourceData> = [
15-
{title: 'HTML', language: 'xml', code: require('!!raw-loader!./link/link.component.html')},
16-
{title: 'TS', language: 'typescript', code: require('!!raw-loader!./link/link.component.ts')},
17-
{title: 'SCSS', language: 'css', code: require('!!raw-loader!./link/link.component.css')}
17+
{ title: 'HTML', language: 'xml', code: require('!!raw-loader!./link/link.component.html') },
18+
{ title: 'TS', language: 'typescript', code: require('!!raw-loader!./link/link.component.ts') },
19+
{ title: 'SCSS', language: 'css', code: require('!!raw-loader!./link/link.component.css') },
1820
];
1921

2022
AccordionDemoTemplate: Array<DevuiSourceData> = [
21-
{title: 'HTML', language: 'xml', code: require('!!raw-loader!./template/template.component.html')},
22-
{title: 'TS', language: 'typescript', code: require('!!raw-loader!./template/template.component.ts')},
23-
{title: 'SCSS', language: 'css', code: require('!!raw-loader!./template/template.component.scss')}
23+
{ title: 'HTML', language: 'xml', code: require('!!raw-loader!./template/template.component.html') },
24+
{ title: 'TS', language: 'typescript', code: require('!!raw-loader!./template/template.component.ts') },
25+
{ title: 'SCSS', language: 'css', code: require('!!raw-loader!./template/template.component.scss') },
2426
];
2527

2628
AccordionDemoInnerListTemplate: Array<DevuiSourceData> = [
27-
{title: 'HTML', language: 'xml',
28-
code: require('!!raw-loader!./inner-list-template/inner-list-template.component.html')},
29-
{title: 'TS', language: 'typescript',
30-
code: require('!!raw-loader!./inner-list-template/inner-list-template.component.ts')},
31-
{title: 'SCSS', language: 'css', code: require('!!raw-loader!./inner-list-template/inner-list-template.component.css')}
29+
{ title: 'HTML', language: 'xml', code: require('!!raw-loader!./inner-list-template/inner-list-template.component.html') },
30+
{ title: 'TS', language: 'typescript', code: require('!!raw-loader!./inner-list-template/inner-list-template.component.ts') },
31+
{ title: 'SCSS', language: 'css', code: require('!!raw-loader!./inner-list-template/inner-list-template.component.css') },
3232
];
3333
AccordionDemoMultiLevel: Array<DevuiSourceData> = [
34-
{title: 'HTML', language: 'xml',
35-
code: require('!!raw-loader!./multi-level/multi-level.component.html')},
36-
{title: 'TS', language: 'typescript',
37-
code: require('!!raw-loader!./multi-level/multi-level.component.ts')},
38-
{title: 'SCSS', language: 'css', code: require('!!raw-loader!./multi-level/multi-level.component.css')}
34+
{ title: 'HTML', language: 'xml', code: require('!!raw-loader!./multi-level/multi-level.component.html') },
35+
{ title: 'TS', language: 'typescript', code: require('!!raw-loader!./multi-level/multi-level.component.ts') },
36+
{ title: 'SCSS', language: 'css', code: require('!!raw-loader!./multi-level/multi-level.component.css') },
3937
];
4038
AccordionDemoChangeKey: Array<DevuiSourceData> = [
41-
{title: 'HTML', language: 'xml',
42-
code: require('!!raw-loader!./change-key/change-key.component.html')},
43-
{title: 'TS', language: 'typescript',
44-
code: require('!!raw-loader!./change-key/change-key.component.ts')},
45-
{title: 'SCSS', language: 'css', code: require('!!raw-loader!./change-key/change-key.component.css')}
46-
];
47-
navItems = [
48-
{ dAnchorLink: 'basic-usage', value: '基本用法'},
49-
{ dAnchorLink: 'use-built-in-routing-and-link-types', value: '内置路由和链接类型'},
50-
{ dAnchorLink: 'using-templates', value: '使用模板'},
51-
{ dAnchorLink: 'compound-level-and-auto-expand', value: '复合层级和自动展开'},
52-
{ dAnchorLink: 'change-values', value: '改变键值'}
39+
{ title: 'HTML', language: 'xml', code: require('!!raw-loader!./change-key/change-key.component.html') },
40+
{ title: 'TS', language: 'typescript', code: require('!!raw-loader!./change-key/change-key.component.ts') },
41+
{ title: 'SCSS', language: 'css', code: require('!!raw-loader!./change-key/change-key.component.css') },
5342
];
43+
44+
navItems = [];
45+
subs: Subscription = new Subscription();
46+
constructor(private translate: TranslateService) {}
47+
48+
ngOnInit() {
49+
this.subs.add(
50+
this.translate.get('components.accordion.anchorLinkValues').subscribe((res) => {
51+
this.setNavValues(res);
52+
})
53+
);
54+
55+
this.subs.add(
56+
this.translate.onLangChange.subscribe((event: TranslationChangeEvent) => {
57+
const values = this.translate.instant('components.accordion.anchorLinkValues');
58+
this.setNavValues(values);
59+
})
60+
);
61+
}
62+
63+
setNavValues(values) {
64+
this.navItems = [
65+
{ dAnchorLink: 'basic-usage', value: values['basic-usage'] },
66+
{ dAnchorLink: 'use-built-in-routing-and-link-types', value: values['use-built-in-routing-and-link-types'] },
67+
{ dAnchorLink: 'using-templates', value: values['using-templates'] },
68+
{ dAnchorLink: 'compound-level-and-auto-expand', value: values['compound-level-and-auto-expand'] },
69+
{ dAnchorLink: 'change-values', value: values['change-values'] },
70+
];
71+
}
72+
73+
ngOnDestroy() {
74+
if (this.subs) {
75+
this.subs.unsubscribe();
76+
}
77+
}
5478
}

‎devui/accordion/demo/accordion-demo.moudule.ts

+24-19
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,44 @@
1-
import { NgModule } from '@angular/core';
2-
import { RouterModule } from '@angular/router';
31
import { CommonModule } from '@angular/common';
2+
import { NgModule } from '@angular/core';
43
import { FormsModule } from '@angular/forms';
5-
6-
import { AccordionModule } from '../accordion.module';
7-
import { AccordionDemoComponent } from './accordion-demo.component';
8-
import { BasicComponent } from './basic/basic.component';
9-
import { LinkComponent } from './link/link.component';
10-
import { TemplateComponent } from './template/template.component';
11-
import { InnerListTemplateComponent } from './inner-list-template/inner-list-template.component';
12-
import { MultiLevelComponent } from './multi-level/multi-level.component';
13-
import { ChangeKeyComponent } from './change-key/change-key.component';
4+
import { RouterModule } from '@angular/router';
145
import { DevUIApiComponent } from 'ng-devui/shared/devui-api/devui-api.component';
156
import { DevUIApiModule } from 'ng-devui/shared/devui-api/devui-api.module';
167
import { DevUICodeboxModule } from 'ng-devui/shared/devui-codebox';
178
import { ToggleModule } from 'ng-devui/toggle';
9+
import { TranslateModule } from '@ngx-translate/core';
1810
import { DDemoNavModule } from 'src/app/component/d-demo-nav.module';
11+
import { AccordionModule } from '../accordion.module';
12+
import { AccordionDemoComponent } from './accordion-demo.component';
13+
import { BasicComponent } from './basic/basic.component';
14+
import { ChangeKeyComponent } from './change-key/change-key.component';
15+
import { InnerListTemplateComponent } from './inner-list-template/inner-list-template.component';
16+
import { LinkComponent } from './link/link.component';
17+
import { MultiLevelComponent } from './multi-level/multi-level.component';
18+
import { TemplateComponent } from './template/template.component';
1919

2020
@NgModule({
2121
imports: [
2222
DDemoNavModule,
2323
CommonModule,
24+
TranslateModule,
2425
AccordionModule,
2526
ToggleModule,
2627
FormsModule,
2728
DevUICodeboxModule,
2829
DevUIApiModule,
2930
RouterModule.forChild([
30-
{ path: '', redirectTo: 'demo' },
31-
{ path: 'demo', component: AccordionDemoComponent},
32-
{ path: 'api', component: DevUIApiComponent, data: {
33-
api: require('!html-loader!markdown-loader!../doc/api.md')
34-
}}
35-
])
31+
{ path: '', redirectTo: 'demo' },
32+
{ path: 'demo', component: AccordionDemoComponent },
33+
{
34+
path: 'api',
35+
component: DevUIApiComponent,
36+
data: {
37+
'zh-cn': require('!html-loader!markdown-loader!../doc/api-cn.md'),
38+
'en-us': require('!html-loader!markdown-loader!../doc/api-en.md'),
39+
},
40+
},
41+
]),
3642
],
3743
exports: [],
3844
declarations: [
@@ -47,5 +53,4 @@ import { DDemoNavModule } from 'src/app/component/d-demo-nav.module';
4753
providers: [],
4854

4955
})
50-
export class AccordionDemoModule {
51-
}
56+
export class AccordionDemoModule {}

0 commit comments

Comments
 (0)