Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: release ng-devui-admin 1.1.0 #9

Merged
merged 1 commit into from
Jun 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
Examples of behavior that contributes to a positive environment for our
community include:

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

Examples of unacceptable behavior include:

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

## Enforcement Responsibilities
Expand Down Expand Up @@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
### 4. Permanent Ban

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

**Consequence**: A permanent ban from any sort of public interaction within
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@
<h1 align="center">DevUI Admin</h1>
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.

![avatar](home-en.png)
&nbsp;
![avatar](home.png)

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

## Features
![avatar](home-1.png)

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

```bash
ng new your-project && cd your-project
ng new your-project && cd your-project # Create options: non-strict mode & SCSS
ng add ng-devui-admin

npm start # open http://localhost:4200
Expand Down
8 changes: 5 additions & 3 deletions README_zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,18 @@
</p>

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

&nbsp;
![avatar](home.png)

- 预览:https://devui.design/admin/
- 首页:https://devui.design/admin-page/home
- 文档:https://devui.design/admin-page/docs/getting-started

## 特性

![avatar](home-1.png)

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

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

npm start # open http://localhost:4200
Expand Down
Binary file added home-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed home-en.png
Binary file not shown.
Binary file modified home.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ng-devui-admin",
"version": "1.0.0",
"version": "1.1.0",
"license": "MIT",
"description": "DevUI Admin based on Angular and DevUI components",
"repository": {
Expand Down Expand Up @@ -34,14 +34,14 @@
"@ngx-translate/core": "^13.0.0",
"@ngx-translate/http-loader": "^6.0.0",
"color": "^3.1.3",
"echarts": "^4.7.0",
"echarts": "^5.1.1",
"ng-devui": "^11.1.0",
"rxjs": "~6.6.0",
"tslib": "^2.0.0",
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1002.0",
"@angular-devkit/build-angular": "~0.1102.0",
"@angular/cli": "~11.2.9",
"@angular/compiler-cli": "~11.2.10",
"@types/node": "^12.11.1",
Expand Down
32 changes: 4 additions & 28 deletions src/app/@core/mock/echarts.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,8 @@ export class EchartsService {
},
legend: {
orient: 'vertical',
x: 'left',
y: 'center',
left: '10px',
left: 'auto',
top: 'center',
data: ['可容忍', '满意', '不可容忍', '极端异常', '良好'],
},
series: [
Expand Down Expand Up @@ -591,20 +590,7 @@ export class EchartsService {
xAxis: [
{
type: 'category',
data: [
'1月',
'2月',
'3月',
'4月',
'5月',
'6月',
'7月',
'8月',
'9月',
'10月',
'11月',
'12月',
],
data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
axisPointer: {
type: 'shadow',
},
Expand Down Expand Up @@ -655,17 +641,7 @@ export class EchartsService {
min: 0,
max: 200,
inRange: {
color: [
'#BDFDFF',
'#9FE1FF',
'#81C5FF',
'#61AAFF',
'#3F8FEC',
'#0676D0',
'#005DB4',
'#004698',
'#00307E',
],
color: ['#BDFDFF', '#9FE1FF', '#81C5FF', '#61AAFF', '#3F8FEC', '#0676D0', '#005DB4', '#004698', '#00307E'],
},
text: ['High', 'Low'], // 文本,默认为数值文本
calculable: true,
Expand Down
36 changes: 26 additions & 10 deletions src/app/@core/mock/work-group.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,45 +6,61 @@ import { WorkGroup, WorkGroupData } from '../data/work-group';
export class WorkGroupService extends WorkGroupData {
private workGroups: WorkGroup[] = [
{
logoSrc:
'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
logoSrc: 'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
departmentTitle: 'Cloud BU 某部门',
description: 'XXX团队终于成立了!',
manOfDepartment: 'XXX大佬',
numberOfMembers: 999,
},
{
logoSrc:
'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
logoSrc: 'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
departmentTitle: 'DevUI XX部门',
description: '成就自己成就他人。',
manOfDepartment: 'Peng',
numberOfMembers: 200,
},
{
logoSrc:
'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
logoSrc: 'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
departmentTitle: '周末吃喝玩乐组织',
description: '周末约起来,想去哪就去哪。',
manOfDepartment: 'Tang',
numberOfMembers: 500,
},
{
logoSrc:
'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
logoSrc: 'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
departmentTitle: '可信交流社区',
description: '可信与工程交流社区',
manOfDepartment: 'Wang',
numberOfMembers: 800,
},
{
logoSrc:
'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
logoSrc: 'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
departmentTitle: '羽毛球协会',
description: '羽毛球爱好者集结地',
manOfDepartment: 'Da Peng',
numberOfMembers: 500,
},
{
logoSrc: 'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
departmentTitle: 'Angular项目组',
description: '暂无描述',
manOfDepartment: 'Da Peng',
numberOfMembers: 500,
},
{
logoSrc: 'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
departmentTitle: 'React项目组',
description: '暂无描述',
manOfDepartment: 'Da Peng',
numberOfMembers: 500,
},
{
logoSrc: 'https://res.hc-cdn.com/x-roma-components/1.0.10/assets/devui/logo.svg',
departmentTitle: 'Vue项目组',
description: '暂无描述',
manOfDepartment: 'Da Peng',
numberOfMembers: 500,
},
];

getWorkGroups(): Observable<WorkGroup[]> {
Expand Down
1 change: 1 addition & 0 deletions src/app/@core/services/auth-guard-service.guard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export class AuthGuardService implements CanActivate {
content: this.i18nValues['content'],
},
],
life: 2000,
});
this.router.navigate(['login']);
return false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
margin-left: 115px !important;
}

@media only screen and (max-width: 1024px) {
@media only screen and (max-width: 1023px) {
.da-form-operation.devui-form-operation {
margin-left: 0 !important;
}
Expand Down
54 changes: 27 additions & 27 deletions src/app/@shared/components/personalize/personalize.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="da-title">{{ 'personalize.title' | translate }}</div>
</div>
<da-layout-row [daGutter]="[12, 12]">
<da-col-item *ngFor="let item of configs" [daSpan]="24" [daMl]="8">
<da-col-item *ngFor="let item of configs; let i = index;" [daSpan]="24" [daMl]="8" [daOrder]="i">
<div class="item">
<div class="da-item-title">
<!-- TODO: add prefix da- -->
Expand Down Expand Up @@ -33,32 +33,32 @@
</d-radio-group>
</div>
</da-col-item>
</da-layout-row>
<da-layout-row class="da-color-picker" [daGutter]="[12, 12]">
<da-layout-col class="themes" *ngFor="let theme of themeColors" [daSpan]="24" [daMl]="12">
<div class="da-theme-name">
<i class="icon {{ theme.icon }}"></i>{{ theme?.name }}
</div>
<da-layout-row class="da-theme-colors">
<div
class="da-color-avatar"
[ngClass]="{
'is-active': customColor === color && customDark === theme.isDark
}"
*ngFor="let color of theme.colors"
[style.backgroundColor]="color"
(click)="selectColor(color, theme)"
>
<i
class="icon icon-right"
*ngIf="
customColor === color &&
customDark === theme.isDark &&
currentTheme === themeType.Custom
"
></i>
<da-row-item class="da-color-picker" [daOrderMl]="2">
<da-layout-col class="themes" *ngFor="let theme of themeColors" [daSpan]="24" [daMl]="12">
<div class="da-theme-name">
<i class="icon {{ theme.icon }}"></i>{{ theme?.name }}
</div>
</da-layout-row>
</da-layout-col>
<da-layout-row class="da-theme-colors">
<div
class="da-color-avatar"
[ngClass]="{
'is-active': customColor === color && customDark === theme.isDark
}"
*ngFor="let color of theme.colors"
[style.backgroundColor]="color"
(click)="selectColor(color, theme)"
>
<i
class="icon icon-right"
*ngIf="
customColor === color &&
customDark === theme.isDark &&
currentTheme === themeType.Custom
"
></i>
</div>
</da-layout-row>
</da-layout-col>
</da-row-item>
</da-layout-row>
</div>
17 changes: 13 additions & 4 deletions src/app/@shared/components/personalize/personalize.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@
}
}
.da-color-picker {
margin-top: 24px;
display: flex;
width: 100%;
}

.da-theme-name {
Expand All @@ -98,6 +99,7 @@
font-size: $devui-font-size-page-title;
font-weight: 600;
margin-bottom: 12px;
margin-top: 24px;

.icon {
font-size: $devui-font-size-data-overview;
Expand Down Expand Up @@ -140,18 +142,25 @@
}
}

@media only screen and (max-width: 1024px) {
@media only screen and (max-width: 1023px) {
.da-personalize-content {
ul {
margin-right: 0 !important;
}
}

.da-color-picker {
display: block;
margin-bottom: 12px;

.da-theme-name {
margin-top: 12px;
}
}

.da-theme-colors {
justify-content: space-between;
.da-color-avatar {
width: 24px;
height: 24px;
margin-left: 0;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/app/@shared/styles/_list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@
}
}

@media only screen and (max-width: 1024px) {
@media only screen and (max-width: 1023px) {
.da-header-item-label {
width: 80px;
}
}

:host::ng-deep {
@media only screen and (max-width: 1024px) {
@media only screen and (max-width: 1023px) {
.devui-pagination {
.devui-total-size,
.devui-jump-container {
Expand Down
Loading