Skip to content

Commit

Permalink
release(10.0.1): release 10.0.1 (#1057)
Browse files Browse the repository at this point in the history
  • Loading branch information
cipchk authored Oct 2, 2020
1 parent ccddfd9 commit 59011b6
Show file tree
Hide file tree
Showing 6 changed files with 71 additions and 33 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)


Expand Down
8 changes: 8 additions & 0 deletions docs/changelog.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions docs/changelog.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

### 脚手架
Expand Down
46 changes: 23 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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": {
Expand Down
9 changes: 5 additions & 4 deletions packages/theme/src/services/drawer/drawer.helper.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down Expand Up @@ -53,7 +54,7 @@ export class DrawerHelper {
/**
* 构建一个抽屉
*/
create(title: string, comp: any, params?: any, options?: DrawerHelperOptions): Observable<any> {
create(title: string | TemplateRef<{}> | undefined | null, comp: any, params?: any, options?: DrawerHelperOptions): Observable<any> {
options = deepMerge(
{
size: 'md',
Expand All @@ -72,7 +73,7 @@ export class DrawerHelper {
const defaultOptions: NzDrawerOptions = {
nzContent: comp,
nzContentParams: params,
nzTitle: title,
nzTitle: title as NzSafeAny,
};

if (typeof size === 'number') {
Expand Down Expand Up @@ -109,7 +110,7 @@ export class DrawerHelper {
/**
* 构建一个抽屉,点击蒙层不允许关闭
*/
static(title: string, comp: any, params?: any, options?: DrawerHelperOptions): Observable<any> {
static(title: string | TemplateRef<{}> | undefined | null, comp: any, params?: any, options?: DrawerHelperOptions): Observable<any> {
const drawerOptions = {
nzMaskClosable: false,
...(options && options.drawerOptions),
Expand Down
23 changes: 17 additions & 6 deletions packages/theme/src/services/modal/modal.helper.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down Expand Up @@ -37,7 +38,7 @@ export class ModalHelper {
* // 关闭
* this.NzModalRef.destroy();
*/
create(comp: any, params?: any, options?: ModalHelperOptions): Observable<any> {
create(comp: TemplateRef<NzSafeAny> | Type<NzSafeAny>, params?: NzSafeAny, options?: ModalHelperOptions): Observable<NzSafeAny> {
options = deepMerge(
{
size: 'lg',
Expand All @@ -46,7 +47,7 @@ export class ModalHelper {
},
options,
);
return new Observable((observer: Observer<any>) => {
return new Observable((observer: Observer<NzSafeAny>) => {
const { size, includeTabs, modalOptions } = options as ModalHelperOptions;
let cls = '';
let width = '';
Expand Down Expand Up @@ -102,7 +103,7 @@ export class ModalHelper {
* // 关闭
* this.NzModalRef.destroy();
*/
createStatic(comp: any, params?: any, options?: ModalHelperOptions): Observable<any> {
createStatic(comp: TemplateRef<NzSafeAny> | Type<NzSafeAny>, params?: NzSafeAny, options?: ModalHelperOptions): Observable<any> {
const modalOptions = {
nzMaskClosable: false,
...(options && options.modalOptions),
Expand All @@ -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<any> {
open(
comp: TemplateRef<NzSafeAny> | Type<NzSafeAny>,
params?: NzSafeAny,
size: 'sm' | 'md' | 'lg' | 'xl' | '' | number = 'lg',
options?: ModalOptions,
): Observable<any> {
return this.create(comp, params, {
size,
modalOptions: options,
Expand All @@ -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<any> {
static(
comp: TemplateRef<NzSafeAny> | Type<NzSafeAny>,
params?: NzSafeAny,
size: 'sm' | 'md' | 'lg' | 'xl' | '' | number = 'lg',
options?: ModalOptions,
): Observable<any> {
return this.open(comp, params, size, {
nzMaskClosable: false,
...options,
Expand Down

0 comments on commit 59011b6

Please sign in to comment.