Skip to content

Commit 96771dc

Browse files
chore: release ng-devui-admin 1.1.0 (#9)
Co-authored-by: huaweidevcloud <[email protected]>
1 parent f866c01 commit 96771dc

30 files changed

+278
-139
lines changed

CODE_OF_CONDUCT.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
1717
Examples of behavior that contributes to a positive environment for our
1818
community include:
1919

20-
* Demonstrating empathy and kindness toward other people
21-
* Being respectful of differing opinions, viewpoints, and experiences
22-
* Giving and gracefully accepting constructive feedback
23-
* Accepting responsibility and apologizing to those affected by our mistakes,
20+
- Demonstrating empathy and kindness toward other people
21+
- Being respectful of differing opinions, viewpoints, and experiences
22+
- Giving and gracefully accepting constructive feedback
23+
- Accepting responsibility and apologizing to those affected by our mistakes,
2424
and learning from the experience
25-
* Focusing on what is best not just for us as individuals, but for the
25+
- Focusing on what is best not just for us as individuals, but for the
2626
overall community
2727

2828
Examples of unacceptable behavior include:
2929

30-
* The use of sexualized language or imagery, and sexual attention or
30+
- The use of sexualized language or imagery, and sexual attention or
3131
advances of any kind
32-
* Trolling, insulting or derogatory comments, and personal or political attacks
33-
* Public or private harassment
34-
* Publishing others' private information, such as a physical or email
32+
- Trolling, insulting or derogatory comments, and personal or political attacks
33+
- Public or private harassment
34+
- Publishing others' private information, such as a physical or email
3535
address, without their explicit permission
36-
* Other conduct which could reasonably be considered inappropriate in a
36+
- Other conduct which could reasonably be considered inappropriate in a
3737
professional setting
3838

3939
## Enforcement Responsibilities
@@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
106106
### 4. Permanent Ban
107107

108108
**Community Impact**: Demonstrating a pattern of violation of community
109-
standards, including sustained inappropriate behavior, harassment of an
109+
standards, including sustained inappropriate behavior, harassment of an
110110
individual, or aggression toward or disparagement of classes of individuals.
111111

112112
**Consequence**: A permanent ban from any sort of public interaction within

README.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@
1414
<h1 align="center">DevUI Admin</h1>
1515
DevUI Admin is an enterprise-level mid- and back-end front-end/design solution. Based on DevUI Design design values, we build a back-end management template DevUI Admin based on its design specifications and basic components.
1616

17-
![avatar](home-en.png)
17+
&nbsp;
18+
![avatar](home.png)
1819

1920
- Preview: https://devui.design/admin/
2021
- Home Page: https://devui.design/admin-page/home
2122
- Document:https://devui.design/admin-page/docs/getting-started
2223

2324
## Features
25+
![avatar](home-1.png)
2426

2527
- Responsive: Adapting to different screen sizes, providing users with a more comfortable interface and user experience.
2628
- Personal Theme: Supports dynamic switching between multiple theme styles and personalized configurations.
@@ -32,7 +34,7 @@ DevUI Admin is an enterprise-level mid- and back-end front-end/design solution.
3234
## Usage
3335

3436
```bash
35-
ng new your-project && cd your-project
37+
ng new your-project && cd your-project # Create options: non-strict mode & SCSS
3638
ng add ng-devui-admin
3739

3840
npm start # open http://localhost:4200

README_zh_CN.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,18 @@
1212
</p>
1313

1414
<h1 align="center">DevUI Admin</h1>
15-
DevUI Admin 是一个企业级中后台前端/设计解决方案,依据 DevUI Design 设计价值观,我们在自身的设计规范和基础组件的基础上,构建出了后台管理模板 DevUI Admin
15+
DevUI Admin 是一个企业级中后台前端/设计解决方案,依据 DevUI Design 设计价值观,我们在自身的设计规范和基础组件的基础上,构建出了后台管理模板 DevUI Admin
1616

17+
&nbsp;
1718
![avatar](home.png)
18-
1919
- 预览:https://devui.design/admin/
2020
- 首页:https://devui.design/admin-page/home
2121
- 文档:https://devui.design/admin-page/docs/getting-started
2222

2323
## 特性
2424

25+
![avatar](home-1.png)
26+
2527
- 响应式:适应不同屏幕大小,为用户提供更舒适的界面与用户体验
2628
- 个性化主题:支持多种主题风格与个性化配置动态切换
2729
- 布局:页面布局可配置,灵活布局
@@ -32,7 +34,7 @@ DevUI Admin 是一个企业级中后台前端/设计解决方案,依据 DevUI
3234
## 使用
3335

3436
```bash
35-
ng new your-project && cd your-project
37+
ng new your-project && cd your-project # 创建选项:非严格模式 & SCSS
3638
ng add ng-devui-admin
3739

3840
npm start # open http://localhost:4200

home-1.png

1.21 MB
Loading

home-en.png

-89 KB
Binary file not shown.

home.png

206 KB
Loading

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ng-devui-admin",
3-
"version": "1.0.0",
3+
"version": "1.1.0",
44
"license": "MIT",
55
"description": "DevUI Admin based on Angular and DevUI components",
66
"repository": {
@@ -34,14 +34,14 @@
3434
"@ngx-translate/core": "^13.0.0",
3535
"@ngx-translate/http-loader": "^6.0.0",
3636
"color": "^3.1.3",
37-
"echarts": "^4.7.0",
37+
"echarts": "^5.1.1",
3838
"ng-devui": "^11.1.0",
3939
"rxjs": "~6.6.0",
4040
"tslib": "^2.0.0",
4141
"zone.js": "~0.10.2"
4242
},
4343
"devDependencies": {
44-
"@angular-devkit/build-angular": "~0.1002.0",
44+
"@angular-devkit/build-angular": "~0.1102.0",
4545
"@angular/cli": "~11.2.9",
4646
"@angular/compiler-cli": "~11.2.10",
4747
"@types/node": "^12.11.1",

src/app/@core/mock/echarts.service.ts

+4-28
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,8 @@ export class EchartsService {
274274
},
275275
legend: {
276276
orient: 'vertical',
277-
x: 'left',
278-
y: 'center',
279-
left: '10px',
277+
left: 'auto',
278+
top: 'center',
280279
data: ['可容忍', '满意', '不可容忍', '极端异常', '良好'],
281280
},
282281
series: [
@@ -591,20 +590,7 @@ export class EchartsService {
591590
xAxis: [
592591
{
593592
type: 'category',
594-
data: [
595-
'1月',
596-
'2月',
597-
'3月',
598-
'4月',
599-
'5月',
600-
'6月',
601-
'7月',
602-
'8月',
603-
'9月',
604-
'10月',
605-
'11月',
606-
'12月',
607-
],
593+
data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
608594
axisPointer: {
609595
type: 'shadow',
610596
},
@@ -655,17 +641,7 @@ export class EchartsService {
655641
min: 0,
656642
max: 200,
657643
inRange: {
658-
color: [
659-
'#BDFDFF',
660-
'#9FE1FF',
661-
'#81C5FF',
662-
'#61AAFF',
663-
'#3F8FEC',
664-
'#0676D0',
665-
'#005DB4',
666-
'#004698',
667-
'#00307E',
668-
],
644+
color: ['#BDFDFF', '#9FE1FF', '#81C5FF', '#61AAFF', '#3F8FEC', '#0676D0', '#005DB4', '#004698', '#00307E'],
669645
},
670646
text: ['High', 'Low'], // 文本,默认为数值文本
671647
calculable: true,

src/app/@core/mock/work-group.service.ts

+26-10
Original file line numberDiff line numberDiff line change
@@ -6,45 +6,61 @@ import { WorkGroup, WorkGroupData } from '../data/work-group';
66
export class WorkGroupService extends WorkGroupData {
77
private workGroups: WorkGroup[] = [
88
{
9-
logoSrc:
10-
'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
9+
logoSrc: 'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
1110
departmentTitle: 'Cloud BU 某部门',
1211
description: 'XXX团队终于成立了!',
1312
manOfDepartment: 'XXX大佬',
1413
numberOfMembers: 999,
1514
},
1615
{
17-
logoSrc:
18-
'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
16+
logoSrc: 'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
1917
departmentTitle: 'DevUI XX部门',
2018
description: '成就自己成就他人。',
2119
manOfDepartment: 'Peng',
2220
numberOfMembers: 200,
2321
},
2422
{
25-
logoSrc:
26-
'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
23+
logoSrc: 'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
2724
departmentTitle: '周末吃喝玩乐组织',
2825
description: '周末约起来,想去哪就去哪。',
2926
manOfDepartment: 'Tang',
3027
numberOfMembers: 500,
3128
},
3229
{
33-
logoSrc:
34-
'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
30+
logoSrc: 'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
3531
departmentTitle: '可信交流社区',
3632
description: '可信与工程交流社区',
3733
manOfDepartment: 'Wang',
3834
numberOfMembers: 800,
3935
},
4036
{
41-
logoSrc:
42-
'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
37+
logoSrc: 'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
4338
departmentTitle: '羽毛球协会',
4439
description: '羽毛球爱好者集结地',
4540
manOfDepartment: 'Da Peng',
4641
numberOfMembers: 500,
4742
},
43+
{
44+
logoSrc: 'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
45+
departmentTitle: 'Angular项目组',
46+
description: '暂无描述',
47+
manOfDepartment: 'Da Peng',
48+
numberOfMembers: 500,
49+
},
50+
{
51+
logoSrc: 'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
52+
departmentTitle: 'React项目组',
53+
description: '暂无描述',
54+
manOfDepartment: 'Da Peng',
55+
numberOfMembers: 500,
56+
},
57+
{
58+
logoSrc: 'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
59+
departmentTitle: 'Vue项目组',
60+
description: '暂无描述',
61+
manOfDepartment: 'Da Peng',
62+
numberOfMembers: 500,
63+
},
4864
];
4965

5066
getWorkGroups(): Observable<WorkGroup[]> {

src/app/@core/services/auth-guard-service.guard.ts

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export class AuthGuardService implements CanActivate {
3030
content: this.i18nValues['content'],
3131
},
3232
],
33+
life: 2000,
3334
});
3435
this.router.navigate(['login']);
3536
return false;

src/app/@shared/components/admin-form/admin-form.component.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
margin-left: 115px !important;
33
}
44

5-
@media only screen and (max-width: 1024px) {
5+
@media only screen and (max-width: 1023px) {
66
.da-form-operation.devui-form-operation {
77
margin-left: 0 !important;
88
}

src/app/@shared/components/personalize/personalize.component.html

+27-27
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="da-title">{{ 'personalize.title' | translate }}</div>
44
</div>
55
<da-layout-row [daGutter]="[12, 12]">
6-
<da-col-item *ngFor="let item of configs" [daSpan]="24" [daMl]="8">
6+
<da-col-item *ngFor="let item of configs; let i = index;" [daSpan]="24" [daMl]="8" [daOrder]="i">
77
<div class="item">
88
<div class="da-item-title">
99
<!-- TODO: add prefix da- -->
@@ -33,32 +33,32 @@
3333
</d-radio-group>
3434
</div>
3535
</da-col-item>
36-
</da-layout-row>
37-
<da-layout-row class="da-color-picker" [daGutter]="[12, 12]">
38-
<da-layout-col class="themes" *ngFor="let theme of themeColors" [daSpan]="24" [daMl]="12">
39-
<div class="da-theme-name">
40-
<i class="icon {{ theme.icon }}"></i>{{ theme?.name }}
41-
</div>
42-
<da-layout-row class="da-theme-colors">
43-
<div
44-
class="da-color-avatar"
45-
[ngClass]="{
46-
'is-active': customColor === color && customDark === theme.isDark
47-
}"
48-
*ngFor="let color of theme.colors"
49-
[style.backgroundColor]="color"
50-
(click)="selectColor(color, theme)"
51-
>
52-
<i
53-
class="icon icon-right"
54-
*ngIf="
55-
customColor === color &&
56-
customDark === theme.isDark &&
57-
currentTheme === themeType.Custom
58-
"
59-
></i>
36+
<da-row-item class="da-color-picker" [daOrderMl]="2">
37+
<da-layout-col class="themes" *ngFor="let theme of themeColors" [daSpan]="24" [daMl]="12">
38+
<div class="da-theme-name">
39+
<i class="icon {{ theme.icon }}"></i>{{ theme?.name }}
6040
</div>
61-
</da-layout-row>
62-
</da-layout-col>
41+
<da-layout-row class="da-theme-colors">
42+
<div
43+
class="da-color-avatar"
44+
[ngClass]="{
45+
'is-active': customColor === color && customDark === theme.isDark
46+
}"
47+
*ngFor="let color of theme.colors"
48+
[style.backgroundColor]="color"
49+
(click)="selectColor(color, theme)"
50+
>
51+
<i
52+
class="icon icon-right"
53+
*ngIf="
54+
customColor === color &&
55+
customDark === theme.isDark &&
56+
currentTheme === themeType.Custom
57+
"
58+
></i>
59+
</div>
60+
</da-layout-row>
61+
</da-layout-col>
62+
</da-row-item>
6363
</da-layout-row>
6464
</div>

src/app/@shared/components/personalize/personalize.component.scss

+13-4
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@
8787
}
8888
}
8989
.da-color-picker {
90-
margin-top: 24px;
90+
display: flex;
91+
width: 100%;
9192
}
9293

9394
.da-theme-name {
@@ -98,6 +99,7 @@
9899
font-size: $devui-font-size-page-title;
99100
font-weight: 600;
100101
margin-bottom: 12px;
102+
margin-top: 24px;
101103

102104
.icon {
103105
font-size: $devui-font-size-data-overview;
@@ -140,18 +142,25 @@
140142
}
141143
}
142144

143-
@media only screen and (max-width: 1024px) {
145+
@media only screen and (max-width: 1023px) {
144146
.da-personalize-content {
145147
ul {
146148
margin-right: 0 !important;
147149
}
148150
}
149151

152+
.da-color-picker {
153+
display: block;
154+
margin-bottom: 12px;
155+
156+
.da-theme-name {
157+
margin-top: 12px;
158+
}
159+
}
160+
150161
.da-theme-colors {
151162
justify-content: space-between;
152163
.da-color-avatar {
153-
width: 24px;
154-
height: 24px;
155164
margin-left: 0;
156165
}
157166
}

src/app/@shared/styles/_list.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@
4747
}
4848
}
4949

50-
@media only screen and (max-width: 1024px) {
50+
@media only screen and (max-width: 1023px) {
5151
.da-header-item-label {
5252
width: 80px;
5353
}
5454
}
5555

5656
:host::ng-deep {
57-
@media only screen and (max-width: 1024px) {
57+
@media only screen and (max-width: 1023px) {
5858
.devui-pagination {
5959
.devui-total-size,
6060
.devui-jump-container {

0 commit comments

Comments
 (0)