chore(release): release ng-devui-admin 13.0.0 (#23)

Co-authored-by: huaweidevcloud <[email protected]>
DevCloudFE · May 26, 2022 · 34fa015 · 34fa015
1 parent 15e2bb2
commit 34fa015
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 120 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,6 +32,7 @@ speed-measure-plugin*.json
 .history/*
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage
@@ -44,6 +45,3 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
-
-#package-lock
-/package-lock.json
diff --git a/README.md b/README.md
@@ -20,9 +20,10 @@ 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/
+- Materials: https://devui.design/admin-materials/
 
 ## Features
+
 ![avatar](home-1.png)
 
 - Responsive: Adapting to different screen sizes, providing users with a more comfortable interface and user experience.

diff --git a/README_zh_CN.md b/README_zh_CN.md
@@ -16,10 +16,11 @@ DevUI Admin 是一个企业级中后台前端/设计解决方案，依据 DevUI
 
 &nbsp;
 ![avatar](home.png)
+
 - 预览：https://devui.design/admin/
 - 首页：https://devui.design/admin-page/home
 - 文档：https://devui.design/admin-page/docs/getting-started
-- Admin 区块：https://devui.design/admin-materials/
+- Admin 区块: https://devui.design/admin-materials/
 
 ## 特性
 

diff --git a/angular.json b/angular.json
@@ -17,17 +17,14 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "allowedCommonJsDependencies": ["color", "enquire.js"],
             "outputPath": "dist/devui-admin",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
             "assets": ["src/favicon.ico", "src/assets"],
-            "styles": [
-              "src/styles.scss",
-              "node_modules/ng-devui/devui.min.css",
-              "node_modules/@devui-design/icons/icomoon/devui-icon.css"
-            ],
+            "styles": ["src/styles.scss", "node_modules/ng-devui/devui.min.css", "node_modules/@devui-design/icons/icomoon/devui-icon.css"],
             "scripts": [],
             "vendorChunk": true,
             "extractLicenses": false,
@@ -47,7 +44,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "extractLicenses": true,
               "vendorChunk": false,
@@ -97,17 +93,6 @@
             "scripts": []
           }
         },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "tsconfig.app.json",
-              "tsconfig.spec.json",
-              "e2e/tsconfig.json"
-            ],
-            "exclude": ["**/node_modules/**"]
-          }
-        },
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-devui-admin",
-  "version": "2.0.0",
+  "version": "13.0.0",
   "license": "MIT",
   "description": "DevUI Admin based on Angular and DevUI components",
   "repository": {
@@ -21,29 +21,29 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~12.0.4",
-    "@angular/cdk": "^12.0.4",
-    "@angular/common": "~12.0.4",
-    "@angular/compiler": "~12.0.4",
-    "@angular/core": "~12.0.4",
-    "@angular/forms": "~12.0.4",
-    "@angular/platform-browser": "~12.0.4",
-    "@angular/platform-browser-dynamic": "~12.0.4",
-    "@angular/router": "~12.0.4",
-    "@devui-design/icons": "^1.2.0",
-    "@ngx-translate/core": "^13.0.0",
-    "@ngx-translate/http-loader": "^6.0.0",
+    "@angular/animations": "~13.2.1",
+    "@angular/cdk": "13.2.1",
+    "@angular/common": "~13.2.1",
+    "@angular/compiler": "~13.2.1",
+    "@angular/core": "~13.2.1",
+    "@angular/forms": "~13.2.1",
+    "@angular/platform-browser": "~13.2.1",
+    "@angular/platform-browser-dynamic": "~13.2.1",
+    "@angular/router": "~13.2.1",
+    "@devui-design/icons": "^1.3.0",
+    "@ngx-translate/core": "13.0.0",
+    "@ngx-translate/http-loader": "6.0.0",
     "color": "^3.1.3",
-    "echarts": "^5.1.1",
-    "ng-devui": "^12.0.0",
-    "rxjs": "~6.6.0",
+    "echarts": "5.2.1",
+    "ng-devui": "^13.2.0",
+    "rxjs": "6.5.5",
     "tslib": "^2.0.0",
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~12.0.4",
-    "@angular/cli": "~12.0.4",
-    "@angular/compiler-cli": "~12.0.4",
+    "@angular-devkit/build-angular": "~13.2.1",
+    "@angular/cli": "~13.2.1",
+    "@angular/compiler-cli": "~13.2.1",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
@@ -63,6 +63,6 @@
     "stylelint-scss": "^3.19.0",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
-    "typescript": "~4.2.4"
+    "typescript": "~4.5.5"
   }
 }
diff --git a/src/app/@core/mock/echarts.service.ts b/src/app/@core/mock/echarts.service.ts
@@ -93,10 +93,8 @@ export class EchartsService {
         show: false,
       },
       axisLabel: {
-        textStyle: {
-          color: 'rgba(103, 103, 103, 1)',
-          fontSize: 14,
-        },
+        color: 'rgba(103, 103, 103, 1)',
+        fontSize: 14,
         interval: 10,
         rotate: 0,
       },
@@ -115,9 +113,7 @@ export class EchartsService {
         show: false,
       },
       axisLabel: {
-        textStyle: {
-          color: 'rgba(103, 103, 103, 1)',
-        },
+        color: 'rgba(103, 103, 103, 1)',
       },
       show: true,
       minInterval: 10,
@@ -137,11 +133,9 @@ export class EchartsService {
         },
 
         label: {
-          normal: {
-            show: false,
-            position: 'top',
-            color: 'rgba(255, 255, 255, 1)',
-          },
+          show: false,
+          position: 'top',
+          color: 'rgba(255, 255, 255, 1)',
         },
         areaStyle: {
           color: {
@@ -183,26 +177,24 @@ export class EchartsService {
           width: 3,
         },
         itemStyle: {
-          normal: {
-            opacity: 1,
-            color: {
-              x: 0,
-              y: 0,
-              x2: 0,
-              y2: 1,
-              type: 'linear',
-              global: false,
-              colorStops: [
-                {
-                  offset: 0,
-                  color: 'rgba(157, 245, 5, 1)',
-                },
-                {
-                  offset: 1,
-                  color: 'rgba(23, 240, 248, 0.84)',
-                },
-              ],
-            },
+          opacity: 1,
+          color: {
+            x: 0,
+            y: 0,
+            x2: 0,
+            y2: 1,
+            type: 'linear',
+            global: false,
+            colorStops: [
+              {
+                offset: 0,
+                color: 'rgba(157, 245, 5, 1)',
+              },
+              {
+                offset: 1,
+                color: 'rgba(23, 240, 248, 0.84)',
+              },
+            ],
           },
         },
         symbolSize: 0,
@@ -239,21 +231,15 @@ export class EchartsService {
         emphasis: {
           label: {
             show: true,
-            textStyle: {
-              fontSize: '20',
-            },
+            fontSize: '20',
           },
         },
         label: {
-          normal: {
-            show: false,
-            position: 'center',
-          },
+          show: false,
+          position: 'center',
         },
         labelLine: {
-          normal: {
-            show: false,
-          },
+          show: false,
         },
         data: [
           { value: 335, name: '可容忍' },
@@ -314,9 +300,7 @@ export class EchartsService {
         emphasis: { focus: 'series' },
         data: [0, 8, 3, 110, 183, 168, 94, 67, 52, 70, 67, 0, 0, 0],
         itemStyle: {
-          normal: {
-            color: ['#1DD1A1'],
-          },
+          color: '#1DD1A1',
         },
       },
       {
@@ -327,9 +311,7 @@ export class EchartsService {
         emphasis: { focus: 'series' },
         data: [0, 0, 0, 0, 0, 0, 0, 14, 58, 55, 69, 77, 60, 59],
         itemStyle: {
-          normal: {
-            color: ['#3F8FEC'],
-          },
+          color: '#3F8FEC',
         },
       },
       {
@@ -340,9 +322,7 @@ export class EchartsService {
         emphasis: { focus: 'series' },
         data: [0, 0, 0, 2, 7, 3, 12, 52, 6, 13, 24, 25, 12, 6],
         itemStyle: {
-          normal: {
-            color: ['#FECA57'],
-          },
+          color: '#FECA57',
         },
       },
       {
@@ -353,9 +333,7 @@ export class EchartsService {
         emphasis: { focus: 'series' },
         data: [7, 31, 41, 40, 44, 82, 64, 63, 33, 39, 36, 27, 9, 9],
         itemStyle: {
-          normal: {
-            color: ['#855CF8'],
-          },
+          color: '#855CF8',
         },
       },
       {
@@ -366,9 +344,7 @@ export class EchartsService {
         emphasis: { focus: 'series' },
         data: [7, 39, 44, 152, 234, 253, 170, 196, 149, 177, 196, 129, 81, 74],
         itemStyle: {
-          normal: {
-            color: ['#F79044'],
-          },
+          color: '#F79044',
         },
       },
     ],

diff --git a/src/app/@shared/components/echarts/echarts.component.ts b/src/app/@shared/components/echarts/echarts.component.ts
@@ -94,9 +94,7 @@ export class EchartsComponent implements AfterViewInit, OnChanges, OnDestroy, On
         },
       },
       axisLabel: {
-        textStyle: {
-          color: this.textColor,
-        },
+        color: this.textColor,
       },
       splitLine: {
         lineStyle: {

diff --git a/src/app/pages/dashboard/echarts.ts b/src/app/pages/dashboard/echarts.ts
@@ -88,10 +88,8 @@ export const echartServiceOption = {
       show: false,
     },
     axisLabel: {
-      textStyle: {
-        color: 'rgba(103, 103, 103, 1)',
-        fontSize: 14,
-      },
+      color: 'rgba(103, 103, 103, 1)',
+      fontSize: 14,
       interval: 10,
       rotate: 0,
     },
@@ -110,9 +108,7 @@ export const echartServiceOption = {
       show: false,
     },
     axisLabel: {
-      textStyle: {
-        color: 'rgba(103, 103, 103, 1)',
-      },
+      color: 'rgba(103, 103, 103, 1)',
     },
     show: true,
     minInterval: 10,

diff --git a/src/polyfills.ts b/src/polyfills.ts
@@ -18,16 +18,6 @@
  * BROWSER POLYFILLS
  */
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
-// import 'classlist.js';  // Run `npm install --save classlist.js`.
-
-/**
- * Web Animations `@angular/platform-browser/animations`
- * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
- * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
- */
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
-
 /**
  * By default, zone.js will patch all possible macroTask and DomEvents
  * user can disable parts of macroTask/DomEvents patch by setting following flags

diff --git a/src/test.ts b/src/test.ts
@@ -17,7 +17,9 @@ declare const require: {
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(), {
+    teardown: { destroyAfterEach: false }
+}
 );
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);