From 59011b65f3b70f8357e682ef4633880b347ef10c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=A1=E8=89=B2?= Date: Fri, 2 Oct 2020 20:20:46 +0800 Subject: [PATCH] release(10.0.1): release 10.0.1 (#1057) --- CHANGELOG.md | 10 ++++ docs/changelog.en-US.md | 8 ++++ docs/changelog.zh-CN.md | 8 ++++ package.json | 46 +++++++++---------- .../src/services/drawer/drawer.helper.ts | 9 ++-- .../theme/src/services/modal/modal.helper.ts | 23 +++++++--- 6 files changed, 71 insertions(+), 33 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c892694a1..dca681e9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## [10.0.1](https://github.com/ng-alain/delon/compare/10.0.0...10.0.1) (2020-10-02) + + +### Bug Fixes + +* **abc:reuse-tab:** fix invalid this scope of hook events ([#1056](https://github.com/ng-alain/delon/issues/1056)) ([ccddfd9](https://github.com/ng-alain/delon/commit/ccddfd973794d93cb48dd37d8e28e39b121ec822)) +* **abc:st:** fix blank area in virtual scroll ([#1055](https://github.com/ng-alain/delon/issues/1055)) ([698f8ac](https://github.com/ng-alain/delon/commit/698f8acf05d994a3555fc575c3178c5c1ed26dba)) + + + # [10.0.0](https://github.com/ng-alain/delon/compare/9.5.5...10.0.0) (2020-09-29) diff --git a/docs/changelog.en-US.md b/docs/changelog.en-US.md index 87e5e21dd..fd7af2a0b 100644 --- a/docs/changelog.en-US.md +++ b/docs/changelog.en-US.md @@ -14,6 +14,14 @@ NG-ALAIN strictly follows [Semantic Versioning 2.0.0](http://semver.org/lang/zh- --- +## [10.0.1](https://github.com/ng-alain/delon/compare/10.0.0...10.0.1) (2020-10-02) + +### Bug Fixes + +* **abc:reuse-tab:** fix invalid this scope of hook events ([#1056](https://github.com/ng-alain/delon/issues/1056)) ([ccddfd9](https://github.com/ng-alain/delon/commit/ccddfd973794d93cb48dd37d8e28e39b121ec822)) +* **abc:st:** fix blank area in virtual scroll ([#1055](https://github.com/ng-alain/delon/issues/1055)) ([698f8ac](https://github.com/ng-alain/delon/commit/698f8acf05d994a3555fc575c3178c5c1ed26dba)) + + # [10.0.0](https://github.com/ng-alain/delon/compare/9.5.5...10.0.0) (2020-09-29) ### Scaffold diff --git a/docs/changelog.zh-CN.md b/docs/changelog.zh-CN.md index 31f8f3911..055c061c8 100644 --- a/docs/changelog.zh-CN.md +++ b/docs/changelog.zh-CN.md @@ -14,6 +14,14 @@ NG-ALAIN 严格遵循 [Semantic Versioning 2.0.0](http://semver.org/lang/zh-CN/) --- +## [10.0.1](https://github.com/ng-alain/delon/compare/10.0.0...10.0.1) (2020-10-02) + +### Bug Fixes + +* **abc:reuse-tab:** 修复钩子事件无效 `this` 作用域 ([#1056](https://github.com/ng-alain/delon/issues/1056)) ([ccddfd9](https://github.com/ng-alain/delon/commit/ccddfd973794d93cb48dd37d8e28e39b121ec822)) +* **abc:st:** 修复虚拟滚动产生空白区域 ([#1055](https://github.com/ng-alain/delon/issues/1055)) ([698f8ac](https://github.com/ng-alain/delon/commit/698f8acf05d994a3555fc575c3178c5c1ed26dba)) + + # [10.0.0](https://github.com/ng-alain/delon/compare/9.5.5...10.0.0) (2020-09-29) ### 脚手架 diff --git a/package.json b/package.json index 1a2924e12..b11f80151 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "delon", - "version": "10.0.0", + "version": "10.0.1", "description": "Delon is a set of essential modules for NG-ALAIN.", "keywords": [ "delon", @@ -45,20 +45,20 @@ "ssr:prerender": "npm run site:build && npm run ng-high-memory run site:prerender" }, "dependencies": { - "@angular/animations": "~10.1.0", - "@angular/common": "~10.1.0", - "@angular/compiler": "~10.1.0", - "@angular/core": "~10.1.0", - "@angular/forms": "~10.1.0", - "@angular/platform-browser": "~10.1.0", - "@angular/platform-browser-dynamic": "~10.1.0", - "@angular/router": "~10.1.0", + "@angular/animations": "~10.1.4", + "@angular/common": "~10.1.4", + "@angular/compiler": "~10.1.4", + "@angular/core": "~10.1.4", + "@angular/forms": "~10.1.4", + "@angular/platform-browser": "~10.1.4", + "@angular/platform-browser-dynamic": "~10.1.4", + "@angular/router": "~10.1.4", "rxjs": "~6.6.0", "tslib": "^2.0.0", "zone.js": "~0.10.2", - "@angular/platform-server": "~10.1.0", - "@angular/elements": "~10.1.0", - "@antv/data-set": "^0.11.5", + "@angular/platform-server": "~10.1.4", + "@angular/elements": "~10.1.4", + "@antv/data-set": "^0.11.7", "@antv/g2": "^4.0.15", "@ngx-translate/core": "^13.0.0", "@ngx-translate/http-loader": "^6.0.0", @@ -85,9 +85,9 @@ "express": "^4.17.1" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.1001.0", - "@angular/cli": "~10.1.0", - "@angular/compiler-cli": "~10.1.0", + "@angular-devkit/build-angular": "~0.1001.4", + "@angular/cli": "~10.1.4", + "@angular/compiler-cli": "~10.1.4", "@types/node": "^12.11.1", "@types/jasmine": "~3.5.0", "@types/jasminewd2": "~2.0.3", @@ -107,7 +107,7 @@ "karma-spec-reporter": "0.0.32", "karma-viewport": "^1.0.6", "@types/aos": "^3.0.3", - "@schematics/schematics": "^0.1001.0", + "@schematics/schematics": "^0.1001.4", "@angularclass/hmr": "^3.0.0", "@types/file-saver": "^2.0.1", "@types/deep-extend": "^0.4.31", @@ -136,11 +136,11 @@ "mark-twain": "^2.0.3", "mockjs": "^1.1.0", "mustache": "^4.0.1", - "ng-packagr": "^10.1.0", + "ng-packagr": "^10.1.2", "tsickle": "^0.39.1", "parse5": "^6.0.0", - "prettier": "^2.0.5", - "pretty-quick": "^3.0.0", + "prettier": "^2.1.2", + "pretty-quick": "^3.0.2", "readline-sync": "^1.4.10", "stream": "0.0.2", "stylelint": "^13.7.0", @@ -150,16 +150,16 @@ "stylelint-declaration-block-no-ignored-properties": "^2.3.0", "stylelint-order": "^4.1.0", "webpack-bundle-analyzer": "^3.8.0", - "xlsx": "^0.16.6", + "xlsx": "^0.16.7", "screenfull": "^5.0.2", "less-bundle-promise": "^1.0.7", "ng-alain-codelyzer": "^0.0.1", "ng-alain-sts": "^0.0.1", - "ng-alain-plugin-theme": "^10.0.2", + "ng-alain-plugin-theme": "^10.0.3", "nz-tslint-rules": "^0.901.2", "tsconfig-paths": "^3.9.0", - "@nguniversal/builders": "^10.0.2", - "@types/express": "^4.17.7" + "@nguniversal/builders": "^10.1.0", + "@types/express": "^4.17.8" }, "husky": { "hooks": { diff --git a/packages/theme/src/services/drawer/drawer.helper.ts b/packages/theme/src/services/drawer/drawer.helper.ts index 2ad87c965..70b87f1ac 100644 --- a/packages/theme/src/services/drawer/drawer.helper.ts +++ b/packages/theme/src/services/drawer/drawer.helper.ts @@ -1,5 +1,6 @@ -import { Injectable } from '@angular/core'; +import { Injectable, TemplateRef } from '@angular/core'; import { deepMerge } from '@delon/util'; +import { NzSafeAny } from 'ng-zorro-antd/core/types'; import { NzDrawerOptions, NzDrawerService } from 'ng-zorro-antd/drawer'; import { Observable, Observer } from 'rxjs'; @@ -53,7 +54,7 @@ export class DrawerHelper { /** * 构建一个抽屉 */ - create(title: string, comp: any, params?: any, options?: DrawerHelperOptions): Observable { + create(title: string | TemplateRef<{}> | undefined | null, comp: any, params?: any, options?: DrawerHelperOptions): Observable { options = deepMerge( { size: 'md', @@ -72,7 +73,7 @@ export class DrawerHelper { const defaultOptions: NzDrawerOptions = { nzContent: comp, nzContentParams: params, - nzTitle: title, + nzTitle: title as NzSafeAny, }; if (typeof size === 'number') { @@ -109,7 +110,7 @@ export class DrawerHelper { /** * 构建一个抽屉，点击蒙层不允许关闭 */ - static(title: string, comp: any, params?: any, options?: DrawerHelperOptions): Observable { + static(title: string | TemplateRef<{}> | undefined | null, comp: any, params?: any, options?: DrawerHelperOptions): Observable { const drawerOptions = { nzMaskClosable: false, ...(options && options.drawerOptions), diff --git a/packages/theme/src/services/modal/modal.helper.ts b/packages/theme/src/services/modal/modal.helper.ts index 4906ba940..b220b69cc 100644 --- a/packages/theme/src/services/modal/modal.helper.ts +++ b/packages/theme/src/services/modal/modal.helper.ts @@ -1,5 +1,6 @@ -import { Injectable } from '@angular/core'; +import { Injectable, TemplateRef, Type } from '@angular/core'; import { deepMerge } from '@delon/util'; +import { NzSafeAny } from 'ng-zorro-antd/core/types'; import { ModalOptions, NzModalService } from 'ng-zorro-antd/modal'; import { Observable, Observer } from 'rxjs'; @@ -37,7 +38,7 @@ export class ModalHelper { * // 关闭 * this.NzModalRef.destroy(); */ - create(comp: any, params?: any, options?: ModalHelperOptions): Observable { + create(comp: TemplateRef | Type, params?: NzSafeAny, options?: ModalHelperOptions): Observable { options = deepMerge( { size: 'lg', @@ -46,7 +47,7 @@ export class ModalHelper { }, options, ); - return new Observable((observer: Observer) => { + return new Observable((observer: Observer) => { const { size, includeTabs, modalOptions } = options as ModalHelperOptions; let cls = ''; let width = ''; @@ -102,7 +103,7 @@ export class ModalHelper { * // 关闭 * this.NzModalRef.destroy(); */ - createStatic(comp: any, params?: any, options?: ModalHelperOptions): Observable { + createStatic(comp: TemplateRef | Type, params?: NzSafeAny, options?: ModalHelperOptions): Observable { const modalOptions = { nzMaskClosable: false, ...(options && options.modalOptions), @@ -125,7 +126,12 @@ export class ModalHelper { * // 关闭 * this.NzModalRef.destroy(); */ - open(comp: any, params?: any, size: 'sm' | 'md' | 'lg' | 'xl' | '' | number = 'lg', options?: ModalOptions): Observable { + open( + comp: TemplateRef | Type, + params?: NzSafeAny, + size: 'sm' | 'md' | 'lg' | 'xl' | '' | number = 'lg', + options?: ModalOptions, + ): Observable { return this.create(comp, params, { size, modalOptions: options, @@ -148,7 +154,12 @@ export class ModalHelper { * // 关闭 * this.NzModalRef.destroy(); */ - static(comp: any, params?: any, size: 'sm' | 'md' | 'lg' | 'xl' | '' | number = 'lg', options?: ModalOptions): Observable { + static( + comp: TemplateRef | Type, + params?: NzSafeAny, + size: 'sm' | 'md' | 'lg' | 'xl' | '' | number = 'lg', + options?: ModalOptions, + ): Observable { return this.open(comp, params, size, { nzMaskClosable: false, ...options,