Skip to content

Commit 34fa015

Browse files
chore(release): release ng-devui-admin 13.0.0 (#23)
Co-authored-by: huaweidevcloud <[email protected]>
1 parent 15e2bb2 commit 34fa015

File tree

10 files changed

+67
-120
lines changed

10 files changed

+67
-120
lines changed

.gitignore

+1-3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ speed-measure-plugin*.json
3232
.history/*
3333

3434
# misc
35+
/.angular/cache
3536
/.sass-cache
3637
/connect.lock
3738
/coverage
@@ -44,6 +45,3 @@ testem.log
4445
# System Files
4546
.DS_Store
4647
Thumbs.db
47-
48-
#package-lock
49-
/package-lock.json

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ DevUI Admin is an enterprise-level mid- and back-end front-end/design solution.
2020
- Preview: https://devui.design/admin/
2121
- Home Page: https://devui.design/admin-page/home
2222
- Document:https://devui.design/admin-page/docs/getting-started
23-
- Materialshttps://devui.design/admin-materials/
23+
- Materials: https://devui.design/admin-materials/
2424

2525
## Features
26+
2627
![avatar](home-1.png)
2728

2829
- Responsive: Adapting to different screen sizes, providing users with a more comfortable interface and user experience.

README_zh_CN.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ DevUI Admin 是一个企业级中后台前端/设计解决方案,依据 DevUI
1616

1717
&nbsp;
1818
![avatar](home.png)
19+
1920
- 预览:https://devui.design/admin/
2021
- 首页:https://devui.design/admin-page/home
2122
- 文档:https://devui.design/admin-page/docs/getting-started
22-
- Admin 区块https://devui.design/admin-materials/
23+
- Admin 区块: https://devui.design/admin-materials/
2324

2425
## 特性
2526

angular.json

+2-17
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,14 @@
1717
"build": {
1818
"builder": "@angular-devkit/build-angular:browser",
1919
"options": {
20+
"allowedCommonJsDependencies": ["color", "enquire.js"],
2021
"outputPath": "dist/devui-admin",
2122
"index": "src/index.html",
2223
"main": "src/main.ts",
2324
"polyfills": "src/polyfills.ts",
2425
"tsConfig": "tsconfig.app.json",
2526
"assets": ["src/favicon.ico", "src/assets"],
26-
"styles": [
27-
"src/styles.scss",
28-
"node_modules/ng-devui/devui.min.css",
29-
"node_modules/@devui-design/icons/icomoon/devui-icon.css"
30-
],
27+
"styles": ["src/styles.scss", "node_modules/ng-devui/devui.min.css", "node_modules/@devui-design/icons/icomoon/devui-icon.css"],
3128
"scripts": [],
3229
"vendorChunk": true,
3330
"extractLicenses": false,
@@ -47,7 +44,6 @@
4744
"optimization": true,
4845
"outputHashing": "all",
4946
"sourceMap": false,
50-
"extractCss": true,
5147
"namedChunks": false,
5248
"extractLicenses": true,
5349
"vendorChunk": false,
@@ -97,17 +93,6 @@
9793
"scripts": []
9894
}
9995
},
100-
"lint": {
101-
"builder": "@angular-devkit/build-angular:tslint",
102-
"options": {
103-
"tsConfig": [
104-
"tsconfig.app.json",
105-
"tsconfig.spec.json",
106-
"e2e/tsconfig.json"
107-
],
108-
"exclude": ["**/node_modules/**"]
109-
}
110-
},
11196
"e2e": {
11297
"builder": "@angular-devkit/build-angular:protractor",
11398
"options": {

package.json

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ng-devui-admin",
3-
"version": "2.0.0",
3+
"version": "13.0.0",
44
"license": "MIT",
55
"description": "DevUI Admin based on Angular and DevUI components",
66
"repository": {
@@ -21,29 +21,29 @@
2121
},
2222
"private": true,
2323
"dependencies": {
24-
"@angular/animations": "~12.0.4",
25-
"@angular/cdk": "^12.0.4",
26-
"@angular/common": "~12.0.4",
27-
"@angular/compiler": "~12.0.4",
28-
"@angular/core": "~12.0.4",
29-
"@angular/forms": "~12.0.4",
30-
"@angular/platform-browser": "~12.0.4",
31-
"@angular/platform-browser-dynamic": "~12.0.4",
32-
"@angular/router": "~12.0.4",
33-
"@devui-design/icons": "^1.2.0",
34-
"@ngx-translate/core": "^13.0.0",
35-
"@ngx-translate/http-loader": "^6.0.0",
24+
"@angular/animations": "~13.2.1",
25+
"@angular/cdk": "13.2.1",
26+
"@angular/common": "~13.2.1",
27+
"@angular/compiler": "~13.2.1",
28+
"@angular/core": "~13.2.1",
29+
"@angular/forms": "~13.2.1",
30+
"@angular/platform-browser": "~13.2.1",
31+
"@angular/platform-browser-dynamic": "~13.2.1",
32+
"@angular/router": "~13.2.1",
33+
"@devui-design/icons": "^1.3.0",
34+
"@ngx-translate/core": "13.0.0",
35+
"@ngx-translate/http-loader": "6.0.0",
3636
"color": "^3.1.3",
37-
"echarts": "^5.1.1",
38-
"ng-devui": "^12.0.0",
39-
"rxjs": "~6.6.0",
37+
"echarts": "5.2.1",
38+
"ng-devui": "^13.2.0",
39+
"rxjs": "6.5.5",
4040
"tslib": "^2.0.0",
4141
"zone.js": "~0.11.4"
4242
},
4343
"devDependencies": {
44-
"@angular-devkit/build-angular": "~12.0.4",
45-
"@angular/cli": "~12.0.4",
46-
"@angular/compiler-cli": "~12.0.4",
44+
"@angular-devkit/build-angular": "~13.2.1",
45+
"@angular/cli": "~13.2.1",
46+
"@angular/compiler-cli": "~13.2.1",
4747
"@types/jasmine": "~3.5.0",
4848
"@types/jasminewd2": "~2.0.3",
4949
"@types/node": "^12.11.1",
@@ -63,6 +63,6 @@
6363
"stylelint-scss": "^3.19.0",
6464
"ts-node": "~8.3.0",
6565
"tslint": "~6.1.0",
66-
"typescript": "~4.2.4"
66+
"typescript": "~4.5.5"
6767
}
6868
}

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

+33-57
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,8 @@ export class EchartsService {
9393
show: false,
9494
},
9595
axisLabel: {
96-
textStyle: {
97-
color: 'rgba(103, 103, 103, 1)',
98-
fontSize: 14,
99-
},
96+
color: 'rgba(103, 103, 103, 1)',
97+
fontSize: 14,
10098
interval: 10,
10199
rotate: 0,
102100
},
@@ -115,9 +113,7 @@ export class EchartsService {
115113
show: false,
116114
},
117115
axisLabel: {
118-
textStyle: {
119-
color: 'rgba(103, 103, 103, 1)',
120-
},
116+
color: 'rgba(103, 103, 103, 1)',
121117
},
122118
show: true,
123119
minInterval: 10,
@@ -137,11 +133,9 @@ export class EchartsService {
137133
},
138134

139135
label: {
140-
normal: {
141-
show: false,
142-
position: 'top',
143-
color: 'rgba(255, 255, 255, 1)',
144-
},
136+
show: false,
137+
position: 'top',
138+
color: 'rgba(255, 255, 255, 1)',
145139
},
146140
areaStyle: {
147141
color: {
@@ -183,26 +177,24 @@ export class EchartsService {
183177
width: 3,
184178
},
185179
itemStyle: {
186-
normal: {
187-
opacity: 1,
188-
color: {
189-
x: 0,
190-
y: 0,
191-
x2: 0,
192-
y2: 1,
193-
type: 'linear',
194-
global: false,
195-
colorStops: [
196-
{
197-
offset: 0,
198-
color: 'rgba(157, 245, 5, 1)',
199-
},
200-
{
201-
offset: 1,
202-
color: 'rgba(23, 240, 248, 0.84)',
203-
},
204-
],
205-
},
180+
opacity: 1,
181+
color: {
182+
x: 0,
183+
y: 0,
184+
x2: 0,
185+
y2: 1,
186+
type: 'linear',
187+
global: false,
188+
colorStops: [
189+
{
190+
offset: 0,
191+
color: 'rgba(157, 245, 5, 1)',
192+
},
193+
{
194+
offset: 1,
195+
color: 'rgba(23, 240, 248, 0.84)',
196+
},
197+
],
206198
},
207199
},
208200
symbolSize: 0,
@@ -239,21 +231,15 @@ export class EchartsService {
239231
emphasis: {
240232
label: {
241233
show: true,
242-
textStyle: {
243-
fontSize: '20',
244-
},
234+
fontSize: '20',
245235
},
246236
},
247237
label: {
248-
normal: {
249-
show: false,
250-
position: 'center',
251-
},
238+
show: false,
239+
position: 'center',
252240
},
253241
labelLine: {
254-
normal: {
255-
show: false,
256-
},
242+
show: false,
257243
},
258244
data: [
259245
{ value: 335, name: '可容忍' },
@@ -314,9 +300,7 @@ export class EchartsService {
314300
emphasis: { focus: 'series' },
315301
data: [0, 8, 3, 110, 183, 168, 94, 67, 52, 70, 67, 0, 0, 0],
316302
itemStyle: {
317-
normal: {
318-
color: ['#1DD1A1'],
319-
},
303+
color: '#1DD1A1',
320304
},
321305
},
322306
{
@@ -327,9 +311,7 @@ export class EchartsService {
327311
emphasis: { focus: 'series' },
328312
data: [0, 0, 0, 0, 0, 0, 0, 14, 58, 55, 69, 77, 60, 59],
329313
itemStyle: {
330-
normal: {
331-
color: ['#3F8FEC'],
332-
},
314+
color: '#3F8FEC',
333315
},
334316
},
335317
{
@@ -340,9 +322,7 @@ export class EchartsService {
340322
emphasis: { focus: 'series' },
341323
data: [0, 0, 0, 2, 7, 3, 12, 52, 6, 13, 24, 25, 12, 6],
342324
itemStyle: {
343-
normal: {
344-
color: ['#FECA57'],
345-
},
325+
color: '#FECA57',
346326
},
347327
},
348328
{
@@ -353,9 +333,7 @@ export class EchartsService {
353333
emphasis: { focus: 'series' },
354334
data: [7, 31, 41, 40, 44, 82, 64, 63, 33, 39, 36, 27, 9, 9],
355335
itemStyle: {
356-
normal: {
357-
color: ['#855CF8'],
358-
},
336+
color: '#855CF8',
359337
},
360338
},
361339
{
@@ -366,9 +344,7 @@ export class EchartsService {
366344
emphasis: { focus: 'series' },
367345
data: [7, 39, 44, 152, 234, 253, 170, 196, 149, 177, 196, 129, 81, 74],
368346
itemStyle: {
369-
normal: {
370-
color: ['#F79044'],
371-
},
347+
color: '#F79044',
372348
},
373349
},
374350
],

src/app/@shared/components/echarts/echarts.component.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,7 @@ export class EchartsComponent implements AfterViewInit, OnChanges, OnDestroy, On
9494
},
9595
},
9696
axisLabel: {
97-
textStyle: {
98-
color: this.textColor,
99-
},
97+
color: this.textColor,
10098
},
10199
splitLine: {
102100
lineStyle: {

src/app/pages/dashboard/echarts.ts

+3-7
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,8 @@ export const echartServiceOption = {
8888
show: false,
8989
},
9090
axisLabel: {
91-
textStyle: {
92-
color: 'rgba(103, 103, 103, 1)',
93-
fontSize: 14,
94-
},
91+
color: 'rgba(103, 103, 103, 1)',
92+
fontSize: 14,
9593
interval: 10,
9694
rotate: 0,
9795
},
@@ -110,9 +108,7 @@ export const echartServiceOption = {
110108
show: false,
111109
},
112110
axisLabel: {
113-
textStyle: {
114-
color: 'rgba(103, 103, 103, 1)',
115-
},
111+
color: 'rgba(103, 103, 103, 1)',
116112
},
117113
show: true,
118114
minInterval: 10,

src/polyfills.ts

-10
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,6 @@
1818
* BROWSER POLYFILLS
1919
*/
2020

21-
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
22-
// import 'classlist.js'; // Run `npm install --save classlist.js`.
23-
24-
/**
25-
* Web Animations `@angular/platform-browser/animations`
26-
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
27-
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
28-
*/
29-
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
30-
3121
/**
3222
* By default, zone.js will patch all possible macroTask and DomEvents
3323
* user can disable parts of macroTask/DomEvents patch by setting following flags

src/test.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ declare const require: {
1717
// First, initialize the Angular testing environment.
1818
getTestBed().initTestEnvironment(
1919
BrowserDynamicTestingModule,
20-
platformBrowserDynamicTesting()
20+
platformBrowserDynamicTesting(), {
21+
teardown: { destroyAfterEach: false }
22+
}
2123
);
2224
// Then we find all the tests.
2325
const context = require.context('./', true, /\.spec\.ts$/);

0 commit comments

Comments
 (0)