Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/atinc/ngx-tethys into min…
Browse files Browse the repository at this point in the history
…lovehua/icon-tooltip-8660
  • Loading branch information
minlovehua committed Jul 24, 2023
2 parents 49b1965 + d5178b1 commit 88ddd44
Show file tree
Hide file tree
Showing 64 changed files with 1,947 additions and 239 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [15.3.18](https://github.com/atinc/ngx-tethys/compare/15.3.16...15.3.18) (2023-07-14)


### Bug Fixes

* **calendar:** should show the default date in the correct format #INFR-7340 ([#2725](https://github.com/atinc/ngx-tethys/issues/2725)) ([0314160](https://github.com/atinc/ngx-tethys/commit/0314160709267cfe4fc965837084098cd56c1359)), closes [#INFR-7340](https://github.com/atinc/ngx-tethys/issues/INFR-7340) [#INFR-7340](https://github.com/atinc/ngx-tethys/issues/INFR-7340) [#INFR-7340](https://github.com/atinc/ngx-tethys/issues/INFR-7340) [#INFR-7340](https://github.com/atinc/ngx-tethys/issues/INFR-7340) [#INFR-7340](https://github.com/atinc/ngx-tethys/issues/INFR-7340) [#INFR-7340](https://github.com/atinc/ngx-tethys/issues/INFR-7340)
* **date-range:** the previous date range and the next date range should be connectable when unit of step is month #INFR-2425 ([#2723](https://github.com/atinc/ngx-tethys/issues/2723)) ([332e2c4](https://github.com/atinc/ngx-tethys/commit/332e2c464ecbca47e999bc6a24902bda81cb99fc)), closes [#INFR-2425](https://github.com/atinc/ngx-tethys/issues/INFR-2425) [#INFR-2425](https://github.com/atinc/ngx-tethys/issues/INFR-2425) [#INFR-2425](https://github.com/atinc/ngx-tethys/issues/INFR-2425) [#INFR-2425](https://github.com/atinc/ngx-tethys/issues/INFR-2425) [#INFR-2425](https://github.com/atinc/ngx-tethys/issues/INFR-2425) [#INFR-2425](https://github.com/atinc/ngx-tethys/issues/INFR-2425) [#INFR-2425](https://github.com/atinc/ngx-tethys/issues/INFR-2425) [#INFR-2425](https://github.com/atinc/ngx-tethys/issues/INFR-2425) [#INFR-2425](https://github.com/atinc/ngx-tethys/issues/INFR-2425)
* **tree-select:** replace wtf-checked with thy-icon named check for tree-select and select component #INFR-5942 ([#2749](https://github.com/atinc/ngx-tethys/issues/2749)) ([ef509ff](https://github.com/atinc/ngx-tethys/commit/ef509ffb9b0d9784ac2acaba95741429e90116e5)), closes [#INFR-5942](https://github.com/atinc/ngx-tethys/issues/INFR-5942)


### Features

* **color-picker:** color-picker support disabled (#INFR-8645) ([#2757](https://github.com/atinc/ngx-tethys/issues/2757)) ([2d8617f](https://github.com/atinc/ngx-tethys/commit/2d8617f228d28c756d44238046337f1e6c41131d)), closes [#INFR-8645](https://github.com/atinc/ngx-tethys/issues/INFR-8645)
* **color-picker:** add popoverRef param when panel open and close #INFR-8673 ([#2756](https://github.com/atinc/ngx-tethys/issues/2756)) ([964a748](https://github.com/atinc/ngx-tethys/commit/964a748016f8ca8d59b229df8a9a81252f4b32b1)), closes [#INFR-8673](https://github.com/atinc/ngx-tethys/issues/INFR-8673)


## [15.3.17](https://github.com/atinc/ngx-tethys/compare/15.3.16...15.3.17) (2023-07-05)


Expand Down
2 changes: 1 addition & 1 deletion cdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@tethys/cdk",
"version": "15.3.17",
"version": "15.3.18",
"peerDependencies": {
"@angular/common": "^15.0.0",
"@angular/core": "^15.0.0",
Expand Down
78 changes: 78 additions & 0 deletions docs/guide/migration-v16.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
---
title: 16.x 升级指南
path: 'migration-v16'
order: 991
hidden: true
---

<alert>本文档将帮助你从 ngx-tethys 15.x 版本升级到 16.x 版本。</alert>

## 开始之前

- 首先确保你 `Node.js ^14.15.0 || >>=16.10.0`
- 创建新的分支进行升级,或者把当前分支备份

## 自动升级
执行 `ng update ngx-tethys` 命令自动升级, 这个命令核心处理如下事项:
- 升级 `ngx-tethys``16.x` 版本,并修改 package.json 中的依赖版本号
- 会自动把依赖的 CDK 和 Angular 库都升级到 `16.x` 版本,并修改 package.json 中的依赖版本号
- 自动修改`thyLabel`组件为`thyTag`

## 破坏性修改

- `thyLabel` 组件从组件库中移除,请使用`thyTag`组件代替

<label type="info">附录1</label> 所有`thyLabel``thyTag`对应的修改列表


- 模板
- thySize:sm20 md24 lg28 不变
- 不设置值(default 22)-> md 24
- default 22 -> md 24
- xlg 36 -> lg 28
- thyHasHover 直接变为 thyHoverable
- thyIconPrefix 删除
- thyBeforeIcon 前插入个名字是 thyBeforeIcon 值的 icon <thy-icon thyIconName="smile">
- thyAfterIcon 后插入个名字是 thyAfterIcon 值的 icon <thy-icon thyIconName="smile" class=“ml-1”>
- thyLabel default | primary | success | info | warning | danger | emboss-default | emboss-primary | emboss-warning | emboss-danger | outline
- thyLabel=default -> thyColor=default
- thyLabel=primary -> thyColor=primary
- thyLabel=success -> thyColor=success
- thyLabel=info -> thyColor=info
- thyLabel=warning -> thyColor=warning
- thyLabel=danger -> thyColor=danger
- thyLabel= emboss-default -> thyColor=default thyTheme="weak-fill"
- thyLabel= emboss-primary -> thyColor=primary thyTheme="weak-fill"
- thyLabel= emboss-warning -> thyColor=warning thyTheme="weak-fill"
- thyLabel= emboss-danger -> thyColor=danger thyTheme="weak-fill"
- thyLabel= outline -> thyTheme=“outline”
- thyLabelColor 直接变为 thyColor
- thyBackgroundOpacity 删除
- thyLabelType state | pill
- thyLabelType = state:thyShape= rectangle
- thyLabelType = pill:thyShape= pill
- thyOnRemove 删除
- ts
- ThyLabelTypeSize -> ThyTagSize
- ThyLabelType -> ThyTagColor
- ThyLabelComponent -> ThyTagComponent
- ThyLabelModule -> ThyTagModule
- 导入路径
- stylesheets
- .thy-label -> .thy-tag
- .thy-label-default -> .thy-tag-default
- .thy-label-primary -> .thy-tag-primary
- .thy-label-success -> .thy-tag-success
- .thy-label-info -> .thy-tag-info
- .thy-label-warning -> .thy-tag-warning
- .thy-label-danger -> .thy-tag-danger
- .thy-label-sm -> .thy-tag-sm
- .thy-label-md -> .thy-tag-md
- .thy-label-lg -> .thy-tag-lg
- .thy-label-pill -> .thy-tag-pill
- .thy-label-emboss-default -> .thy-tag-weak-fill-default
- .thy-label-emboss-primary -> .thy-tag-weak-fill-primary
- .thy-label-emboss-warning -> .thy-tag-tag-weak-fill-warning
- .thy-label-emboss-danger -> .thy-tag-tag-weak-fill-danger
- .thy-label-outline -> .thy-tag-outline

16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-tethys",
"version": "15.3.17",
"version": "15.3.18",
"license": "MIT",
"engines": {
"node": "^14.15.0 || >=16.10.0",
Expand Down Expand Up @@ -51,7 +51,8 @@
"build:schematics": "tsc -p ./schematics && npm run copy:schematics",
"copy:schematics": "cpx \"./schematics/**/*.{json,template}\" ./dist/tethys/schematics/ -v",
"test-schematics": "TS_NODE_PROJECT=./schematics/tsconfig.json node --require ts-node/register/transpile-only ./node_modules/jasmine/bin/jasmine './schematics/**/*.spec.ts'",
"prettier-all": "prettier --write \"./src/**/*.ts\""
"prettier-all": "prettier --write \"./src/**/*.ts\"",
"prettier-schematics": "prettier --write \"./schematics/**/*.ts\""
},
"repository": {
"type": "git",
Expand Down
15 changes: 15 additions & 0 deletions schematics/ng-update/core/complete.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { SchematicContext } from '@angular-devkit/schematics';
import { TargetVersion } from '@angular/cdk/schematics';

export function onMigrationComplete(context: SchematicContext, targetVersion: TargetVersion, hasFailures: boolean) {
context.logger.info('');
context.logger.info(` ✓ Updated NGX-TETHYS to ${targetVersion}`);
context.logger.info('');

if (hasFailures) {
context.logger.warn(
' ⚠ Some issues were detected but could not be fixed automatically. Please check the ' +
'output above and fix these issues manually.'
);
}
}

0 comments on commit 88ddd44

Please sign in to comment.