Skip to content

Commit

Permalink
chore(release): release ng-devui-admin 2.0.0 (#16)
Browse files Browse the repository at this point in the history
Co-authored-by: huaweidevcloud <devcloudmobile@huawei.com>
  • Loading branch information
wangyaju and huaweidevcloud committed Aug 13, 2021
1 parent dbe4f9a commit 15e2bb2
Show file tree
Hide file tree
Showing 76 changed files with 1,111 additions and 1,468 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ DevUI Admin is an enterprise-level mid- and back-end front-end/design solution.
- Preview: https://devui.design/admin/
- Home Page: https://devui.design/admin-page/home
- Document:https://devui.design/admin-page/docs/getting-started
- Materials:https://devui.design/admin-materials/

## Features
![avatar](home-1.png)
Expand Down
1 change: 1 addition & 0 deletions README_zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ DevUI Admin 是一个企业级中后台前端/设计解决方案,依据 DevUI
- 预览:https://devui.design/admin/
- 首页:https://devui.design/admin-page/home
- 文档:https://devui.design/admin-page/docs/getting-started
- Admin 区块:https://devui.design/admin-materials/

## 特性

Expand Down
5 changes: 2 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.2.0",
"version": "2.0.0",
"license": "MIT",
"description": "DevUI Admin based on Angular and DevUI components",
"repository": {
Expand Down Expand Up @@ -35,8 +35,7 @@
"@ngx-translate/http-loader": "^6.0.0",
"color": "^3.1.3",
"echarts": "^5.1.1",
"ng-devui": "^12.0.0-beta.1",
"ng-packagr": "^12.0.5",
"ng-devui": "^12.0.0",
"rxjs": "~6.6.0",
"tslib": "^2.0.0",
"zone.js": "~0.11.4"
Expand Down
2 changes: 1 addition & 1 deletion src/app/@core/core.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const DATA_SERVICES = [
];

export const DEVUI_CORE_PROVIDERS = [
...MockDataModule.forRoot().providers,
...MockDataModule.forRoot().providers!,
...DATA_SERVICES,
AuthService,
PersonalizeService,
Expand Down
11 changes: 5 additions & 6 deletions src/app/@core/data/userData.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Observable } from "rxjs";
import { Observable } from 'rxjs';

export interface Team {
name?: string;
label?: string;
label?: string;
}

export interface User {
Expand All @@ -12,11 +12,10 @@ export interface User {
assign?: string;
group?: string;
address?: string;
tags?: string[];
tags?: any[];
teams?: Team[];
}


export interface Article {
id?: string;
title?: string;
Expand All @@ -38,7 +37,7 @@ export interface Project {
}

export abstract class UserData {
abstract getUser(): Observable<User[]>;
abstract getUser(): Observable<User>;
abstract getArticles(): Observable<Article[]>;
abstract getProjects(): Observable<Project[]>;
}
}
56 changes: 4 additions & 52 deletions src/app/@core/mock/echarts.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,57 +126,9 @@ export class EchartsService {
{
name: '服务水位',
data: [
21.69,
30.16,
11.64,
11.64,
31.22,
17.46,
14.81,
44.44,
28.57,
14.81,
12.7,
35.98,
23.28,
16.93,
19.58,
8.99,
11.64,
4.23,
5.29,
1.06,
3.7,
3.17,
3.17,
5.82,
16.4,
15.87,
18.52,
13.76,
19.05,
26.46,
30.16,
24.87,
23.81,
24.87,
16.93,
17.99,
13.76,
10.58,
20.63,
12.7,
13.17,
15.82,
16.4,
15.87,
8.52,
3.76,
19.05,
6.46,
30.16,
24.87,
13.81,
21.69, 30.16, 11.64, 11.64, 31.22, 17.46, 14.81, 44.44, 28.57, 14.81, 12.7, 35.98, 23.28, 16.93, 19.58, 8.99, 11.64, 4.23, 5.29,
1.06, 3.7, 3.17, 3.17, 5.82, 16.4, 15.87, 18.52, 13.76, 19.05, 26.46, 30.16, 24.87, 23.81, 24.87, 16.93, 17.99, 13.76, 10.58,
20.63, 12.7, 13.17, 15.82, 16.4, 15.87, 8.52, 3.76, 19.05, 6.46, 30.16, 24.87, 13.81,
],
type: 'line',
smooth: false,
Expand Down Expand Up @@ -632,7 +584,7 @@ export class EchartsService {
trigger: 'item',
showDelay: 0,
transitionDuration: 0.2,
formatter: function (params) {
formatter: function (params: any) {
return `用户数 <br/> ${params.name}: ${params.value}`;
},
},
Expand Down
25 changes: 8 additions & 17 deletions src/app/@core/mock/list-data.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,7 @@ export class ListDataService extends ListData {
{
name: 'React',
title: 'React',
imgSrc:
'https://codingthesmartway.com/wp-content/uploads/2019/12/logo_react.png',
imgSrc: 'https://codingthesmartway.com/wp-content/uploads/2019/12/logo_react.png',
content:
'DevUI 是面向企业中后台产品的开源前端解决方案,其设计价值观基于"至简"、"沉浸"、"灵活"三种自然与人文相结合的理念,旨在为设计....',
actions: [
Expand Down Expand Up @@ -333,8 +332,7 @@ export class ListDataService extends ListData {
{
name: 'Webpack',
title: 'Webpack',
imgSrc:
'https://webpack.js.org/icon-square-small.85ba630cf0c5f29ae3e3.svg',
imgSrc: 'https://webpack.js.org/icon-square-small.85ba630cf0c5f29ae3e3.svg',
content:
'DevUI 是面向企业中后台产品的开源前端解决方案,其设计价值观基于"至简"、"沉浸"、"灵活"三种自然与人文相结合的理念,旨在为设计....',
actions: [
Expand Down Expand Up @@ -383,8 +381,7 @@ export class ListDataService extends ListData {
{
name: 'React',
title: 'React',
imgSrc:
'https://codingthesmartway.com/wp-content/uploads/2019/12/logo_react.png',
imgSrc: 'https://codingthesmartway.com/wp-content/uploads/2019/12/logo_react.png',
content:
'DevUI 是面向企业中后台产品的开源前端解决方案,其设计价值观基于"至简"、"沉浸"、"灵活"三种自然与人文相结合的理念,旨在为设计....',
actions: [
Expand Down Expand Up @@ -418,8 +415,7 @@ export class ListDataService extends ListData {
{
name: 'Webpack',
title: 'Webpack',
imgSrc:
'https://webpack.js.org/icon-square-small.85ba630cf0c5f29ae3e3.svg',
imgSrc: 'https://webpack.js.org/icon-square-small.85ba630cf0c5f29ae3e3.svg',
content:
'DevUI 是面向企业中后台产品的开源前端解决方案,其设计价值观基于"至简"、"沉浸"、"灵活"三种自然与人文相结合的理念,旨在为设计....',
actions: [
Expand Down Expand Up @@ -468,8 +464,7 @@ export class ListDataService extends ListData {
{
name: 'React',
title: 'React',
imgSrc:
'https://codingthesmartway.com/wp-content/uploads/2019/12/logo_react.png',
imgSrc: 'https://codingthesmartway.com/wp-content/uploads/2019/12/logo_react.png',
content:
'DevUI 是面向企业中后台产品的开源前端解决方案,其设计价值观基于"至简"、"沉浸"、"灵活"三种自然与人文相结合的理念,旨在为设计....',
actions: [
Expand Down Expand Up @@ -503,8 +498,7 @@ export class ListDataService extends ListData {
{
name: 'Webpack',
title: 'Webpack',
imgSrc:
'https://webpack.js.org/icon-square-small.85ba630cf0c5f29ae3e3.svg',
imgSrc: 'https://webpack.js.org/icon-square-small.85ba630cf0c5f29ae3e3.svg',
content:
'DevUI 是面向企业中后台产品的开源前端解决方案,其设计价值观基于"至简"、"沉浸"、"灵活"三种自然与人文相结合的理念,旨在为设计....',
actions: [
Expand All @@ -520,11 +514,8 @@ export class ListDataService extends ListData {
},
];

private pagerList(data, pager) {
return data.slice(
pager.pageSize * (pager.pageIndex - 1),
pager.pageSize * pager.pageIndex
);
private pagerList(data: Item[] | Card[], pager: ListPager) {
return data.slice(pager.pageSize! * (pager.pageIndex! - 1), pager.pageSize! * pager.pageIndex!);
}

getListData(pager: ListPager): Observable<any> {
Expand Down

0 comments on commit 15e2bb2

Please sign in to comment.