Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ng-alain/delon
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 14.0.0
Choose a base ref
...
head repository: ng-alain/delon
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 14.1.0
Choose a head ref
  • 11 commits
  • 48 files changed
  • 1 contributor

Commits on Aug 28, 2022

  1. Copy the full SHA
    1e1c165 View commit details

Commits on Sep 8, 2022

  1. Copy the full SHA
    b56d75b View commit details
  2. Copy the full SHA
    c43afb8 View commit details

Commits on Sep 10, 2022

  1. Copy the full SHA
    b9e433d View commit details

Commits on Sep 14, 2022

  1. Copy the full SHA
    2fb2d2b View commit details

Commits on Oct 2, 2022

  1. Copy the full SHA
    7d8fbf5 View commit details

Commits on Oct 9, 2022

  1. Copy the full SHA
    b25ae52 View commit details
  2. Copy the full SHA
    8b0be4c View commit details
  3. Copy the full SHA
    aaac605 View commit details
  4. Copy the full SHA
    a807429 View commit details
  5. Copy the full SHA
    f11a1b3 View commit details
Showing with 581 additions and 510 deletions.
  1. +19 −0 CHANGELOG.md
  2. +3 −1 angular.json
  3. +16 −0 docs/changelog.en-US.md
  4. +16 −0 docs/changelog.zh-CN.md
  5. +0 −52 docs/upgrade-v13.en-US.md
  6. +0 −53 docs/upgrade-v13.zh-CN.md
  7. +32 −0 docs/upgrade-v14.en-US.md
  8. +33 −0 docs/upgrade-v14.zh-CN.md
  9. +2 −3 package.json
  10. +1 −1 packages/abc/reuse-tab/index.en-US.md
  11. +1 −1 packages/abc/reuse-tab/index.zh-CN.md
  12. +7 −0 packages/abc/reuse-tab/reuse-tab.component.ts
  13. +109 −76 packages/abc/st/demo/custom-data.md
  14. +1 −1 packages/abc/st/index.en-US.md
  15. +1 −1 packages/abc/st/index.zh-CN.md
  16. +37 −11 packages/abc/st/st-column-source.ts
  17. +29 −10 packages/abc/st/st-filter.component.ts
  18. +1 −1 packages/abc/st/st.component.html
  19. +27 −4 packages/abc/st/st.interfaces.ts
  20. +1 −0 packages/abc/st/style/index.less
  21. +4 −1 packages/abc/st/test/base.spec.ts
  22. +27 −7 packages/abc/st/test/st-column-source.spec.ts
  23. +16 −0 packages/abc/st/test/st-filter.spec.ts
  24. +1 −1 packages/abc/st/test/st.spec.ts
  25. +0 −1 packages/form/docs/customize.en-US.md
  26. +0 −1 packages/form/docs/customize.zh-CN.md
  27. +0 −44 packages/form/widgets-third/ueditor/demo/simple.md
  28. +0 −78 packages/form/widgets-third/ueditor/index.en-US.md
  29. +0 −80 packages/form/widgets-third/ueditor/index.zh-CN.md
  30. +0 −51 packages/form/widgets-third/ueditor/ueditor.widget.ts
  31. +1 −0 schematics/application/files/src/app/core/index.ts
  32. +1 −1 schematics/application/files/src/app/core/startup/startup.service.ts
  33. +2 −1 schematics/application/files/src/app/routes/routes-routing.module.ts
  34. +2 −2 schematics/ng-update/upgrade-rules/v12/index.ts
  35. +2 −2 schematics/ng-update/upgrade-rules/v13/index.ts
  36. +150 −2 schematics/ng-update/upgrade-rules/v14/index.spec.ts
  37. +20 −0 schematics/ng-update/upgrade-rules/v14/index.ts
  38. +10 −0 schematics/utils/file.ts
  39. +1 −1 schematics/utils/workspace.ts
  40. +1 −0 scripts/ci/build-schematics.sh
  41. +0 −1 scripts/ci/utils.sh
  42. +1 −3 scripts/site/route-paths.txt
  43. +0 −11 src/app/app.module.ts
  44. +2 −0 src/app/core/code/files/delon-abc.module.ts
  45. +1 −3 src/app/shared/json-schema/json-schema.module.ts
  46. +1 −2 src/app/shared/shared.module.ts
  47. +1 −1 src/dev/layout.component.ts
  48. +1 −1 src/dev/pages/page.component.ts
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
## [14.1.0](https://github.com/ng-alain/delon/compare/14.0.0...14.0.1) (2022-10-09)


### Bug Fixes

* **abc:reuse-tab:** fix can't refresh current tab ([#1529](https://github.com/ng-alain/delon/issues/1529)) ([2fb2d2b](https://github.com/ng-alain/delon/commit/2fb2d2b3af7c10255c0f0b4c82a823cee6c2c1d9))
* **abc:st:** fix built-in style into to `className` ([#1525](https://github.com/ng-alain/delon/issues/1525)) ([b9e433d](https://github.com/ng-alain/delon/commit/b9e433da4a5d9fc0e88e5707753be4a8a3821a61))
* **abc:st:** fix can't close panel when `showOPArea` is `true` ([#1527](https://github.com/ng-alain/delon/issues/1527)) ([7d8fbf5](https://github.com/ng-alain/delon/commit/7d8fbf56e369cb58ef189f5df41f8020369ca8b9))
* **abc:st:** fix click trigger on blank area of sub-menus ([#1534](https://github.com/ng-alain/delon/issues/1534)) ([a807429](https://github.com/ng-alain/delon/commit/a80742910dfd1e4ce1e9c184469e49422ffb1a63))
* **cli:** fix correctly returns undefined ([#1533](https://github.com/ng-alain/delon/issues/1533)) ([8b0be4c](https://github.com/ng-alain/delon/commit/8b0be4ca90b28a311262e000a27d5180015ce533))
* **cli:** fix merge `allowedCommonJsDependencies` ([#1526](https://github.com/ng-alain/delon/issues/1526)) ([c43afb8](https://github.com/ng-alain/delon/commit/c43afb837e2619d1d92067c3fce78234ad5c814e))


### Features

* **cli:** add dynamic start page ([#1524](https://github.com/ng-alain/delon/issues/1524)) ([1e1c165](https://github.com/ng-alain/delon/commit/1e1c165c97a3ebef427a8558f474366bac75651f))



# [14.0.0](https://github.com/ng-alain/delon/compare/13.5.2...14.0.0) (2022-08-27)


4 changes: 3 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
@@ -75,7 +75,9 @@
"ajv",
"file-saver",
"ajv-formats",
"date-fns"
"date-fns",
"extend",
"aos"
]
},
"configurations": {
16 changes: 16 additions & 0 deletions docs/changelog.en-US.md
Original file line number Diff line number Diff line change
@@ -14,6 +14,22 @@ NG-ALAIN strictly follows [Semantic Versioning 2.0.0](http://semver.org/lang/zh-

---

## [14.1.0](https://github.com/ng-alain/delon/compare/14.0.0...14.0.1) (2022-10-09)

### Bug Fixes

* **abc:reuse-tab:** fix can't refresh current tab ([#1529](https://github.com/ng-alain/delon/issues/1529)) ([2fb2d2b](https://github.com/ng-alain/delon/commit/2fb2d2b3af7c10255c0f0b4c82a823cee6c2c1d9))
* **abc:st:** fix built-in style into to `className` ([#1525](https://github.com/ng-alain/delon/issues/1525)) ([b9e433d](https://github.com/ng-alain/delon/commit/b9e433da4a5d9fc0e88e5707753be4a8a3821a61))
* **abc:st:** fix can't close panel when `showOPArea` is `true` ([#1527](https://github.com/ng-alain/delon/issues/1527)) ([7d8fbf5](https://github.com/ng-alain/delon/commit/7d8fbf56e369cb58ef189f5df41f8020369ca8b9))
* **abc:st:** fix click trigger on blank area of sub-menus ([#1534](https://github.com/ng-alain/delon/issues/1534)) ([a807429](https://github.com/ng-alain/delon/commit/a80742910dfd1e4ce1e9c184469e49422ffb1a63))
* **cli:** fix correctly returns undefined ([#1533](https://github.com/ng-alain/delon/issues/1533)) ([8b0be4c](https://github.com/ng-alain/delon/commit/8b0be4ca90b28a311262e000a27d5180015ce533))
* **cli:** fix merge `allowedCommonJsDependencies` ([#1526](https://github.com/ng-alain/delon/issues/1526)) ([c43afb8](https://github.com/ng-alain/delon/commit/c43afb837e2619d1d92067c3fce78234ad5c814e))

### Features

* **cli:** add dynamic start page ([#1524](https://github.com/ng-alain/delon/issues/1524)) ([1e1c165](https://github.com/ng-alain/delon/commit/1e1c165c97a3ebef427a8558f474366bac75651f))


# [14.0.0](https://github.com/ng-alain/delon/compare/13.5.2...14.0.0) (2022-08-27)

### Bug Fixes
16 changes: 16 additions & 0 deletions docs/changelog.zh-CN.md
Original file line number Diff line number Diff line change
@@ -14,6 +14,22 @@ NG-ALAIN 严格遵循 [Semantic Versioning 2.0.0](http://semver.org/lang/zh-CN/)

---

## [14.1.0](https://github.com/ng-alain/delon/compare/14.0.0...14.0.1) (2022-10-09)

### Bug Fixes

* **abc:reuse-tab:** 修复无法刷新当前页 ([#1529](https://github.com/ng-alain/delon/issues/1529)) ([2fb2d2b](https://github.com/ng-alain/delon/commit/2fb2d2b3af7c10255c0f0b4c82a823cee6c2c1d9))
* **abc:st:** 修复当指定 `className` 时导致内置样式失效 ([#1525](https://github.com/ng-alain/delon/issues/1525)) ([b9e433d](https://github.com/ng-alain/delon/commit/b9e433da4a5d9fc0e88e5707753be4a8a3821a61))
* **abc:st:** 修复 `showOPArea``true` 时无法关闭面板 ([#1527](https://github.com/ng-alain/delon/issues/1527)) ([7d8fbf5](https://github.com/ng-alain/delon/commit/7d8fbf56e369cb58ef189f5df41f8020369ca8b9))
* **abc:st:** 修复子菜单下点击空白区域无法触发事件 ([#1534](https://github.com/ng-alain/delon/issues/1534)) ([a807429](https://github.com/ng-alain/delon/commit/a80742910dfd1e4ce1e9c184469e49422ffb1a63))
* **cli:** 修复初始化NG-ALAIN时 `startup.service.ts` 不正确返回 `undefined` ([#1533](https://github.com/ng-alain/delon/issues/1533)) ([8b0be4c](https://github.com/ng-alain/delon/commit/8b0be4ca90b28a311262e000a27d5180015ce533))
* **cli:** 修复多余 `allowedCommonJsDependencies` 项 ([#1526](https://github.com/ng-alain/delon/issues/1526)) ([c43afb8](https://github.com/ng-alain/delon/commit/c43afb837e2619d1d92067c3fce78234ad5c814e))

### Features

* **cli:** 新增动态启动页 ([#1524](https://github.com/ng-alain/delon/issues/1524)) ([1e1c165](https://github.com/ng-alain/delon/commit/1e1c165c97a3ebef427a8558f474366bac75651f))


# [14.0.0](https://github.com/ng-alain/delon/compare/13.5.2...14.0.0) (2022-08-27)

### Bug Fixes
52 changes: 0 additions & 52 deletions docs/upgrade-v13.en-US.md

This file was deleted.

53 changes: 0 additions & 53 deletions docs/upgrade-v13.zh-CN.md

This file was deleted.

32 changes: 32 additions & 0 deletions docs/upgrade-v14.en-US.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
order: 1000
type: Basic
title: Upgrade to version 14.0
hot: true
---

> This guide applies to the current version ng-alain >= `13`;
> If you encounter problems during the upgrade process, feel free to comment here.
> If you find any errors in this guide, please point out
> Or you have encountered a new problem and solved it, welcome to comment here.

## Before upgrade

1. Make sure `Node.js` >= `14.15` <= `16.10.0`.
2. Create a new branch, or use other methods to back up the current project.
3. Delete the `package-lock.json` or `yarn.lock` file.

### 1.Upgrade dependencies

- Upgrade Angular to 14.x version, Run `ng update @angular/core@14 @angular/cli@14 @angular-eslint/schematics@14`.
- Run `ng update @angular/cdk@14`, if you have used `@angular/cdk`.

### 2.Upgrade NG-ZORRO

- Run `ng update ng-zorro-antd@14`.
- If any warning messages appear in the console, follow the prompts to modify the corresponding code.

### 3.Upgrade NG-ALAIN

- Run `ng update ng-alain@14`
33 changes: 33 additions & 0 deletions docs/upgrade-v14.zh-CN.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
order: 1000
type: Basic
title: 升级到 14.0 版本
hot: true
---

> 本指南适用于当前版本 ng-alain >= `13` ;
> 如果在升级过程中遇到问题,欢迎提出。提问前请阅读 [如何向开源社区提问题](https://github.com/seajs/seajs/issues/545)
> 如果发现本指南存在遗漏/错误,请指出!
> 或者你遇到了新的问题并解决了,欢迎补充!
## 开始之前

1. 首先确保你 `Node.js` >= `14.15` <= `16.10.0`
2. 创建新的分支,或者使用其他方式备份当前项目
3. 删除项目下 `package-lock.json``yarn.lock` 文件

## 升级步骤

### 1. 升级相关依赖

- 将项目升级到 Angular 13 运行 `ng update @angular/core@14 @angular/cli@14 @angular-eslint/schematics@14`
- 如果你有单独使用 `@angular/cdk` 请执行 `ng update @angular/cdk@14`

### 2.升级 NG-ZORRO

- 运行 `ng update ng-zorro-antd@14`
- 如果控制台出现警告消息请按提示修改对应代码

### 3.升级 NG-ALAIN

- 运行 `ng update ng-alain@14`
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "delon",
"version": "14.0.0",
"version": "14.1.0",
"description": "Delon is a set of essential modules for NG-ALAIN.",
"keywords": [
"delon",
@@ -85,7 +85,6 @@
"ngx-countdown": "^14.0.0",
"ngx-highlight-js": "^14.0.0",
"ngx-tinymce": "^14.0.0",
"ngx-ueditor": "^14.0.0",
"qrious": "^4.0.2",
"@webcomponents/custom-elements": "^1.5.0",
"aos": "^3.0.0-beta.6",
@@ -105,7 +104,7 @@
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.0.0",
"typescript": "~4.7.2",
"typescript": "~4.8.2",
"codelyzer": "^6.0.2",
"jasmine-spec-reporter": "^7.0.0",
"protractor": "~7.0.0",
2 changes: 1 addition & 1 deletion packages/abc/reuse-tab/index.en-US.md
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ alainProvides.push({
```html
<reuse-tab #reuseTab></reuse-tab>
<router-outlet (activate)="reuseTab.activate($event)"></router-outlet>
<router-outlet (activate)="reuseTab.activate($event)" (attach)="reuseTab.activate($event)"></router-outlet>
```

> **Note: If you do not specify the `(activate)` event, you cannot refresh current tab when uncached.**
2 changes: 1 addition & 1 deletion packages/abc/reuse-tab/index.zh-CN.md
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ alainProvides.push({
```html
<reuse-tab #reuseTab></reuse-tab>
<router-outlet (activate)="reuseTab.activate($event)"></router-outlet>
<router-outlet (activate)="reuseTab.activate($event)" (attach)="reuseTab.activate($event)"></router-outlet>
```

> **注意:若不指定 `(activate)` 事件,无法刷新未缓存过的当前标签页。**
7 changes: 7 additions & 0 deletions packages/abc/reuse-tab/reuse-tab.component.ts
Original file line number Diff line number Diff line change
@@ -261,6 +261,13 @@ export class ReuseTabComponent implements OnInit, OnChanges, OnDestroy {
return false;
}

/**
* 设置激活路由的实例,在 `src/app/layout/basic/basic.component.ts` 修改:
*
* @example
* <reuse-tab #reuseTab></reuse-tab>
* <router-outlet (activate)="reuseTab.activate($event)" (attach)="reuseTab.activate($event)"></router-outlet>
*/
activate(instance: NzSafeAny): void {
this.srv.componentRef = { instance };
}
Loading