diff --git a/CHANGELOG.md b/CHANGELOG.md index 04912c0944a2f0779b44a32058e0c668b8240151..73250b8e64d5e2cf2a8b837a5b18b280f146345f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,14 +3,18 @@ title: 更新日志 | TinyNG --- ## 更新日志 -### 1.0.0-beta.2 +### 1.0.2(Angular13、Angular14、Angular15、Angular16) -*2023-05-16* +*2023-11-09* -1. Latest version +1.menu:单独使用该模块时国际化词条报错。 -### 1.0.0-beta.1 +### 1.0.1(Angular13、Angular14、Angular15、Angular16) -*2023-04-19* +*2023-07-27* -1. Latest version +1.tree:单选树子层级只有一项时,使用`selectNode`方法时无法高亮子级,会高亮父节点。 + +### 1.0.0(Angular13、Angular14、Angular15) + +*2023-06-09* diff --git a/README-zh_CN.md b/README-zh_CN.md index ce9045dbe3773c27d9b2280a3bca2d6c68fd3ff3..41a7ffe104096b674f528018dc89c65ab65e496c 100644 --- a/README-zh_CN.md +++ b/README-zh_CN.md @@ -58,8 +58,8 @@ export class AppModule { ```diff { "styles": [ -+ "node_modules/@opentiny/ng/themes/styles.css", -+ "node_modules/@opentiny/ng/themes/theme-default.css", ++ "node_modules/@opentiny/ng-themes/styles.css", ++ "node_modules/@opentiny/ng-themes/theme-default.css", ] } ``` diff --git a/README.md b/README.md index 50977fdc4cf5720928fca42d1ce234123de2dd13..85dbfae3fffe3aba7afd831f94cdb866dd76d5a6 100644 --- a/README.md +++ b/README.md @@ -59,8 +59,8 @@ And import style file link in `angular.json`. ```diff { "styles": [ -+ "node_modules/@opentiny/ng/themes/styles.css", -+ "node_modules/@opentiny/ng/themes/theme-default.css", ++ "node_modules/@opentiny/ng-themes/styles.css", ++ "node_modules/@opentiny/ng-themes/theme-default.css", ] } ``` diff --git a/build.md b/build.md index 1605545eca86ce2da12ae91e43d0473578d92178..521979e69ae18140cf8e13bd321c46cfd0d1381d 100644 --- a/build.md +++ b/build.md @@ -99,9 +99,54 @@ ``` 或执行命令行: - ``` + ```bash ng run ng-demo:preview ``` 功能:1. 构建打包相关 @opentiny/ng-xxx 发布包(.tgz);2. 在 ng-demo 项目中 npm install 安装 .tgz 包;3. ng-demo 项目生产环境构建;4. 启动浏览器在8020 端口运行 + +### 基于 Angular13 构建的 lib 在 Angular14/15 的应用中使用效果预览命令 + + 执行命令行: + ```bash + ng preview ng-demo --configuration ng14(或者 ng15) + ``` + + 或执行命令行: + ```bash + ng run ng-demo:preview --configuration ng14(或者 ng15) + ``` + + 功能: + 1. 基于 Angular13 构建打包相关 @opentiny/ng-xxx 发布包(.tgz); + 2. 在 src/ng/ngversion 项目中 npm install 安装 Angular14/15,同时安装 @opentiny/ng-xxx 的 tgz 包; + 3. 基于 Angular14/15 对 ng-demo 项目进行生产环境构建; + 4. 启动浏览器在 8020 端口运行,查看 Angular13 的 lib 在 Angular14/15 demo中的使用效果。 + +### 发布组件 + +1. 发布全量组件: + + 执行命令行: + ```bash + ng publish ng --args="--tag=xxxx" (例如:ng publish ng --args="--tag=latest") + ``` + + 或执行命令行: + ```bash + ng run ng:publish --args="--tag=xxxx" + ``` + +2. 发布单个组件: + + 执行命令行: + ```bash + ng publish 组件名 --args="--tag=xxxx" (例如:ng publish select --args="--tag=latest") + ``` + + 或执行命令行: + ```bash + ng run 组件名:publish --args="--tag=xxxx" + ``` + diff --git a/build/buildwc.js b/build/buildwc.js index e17e6d2876f1df385efee2c3de9acbfa328f4afe..736a625ad91893a766e206cc510b9de1c5c3bfc1 100644 --- a/build/buildwc.js +++ b/build/buildwc.js @@ -4,7 +4,7 @@ const { execSync } = require('child_process'); // 1.删除 dist 目录 execSync('npm run clean'); -// 2.编译生产环境 tiny3demo +// 2.编译生产环境 tinyng-demo execSync('ng run ng-demo:build:wc --skip-nx-cache'); // 3.编译基础样式 execSync('npx lessc src/themes/basic/build.less dist/apps/ng/assets/themes/styles.css'); diff --git a/build/preview-demo.js b/build/preview-demo.js index 16975397fd8205b38b427946e636023b5feea893..cbd8a3c898bded86d14089db41cc40e98d053056 100644 --- a/build/preview-demo.js +++ b/build/preview-demo.js @@ -40,14 +40,15 @@ serverDemo(); function ready(){ - execSync('npm run prepreview'); + execSync('npm run prepreview', { stdio: 'inherit' }); } function buildLib() { - execSync(`ng build ${name}`); + console.log('---------------- build lib ---------------'); + execSync(`ng build ${name}`, { stdio: 'inherit' }); if (isNeedThemesBuild() && !isNgDemoPreview) { - execSync('ng build themes'); + execSync('ng build themes', { stdio: 'inherit' }); } } @@ -65,15 +66,19 @@ function changePathAliasAndInstallLib() { if (isNgDemoPreview) { delete baseTsConfigData.compilerOptions.paths; - execSync(`ng pack ${ngDemoDir}`); + + console.log('---------------- pack lib ---------------'); + execSync(`ng pack ${ngDemoDir}`, { stdio: 'inherit' }); } dirs.forEach((dir) => { // 去除掉 compilerOptions.paths 中当前组件 demo 中使用的当前组件 lib 库的路径,以便在后续构建当前组件demo 时使用 node_modules 中的当前组件 lib 库 if (!isNgDemoPreview) { delete baseTsConfigData.compilerOptions.paths[`@opentiny/ng-${dir}`]; - // 打包压缩 lib 库 - execSync(`ng pack ${dir}`); + + console.log('---------------- pack lib ---------------'); + // 打包压缩 lib 库,路径为 ng-xx 需要去除前三位 + execSync(`ng pack ${dir.slice(3)}`, { stdio: 'inherit' }); } // 拼凑 npm install 时所需的 lib 库的 tgz 包路径 @@ -86,8 +91,10 @@ function changePathAliasAndInstallLib() { installs += `dist/libs/${dir}/${fileName} `; } }); + + console.log('---------------- install lib ---------------'); // 安装当前组件 lib 库 - execSync(`npm install ${installs} --legacy-peer-deps`); + execSync(`npm install ${installs} --legacy-peer-deps`, { stdio: 'inherit' }); // 将经上面处理过的 tsconfig.base.json 文件内容再写入 fs.writeFileSync(baseTsConfigPath, JSON.stringify(baseTsConfigData, "", "\t")); @@ -111,16 +118,18 @@ function configDemoThemes() { } function buildDemo() { - execSync(`ng build ${name}-demo`); + console.log('---------------- build demo ---------------'); + execSync(`ng build ${name}-demo`, { stdio: 'inherit' }); } function reset() { const param = isNeedThemesBuild() ? ` ${name}` : ''; - execSync(`npm run resetpreview${param}`); + execSync(`npm run resetpreview${param}`, { stdio: 'inherit' }); } function serverDemo() { - execSync(`npx live-server dist/apps/${name} --port=8020`); + console.log('---------------- serve demo ---------------'); + execSync(`npx live-server dist/apps/${name} --port=8020`, { stdio: 'inherit' }); } function isNeedThemesBuild() { diff --git a/build/preview-ngversion-demo.js b/build/preview-ngversion-demo.js new file mode 100644 index 0000000000000000000000000000000000000000..e52cf92c12deb5827a4e9bfcfb88a0f44f58134d --- /dev/null +++ b/build/preview-ngversion-demo.js @@ -0,0 +1,87 @@ +/** + * 基于 Angular13 构建的 lib 在 Angular14/15 的应用demo中使用效果(生产环境)预览。 + * 使用方式:在根目录下,执行 `ng preview ng-demo --configuration ng14(或者 ng15)`。 + */ +const path = require('path'); +const fs = require('fs-extra'); +const { execSync } = require('child_process'); + +// 处理输入参数,获取目标组件名 +const args = process.argv; +if (args.length !== 3) { + throw new TypeError('请输入要预览的组件名称!'); + return; +} +const name = args[2]; +console.log('name', name); +// 删除 dist、node_modules/@opentiny 等 +ready(); + +// build 构建 lib +buildLib(); + +// 打包压缩 lib 为 tgz 文件 +packLib(); + +// 在对应目录执行 npm install,并安装 demo 所依赖的 lib 的 tgz 包。 +installLib(); + +// 打包构建 demo +buildDemo(); + +// // 启动 demo +serverDemo(); + + +function ready(){ + execSync('npm run clean', { stdio: 'inherit' }); +} + +function buildLib() { + console.log('---------------- build lib ---------------'); + execSync(`ng build ng`, { stdio: 'inherit' }); +} + +function packLib() { + console.log('---------------- pack lib ---------------'); + execSync('ng pack ng', { stdio: 'inherit' }); +} + +function installLib() { + const distLibsPath = path.resolve(__dirname, '../dist/libs'); + const dirs = fs.readdirSync(distLibsPath); + let installs = ''; + dirs.forEach((dir) => { + // 拼凑 npm install 时所需的 lib 库的 tgz 包路径 + const dirPath = path.resolve(distLibsPath, `${dir}`); + const fileName = fs.readdirSync(dirPath).filter((file) => { + return file.endsWith('.tgz'); + })[0]; + + if (fileName) { + installs += `../../../../dist/libs/${dir}/${fileName} `; + } + }); + console.log('---------------- install lib ---------------'); + // 安装当前组件 lib 库 + execSync(`cd src/ng/ngversion/${name} && npm install --force && npm install ${installs} --legacy-peer-deps`, { stdio: 'inherit' }); +} + +function buildDemo() { + // 解决 ng16 时生产环境启动运行时报错问题 + if (name === 'ng16') { + fs.moveSync(path.resolve(__dirname, '../src/browserslist'),path.resolve(__dirname, '../src/browserslist_bak')) + } + + console.log(`---------------- build ${name} demo ---------------`); + execSync(`cd src/ng/ngversion/${name} && npm run build`, { stdio: 'inherit' }); + + if (name === 'ng16') { + fs.moveSync(path.resolve(__dirname, '../src/browserslist_bak'),path.resolve(__dirname, '../src/browserslist')) + } +} + +function serverDemo() { + console.log(`---------------- serve ${name} demo ---------------`); + execSync(`npx live-server dist/apps/${name} --port=8022`, { stdio: 'inherit' }); +} diff --git a/src/accordion/lib/package.json b/src/accordion/lib/package.json index a93ead23fb49565e4408576b3277cc93a19ccc10..879d992fe30713592787e82608140b478cbee52e 100644 --- a/src/accordion/lib/package.json +++ b/src/accordion/lib/package.json @@ -1,13 +1,13 @@ { "name": "@opentiny/ng-accordion", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", "@angular/animations": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-outline": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2" + "@opentiny/ng-outline": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2" } } \ No newline at end of file diff --git a/src/actionmenu/demo/src/app/actionmenu/actionmenu-items.html b/src/actionmenu/demo/src/app/actionmenu/actionmenu-items.html index 9432098ff0511b0145fd8eee3022d4e3e2111dcb..6b13e5047247445c8da448a76f46ae5545b54826 100644 --- a/src/actionmenu/demo/src/app/actionmenu/actionmenu-items.html +++ b/src/actionmenu/demo/src/app/actionmenu/actionmenu-items.html @@ -1,6 +1,5 @@

描述

Actionmenu菜单按钮组件,选项数目依照最大个数和宽度空间。

-注: 10.1.5版本改动默认最大显示数量3个(包括menu)

示例

diff --git a/src/actionmenu/demo/src/app/actionmenu/actionmenu-templete-test.html b/src/actionmenu/demo/src/app/actionmenu/actionmenu-templete-test.html index 450948fa443e021b05278de91f089167c9d153a3..cd2ff2ce1acb1963b513b5b61b905ef57069543e 100644 --- a/src/actionmenu/demo/src/app/actionmenu/actionmenu-templete-test.html +++ b/src/actionmenu/demo/src/app/actionmenu/actionmenu-templete-test.html @@ -1,7 +1,7 @@

描述

自定义模板测试

示例

-

1.兼容旧版模板测试(10.0.3 之前版本)

+

1.兼容旧版模板测试

自定义 item 模板(未添加 #item 标签

diff --git a/src/actionmenu/demo/src/app/actionmenu/actionmenu-tips-test.html b/src/actionmenu/demo/src/app/actionmenu/actionmenu-tips-test.html index 4a5f29bd850e97aae5568e7cd969a3c0807e5a8f..fa48b2c54edd321e1be741f2f23af7a19e1ffa13 100644 --- a/src/actionmenu/demo/src/app/actionmenu/actionmenu-tips-test.html +++ b/src/actionmenu/demo/src/app/actionmenu/actionmenu-tips-test.html @@ -43,7 +43,7 @@
-

5.兼容旧版模板测试(10.0.3 之前版本)

+

5.兼容旧版模板测试

自定义 item 模板(未添加 #item 标签) + 自定义 tip 模板

diff --git a/src/actionmenu/lib/package.json b/src/actionmenu/lib/package.json index ad31380ccc9cb53126da1cf7921d90098b139d31..557826d5b83a6ad63b2e8d6c348df5a9f4e4255d 100644 --- a/src/actionmenu/lib/package.json +++ b/src/actionmenu/lib/package.json @@ -1,14 +1,14 @@ { "name": "@opentiny/ng-actionmenu", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-menu": "~1.0.0-beta.2", - "@opentiny/ng-locale": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-menu": "~1.0.2", + "@opentiny/ng-locale": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-tip": "~1.0.0-beta.2", - "@opentiny/ng-popconfirm": "~1.0.0-beta.2" + "@opentiny/ng-tip": "~1.0.2", + "@opentiny/ng-popconfirm": "~1.0.2" } } \ No newline at end of file diff --git a/src/actionmenu/lib/src/TiActionmenuComponent.ts b/src/actionmenu/lib/src/TiActionmenuComponent.ts index b172c5864a7de10d9a651965880f2ac00cfc7fcd..24933948050ce0bdf7671819edcb50a6c10215a1 100644 --- a/src/actionmenu/lib/src/TiActionmenuComponent.ts +++ b/src/actionmenu/lib/src/TiActionmenuComponent.ts @@ -254,7 +254,7 @@ export class TiActionmenuComponent extends TiFormComponent { } /** * 兼容旧版: - * 10.0.3 版本之前只能内嵌一个模板,无命名。 + * 之前只能内嵌一个模板,无命名。 * 新版可以内嵌两个模板,示例书写要求都命名(#item,#tip)。 * 但需要兼容旧版无命名测试用例。 */ diff --git a/src/alert/demo/src/app/alert/AlertDarkthemeComponent.ts b/src/alert/demo/src/app/alert/AlertDarkthemeComponent.ts index 3dedf6cdb387da26eaf894b3cb3337040daf6552..9cb9a78490010f4377e27949a814f549cbb7f3ff 100644 --- a/src/alert/demo/src/app/alert/AlertDarkthemeComponent.ts +++ b/src/alert/demo/src/app/alert/AlertDarkthemeComponent.ts @@ -3,4 +3,12 @@ import { Component } from '@angular/core'; @Component({ templateUrl: './alert-darktheme.html' }) -export class AlertDarkthemeComponent {} +export class AlertDarkthemeComponent { + public isShow: boolean = false; + //当10000ms之后,所有的提示都消失后,显示提示信息,避免服务误认为啥都没显示。 + ngAfterViewInit(): void { + setTimeout(() => { + this.isShow = true; + }, 10100); + } +} diff --git a/src/alert/demo/src/app/alert/AlertTestModule.ts b/src/alert/demo/src/app/alert/AlertTestModule.ts index a5d5ab0337b86d23f2b6f88f78b1305b9f1c32b3..acbb31fc81e1a7db506a834b6027baaf240d51ae 100644 --- a/src/alert/demo/src/app/alert/AlertTestModule.ts +++ b/src/alert/demo/src/app/alert/AlertTestModule.ts @@ -3,9 +3,6 @@ import { CommonModule } from '@angular/common'; import { RouterModule, Routes } from '@angular/router'; import { TiAlertModule, TiButtonModule, TiSelectModule } from '@opentiny/ng'; -// import { TiAlertModule } from '@opentiny/ng-alert'; -// import { TiButtonModule } from '@opentiny/ng-button'; -// import { TiSelectModule } from '@opentiny/ng-select'; import { DemoLogModule } from '../../../../../ng/demolog/DemoLogModule'; import { AlertTypeComponent } from './AlertTypeComponent'; diff --git a/src/alert/demo/src/app/alert/alert-darktheme.html b/src/alert/demo/src/app/alert/alert-darktheme.html index feeac2361bb1743a99a258fed0720eef618b459a..032b2d99eaf166a60f222bfe32890b7d38f40ab2 100644 --- a/src/alert/demo/src/app/alert/alert-darktheme.html +++ b/src/alert/demo/src/app/alert/alert-darktheme.html @@ -5,3 +5,4 @@ warn类型
error类型 +

告警已消失,重新加载请刷新。

diff --git a/src/alert/demo/src/app/alert/alert-dismiss.html b/src/alert/demo/src/app/alert/alert-dismiss.html index df27c24c3f72443189b4877a328aa6531e5305e5..ab537ca99f82222167ccbfa36b8f2d6fce7d9cbd 100644 --- a/src/alert/demo/src/app/alert/alert-dismiss.html +++ b/src/alert/demo/src/app/alert/alert-dismiss.html @@ -1 +1 @@ -5000ms后自动消失 +5000ms后自动消失 diff --git a/src/alert/lib/package.json b/src/alert/lib/package.json index b263f01875bd0c71086b1bb0316486a1820d38e1..e14ede780be690706035f4729aa036bcf7cee199 100644 --- a/src/alert/lib/package.json +++ b/src/alert/lib/package.json @@ -1,14 +1,14 @@ { "name": "@opentiny/ng-alert", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/common": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2", "@angular/core": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-outline": "~1.0.0-beta.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-outline": "~1.0.2", "@angular/animations": ">=13.0.0" } } \ No newline at end of file diff --git a/src/alert/lib/src/TiAlertComponent.ts b/src/alert/lib/src/TiAlertComponent.ts index 1069a43bffaa8350564bd2a498c31e75532bc98a..e2c43534dfe673faf8863fa1c602d7f1405a476f 100644 --- a/src/alert/lib/src/TiAlertComponent.ts +++ b/src/alert/lib/src/TiAlertComponent.ts @@ -34,7 +34,7 @@ import packageInfo from '../package.json'; /** * Alert组件用于消息提示,提供了四种类型 * - *

10.1.13版本之后,使用此组件时需要开发者在项目模块(建议在根模块) + *

使用此组件时需要开发者在项目模块(建议在根模块) * 中引入BrowserAnimationsModule。这是因为此组件中使用了Angular动画,需要引入BrowserAnimationsModule, * 但是 BrowserAnimationsModule 不能在懒加载模块被重复引入,所以需要开发者来引入BrowserAnimationsModule,保证其引入一次。

* diff --git a/src/anchor/lib/package.json b/src/anchor/lib/package.json index afe74b1d6cdcbe9126132aa96780059ade6e8d9d..b649fdb7eea7c738f2b3f0ba5432af1f3e024c97 100644 --- a/src/anchor/lib/package.json +++ b/src/anchor/lib/package.json @@ -1,10 +1,10 @@ { "name": "@opentiny/ng-anchor", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/anchor/lib/src/TiAnchorComponent.ts b/src/anchor/lib/src/TiAnchorComponent.ts index fd750eef5aee5dfb9144cea8169d623189feda1b..a7b4be4a8fe15ec49891b974fd3fbf9d24122e6a 100644 --- a/src/anchor/lib/src/TiAnchorComponent.ts +++ b/src/anchor/lib/src/TiAnchorComponent.ts @@ -50,7 +50,7 @@ export interface TiAnchorItem { styleUrls: ['./anchor.less'], changeDetection: ChangeDetectionStrategy.OnPush, host: { - '[class.tp-anchor-container]': 'true' + '[class.ti3-anchor-container]': 'true' } }) export class TiAnchorComponent extends TiBaseComponent { diff --git a/src/anchor/lib/src/anchor.html b/src/anchor/lib/src/anchor.html index fcdcdf261806d1a9079e3cda3826f47c32dffced..ee8bf9e3a997c27d895692360c668d8e863e064c 100644 --- a/src/anchor/lib/src/anchor.html +++ b/src/anchor/lib/src/anchor.html @@ -1,9 +1,9 @@

- +
Current value: {{ selected1 | json }}
diff --git a/src/buttongroup/demo/src/app/buttongroup/webdoc/buttongroup-demos.js b/src/buttongroup/demo/src/app/buttongroup/webdoc/buttongroup-demos.js index f04a0c52f4259f9f2e81028e4d1635ee0700d90a..2917c1053345d69c85e308e9447edb1e42a4822f 100644 --- a/src/buttongroup/demo/src/app/buttongroup/webdoc/buttongroup-demos.js +++ b/src/buttongroup/demo/src/app/buttongroup/webdoc/buttongroup-demos.js @@ -143,7 +143,7 @@ export default { }, desc: { 'zh-CN': - '通过items.tipContent配置提示信息,10.1.1 版本起,tip 接口的类型扩展为:string | TemplateRef | Component,旧版本为:string。通过items.tipPosition配置提示信息方位。超长文本以 title 显示,不建议使用 tip 提示。', + '通过items.tipContent配置提示信息,tip 接口的类型为:string | TemplateRef | Component。通过items.tipPosition配置提示信息方位。超长文本以 title 显示,不建议使用 tip 提示。', 'en-US': '', }, apis: [ diff --git a/src/buttongroup/lib/package.json b/src/buttongroup/lib/package.json index 37f9575f65be174872c6f8c6b6427a14f4657e6c..eaa74a599f9546a26df8aa4655b12585d19e32e9 100644 --- a/src/buttongroup/lib/package.json +++ b/src/buttongroup/lib/package.json @@ -1,14 +1,14 @@ { "name": "@opentiny/ng-buttongroup", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-tip": "~1.0.0-beta.2", - "@opentiny/ng-outline": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-tip": "~1.0.2", + "@opentiny/ng-outline": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/buttongroup/lib/src/TiButtongroupComponent.ts b/src/buttongroup/lib/src/TiButtongroupComponent.ts index 3370c0fcff692ae0cb275784a8e8454bd865448a..4010173bd295bf70643bcd5eaf5bf668689060de 100644 --- a/src/buttongroup/lib/src/TiButtongroupComponent.ts +++ b/src/buttongroup/lib/src/TiButtongroupComponent.ts @@ -61,7 +61,7 @@ export interface TiButtonItem { * * 对象类型,包含两个属性:1.text: 显示的文本;2.class:标志的样式;eg: {text: string; class: string} * - * 10.1.2版本之后可以通过 #sup 模板配置选块角标,因此隐藏sup键值对 + * 可以通过 #sup 模板配置选块角标,因此隐藏sup键值对 */ sup?: { text?: string; @@ -208,7 +208,7 @@ export class TiButtongroupComponent extends TiWholeComponent { /** * 兼容旧版: - * 10.1.2 版本之前只能内嵌一个模板,无命名。 + * 之前只能内嵌一个模板,无命名。 * 新版可以内嵌两个模板,示例书写要求都命名(#item,#sup)。 * 但需要兼容旧版无命名测试用例。 */ diff --git a/src/buttonselect/lib/package.json b/src/buttonselect/lib/package.json index b59b2bbd2a34cf4cb233d7d07da77c3cae3be12d..25e061ea3422898bc53b11468d203b6dac3380bf 100644 --- a/src/buttonselect/lib/package.json +++ b/src/buttonselect/lib/package.json @@ -1,13 +1,13 @@ { "name": "@opentiny/ng-buttonselect", - "version": "1.0.0-beta.2", + "version": "1.0.2", "peerDependencies": { - "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-droplist": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-outline": "~1.0.0-beta.2" + "@opentiny/ng-droplist": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-outline": "~1.0.2" } } \ No newline at end of file diff --git a/src/buttonselect/lib/src/buttonselect.less b/src/buttonselect/lib/src/buttonselect.less index 8e74f1530f129ff1b68221ea54e097e3b9d79ea3..cd1be15a8b4a2474f1022c3fd9bd3787fe3502ea 100644 --- a/src/buttonselect/lib/src/buttonselect.less +++ b/src/buttonselect/lib/src/buttonselect.less @@ -1,8 +1,9 @@ -::ng-deep :root { +:host { --ti-buttonselect-maxwidth: 300px; - --ti-buttonselect-padding: 20px; - --ti-buttonselect-triangle-width: 16px; - --ti-button-group-height: 28px; + --ti-buttonselect-padding: var(--ti-common-space-5x); + --ti-buttonselect-triangle-width: var(--ti-common-size-4x); + --ti-buttonselect-height: var(--ti-common-size-7x); + --ti-buttonselect-checkmark-size: var(--ti-common-size-3x); } :host { @@ -10,14 +11,14 @@ } .ti-btnselect-triangle { display: inline-block; - width: 16px; + width: var(--ti-buttonselect-triangle-width); &:after { border-left: 4px solid transparent; border-right: 4px solid transparent; border-top: 5px solid var(--ti-common-color-icon-normal); content: ''; position: absolute; - top: 10.5px; + top: calc((var(--ti-buttonselect-height) - 2px - 5px) / 2); // (组件高度 - 边框高度 - 三角标高度) / 2 } } .ti-btnselect-triangle-up:after { @@ -30,14 +31,16 @@ padding: 0 var(--ti-buttonselect-padding); position: relative; display: inline-block; - height: var(--ti-button-group-height); + height: var(--ti-buttonselect-height); text-align: center; white-space: nowrap; vertical-align: middle; cursor: pointer; - color: #252b3a; - background-color: #e9edfa; - line-height: calc(var(--ti-button-group-height) - 2px); + color: var(--ti-common-color-text-primary); + font-size: var(--ti-common-font-size-base); + font-weight: var(--ti-common-font-weight-4); + background-color: var(--ti-common-color-bg-light-normal); + line-height: calc(var(--ti-buttonselect-height) - 2px); max-width: var(--ti-buttonselect-maxwidth); &.ti-buttonselect-dominator-border { border: 1px solid var(--ti-common-color-bg-emphasize); @@ -60,16 +63,16 @@ color: #fff; width: 0; height: 0; - border-right: 16px solid #5e7ce0; + border-right: 16px solid var(--ti-common-color-bg-emphasize); border-bottom: 16px solid transparent; position: absolute; right: 0px; top: 0px; - font-size: 12px; & .ti3-icon-checkmark-small { + font-size: var(--ti-buttonselect-checkmark-size); position: relative; - right: -5px; - top: -8px; + right: -5px; // - (16 - 12 + 1) + bottom: calc((var(--ti-buttonselect-height) - var(--ti-buttonselect-checkmark-size)) / 2); } } .ti-buttonselect-list { diff --git a/src/card/demo/src/app/card/card-grid.html b/src/card/demo/src/app/card/card-grid.html index cfad87849060203a33366c97eb075fcbc1d48981..3742559fdafcddc2dd52474fc851ec4670405c05 100644 --- a/src/card/demo/src/app/card/card-grid.html +++ b/src/card/demo/src/app/card/card-grid.html @@ -1,4 +1,4 @@ -
+

{{card.title}}

diff --git a/src/card/demo/src/app/card/card-grid2.html b/src/card/demo/src/app/card/card-grid2.html index 3c4150fdfbf23e6e823a563e7b282218f9e6a728..fd62c05a5dd570a0c7a06114920bcd937a98e9d7 100644 --- a/src/card/demo/src/app/card/card-grid2.html +++ b/src/card/demo/src/app/card/card-grid2.html @@ -1,4 +1,4 @@ -
+

{{card.title}}

diff --git a/src/card/demo/src/app/card/webdoc/card-demos.js b/src/card/demo/src/app/card/webdoc/card-demos.js index 024f7ef8e7ccf79c75f0afd1f7f59e3b1a223ab7..8a768666f4ff4413af50b5eb7e1781516ce5991d 100644 --- a/src/card/demo/src/app/card/webdoc/card-demos.js +++ b/src/card/demo/src/app/card/webdoc/card-demos.js @@ -54,7 +54,7 @@ export default { 'en-US': 'card grid', }, desc: { - 'zh-CN': '

使用栅格布局需要导入TiGridModule模块,根据栅格体系,自适应依据规范定义的四种分辨率 xs:1280~1439【1280、1366】, sm:1440~1599【1440】,md:1600~1759【1680】, lg: 1760~1920【1920】,通过不同的样式类设置子元素的宽度,使用 ti-row 定义一行,使用 ti-col-xs-[num] 设置一行所所占的比。

', + 'zh-CN': '

使用栅格布局需要导入TiGridModule模块,根据栅格体系,自适应依据规范定义的四种分辨率 xs:1280~1439【1280、1366】, sm:1440~1599【1440】,md:1600~1759【1680】, lg: 1760~1920【1920】,通过不同的样式类设置子元素的宽度,使用 ti3-row 定义一行,使用 ti-col-xs-[num] 设置一行所所占的比。

', 'en-US': '

card icon

', } }, diff --git a/src/card/lib/package.json b/src/card/lib/package.json index 6d97f7ec5be6652b8e7d0e444acfb011ea126455..1e3f4f1233f2e38309b88c46848ca59c0a4e8e6a 100644 --- a/src/card/lib/package.json +++ b/src/card/lib/package.json @@ -1,11 +1,11 @@ { "name": "@opentiny/ng-card", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.2" + "@opentiny/ng-icon": "~1.0.2" } } \ No newline at end of file diff --git a/src/cascader/lib/package.json b/src/cascader/lib/package.json index 284e8deee5fd8bfe7d5977e1edf46c5d7dc33aeb..e05111a2de2df9379df915aac733ec13f12b2e00 100644 --- a/src/cascader/lib/package.json +++ b/src/cascader/lib/package.json @@ -1,17 +1,17 @@ { "name": "@opentiny/ng-cascader", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-dominator": "~1.0.0-beta.2", - "@opentiny/ng-drop": "~1.0.0-beta.2", - "@opentiny/ng-droplist": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-list": "~1.0.0-beta.2", + "@opentiny/ng-dominator": "~1.0.2", + "@opentiny/ng-drop": "~1.0.2", + "@opentiny/ng-droplist": "~1.0.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-list": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-tip": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2" + "@opentiny/ng-tip": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2" } } \ No newline at end of file diff --git a/src/cascader/lib/src/TiCascaderComponent.ts b/src/cascader/lib/src/TiCascaderComponent.ts index cd7349d299554e9ff59dc70f7f112a840f5b855b..b4bdbd572db6e474a9626d2fadcdbbb2c16b8fad 100644 --- a/src/cascader/lib/src/TiCascaderComponent.ts +++ b/src/cascader/lib/src/TiCascaderComponent.ts @@ -67,7 +67,7 @@ export interface TiCascaderItem { changeDetection: ChangeDetectionStrategy.OnPush, host: { '(blur)': 'onBlur()', - '[class.tp-cascader-dominator]': 'true' + '[class.ti3-cascader-dominator]': 'true' } }) export class TiCascaderComponent extends TiFormComponent { diff --git a/src/cascader/lib/src/cascader.html b/src/cascader/lib/src/cascader.html index 93c310e3e93649ce097b4456afde7afa40d09e86..c25168101bb2cb06240dafb0a876c7cfe444493a 100644 --- a/src/cascader/lib/src/cascader.html +++ b/src/cascader/lib/src/cascader.html @@ -26,7 +26,7 @@ #commonList [id]="appendId('list_' + panelIndex)" [ngStyle]="{width: panelWidth}" - class="tp-cascader-list" + class="ti3-cascader-list" [options]="options" [labelKey]="labelKey" [idKey]="idKey" @@ -41,7 +41,7 @@ #commonList [id]="appendId('list_' + panelIndex)" [ngStyle]="{width: panelWidth}" - class="tp-cascader-list" + class="ti3-cascader-list" [options]="options" [labelKey]="labelKey" [idKey]="idKey" diff --git a/src/cascader/lib/src/cascader.less b/src/cascader/lib/src/cascader.less index 37d0fed051b6142b5adfb01535622acba7ff065d..1393b61cce58f20588cb4575997610ab1ad60120 100644 --- a/src/cascader/lib/src/cascader.less +++ b/src/cascader/lib/src/cascader.less @@ -1,12 +1,12 @@ @import '../../../themes/basic/base-all.less'; @import '../../../themes/basic/compnent-container-border.less'; -:host.tp-cascader-dominator :extend(.ti3-compnent-container-border all) { +:host.ti3-cascader-dominator :extend(.ti3-compnent-container-border all) { width: var(--ti-common-size-50x); font-size: var(--ti-common-font-size-base); font-weight: var(--ti-common-font-weight-4); } -.tp-cascader-input { +.ti3-cascader-input { display: inline-block; height: 100%; width: 100%; @@ -16,7 +16,7 @@ background-color: transparent; cursor: inherit; } -.tp-cascader-list { +.ti3-cascader-list { height: 100%; &:not(:first-child) { display: none; diff --git a/src/checkbox/demo/src/app/checkbox/CheckboxGroupLevelComponent.ts b/src/checkbox/demo/src/app/checkbox/CheckboxGroupLevelComponent.ts index ee50165d7ec8dfcde5e018888a045b943d37d907..acbc2b8acffae8604f10cce93bdfdeccaf4b0769 100644 --- a/src/checkbox/demo/src/app/checkbox/CheckboxGroupLevelComponent.ts +++ b/src/checkbox/demo/src/app/checkbox/CheckboxGroupLevelComponent.ts @@ -31,5 +31,5 @@ export class CheckboxGroupLevelComponent { { items: this.females, checkeds: this.femalesSet, label: '女性' } ]; - checkedSet1: Array = []; + checkedSet1: any = []; } diff --git a/src/checkbox/demo/src/app/checkbox/CheckboxGroupValuekeyComponent.ts b/src/checkbox/demo/src/app/checkbox/CheckboxGroupValuekeyComponent.ts index 2bcb9314ca42f722b74568d077888ce259d6c69e..83c9284413301448e392ee65aebdee680e9c33e1 100644 --- a/src/checkbox/demo/src/app/checkbox/CheckboxGroupValuekeyComponent.ts +++ b/src/checkbox/demo/src/app/checkbox/CheckboxGroupValuekeyComponent.ts @@ -11,7 +11,7 @@ export class CheckboxGroupValuekeyComponent { { id: 3, text: 'customer' }, { id: 4, text: 'admin' } ]; - checked: Array = [1, 2]; + checked: any = [1, 2]; items: Array = [ { diff --git a/src/checkbox/demo/src/app/checkbox/CheckboxIndeterminateComponent.ts b/src/checkbox/demo/src/app/checkbox/CheckboxIndeterminateComponent.ts index 4902f83c6eb9d22bf08ca09b0403d04522c39d3b..c5b0ed056b7ae8fa38345579afb1bc8e5794fa0c 100644 --- a/src/checkbox/demo/src/app/checkbox/CheckboxIndeterminateComponent.ts +++ b/src/checkbox/demo/src/app/checkbox/CheckboxIndeterminateComponent.ts @@ -11,5 +11,5 @@ export class CheckboxIndeterminateComponent { { id: 4, text: 'admin' } ]; - checked: Array = [this.data[0], this.data[2]]; + checked: any = [this.data[0], this.data[2]]; } diff --git a/src/checkbox/demo/src/app/checkbox/checkbox-group-validation.html b/src/checkbox/demo/src/app/checkbox/checkbox-group-validation.html index d71df3b157e4ad156d8fda4c822c44045275b592..24f26df402576f4d9d6effcc0f12ff0052dcaa12 100644 --- a/src/checkbox/demo/src/app/checkbox/checkbox-group-validation.html +++ b/src/checkbox/demo/src/app/checkbox/checkbox-group-validation.html @@ -6,11 +6,11 @@ name="formcheckbox" [(ngModel)]="value" [tiValidation]="validationConfig" - tiRequired + [tiRequired]="true" >
- +

2.响应式表单

diff --git a/src/checkbox/lib/package.json b/src/checkbox/lib/package.json index 710620d2786083c8ed0f111e82e4d380f4f9b19c..e2509bc199e35bf983fa10b990c9b8b98847005f 100644 --- a/src/checkbox/lib/package.json +++ b/src/checkbox/lib/package.json @@ -1,13 +1,13 @@ { "name": "@opentiny/ng-checkbox", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-outline": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2" + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-outline": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2" } } \ No newline at end of file diff --git a/src/collapse/lib/package.json b/src/collapse/lib/package.json index 24e914f989137fbe641080a1cd2431ad020a573c..3e27f8caee598992f767eca4693879a786693145 100644 --- a/src/collapse/lib/package.json +++ b/src/collapse/lib/package.json @@ -1,11 +1,11 @@ { "name": "@opentiny/ng-collapse", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/animations": ">=13.0.0", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.2" + "@opentiny/ng-utils": "~1.0.2" } } \ No newline at end of file diff --git a/src/collapsebox/lib/package.json b/src/collapsebox/lib/package.json index 23c37216e291165147c4e0f0124f7ea8b7f68fc8..3cfa89a56802f171fc9c42d154977ce1a5d8ca7a 100644 --- a/src/collapsebox/lib/package.json +++ b/src/collapsebox/lib/package.json @@ -1,12 +1,12 @@ { "name": "@opentiny/ng-collapsebox", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-collapse": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-outline": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-collapse": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-outline": "~1.0.2", + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/collapsebox/lib/src/collapsebox.less b/src/collapsebox/lib/src/collapsebox.less index e424917cd495db12a7e7a1c8146ed051e40bc85d..c3b11fb334f8402a30981d04800b822586e7d78e 100644 --- a/src/collapsebox/lib/src/collapsebox.less +++ b/src/collapsebox/lib/src/collapsebox.less @@ -1,6 +1,4 @@ -// @import "../../themes/basic/base-.allless"; - -::ng-deep :root { +:host { --ti3-collapsebox-close-position: 20px; } diff --git a/src/collapsebutton/demo/src/app/collapsebutton/CollapsebuttonSearchcountComponent.ts b/src/collapsebutton/demo/src/app/collapsebutton/CollapsebuttonSearchcountComponent.ts index 515116bb75f2d378487390652bdd0d1b89ebacef..3305e1b04a33d211d862fee48337ef02f0629859 100644 --- a/src/collapsebutton/demo/src/app/collapsebutton/CollapsebuttonSearchcountComponent.ts +++ b/src/collapsebutton/demo/src/app/collapsebutton/CollapsebuttonSearchcountComponent.ts @@ -8,7 +8,7 @@ export class CollapsebuttonSearchcountComponent { text1: string = '服务名称:'; text2: string = '状态:'; colsNumber: number = 5; - fieldVerticalAlign: string = 'middle'; + fieldVerticalAlign: 'top' | 'middle' | 'bottom' = 'middle'; collapseButtonSearch: string = '搜索'; collapseButtonReset: string = '重置'; advancedSearch: any = { diff --git a/src/collapsebutton/lib/package.json b/src/collapsebutton/lib/package.json index 1f17b3d3ee84017856bcd51b0bf5e5999ad6d20d..cf48d9f6e809b117bf329c9c7d7848cc7c39715c 100644 --- a/src/collapsebutton/lib/package.json +++ b/src/collapsebutton/lib/package.json @@ -1,13 +1,13 @@ { "name": "@opentiny/ng-collapsebutton", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-button": "~1.0.0-beta.2", - "@opentiny/ng-locale": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-button": "~1.0.2", + "@opentiny/ng-locale": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/collapsetext/demo/src/app/collapsetext/CollapsetextSceneComponent.ts b/src/collapsetext/demo/src/app/collapsetext/CollapsetextSceneComponent.ts index b6a5f309bd900f31da82451795be247315c0f660..6e367dfa443e77ac4522ebdee952d191a298849d 100644 --- a/src/collapsetext/demo/src/app/collapsetext/CollapsetextSceneComponent.ts +++ b/src/collapsetext/demo/src/app/collapsetext/CollapsetextSceneComponent.ts @@ -5,7 +5,7 @@ import { Component } from '@angular/core'; }) export class CollapsetextSceneComponent { label: string = '查看'; - type: string = 'content'; + type: 'title' | 'content' = 'content'; collapsed: boolean = true; highlight: boolean = true; collapsedChange(collapsed: boolean): void { diff --git a/src/collapsetext/demo/src/app/collapsetext/CollapsetextTypeComponent.ts b/src/collapsetext/demo/src/app/collapsetext/CollapsetextTypeComponent.ts index 1adb93e2da368dc90d328187b44379a933164bd0..f9296fc89ff73ec8021ddf1bab0043ce0caa5dbe 100644 --- a/src/collapsetext/demo/src/app/collapsetext/CollapsetextTypeComponent.ts +++ b/src/collapsetext/demo/src/app/collapsetext/CollapsetextTypeComponent.ts @@ -5,7 +5,7 @@ import { Component } from '@angular/core'; }) export class CollapsetextTypeComponent { label: string = '标题下展'; - type: string = 'title'; + type: 'title' | 'content' = 'title'; label1: string = '内容下展'; - type1: string = 'content'; + type1: 'title' | 'content' = 'content'; } diff --git a/src/collapsetext/lib/package.json b/src/collapsetext/lib/package.json index 7282dfe16d77c8ff86acf476fa14081f6b94ce22..52c212a6f7bc1434c22f779a34186c5eec036f27 100644 --- a/src/collapsetext/lib/package.json +++ b/src/collapsetext/lib/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/ng-collapsetext", - "version": "1.0.0-beta.2", + "version": "1.0.2", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0" diff --git a/src/collapsetext/lib/src/collapsetext.less b/src/collapsetext/lib/src/collapsetext.less index aaf95150e61f3cc2af6927a06ea88ad84df9aa17..33361dd72a178957c63764ed220e4d900948599f 100644 --- a/src/collapsetext/lib/src/collapsetext.less +++ b/src/collapsetext/lib/src/collapsetext.less @@ -1,10 +1,3 @@ -// 因为CSS Var补丁,处理:host内变量有问题。所以写为::ng-deep :root -::ng-deep :root { - --ti-collapsetext-label-color: var(--ti-common-color-text-primary); - --ti-collapsetext-label-color-highlight: var(--ti-common-color-text-highlight); - --ti-collapsetext-label-color-hover: var(--ti-common-color-text-link-hover); -} - // 组件容器 .ti3-collapsetext-container { .flex-container(row, flex-start, center); @@ -15,31 +8,37 @@ // 文字显示(默认内容类型) .ti3-collapsetext-label { + color: var(--ti-common-color-text-primary); + font-size: var(--ti-common-font-size-base); + font-weight: var(--ti-common-font-weight-4); line-height: var(--ti-common-line-height-number); &:hover { - color: var(--ti-collapsetext-label-color-hover); + color: var(--ti-common-color-text-link-hover); & + .ti3-collapsetext-arrow { - border-top-color: var(--ti-collapsetext-label-color-hover); + border-top-color: var(--ti-common-color-text-link-hover); } } } // 文字显示(标题类型) .ti3-collapsetext-label-title { + color: var(--ti-common-color-text-primary); font-size: var(--ti-common-font-size-2); + font-weight: var(--ti-common-font-weight-4); + line-height: var(--ti-common-line-height-number); } // 文字高亮显示 .ti3-collapsetext-label-highlight { - color: var(--ti-collapsetext-label-color-highlight); + color: var(--ti-common-color-text-highlight); & + .ti3-collapsetext-arrow { - border-top-color: var(--ti-collapsetext-label-color-highlight); + border-top-color: var(--ti-common-color-text-highlight); } } // 三角箭头 .ti3-collapsetext-arrow { - .triangle-down(8px, 5px, var(--ti-collapsetext-label-color)); + .triangle-down(8px, 5px, var(--ti-common-color-text-primary)); margin-left: var(--ti-common-space-2x); } diff --git a/src/copy/lib/package.json b/src/copy/lib/package.json index ed69f86b344c1373e843b406c0b5a82ab254b35c..28c2f05aa72627ac26be19625a134a4a4648edef 100644 --- a/src/copy/lib/package.json +++ b/src/copy/lib/package.json @@ -1,15 +1,15 @@ { "name": "@opentiny/ng-copy", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-popup": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2", - "@opentiny/ng-locale": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-popup": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2", + "@opentiny/ng-locale": "~1.0.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-outline": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2" + "@opentiny/ng-outline": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2" } } \ No newline at end of file diff --git a/src/crumb/lib/package.json b/src/crumb/lib/package.json index 0a5d447ccc32d606a44fdcb44f960a13e4e583b1..3bece7582818e0896a4dbedec67d9792690623c8 100644 --- a/src/crumb/lib/package.json +++ b/src/crumb/lib/package.json @@ -1,11 +1,11 @@ { "name": "@opentiny/ng-crumb", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/router": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/crumb/lib/src/crumb.html b/src/crumb/lib/src/crumb.html index 52f04d3a0dcc5e9c08cf71d64cb986f84011e52d..60d8bce609bf9baa807c4d072c1b9e4db7f631c9 100644 --- a/src/crumb/lib/src/crumb.html +++ b/src/crumb/lib/src/crumb.html @@ -1,7 +1,7 @@ {{item.label}} {{item.label}} - / + / - {{item.label}} + {{item.label}} diff --git a/src/crumb/lib/src/crumb.less b/src/crumb/lib/src/crumb.less index d5828fcfec05b2ca4b452783fc693b7793202c5c..84c78bff9b29a57ec684ac6806e45a3ec9c314fd 100644 --- a/src/crumb/lib/src/crumb.less +++ b/src/crumb/lib/src/crumb.less @@ -3,7 +3,7 @@ } // 用户设置href属性时文本样式 -.tp-crumb-label { +.ti3-crumb-label { color: var(--ti-common-color-text-link); text-decoration: none; vertical-align: bottom; @@ -15,7 +15,7 @@ } // 用户未设置href属性、最后一级时文本样式 -.tp-crumb-nohref-label { +.ti3-crumb-nohref-label { color: var(--ti-common-color-text-primary); font-weight: bold; vertical-align: bottom; @@ -26,7 +26,7 @@ } // 两级文本间分割线样式 -.tp-crumb-divider { +.ti3-crumb-divider { display: inline-block; width: var(--ti-common-size-4x); color: var(--ti-common-color-text-weaken); diff --git a/src/date/demo/src/app/date/DatePanelalignComponent.ts b/src/date/demo/src/app/date/DatePanelalignComponent.ts index 17e90397b5adee719d9fa133b05e9478be92df8b..d91c9cf6417275f41c3380ce8b82dfc3170a4922 100644 --- a/src/date/demo/src/app/date/DatePanelalignComponent.ts +++ b/src/date/demo/src/app/date/DatePanelalignComponent.ts @@ -4,6 +4,6 @@ import { Component } from '@angular/core'; templateUrl: './date-panelalign.html' }) export class DatePanelalignComponent { - panelAlign: string = 'right'; + panelAlign: 'left' | 'right' = 'right'; value: Date = new Date(2015, 8, 2); } diff --git a/src/date/lib/package.json b/src/date/lib/package.json index 5cd569c7b94e0bcbf641139fb016adee03323150..33d6583460af279e56c3ce26c8962e90a42540b5 100644 --- a/src/date/lib/package.json +++ b/src/date/lib/package.json @@ -1,19 +1,19 @@ { "name": "@opentiny/ng-date", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.2", - "@opentiny/ng-locale": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.2", + "@opentiny/ng-locale": "~1.0.2", + "@opentiny/ng-base": "~1.0.2", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-drop": "~1.0.0-beta.2", - "@opentiny/ng-datepanel": "~1.0.0-beta.2", - "@opentiny/ng-button": "~1.0.0-beta.2", - "@opentiny/ng-datedominator": "~1.0.0-beta.2", - "@opentiny/ng-dateedit": "~1.0.0-beta.2", - "@opentiny/ng-datebase": "~1.0.0-beta.2" + "@opentiny/ng-drop": "~1.0.2", + "@opentiny/ng-datepanel": "~1.0.2", + "@opentiny/ng-button": "~1.0.2", + "@opentiny/ng-datedominator": "~1.0.2", + "@opentiny/ng-dateedit": "~1.0.2", + "@opentiny/ng-datebase": "~1.0.2" } } \ No newline at end of file diff --git a/src/datebase/lib/package.json b/src/datebase/lib/package.json index a6fbbeede26f31008619e099a2d4befa32f036e2..5d0a914dc6c2a639be18f82d4e0ebd38c029a26d 100644 --- a/src/datebase/lib/package.json +++ b/src/datebase/lib/package.json @@ -1,17 +1,17 @@ { "name": "@opentiny/ng-datebase", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/common": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.2", - "@opentiny/ng-locale": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-datedominator": "~1.0.0-beta.2", - "@opentiny/ng-drop": "~1.0.0-beta.2", - "@opentiny/ng-dateedit": "~1.0.0-beta.2", - "@opentiny/ng-button": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.2", + "@opentiny/ng-locale": "~1.0.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-datedominator": "~1.0.2", + "@opentiny/ng-drop": "~1.0.2", + "@opentiny/ng-dateedit": "~1.0.2", + "@opentiny/ng-button": "~1.0.2", "@angular/core": ">=13.0.0", - "@opentiny/ng-text": "~1.0.0-beta.2" + "@opentiny/ng-text": "~1.0.2" } } \ No newline at end of file diff --git a/src/datedominator/lib/package.json b/src/datedominator/lib/package.json index 4fa4ba21b5a0ec6d9ee4c50c2e462521e2f9e175..ca57a52e923d0fb318b833c63d8661a5eb2111e5 100644 --- a/src/datedominator/lib/package.json +++ b/src/datedominator/lib/package.json @@ -1,13 +1,13 @@ { "name": "@opentiny/ng-datedominator", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-overflow": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-locale": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-overflow": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-locale": "~1.0.2", + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/dateedit/lib/package.json b/src/dateedit/lib/package.json index 3adb44f3c744d03296d989562fc638f6c6834026..879f925a03525450af2d1bb7aa8b5367139be5bd 100644 --- a/src/dateedit/lib/package.json +++ b/src/dateedit/lib/package.json @@ -1,14 +1,14 @@ { "name": "@opentiny/ng-dateedit", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.2", - "@opentiny/ng-locale": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.2", + "@opentiny/ng-locale": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-text": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-text": "~1.0.2", + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/datepanel/lib/package.json b/src/datepanel/lib/package.json index 5f72638cee4c065374ced25dbc498d8c62fce1fb..65f57878e6297d1afad597195ccfeca29d0c1a69 100644 --- a/src/datepanel/lib/package.json +++ b/src/datepanel/lib/package.json @@ -1,17 +1,17 @@ { "name": "@opentiny/ng-datepanel", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.2", - "@opentiny/ng-locale": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-datebase": "~1.0.0-beta.2", - "@opentiny/ng-drop": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.2", + "@opentiny/ng-locale": "~1.0.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-datebase": "~1.0.2", + "@opentiny/ng-drop": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/forms": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-list": "~1.0.0-beta.2" + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-list": "~1.0.2" } } \ No newline at end of file diff --git a/src/daterange/demo/src/app/daterange/DaterangePanelalignComponent.ts b/src/daterange/demo/src/app/daterange/DaterangePanelalignComponent.ts index 5611aa31941c48a695743f3a50119efc06f55206..7e9b28f72b8d3ab548697ef22d3e3d23d5d7d1a9 100644 --- a/src/daterange/demo/src/app/daterange/DaterangePanelalignComponent.ts +++ b/src/daterange/demo/src/app/daterange/DaterangePanelalignComponent.ts @@ -5,7 +5,7 @@ import { TiDateValue } from '@opentiny/ng'; templateUrl: './daterange-panelalign.html' }) export class DaterangePanelalignComponent { - panelAlign: string = 'right'; + panelAlign: 'left' | 'right' = 'right'; value: TiDateValue = { begin: new Date(2015, 3, 12), end: new Date(2056, 2, 1) diff --git a/src/daterange/demo/src/app/daterange/daterange-max.html b/src/daterange/demo/src/app/daterange/daterange-max.html index a18ff9e7b623ad8431734f7db8fd53d73ed1c656..fe2195ecef28a33037fbe852092484bf7c04c506 100644 --- a/src/daterange/demo/src/app/daterange/daterange-max.html +++ b/src/daterange/demo/src/app/daterange/daterange-max.html @@ -17,7 +17,7 @@


-

(2.3)dayClick事件中设置最大值(选择开始时间,更改最大值 10.1.11版本支持)

+

(2.3)dayClick事件中设置最大值(选择开始时间,更改最大值)

最大值: {{ max1 | date: "y-MM-dd"}}

diff --git a/src/daterange/demo/src/app/daterange/daterange-min.html b/src/daterange/demo/src/app/daterange/daterange-min.html index 16475d811bd8428e7414b64ca1c56dbe5eb61220..0f231680bf32e7b05b6eef4644d1477ec2800e07 100644 --- a/src/daterange/demo/src/app/daterange/daterange-min.html +++ b/src/daterange/demo/src/app/daterange/daterange-min.html @@ -17,7 +17,7 @@


-

(2.3)dayClick事件中设置最小值(选择结束时间,更改最小值 10.1.11版本支持)

+

(2.3)dayClick事件中设置最小值(选择结束时间,更改最小值)

最小值: {{ min2 | date: "y-MM-dd"}}

diff --git a/src/daterange/demo/src/app/daterange/daterange-validation.html b/src/daterange/demo/src/app/daterange/daterange-validation.html index 71aaca6c130179088fa1a2ec09282b642bb420b6..97df2758c3a4b6c539fe524983b3708b939b58e6 100644 --- a/src/daterange/demo/src/app/daterange/daterange-validation.html +++ b/src/daterange/demo/src/app/daterange/daterange-validation.html @@ -1 +1 @@ - + diff --git a/src/daterange/lib/package.json b/src/daterange/lib/package.json index 5568c1627779ee312f65e49fc98d48a46ee1a60c..d2143c1c6e9b97c0362d46dc35930c150eb08177 100644 --- a/src/daterange/lib/package.json +++ b/src/daterange/lib/package.json @@ -1,19 +1,19 @@ { "name": "@opentiny/ng-daterange", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-datebase": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-datebase": "~1.0.2", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-drop": "~1.0.0-beta.2", - "@opentiny/ng-locale": "~1.0.0-beta.2", - "@opentiny/ng-button": "~1.0.0-beta.2", - "@opentiny/ng-datepanel": "~1.0.0-beta.2", - "@opentiny/ng-dateedit": "~1.0.0-beta.2", - "@opentiny/ng-datedominator": "~1.0.0-beta.2" + "@opentiny/ng-drop": "~1.0.2", + "@opentiny/ng-locale": "~1.0.2", + "@opentiny/ng-button": "~1.0.2", + "@opentiny/ng-datepanel": "~1.0.2", + "@opentiny/ng-dateedit": "~1.0.2", + "@opentiny/ng-datedominator": "~1.0.2" } } \ No newline at end of file diff --git a/src/datetime/demo/src/app/datetime/DatetimeTimezoneableComponent.ts b/src/datetime/demo/src/app/datetime/DatetimeTimezoneableComponent.ts index 8b59eae5a8eed45315109fdd2ffbc2ac7a188753..ff95f96f8130f3c0fe7290da877f11c8c6105e1e 100644 --- a/src/datetime/demo/src/app/datetime/DatetimeTimezoneableComponent.ts +++ b/src/datetime/demo/src/app/datetime/DatetimeTimezoneableComponent.ts @@ -43,7 +43,7 @@ export class DatetimeTimezoneableComponent { this.timeZone = timeZone; } - getCurrentTimeZone2(timeZone) { + getCurrentTimeZone2(timeZone: string): void { this.timeZone2 = timeZone; } } diff --git a/src/datetime/demo/src/app/datetime/datetime-clearicon.html b/src/datetime/demo/src/app/datetime/datetime-clearicon.html index 619662102c14b62f325d7b9b96c44d34de8bcd2c..6b6ad509971ccd2c152d5efc7615e52e7420c1be 100644 --- a/src/datetime/demo/src/app/datetime/datetime-clearicon.html +++ b/src/datetime/demo/src/app/datetime/datetime-clearicon.html @@ -1 +1 @@ - + diff --git a/src/datetime/demo/src/app/datetime/datetime-panelalign.html b/src/datetime/demo/src/app/datetime/datetime-panelalign.html index 67943c2e0f023dad662ade9d6edfd24af28d75cc..c57f52c8df347f1a3f7b586508b4965313326bb4 100644 --- a/src/datetime/demo/src/app/datetime/datetime-panelalign.html +++ b/src/datetime/demo/src/app/datetime/datetime-panelalign.html @@ -1 +1 @@ - + diff --git a/src/datetime/demo/src/app/datetime/datetime-validation.html b/src/datetime/demo/src/app/datetime/datetime-validation.html index e2b1e1fe50571af2edbeaf22bdc0566e414814bd..9374d973e285f70a42f4af825a5e97661c9b7aa8 100644 --- a/src/datetime/demo/src/app/datetime/datetime-validation.html +++ b/src/datetime/demo/src/app/datetime/datetime-validation.html @@ -1 +1 @@ - + diff --git a/src/datetime/lib/package.json b/src/datetime/lib/package.json index 711d617c96b7d0b7ec678216c2a419ba19e507be..688cc454d531b8f0583864bb9e15cbf6f05a316e 100644 --- a/src/datetime/lib/package.json +++ b/src/datetime/lib/package.json @@ -1,22 +1,22 @@ { "name": "@opentiny/ng-datetime", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-locale": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-datebase": "~1.0.0-beta.2", + "@opentiny/ng-locale": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-datebase": "~1.0.2", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-drop": "~1.0.0-beta.2", - "@opentiny/ng-button": "~1.0.0-beta.2", - "@opentiny/ng-datepanel": "~1.0.0-beta.2", - "@opentiny/ng-dateedit": "~1.0.0-beta.2", - "@opentiny/ng-datedominator": "~1.0.0-beta.2", - "@opentiny/ng-text": "~1.0.0-beta.2", - "@opentiny/ng-time": "~1.0.0-beta.2", - "@opentiny/ng-select": "~1.0.0-beta.2" + "@opentiny/ng-drop": "~1.0.2", + "@opentiny/ng-button": "~1.0.2", + "@opentiny/ng-datepanel": "~1.0.2", + "@opentiny/ng-dateedit": "~1.0.2", + "@opentiny/ng-datedominator": "~1.0.2", + "@opentiny/ng-text": "~1.0.2", + "@opentiny/ng-time": "~1.0.2", + "@opentiny/ng-select": "~1.0.2" } } \ No newline at end of file diff --git a/src/datetimerange/demo/src/app/datetimerange/datetimerange-max.html b/src/datetimerange/demo/src/app/datetimerange/datetimerange-max.html index 9e51ab921702aca2817c0d3586e966f412db0789..a559913f1a345594bece979f133c57f9144c46ae 100644 --- a/src/datetimerange/demo/src/app/datetimerange/datetimerange-max.html +++ b/src/datetimerange/demo/src/app/datetimerange/datetimerange-max.html @@ -31,7 +31,7 @@

-

5.dayClick事件中设置最大值(选择开始时间,更改最大值 10.1.13版本支持)

+

5.dayClick事件中设置最大值(选择开始时间,更改最大值)


最大值: {{ max4 | date: "yyyy-MM-dd HH:mm:ss" }}
diff --git a/src/datetimerange/demo/src/app/datetimerange/datetimerange-min.html b/src/datetimerange/demo/src/app/datetimerange/datetimerange-min.html index 7218e7689d024efc98e0cc819e975cfd8a309c55..97ad70feeb201290c45de2e9a0073483304fb9fb 100644 --- a/src/datetimerange/demo/src/app/datetimerange/datetimerange-min.html +++ b/src/datetimerange/demo/src/app/datetimerange/datetimerange-min.html @@ -18,7 +18,7 @@

-

3.dayClick事件中设置最小值(选择结束时间,更改最小值 10.1.13版本支持)

+

3.dayClick事件中设置最小值(选择结束时间,更改最小值)


最小值: {{ min2 | date: "yyyy-MM-dd HH:mm:ss" }}
diff --git a/src/datetimerange/demo/src/app/datetimerange/datetimerange-validation.html b/src/datetimerange/demo/src/app/datetimerange/datetimerange-validation.html index 9fba69423bf1a57bab135e939478343d1618568e..9a34f54ddea9d59386cbdbb3dbc9c4e45b42ccab 100644 --- a/src/datetimerange/demo/src/app/datetimerange/datetimerange-validation.html +++ b/src/datetimerange/demo/src/app/datetimerange/datetimerange-validation.html @@ -1 +1,7 @@ - + diff --git a/src/datetimerange/lib/package.json b/src/datetimerange/lib/package.json index d1f95306ae66bc438459cf6b45e294234c83c052..9dc0abc28a11f1d545ef872b3ae7f77e002a2db3 100644 --- a/src/datetimerange/lib/package.json +++ b/src/datetimerange/lib/package.json @@ -1,22 +1,22 @@ { "name": "@opentiny/ng-datetimerange", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.2", - "@opentiny/ng-locale": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-datebase": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.2", + "@opentiny/ng-locale": "~1.0.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-datebase": "~1.0.2", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-drop": "~1.0.0-beta.2", - "@opentiny/ng-button": "~1.0.0-beta.2", - "@opentiny/ng-datepanel": "~1.0.0-beta.2", - "@opentiny/ng-dateedit": "~1.0.0-beta.2", - "@opentiny/ng-time": "~1.0.0-beta.2", - "@opentiny/ng-text": "~1.0.0-beta.2", - "@opentiny/ng-datedominator": "~1.0.0-beta.2", - "@opentiny/ng-select": "~1.0.0-beta.2" + "@opentiny/ng-drop": "~1.0.2", + "@opentiny/ng-button": "~1.0.2", + "@opentiny/ng-datepanel": "~1.0.2", + "@opentiny/ng-dateedit": "~1.0.2", + "@opentiny/ng-time": "~1.0.2", + "@opentiny/ng-text": "~1.0.2", + "@opentiny/ng-datedominator": "~1.0.2", + "@opentiny/ng-select": "~1.0.2" } } \ No newline at end of file diff --git a/src/dominator/lib/package.json b/src/dominator/lib/package.json index c08b429f66bd9a7ec1ce6b7e0ca211df0d103121..f2e2b6521ec3528d5c2e04b612e4aee5fcd6b9bb 100644 --- a/src/dominator/lib/package.json +++ b/src/dominator/lib/package.json @@ -1,16 +1,16 @@ { "name": "@opentiny/ng-dominator", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-tip": "~1.0.0-beta.2", - "@opentiny/ng-tag": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-locale": "~1.0.0-beta.2" + "@opentiny/ng-tip": "~1.0.2", + "@opentiny/ng-tag": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-locale": "~1.0.2" } } \ No newline at end of file diff --git a/src/drag/lib/package.json b/src/drag/lib/package.json index 7e6d4c860762463e3176227851952421d8ae9112..d5812236ad9ef08b7f87700e8f0d378aa0038ea0 100644 --- a/src/drag/lib/package.json +++ b/src/drag/lib/package.json @@ -1,11 +1,11 @@ { "name": "@opentiny/ng-drag", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-renderer": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2" + "@opentiny/ng-renderer": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2" } } \ No newline at end of file diff --git a/src/drop/lib/package.json b/src/drop/lib/package.json index be1a1564a7b35c0db64ca62d7cdc9939cd4691a4..c6c9bef144592f92e3fcf6fdb57f95e0bead4708 100644 --- a/src/drop/lib/package.json +++ b/src/drop/lib/package.json @@ -1,10 +1,10 @@ { "name": "@opentiny/ng-drop", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.2", + "@opentiny/ng-base": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0" } diff --git a/src/droplist/lib/package.json b/src/droplist/lib/package.json index 45fbd62db1a17f7a0fef9852561a1abf069ef5c3..19755c3e711e86d5185d87663eda142c76f53703 100644 --- a/src/droplist/lib/package.json +++ b/src/droplist/lib/package.json @@ -1,15 +1,15 @@ { "name": "@opentiny/ng-droplist", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-drop": "~1.0.0-beta.2", - "@opentiny/ng-list": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-drop": "~1.0.2", + "@opentiny/ng-list": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-locale": "~1.0.0-beta.2" + "@opentiny/ng-locale": "~1.0.2" } } \ No newline at end of file diff --git a/src/dropsearch/lib/package.json b/src/dropsearch/lib/package.json index 387135d2f93528c45133ecb16753cdfb869e1cc7..b8f4e9a5a9d52ff863f50d6a71336d45c761774e 100644 --- a/src/dropsearch/lib/package.json +++ b/src/dropsearch/lib/package.json @@ -1,17 +1,17 @@ { "name": "@opentiny/ng-dropsearch", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-searchbox": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2", - "@opentiny/ng-drop": "~1.0.0-beta.2", - "@opentiny/ng-droplist": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-searchbox": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2", + "@opentiny/ng-drop": "~1.0.2", + "@opentiny/ng-droplist": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-list": "~1.0.0-beta.2", - "@opentiny/ng-locale": "~1.0.0-beta.2" + "@opentiny/ng-list": "~1.0.2", + "@opentiny/ng-locale": "~1.0.2" } } \ No newline at end of file diff --git a/src/foldtext/lib/package.json b/src/foldtext/lib/package.json index 56a5ac44d1732102ac16155b607d5fd7632f58ed..85c447f41f25f63fc9601947c68a956195dea75b 100644 --- a/src/foldtext/lib/package.json +++ b/src/foldtext/lib/package.json @@ -1,12 +1,12 @@ { "name": "@opentiny/ng-foldtext", - "version": "1.0.0-beta.2", + "version": "1.0.2", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-locale": "~1.0.0-beta.2", - "@opentiny/ng-overflow": "~1.0.0-beta.2", - "@opentiny/ng-outline": "~1.0.0-beta.2" + "@opentiny/ng-locale": "~1.0.2", + "@opentiny/ng-overflow": "~1.0.2", + "@opentiny/ng-outline": "~1.0.2" } } \ No newline at end of file diff --git a/src/foldtext/lib/src/foldtext.less b/src/foldtext/lib/src/foldtext.less index ac152dfc88c2f8ae66f1b875f8b436a49d416c2b..eeb830b8962fa0edda207b1cb076f6723f0c8f3c 100644 --- a/src/foldtext/lib/src/foldtext.less +++ b/src/foldtext/lib/src/foldtext.less @@ -1,13 +1,27 @@ -@import '../../../themes/basic/link-no-decoration.less'; - .ti-foldtext-wraper { overflow-y: hidden; + color: var(--ti-common-color-text-primary); + font-size: var(--ti-common-font-size-base); + font-weight: var(--ti-common-font-weight-4); ::ng-deep a { - .ti-link-no-decoration(); + color: var(--ti-common-color-text-link); + font-size: var(--ti-common-font-size-base); + font-weight: var(--ti-common-font-weight-4); + text-decoration: none; + cursor: pointer; + + &:hover { + color: var(--ti-common-color-text-link-hover); + font-size: var(--ti-common-font-size-base); + font-weight: var(--ti-common-font-weight-4); + text-decoration: underline; + } } } .ti-foldtext-toggle { color: var(--ti-common-color-text-highlight); + font-size: var(--ti-common-font-size-base); + font-weight: var(--ti-common-font-weight-4); &:hover { cursor: pointer; } diff --git a/src/formfield/lib/package.json b/src/formfield/lib/package.json index a2ae05da6081098dfeff14dc0e333bb20ac93970..5f0ca6841091025ad5ef5e5a3eb4bc6b5476461a 100644 --- a/src/formfield/lib/package.json +++ b/src/formfield/lib/package.json @@ -1,13 +1,13 @@ { "name": "@opentiny/ng-formfield", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.2", + "@opentiny/ng-base": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-include": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2" + "@opentiny/ng-include": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2" } } \ No newline at end of file diff --git a/src/grid/lib/package.json b/src/grid/lib/package.json index c6328a3816f2622622bfbaa2784b1ac000ca077d..fb768674ae079872b3849861c099b154518a825d 100644 --- a/src/grid/lib/package.json +++ b/src/grid/lib/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/ng-grid", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0" diff --git a/src/grid/lib/src/TiGridComponent.ts b/src/grid/lib/src/TiGridComponent.ts index 842b5d641971799c719fa81f88e967336c78e994..04a41065492880ad952da540c17aca41d8aa9aa0 100644 --- a/src/grid/lib/src/TiGridComponent.ts +++ b/src/grid/lib/src/TiGridComponent.ts @@ -15,14 +15,11 @@ import { Component, ViewEncapsulation } from '@angular/core'; * @ignore * * 栅格样式组件 - * - * 10.0.4及之前的版本grid.less是全局的。10.1.0版本为了实现样式按需加载,将grid.less封装在一个组件模块,所以该组件实际只提供了样式。 - * - * 使用示例在 card 组件示例中 + * 使用示例在 card 组件示例中 * */ @Component({ - selector: '.ti-row', // 兼容延用栅格样式选择器 + selector: '.ti3-row', // 兼容延用栅格样式选择器 template: '', styleUrls: ['./grid.less'], encapsulation: ViewEncapsulation.None diff --git a/src/grid/lib/src/grid.less b/src/grid/lib/src/grid.less index 47bdf722d26f66e17728538eb753e62f07af404a..59bcf069a1c0b95840881065aa5040a4221595fe 100644 --- a/src/grid/lib/src/grid.less +++ b/src/grid/lib/src/grid.less @@ -11,7 +11,7 @@ .make-grid-columns(); -.ti-row { +.ti3-row { .make-row(); } diff --git a/src/guides/lib/package.json b/src/guides/lib/package.json index c5e68eb7920f2ac8c027d6e8d661853b4ceb50ca..8e1879590680e8fd0e3807bb0b24a470cd33686c 100644 --- a/src/guides/lib/package.json +++ b/src/guides/lib/package.json @@ -1,11 +1,11 @@ { "name": "@opentiny/ng-guides", - "version": "1.0.0-beta.2", + "version": "1.0.2", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-renderer": "~1.0.0-beta.2" + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-renderer": "~1.0.2" } } \ No newline at end of file diff --git a/src/guidesteps/lib/package.json b/src/guidesteps/lib/package.json index 8e9f9842e4ae92c8248125880558b8e8887fbccb..a8282a75226158c9cbd2fc56ee21db6422d999bf 100644 --- a/src/guidesteps/lib/package.json +++ b/src/guidesteps/lib/package.json @@ -1,9 +1,9 @@ { "name": "@opentiny/ng-guidesteps", - "version": "1.0.0-beta.2", + "version": "1.0.2", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", "@angular/common": ">=13.0.0" } } \ No newline at end of file diff --git a/src/halfmodal/demo/src/app/halfmodal/HalfmodalTestModule.ts b/src/halfmodal/demo/src/app/halfmodal/HalfmodalTestModule.ts index d8aa16ead2fdcc578b94ada641b73b48ab926eef..a71f70db66de852bfef5dd768dacad7f9c6d3203 100644 --- a/src/halfmodal/demo/src/app/halfmodal/HalfmodalTestModule.ts +++ b/src/halfmodal/demo/src/app/halfmodal/HalfmodalTestModule.ts @@ -73,8 +73,7 @@ import { HalfmodalServiceTestComponent } from './HalfmodalServiceTestComponent'; ContentComponent, HalfmodalAsyncComponent, HalfmodalServiceTestComponent - ], - entryComponents: [ContentComponent] + ] }) export class HalfmodalTestModule { public static readonly ROUTES: Routes = [ diff --git a/src/halfmodal/lib/package.json b/src/halfmodal/lib/package.json index 869a9fc96fa61fe7401c0f04d08800fed114ebe8..d5b1d487a4bf9ac9de36c6a8958eb079fe1ed3c0 100644 --- a/src/halfmodal/lib/package.json +++ b/src/halfmodal/lib/package.json @@ -1,15 +1,15 @@ { "name": "@opentiny/ng-halfmodal", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2", "@angular/animations": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-outline": "~1.0.0-beta.2", - "@opentiny/ng-popup": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2" + "@opentiny/ng-outline": "~1.0.2", + "@opentiny/ng-popup": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2" } } \ No newline at end of file diff --git a/src/icon/demo/src/app/icon/SvgSetpathComponent.ts b/src/icon/demo/src/app/icon/SvgSetpathComponent.ts index 479184f83208f3b36ad38f40c6902bbeaa8ef7d3..bd7e3aa356c709673b3b71b57dfade0e5f52b30d 100644 --- a/src/icon/demo/src/app/icon/SvgSetpathComponent.ts +++ b/src/icon/demo/src/app/icon/SvgSetpathComponent.ts @@ -6,7 +6,8 @@ import { TiSvgComponent } from '@opentiny/ng'; styleUrls: ['./icon.less'] }) export class SvgSetpathComponent { + baseUrl: string = window['DEPLOY_URL'] + window['PUBLIC_URL']; constructor() { - TiSvgComponent.setPath('/assets/ionicons/'); + TiSvgComponent.setPath(`${this.baseUrl}assets/ionicons/`); } } diff --git a/src/icon/lib/package.json b/src/icon/lib/package.json index 11499f142bd052c05790f00d79e7b05824b96c90..e198fe10899e394b9385ef32007b9091d948e545 100644 --- a/src/icon/lib/package.json +++ b/src/icon/lib/package.json @@ -1,11 +1,11 @@ { "name": "@opentiny/ng-icon", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.2" + "@opentiny/ng-utils": "~1.0.2" } } \ No newline at end of file diff --git a/src/iconaction/demo/src/app/iconaction/IconactionTestModule.ts b/src/iconaction/demo/src/app/iconaction/IconactionTestModule.ts index 9506e0a0812442f1fa9e7596b63718e0f8b7bf38..90e3fecbb4cb5603cdc51b2ee8e216f70ca27505 100644 --- a/src/iconaction/demo/src/app/iconaction/IconactionTestModule.ts +++ b/src/iconaction/demo/src/app/iconaction/IconactionTestModule.ts @@ -13,8 +13,9 @@ import { IconactionHrefComponent } from './IconactionHrefComponent'; declarations: [IconactionBasicComponent, IconactionDarkComponent, IconactionDisabledComponent, IconactionHrefComponent] }) export class IconactionTestModule { + baseUrl: string = window['DEPLOY_URL'] + window['PUBLIC_URL']; constructor() { - TiSvgComponent.setPath('/assets/ionicons/'); + TiSvgComponent.setPath(`${this.baseUrl}assets/ionicons/`); } static readonly ROUTES: Routes = [ { diff --git a/src/iconaction/lib/package.json b/src/iconaction/lib/package.json index f1d1302a777813c98f56ebc5fbc9d6c159d7b167..d7b96bd2f243d89b39dac4cebb34b729dff5d46a 100644 --- a/src/iconaction/lib/package.json +++ b/src/iconaction/lib/package.json @@ -1,10 +1,10 @@ { "name": "@opentiny/ng-iconaction", - "version": "1.0.0-beta.2", + "version": "1.0.2", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/iconaction/lib/src/iconaction.less b/src/iconaction/lib/src/iconaction.less index d75db421a0e3176d00c808747f9d3380d7fdfdde..148e12fadb79df61debb31b2a81b840a1dbe03a1 100644 --- a/src/iconaction/lib/src/iconaction.less +++ b/src/iconaction/lib/src/iconaction.less @@ -55,7 +55,7 @@ .ti-iconaction-text { font-size: var(--ti-common-font-size-base); line-height: var(--ti-common-line-height-number); - + font-weight: var(--ti-common-font-weight-4); color: var(--ti-common-color-text-primary); .ti-iconaction:hover &, .ti-iconaction:active &, diff --git a/src/imagepreview/demo/src/app/imagepreview/ImagepreviewBasicComponent.ts b/src/imagepreview/demo/src/app/imagepreview/ImagepreviewBasicComponent.ts index 883e029c78b379bdbc29b9d437a388014c994dbd..c41e401400ef8ea5765a156f24433f591d10301d 100644 --- a/src/imagepreview/demo/src/app/imagepreview/ImagepreviewBasicComponent.ts +++ b/src/imagepreview/demo/src/app/imagepreview/ImagepreviewBasicComponent.ts @@ -29,7 +29,7 @@ export class ImagepreviewBasicComponent { showImagepreview(): void { this.tiModal.open(TiImagepreviewComponent, { id: 'productPreviewModal', - modalClass: 'tp-product-preview-modal', + modalClass: 'product-preview-modal', context: { index: 0, // 当前文件索引 fileList: this.files diff --git a/src/imagepreview/demo/src/app/imagepreview/imagepreview.less b/src/imagepreview/demo/src/app/imagepreview/imagepreview.less index bb220559d8e2fa57ed6f8927b01cb415d993bcdb..a11aa80893327f271741cf626fc3555b22977c9c 100644 --- a/src/imagepreview/demo/src/app/imagepreview/imagepreview.less +++ b/src/imagepreview/demo/src/app/imagepreview/imagepreview.less @@ -1,4 +1,4 @@ -.tp-product-preview-modal { +.product-preview-modal { width: 640px !important; .ti3-modal-close { top: 0; diff --git a/src/imagepreview/lib/package.json b/src/imagepreview/lib/package.json index 071511e21639568b6cb92b7f0892ab69173fca6a..5e649db2863f8671d94651c0e784a1a8f366644c 100644 --- a/src/imagepreview/lib/package.json +++ b/src/imagepreview/lib/package.json @@ -1,14 +1,14 @@ { "name": "@opentiny/ng-imagepreview", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/platform-browser": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-modal": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-outline": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-modal": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-outline": "~1.0.2", + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/include/lib/package.json b/src/include/lib/package.json index 62811aa171e716636db2b8a49629dbdb35b6915f..b35b4c4b4bec505186f39cb52693f1a21a3b7fde 100644 --- a/src/include/lib/package.json +++ b/src/include/lib/package.json @@ -1,10 +1,10 @@ { "name": "@opentiny/ng-include", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.2" + "@opentiny/ng-utils": "~1.0.2" } } \ No newline at end of file diff --git a/src/inputnumber/lib/package.json b/src/inputnumber/lib/package.json index 63d8dcc0702c5107ce6c4c4a3462860ad1096c49..bb2bfe2af622a3b554f620c8d63cbcb6c9f3991a 100644 --- a/src/inputnumber/lib/package.json +++ b/src/inputnumber/lib/package.json @@ -1,12 +1,12 @@ { "name": "@opentiny/ng-inputnumber", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/forms": ">=13.0.0", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-locale": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2" + "@opentiny/ng-locale": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2" } } \ No newline at end of file diff --git a/src/inputnumber/lib/src/TiInputNumberDirective.ts b/src/inputnumber/lib/src/TiInputNumberDirective.ts index 2e107d7a1de38e7ced76ee0af15438a0f0997d40..afe239d4ed7bb965f24061f4a77149cfa13bea50 100644 --- a/src/inputnumber/lib/src/TiInputNumberDirective.ts +++ b/src/inputnumber/lib/src/TiInputNumberDirective.ts @@ -51,7 +51,7 @@ export class TiInputNumberDirective extends DefaultValueAccessor { /** * 小数保留位数。使用 n +'数字' 形式,例如:'n4',代表保留4位小数。spinner 保持一致。 * - * 不设置时,10.0.1 版本后小数保留位数最少 0 位,最多 3 位;10.0.0 版本前小数保留位数为 3 位 + * 不设置时,小数保留位数最少 0 位,最多 3 位 */ @Input() format: string; private numberFormat: string = '1.0-3'; @@ -132,8 +132,8 @@ export class TiInputNumberDirective extends DefaultValueAccessor { return; } - // 由于10.0.0及之前版本中开发者只能给ngModel传入空字符串时才能清空值,但是该组件ngModel应该是传入number类型,所以要清空时应该设置undefined。 - // 10.0.1版本开始进行纠正,为了兼容旧版本,设置空字符串时也能清空。 + // 旧版本中开发者只能给ngModel传入空字符串时才能清空值,但是该组件ngModel应该是传入number类型,所以要清空时应该设置undefined。 + // 为了进行纠正,为了兼容旧版本,设置空字符串时也能清空。 if (value === undefined || value === '') { super.writeValue(''); this.oldInputValue = ''; diff --git a/src/intro/lib/package.json b/src/intro/lib/package.json index 0ab330adb9fa375bb2752e42db57cf4cd3847bb3..982485160c9f553929dda098e4ea31cb516cdb10 100644 --- a/src/intro/lib/package.json +++ b/src/intro/lib/package.json @@ -1,17 +1,17 @@ { "name": "@opentiny/ng-intro", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.2", "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-button": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-modal": "~1.0.0-beta.2", - "@opentiny/ng-tip": "~1.0.0-beta.2", - "@opentiny/ng-locale": "~1.0.0-beta.2", - "@opentiny/ng-outline": "~1.0.0-beta.2" + "@opentiny/ng-button": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-modal": "~1.0.2", + "@opentiny/ng-tip": "~1.0.2", + "@opentiny/ng-locale": "~1.0.2", + "@opentiny/ng-outline": "~1.0.2" } } \ No newline at end of file diff --git a/src/ip/lib/package.json b/src/ip/lib/package.json index 0c9ab13a91c54f117919c760b0e23e912aea21db..c034229a90a85d29c490a59eaefc7b1683147e2d 100644 --- a/src/ip/lib/package.json +++ b/src/ip/lib/package.json @@ -1,13 +1,13 @@ { "name": "@opentiny/ng-ip", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.2", "@angular/forms": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-text": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-text": "~1.0.2", + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/ipsection/lib/package.json b/src/ipsection/lib/package.json index 22d0a56ddb787c203d9c7ab4ebba1ccd2a8906c4..78c6426c75f78872044dec028e3f936b8e8a2e4e 100644 --- a/src/ipsection/lib/package.json +++ b/src/ipsection/lib/package.json @@ -1,14 +1,14 @@ { "name": "@opentiny/ng-ipsection", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-validation": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-validation": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-select": "~1.0.0-beta.2", - "@opentiny/ng-text": "~1.0.0-beta.2" + "@opentiny/ng-select": "~1.0.2", + "@opentiny/ng-text": "~1.0.2" } } \ No newline at end of file diff --git a/src/ipsection/lib/src/TiIpsectionComponent.ts b/src/ipsection/lib/src/TiIpsectionComponent.ts index 8fada8862a1e233c550fbc43eaf6a8fb76c810a3..770d2afd4045136c30d55bb70827ee0e502020a6 100644 --- a/src/ipsection/lib/src/TiIpsectionComponent.ts +++ b/src/ipsection/lib/src/TiIpsectionComponent.ts @@ -41,7 +41,7 @@ export interface TiIpsectionConfig { */ validation?: TiValidationConfig; /** - * 网段为 input 类型时的校验规则,10.1.15 支持 ValidatorFn 类型 + * 网段为 input 类型时的校验规则,支持 ValidatorFn 类型 */ validationRules?: Array | ValidatorFn; /** diff --git a/src/labeleditor/demo/src/app/labeleditor/LabeleditorTestModule.ts b/src/labeleditor/demo/src/app/labeleditor/LabeleditorTestModule.ts index 7730fc16e977d43a3c89e35fcd0b86fc66c6261e..f3298560c88d768d487d745e514e7b51b990812d 100644 --- a/src/labeleditor/demo/src/app/labeleditor/LabeleditorTestModule.ts +++ b/src/labeleditor/demo/src/app/labeleditor/LabeleditorTestModule.ts @@ -42,8 +42,7 @@ import { LabeleditorIconTipContextComponent, TemplateComponent } from './Labeled TemplateComponent, LabeleditorValidationAsyncComponent, LabeleditorIconTipContextComponent - ], - entryComponents: [TemplateComponent] + ] }) export class LabeleditorTestModule { static readonly ROUTES: Routes = [ diff --git a/src/labeleditor/lib/package.json b/src/labeleditor/lib/package.json index 9f1b374b5ef562972b59517d95e4687ae80b8724..e940e07a60e8e3e67737a30458b447734393afd8 100644 --- a/src/labeleditor/lib/package.json +++ b/src/labeleditor/lib/package.json @@ -1,18 +1,18 @@ { "name": "@opentiny/ng-labeleditor", - "version": "1.0.0-beta.2", + "version": "1.0.2", "peerDependencies": { "@angular/forms": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-validation": "~1.0.0-beta.2", - "@opentiny/ng-text": "~1.0.0-beta.2", - "@opentiny/ng-textarea": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-validation": "~1.0.2", + "@opentiny/ng-text": "~1.0.2", + "@opentiny/ng-textarea": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-tip": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-outline": "~1.0.0-beta.2", - "@opentiny/ng-overflow": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2" + "@opentiny/ng-tip": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-outline": "~1.0.2", + "@opentiny/ng-overflow": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2" } } \ No newline at end of file diff --git a/src/labeleditor/lib/src/TiLabeleditorComponent.ts b/src/labeleditor/lib/src/TiLabeleditorComponent.ts index 1befcad939b835ca51ed7369f6f394395d9cbbf0..abaae9f544969482698169e7c16ec736f7e7e46c 100644 --- a/src/labeleditor/lib/src/TiLabeleditorComponent.ts +++ b/src/labeleditor/lib/src/TiLabeleditorComponent.ts @@ -34,8 +34,6 @@ import { Util } from '@opentiny/ng-utils'; * 在编辑状态:点击右侧对号图标时,切换到非编辑状态, * 并且将输入框中内容显示在非编辑状态的文本中; * 点击右侧叉图标时,切换到非编辑状态,非编辑状态的文本保持之前的不变,用户输入不生效。 - * - * ../tinyplus3demo/#/labeleditor/labeleditor-all */ @Component({ selector: 'ti-labeleditor', diff --git a/src/labeleditor/lib/src/labeleditor.less b/src/labeleditor/lib/src/labeleditor.less index a32d11672b5f2e8aca95a1c2051c2d015b212adf..feb9f790c4aaccf80e9d1bb2ee386e278efe13ea 100644 --- a/src/labeleditor/lib/src/labeleditor.less +++ b/src/labeleditor/lib/src/labeleditor.less @@ -1,7 +1,11 @@ +:host { + --ti-labeleditor-icon-line-height: 28px; +} .ti3-labeleditor-icon { vertical-align: top; - line-height: 28px; + line-height: var(--ti-labeleditor-icon-line-height); // 和input 高度相同 margin-left: var(--ti-common-space-2x); + font-size: var(--ti-common-size-3x); cursor: pointer; } .ti3-icon-confirm { @@ -30,7 +34,7 @@ .ti3-editor-icon, ::ng-deep span[tiOverflowEndicon] { - font-size: var(--ti-common-font-size-2); + font-size: var(--ti-common-size-4x); margin-left: var(--ti-common-space-2x); color: var(--ti-common-color-icon-normal); cursor: pointer; diff --git a/src/layout/demo/src/app/layout/layout-basic-simple-responsive.html b/src/layout/demo/src/app/layout/layout-basic-simple-responsive.html index 1a7810c27e6f4063d9ef3e614cc97bae2dced2f6..e41d76790acc166de068e208bbafe0966f428005 100644 --- a/src/layout/demo/src/app/layout/layout-basic-simple-responsive.html +++ b/src/layout/demo/src/app/layout/layout-basic-simple-responsive.html @@ -1,8 +1,8 @@ - +
Header
- +
Content
diff --git a/src/layout/demo/src/app/layout/layout-purchase-responsive.html b/src/layout/demo/src/app/layout/layout-purchase-responsive.html index 5ebb4d142000197d9e471956eabe2d4e05139e68..5421be2f45f5c302c492dde1dc884d36f87bdd2b 100644 --- a/src/layout/demo/src/app/layout/layout-purchase-responsive.html +++ b/src/layout/demo/src/app/layout/layout-purchase-responsive.html @@ -8,12 +8,11 @@
- - + diff --git a/src/layout/lib/package.json b/src/layout/lib/package.json index 8db5dd0cc1852fac92ecb1781144ec0804b070f7..9b9017a8b86555506d3a5c4e53c196df6a670d26 100644 --- a/src/layout/lib/package.json +++ b/src/layout/lib/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/ng-layout", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", diff --git a/src/layout/lib/src/TiLayoutContentComponent.ts b/src/layout/lib/src/TiLayoutContentComponent.ts index 5f83974781c1539fcdd17defae9309c1732ac7e1..d03f025d6600d79346660f9be401d6ac29e8f1fa 100644 --- a/src/layout/lib/src/TiLayoutContentComponent.ts +++ b/src/layout/lib/src/TiLayoutContentComponent.ts @@ -24,7 +24,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; changeDetection: ChangeDetectionStrategy.OnPush, host: { '[class.ti3-layout-content]': 'true', - // 这里用 false 判断是为了兼容 10.1.10 及之前的版本,之前使用方式是业务在ti-layout-content标签上直接添加responsive属性(非input接口)来使用响应式布局。 + // 这里用 false 判断是为了兼容业务在ti-layout-content标签上直接添加responsive属性(非input接口)来使用响应式布局。 // 所以responsive接口的值为true或undefined(以标签属性的方式使用)时都应该是响应式布局,只有为false时才不是响应式布局。 '[class.ti3-layout-purchase-responsive]': 'responsive !== false' } diff --git a/src/layout/lib/src/TiLayoutHeaderComponent.ts b/src/layout/lib/src/TiLayoutHeaderComponent.ts index 26121576413e9709e73b55d00c14f362b7a0b131..4354662338b529128be64ea907168ccb4aad000f 100644 --- a/src/layout/lib/src/TiLayoutHeaderComponent.ts +++ b/src/layout/lib/src/TiLayoutHeaderComponent.ts @@ -24,7 +24,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; changeDetection: ChangeDetectionStrategy.OnPush, host: { '[class.ti3-layout-header]': 'true', - // 这里用 false 判断是为了兼容 10.1.10 及之前的版本,之前使用方式是业务在ti-layout-header标签上直接添加responsive属性(非input接口)来使用响应式布局。 + // 这里用 false 判断是为了兼容业务在ti-layout-header标签上直接添加responsive属性(非input接口)来使用响应式布局。 // 所以responsive接口的值为true或undefined(以标签属性的方式使用)时都应该是响应式布局,只有为false时才不是响应式布局。 '[class.ti3-layout-purchase-responsive]': 'responsive !== false' } diff --git a/src/leftmenu/demo/src/app/leftmenu/LeftmenuDisabledComponent.ts b/src/leftmenu/demo/src/app/leftmenu/LeftmenuDisabledComponent.ts index 15e812a468b80d7474e52f27476b2a955b8aac32..959ec627619015a814116d73be87908688c3d4bb 100644 --- a/src/leftmenu/demo/src/app/leftmenu/LeftmenuDisabledComponent.ts +++ b/src/leftmenu/demo/src/app/leftmenu/LeftmenuDisabledComponent.ts @@ -14,12 +14,12 @@ export class LeftmenuDisabledComponent { children: [ { label: '子菜单1.1', - router: ['./router11'], - disabled: true + router: ['./router11'] }, { label: '子菜单1.2', - router: ['./router12'] + router: ['./router12'], + disabled: true } ] }, diff --git a/src/leftmenu/demo/src/app/leftmenu/LeftmenuSecurityComponent.ts b/src/leftmenu/demo/src/app/leftmenu/LeftmenuSecurityComponent.ts index 666bebb20e7071033bd6a4ddac5df5498ccded68..2b9d0410e5803baec46dab31ce426240ad7ce6aa 100644 --- a/src/leftmenu/demo/src/app/leftmenu/LeftmenuSecurityComponent.ts +++ b/src/leftmenu/demo/src/app/leftmenu/LeftmenuSecurityComponent.ts @@ -51,7 +51,6 @@ export class LeftmenuSecurityComponent { toggleClick(isHide: boolean): void { // 需要业务侧在菜单收起\展开时,控制右侧内容的位置 - // 3.1.3版本leftMenu默认宽度修改为192px this.marginLeft = isHide ? '0' : '192px'; } } diff --git a/src/leftmenu/demo/src/app/leftmenu/Router12Component.ts b/src/leftmenu/demo/src/app/leftmenu/Router12Component.ts index af7dd8bf9f0d8bc1dcd9c59b8af169fd8e148e0e..cde4a814d634e0c39631d020cb6c41bd9eeff8fa 100644 --- a/src/leftmenu/demo/src/app/leftmenu/Router12Component.ts +++ b/src/leftmenu/demo/src/app/leftmenu/Router12Component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, TemplateRef } from '@angular/core'; import { TiModalService } from '@opentiny/ng'; @Component({ template: ` @@ -17,7 +17,7 @@ import { TiModalService } from '@opentiny/ng'; }) export class Router12Component { constructor(private tiModal: TiModalService) {} - show(content: string): void { + show(content: TemplateRef): void { this.tiModal.open(content, { modalClass: 'modal-class' }); diff --git a/src/leftmenu/demo/src/app/leftmenu/leftmenu-disabled.html b/src/leftmenu/demo/src/app/leftmenu/leftmenu-disabled.html index aac1f5b5ccd38be9bc35dcade1b71906d53eb070..823ef553acb561140c698651d863881817ff94ef 100644 --- a/src/leftmenu/demo/src/app/leftmenu/leftmenu-disabled.html +++ b/src/leftmenu/demo/src/app/leftmenu/leftmenu-disabled.html @@ -1,9 +1,9 @@ - +
{{ m1.label }}
- + {{ m2.label }}
diff --git a/src/leftmenu/demo/src/app/leftmenu/website-views/LeftmenuDisabledWebsiteViewComponent.ts b/src/leftmenu/demo/src/app/leftmenu/website-views/LeftmenuDisabledWebsiteViewComponent.ts index b5a0b36a83f57a63183480aff3d932d46ada5c87..ba3dd0367313a22e9595dfbeb79f0e0e668f46a9 100644 --- a/src/leftmenu/demo/src/app/leftmenu/website-views/LeftmenuDisabledWebsiteViewComponent.ts +++ b/src/leftmenu/demo/src/app/leftmenu/website-views/LeftmenuDisabledWebsiteViewComponent.ts @@ -14,11 +14,11 @@ export class LeftmenuDisabledWebsiteViewComponent { label: '菜单一', children: [ { - label: '子菜单1.1', - disabled: true + label: '子菜单1.1' }, { - label: '子菜单1.2' + label: '子菜单1.2', + disabled: true } ] }, diff --git a/src/leftmenu/lib/package.json b/src/leftmenu/lib/package.json index c7b7e078854cc3ef265d5f75f2303188e2d360d1..8dd32ca9380012ded002840be892f3ea54203844 100644 --- a/src/leftmenu/lib/package.json +++ b/src/leftmenu/lib/package.json @@ -1,16 +1,16 @@ { "name": "@opentiny/ng-leftmenu", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/router": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.2", + "@opentiny/ng-base": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/platform-browser": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-renderer": "~1.0.0-beta.2", - "@opentiny/ng-outline": "~1.0.0-beta.2" + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-renderer": "~1.0.2", + "@opentiny/ng-outline": "~1.0.2" } } \ No newline at end of file diff --git a/src/leftmenu/lib/src/TiLeftmenuComponent.ts b/src/leftmenu/lib/src/TiLeftmenuComponent.ts index 95a8875711373e49b531a1033e9ccd78ab877875..b775315a4b4fb8b4714d3bce5e19a6f86301d94d 100644 --- a/src/leftmenu/lib/src/TiLeftmenuComponent.ts +++ b/src/leftmenu/lib/src/TiLeftmenuComponent.ts @@ -125,7 +125,6 @@ export class TiLeftmenuComponent extends TiBaseComponent { * @ignore */ @Output() readonly reloadStateChange: EventEmitter = new EventEmitter(); - // routable接口在3.0.3版本起对外隐藏,10.0.1重新开放 /** * 是否使用路由来控制菜单对应内容显示/隐藏,默认使用路由。 */ diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/LeftmenuthinTestModule.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/LeftmenuthinTestModule.ts index 8c4975c462e4e7094e7ed84d8a9b992b5d395449..0068779006acea7fd6d4ba3d4dc636336268ff41 100644 --- a/src/leftmenuthin/demo/src/app/leftmenuthin/LeftmenuthinTestModule.ts +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/LeftmenuthinTestModule.ts @@ -55,8 +55,9 @@ import { RouterFWebsiteViewsComponent } from './website-views/RouterFComponent'; ] }) export class LeftmenuthinTestModule { + baseUrl: string = window['DEPLOY_URL'] + window['PUBLIC_URL']; constructor() { - TiSvgComponent.setPath('/assets/ionicons/'); + TiSvgComponent.setPath(`${this.baseUrl}assets/ionicons/`); } static childrenRouter: Routes = [ { path: 'home', component: Router1Component }, diff --git a/src/leftmenuthin/lib/package.json b/src/leftmenuthin/lib/package.json index e4339ba67717ed88e9897b01d5927c867f91cac3..aabb9f9f09e830e92b87305310e63d1f250c3da9 100644 --- a/src/leftmenuthin/lib/package.json +++ b/src/leftmenuthin/lib/package.json @@ -1,8 +1,13 @@ { "name": "@opentiny/ng-leftmenuthin", - "version": "1.0.0-beta.2", + "version": "1.0.2", "peerDependencies": { "@angular/common": ">=13.0.0", - "@angular/core": ">=13.0.0" + "@angular/core": ">=13.0.0", + "@angular/router": ">=13.0.0", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-outline": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2" } } diff --git a/src/leftmenuthin/lib/src/leftmenuthin.less b/src/leftmenuthin/lib/src/leftmenuthin.less index c39ff3d3fa32e108e3df4cc30002aca599fe1d4e..227ba0abed62177ead98fea4f4c448bfae5fe398 100644 --- a/src/leftmenuthin/lib/src/leftmenuthin.less +++ b/src/leftmenuthin/lib/src/leftmenuthin.less @@ -1,37 +1,33 @@ @import '../../../themes/basic/base-all.less'; -:host { - --ti-leftmenuthin-level-width: 80px; - --ti-leftmenuthin-level-height: 78px; -} .ti-leftmenuthin-content { position: fixed; top: 0; bottom: 0; z-index: 1000; - width: var(--ti-leftmenuthin-level-width); background-color: var(--ti-common-color-bg-white-normal); } .ti-leftmenuthin-level { - width: var(--ti-leftmenuthin-level-width); - height: var(--ti-leftmenuthin-level-height); + width: var(--ti-common-size-20x); padding-top: var(--ti-common-space-3x); + padding-bottom: var(--ti-common-space-6); text-align: center; color: var(--ti-common-color-text-secondary); cursor: pointer; box-sizing: border-box; .ti-leftmenuthin-icon { - font-size: var(--ti-common-font-size-6); - line-height: 1; + font-size: var(--ti-common-size-8x); + line-height: 0; } .ti-leftmenuthin-level-text { font-size: var(--ti-common-font-size-base); + font-weight: var(--ti-common-font-weight-4); line-height: var(--ti-common-line-height-number); text-align: center; - margin-top: var(--ti-common-space-base); + margin-top: var(--ti-common-space-10); } &:hover { diff --git a/src/linkbutton/lib/package.json b/src/linkbutton/lib/package.json index 5eb066b1246847dcf7aa6dfbe44124c149c59c70..1a9b814f3c6f6b85051195521de7fa7cc881b7e7 100644 --- a/src/linkbutton/lib/package.json +++ b/src/linkbutton/lib/package.json @@ -1,11 +1,11 @@ { "name": "@opentiny/ng-linkbutton", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/list/lib/package.json b/src/list/lib/package.json index 2a97ab30eb208f18ecf08e56f222dcc5a25d7eb7..c3ade2cff799d95d84088b5af8afc4a6e9257d80 100644 --- a/src/list/lib/package.json +++ b/src/list/lib/package.json @@ -1,16 +1,16 @@ { "name": "@opentiny/ng-list", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/cdk": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-tip": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-loading": "~1.0.0-beta.2", - "@opentiny/ng-locale": "~1.0.0-beta.2" + "@opentiny/ng-tip": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-loading": "~1.0.2", + "@opentiny/ng-locale": "~1.0.2" } } \ No newline at end of file diff --git a/src/loading/lib/package.json b/src/loading/lib/package.json index 89337102393b7026ec4282919e6a25c8b11887ea..12b8531b248dd7e99f45d6f571657497065531c4 100644 --- a/src/loading/lib/package.json +++ b/src/loading/lib/package.json @@ -1,12 +1,12 @@ { "name": "@opentiny/ng-loading", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-locale": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-locale": "~1.0.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.2" + "@opentiny/ng-icon": "~1.0.2" } } \ No newline at end of file diff --git a/src/locale/lib/package.json b/src/locale/lib/package.json index 8e8e106290cdfc029d6f97ff8d5fe0e260f06dd6..48b2cd624a35fa7b7ad9bdb8080673f722d135d9 100644 --- a/src/locale/lib/package.json +++ b/src/locale/lib/package.json @@ -1,10 +1,10 @@ { "name": "@opentiny/ng-locale", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/common": ">=13.0.0", "@angular/core": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.2" + "@opentiny/ng-utils": "~1.0.2" } } \ No newline at end of file diff --git a/src/menu/demo/src/app/menu/menu-default.html b/src/menu/demo/src/app/menu/menu-default.html index 678ffd2def13066b5ade7cdafa9fde93083e8067..616fe73d28ba95a5e425f61c8ba4e8c03042ab41 100644 --- a/src/menu/demo/src/app/menu/menu-default.html +++ b/src/menu/demo/src/app/menu/menu-default.html @@ -25,7 +25,7 @@
-

4.兼容旧版模板测试(10.0.3 之前版本)

+

4.兼容旧版模板测试

自定义 item 模板(未添加 #item 标签

diff --git a/src/menu/demo/src/app/menu/menu-templete-test.html b/src/menu/demo/src/app/menu/menu-templete-test.html index 5e4d8de1b0514cae0dbe58f30188305ab007e471..7caed1be87799b69ba03e77cb66115dc490e21cf 100644 --- a/src/menu/demo/src/app/menu/menu-templete-test.html +++ b/src/menu/demo/src/app/menu/menu-templete-test.html @@ -1,7 +1,7 @@

描述

自定义模板测试

示例

-

1.兼容旧版模板测试(10.0.3 之前版本)

+

1.兼容旧版模板测试

自定义 item 模板(未添加 #item 标签

diff --git a/src/menu/lib/package.json b/src/menu/lib/package.json index 2926f86aab6ac61157cf98ae28ba18044617e39a..9e764394fdb5d3792bd3117580d60c0ab217db38 100644 --- a/src/menu/lib/package.json +++ b/src/menu/lib/package.json @@ -1,14 +1,14 @@ { "name": "@opentiny/ng-menu", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-drop": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-drop": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2", "@angular/core": ">=13.0.0", - "@opentiny/ng-list": "~1.0.0-beta.2", + "@opentiny/ng-list": "~1.0.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-tip": "~1.0.0-beta.2" + "@opentiny/ng-tip": "~1.0.2" } } \ No newline at end of file diff --git a/src/menu/lib/src/TiMenuComponent.ts b/src/menu/lib/src/TiMenuComponent.ts index 6c4e47c84aec138136ebb1bdff34134dece25d9e..40561552d4c0968551c35fb23b8b52cf697e3f9e 100644 --- a/src/menu/lib/src/TiMenuComponent.ts +++ b/src/menu/lib/src/TiMenuComponent.ts @@ -132,7 +132,7 @@ export class TiMenuComponent extends TiFormComponent { ngOnInit(): void { // 基类中做了设置宿主id的操作 super.ngOnInit(); - // 10.1.17 版本之前在标签上写 hasborder 属性会呈现按钮下拉样式,10.1.17 版本之后修改为 buttonselect 属性,也兼容之前的写法 + // buttonselect 属性,也兼容之前在标签上写 hasborder 属性会呈现按钮下拉样式的写法 this.buttonSelect = this.nativeElement.hasAttribute('hasborder') || this.nativeElement.hasAttribute('buttonselect'); } ngOnChanges(changes: SimpleChanges): void { @@ -145,7 +145,7 @@ export class TiMenuComponent extends TiFormComponent { } /** * 兼容旧版: - * 10.0.3 版本之前只能内嵌一个模板,无命名。 + * 之前只能内嵌一个模板,无命名。 * 新版可以内嵌两个模板,示例书写要求都命名(#item,#tip)。 * 但需要兼容旧版无命名测试用例。 */ @@ -200,7 +200,7 @@ export class TiMenuComponent extends TiFormComponent { * 切换面板状态:打开/关闭 */ public toggle(): void { - this.dropComs.first.isShow ? this.close() : this.open(); + this.dropComs?.first?.isShow ? this.close() : this.open(); } /** * @ignore @@ -271,7 +271,7 @@ export class TiMenuComponent extends TiFormComponent { * @ignore */ public onMousedown(event: MouseEvent): void { - if (this.dropComs.first.isShow) { + if (this.dropComs?.first?.isShow) { // 已打开,则关闭 this.close(); } else if (this.beforeOpen.observers.length === 0) { diff --git a/src/menu/lib/src/TiMenuModule.ts b/src/menu/lib/src/TiMenuModule.ts index c8fcff501e91c63afeb3e80d8fa0f2ea1ab5e481..b63215d2201fa6bac0d9123e9c9d1674bf82d2f8 100644 --- a/src/menu/lib/src/TiMenuModule.ts +++ b/src/menu/lib/src/TiMenuModule.ts @@ -13,11 +13,12 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { TiDropModule } from '@opentiny/ng-drop'; import { TiTipModule } from '@opentiny/ng-tip'; +import { TiListModule } from '@opentiny/ng-list'; import { TiMenuComponent } from './TiMenuComponent'; import { TiMenuListComponent } from './TiMenuListComponent'; @NgModule({ - imports: [CommonModule, TiDropModule, TiTipModule], + imports: [CommonModule, TiDropModule, TiTipModule, TiListModule], exports: [TiMenuComponent, TiMenuListComponent], declarations: [TiMenuComponent, TiMenuListComponent] }) diff --git a/src/menu/lib/src/menu.html b/src/menu/lib/src/menu.html index cd51ca70f6daa12b218f60523dcf1afd09f782b1..c89ec2e39433abbdbb8b45eb941e326c384687c7 100644 --- a/src/menu/lib/src/menu.html +++ b/src/menu/lib/src/menu.html @@ -1,7 +1,7 @@ this is a message' }); } - showTemplate(content: string): void { + showTemplate(content: TemplateRef): void { this.tiMessage.open({ content, context: { diff --git a/src/message/demo/src/app/message/MessageSecurityComponent.ts b/src/message/demo/src/app/message/MessageSecurityComponent.ts index 9fbfbcc3be3db1da447a60ff1ebc58a33690d28a..ab116ff809ab96f0b6fa9a0ed126437d95093e4f 100644 --- a/src/message/demo/src/app/message/MessageSecurityComponent.ts +++ b/src/message/demo/src/app/message/MessageSecurityComponent.ts @@ -9,7 +9,7 @@ export class MessageSecurityComponent { constructor(private tiMessage: TiMessageService, private domSanitizer: DomSanitizer) {} showString1(): void { this.tiMessage.open({ - // 10.1.3及之前版本该接口存在XSS攻击风险;该接口在10.1.4版本已经做了安全处理,js脚本不会执行。 + // 该接口已经做了安全处理,js脚本不会执行。 content: `hello链接1链接2` }); } diff --git a/src/message/demo/src/app/message/MessageTestModule.ts b/src/message/demo/src/app/message/MessageTestModule.ts index e291645c85f9fe1235fe7387a53fa5653adba726..70e591fd71b11bea1114902b69a216ba0108201a 100644 --- a/src/message/demo/src/app/message/MessageTestModule.ts +++ b/src/message/demo/src/app/message/MessageTestModule.ts @@ -33,8 +33,7 @@ import { MessageSecurityComponent } from './MessageSecurityComponent'; MessageTitleComponent, MessageIdComponent, MessageSecurityComponent - ], - entryComponents: [TestComponent] + ] }) export class MessageTestModule { static readonly LINKS: Array = [ diff --git a/src/message/demo/src/app/message/message-security.html b/src/message/demo/src/app/message/message-security.html index 7b28fd6793ce31751953698e62474d59885dc990..fb7401e63f8cb5199415cace539347ecc6a9e0e4 100644 --- a/src/message/demo/src/app/message/message-security.html +++ b/src/message/demo/src/app/message/message-security.html @@ -1,7 +1,6 @@

描述

- 内容通过content属性定义,支持传入字符串/template/组件形式。其中传入字符串形式时,是支持传入html字符串片段的, - v10.1.3及之前的版本存在XSS攻击风险,v10.1.4版本做了安全处理,v10.1.4及之后版本不存在XSS攻击风险。 + 内容通过content属性定义,支持传入字符串/template/组件形式。其中传入字符串形式时,是支持传入html字符串片段的,不存在XSS攻击风险。

示例

diff --git a/src/message/lib/package.json b/src/message/lib/package.json index c1dbb2bcc884f71bfc45a85bedacd161a9d21902..c5dd2a5804e81c4b6cecca8d87212f4e083f74a1 100644 --- a/src/message/lib/package.json +++ b/src/message/lib/package.json @@ -1,15 +1,15 @@ { "name": "@opentiny/ng-message", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-locale": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2", - "@opentiny/ng-modal": "~1.0.0-beta.2", + "@opentiny/ng-locale": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2", + "@opentiny/ng-modal": "~1.0.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-button": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-popup": "~1.0.0-beta.2" + "@opentiny/ng-button": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-popup": "~1.0.2" } } \ No newline at end of file diff --git a/src/message/lib/src/TiMessageModule.ts b/src/message/lib/src/TiMessageModule.ts index c785d06b3350770c7adf4eb41f722612969624b2..90c45690df31250fc6d2352ab2f1975f57a5e0c4 100644 --- a/src/message/lib/src/TiMessageModule.ts +++ b/src/message/lib/src/TiMessageModule.ts @@ -25,8 +25,7 @@ import { locales } from './i18n'; */ @NgModule({ imports: [CommonModule, TiModalModule, TiButtonModule, TiIconModule], - declarations: [TiMessageComponent, TiTranscludeDirective, TiContentWrapperComponent], - entryComponents: [TiMessageComponent, TiContentWrapperComponent] + declarations: [TiMessageComponent, TiTranscludeDirective, TiContentWrapperComponent] }) export class TiMessageModule { constructor() { diff --git a/src/modal/demo/src/app/modal/ModalAnimationComponent.ts b/src/modal/demo/src/app/modal/ModalAnimationComponent.ts index 0489d80aecf2b00ad5ba92d336c384ab89960e95..7067fcedb27c28701463d5c541ff991d467e9be6 100644 --- a/src/modal/demo/src/app/modal/ModalAnimationComponent.ts +++ b/src/modal/demo/src/app/modal/ModalAnimationComponent.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component, TemplateRef } from '@angular/core'; import { TiModalService } from '@opentiny/ng'; @Component({ @@ -7,7 +7,7 @@ import { TiModalService } from '@opentiny/ng'; export class ModalAnimationComponent { constructor(private tiModal: TiModalService) {} - show(content: string): void { + show(content: TemplateRef): void { this.tiModal.open(content, { animation: false }); diff --git a/src/modal/demo/src/app/modal/ModalBackdropComponent.ts b/src/modal/demo/src/app/modal/ModalBackdropComponent.ts index 4662f23a53ac087bb6b97ee4ffe76457084164ed..4b19bf10248a54ccb4b0308de361a0b08834b682 100644 --- a/src/modal/demo/src/app/modal/ModalBackdropComponent.ts +++ b/src/modal/demo/src/app/modal/ModalBackdropComponent.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component, TemplateRef } from '@angular/core'; import { TiModalService } from '@opentiny/ng'; @Component({ @@ -7,7 +7,7 @@ import { TiModalService } from '@opentiny/ng'; export class ModalBackdropComponent { constructor(private tiModal: TiModalService) {} - show(content: string): void { + show(content: TemplateRef): void { this.tiModal.open(content, { backdrop: false }); diff --git a/src/modal/demo/src/app/modal/ModalClassComponent.ts b/src/modal/demo/src/app/modal/ModalClassComponent.ts index a4147c6ae337e3a78665def66d363ae0944b4d26..22160fa1207e203ea4992bf6585490605cd00200 100644 --- a/src/modal/demo/src/app/modal/ModalClassComponent.ts +++ b/src/modal/demo/src/app/modal/ModalClassComponent.ts @@ -1,4 +1,4 @@ -import { Component, ViewEncapsulation } from '@angular/core'; +import { Component, TemplateRef, ViewEncapsulation } from '@angular/core'; import { TiModalService } from '@opentiny/ng'; @Component({ @@ -9,7 +9,7 @@ import { TiModalService } from '@opentiny/ng'; export class ModalClassComponent { constructor(private tiModal: TiModalService) {} - show(content: string): void { + show(content: TemplateRef): void { this.tiModal.open(content, { modalClass: 'modal-class' }); diff --git a/src/modal/demo/src/app/modal/ModalCloseIconComponent.ts b/src/modal/demo/src/app/modal/ModalCloseIconComponent.ts index bc69571f6fb63e97488a0ca373c36553009f7886..cf8cc0609d9d627c064d58e9276b45589629d468 100644 --- a/src/modal/demo/src/app/modal/ModalCloseIconComponent.ts +++ b/src/modal/demo/src/app/modal/ModalCloseIconComponent.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component, TemplateRef } from '@angular/core'; import { TiModalService } from '@opentiny/ng'; @Component({ @@ -7,7 +7,7 @@ import { TiModalService } from '@opentiny/ng'; export class ModalCloseIconComponent { constructor(private tiModal: TiModalService) {} - show(content: string): void { + show(content: TemplateRef): void { this.tiModal.open(content, { closeIcon: false }); diff --git a/src/modal/demo/src/app/modal/ModalDraggableComponent.ts b/src/modal/demo/src/app/modal/ModalDraggableComponent.ts index 2842c04ae79f108e7970d26f51e610d4fdab00b6..9fa3229623e7856d068a0e77a6e0d547e0fc7993 100644 --- a/src/modal/demo/src/app/modal/ModalDraggableComponent.ts +++ b/src/modal/demo/src/app/modal/ModalDraggableComponent.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component, TemplateRef } from '@angular/core'; import { TiModalService } from '@opentiny/ng'; @Component({ @@ -7,9 +7,9 @@ import { TiModalService } from '@opentiny/ng'; export class ModalDraggableComponent { constructor(private tiModal: TiModalService) {} - show(content: string): void { + show(content: TemplateRef): void { this.tiModal.open(content, { - draggable: false + draggable: true }); } } diff --git a/src/modal/demo/src/app/modal/ModalEscComponent.ts b/src/modal/demo/src/app/modal/ModalEscComponent.ts index 378fa68d88c146c627e612c110ab821b45b64482..a03c6fe0690a2d621e924ab1b0a5c7580e289217 100644 --- a/src/modal/demo/src/app/modal/ModalEscComponent.ts +++ b/src/modal/demo/src/app/modal/ModalEscComponent.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component, TemplateRef } from '@angular/core'; import { TiModalService } from '@opentiny/ng'; @Component({ @@ -7,7 +7,7 @@ import { TiModalService } from '@opentiny/ng'; export class ModalEscComponent { constructor(private tiModal: TiModalService) {} - show(content: string): void { + show(content: TemplateRef): void { this.tiModal.open(content, { closeOnEsc: false }); diff --git a/src/modal/demo/src/app/modal/ModalHeaderAlignComponent.ts b/src/modal/demo/src/app/modal/ModalHeaderAlignComponent.ts index 46e710fc924772d9f8fe8567e62f48e9fdfca801..d46ac511f5b074f77025353e59fc01e695f6f025 100644 --- a/src/modal/demo/src/app/modal/ModalHeaderAlignComponent.ts +++ b/src/modal/demo/src/app/modal/ModalHeaderAlignComponent.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component, TemplateRef } from '@angular/core'; import { TiModalService } from '@opentiny/ng'; @Component({ @@ -7,7 +7,7 @@ import { TiModalService } from '@opentiny/ng'; export class ModalHeaderAlignComponent { constructor(private tiModal: TiModalService) {} - show(content: string): void { + show(content: TemplateRef): void { this.tiModal.open(content, { headerAlign: 'center' }); diff --git a/src/modal/demo/src/app/modal/ModalTestModule.ts b/src/modal/demo/src/app/modal/ModalTestModule.ts index 5d19f3df4afc2fc4de3aea41186d5f1f6daa0cac..17e802016c3e8b33687d04b71f43ebc4c84236d9 100644 --- a/src/modal/demo/src/app/modal/ModalTestModule.ts +++ b/src/modal/demo/src/app/modal/ModalTestModule.ts @@ -67,8 +67,7 @@ import { ModalEscComponent } from './ModalEscComponent'; ModalDraggableComponent, ModalHeaderAlignComponent, ModalEscComponent - ], - entryComponents: [TestComponent, ModalTestComponent] + ] }) export class ModalTestModule { static readonly LINKS: Array = [ diff --git a/src/modal/demo/src/app/modal/modal-two-backdrop.html b/src/modal/demo/src/app/modal/modal-two-backdrop.html index c6ba4576cb01306efc40dab4aa9069d76e1ba0f2..addf3c1da06fcf86d5d5430562bc9f196bb69684 100644 --- a/src/modal/demo/src/app/modal/modal-two-backdrop.html +++ b/src/modal/demo/src/app/modal/modal-two-backdrop.html @@ -1,6 +1,6 @@

描述

- 此场景修复的问题:两个弹窗同时打开,第一个弹窗没有遮罩,第二个弹窗有遮罩的场景。当关闭两个弹窗后,遮罩无法正常关闭的问题。10.1.13版本进行了修复 + 此场景修复的问题:两个弹窗同时打开,第一个弹窗没有遮罩,第二个弹窗有遮罩的场景。当关闭两个弹窗后,遮罩无法正常关闭的问题

示例

diff --git a/src/modal/demo/src/app/modal/webdoc/modal-demos.js b/src/modal/demo/src/app/modal/webdoc/modal-demos.js index 5c7c2f84f92d6fd14c6b650c4fddcb7b2ec7c124..3031961bd0f014d78171227b8839897583357ac8 100644 --- a/src/modal/demo/src/app/modal/webdoc/modal-demos.js +++ b/src/modal/demo/src/app/modal/webdoc/modal-demos.js @@ -5,134 +5,121 @@ export default { demoId: 'modal-content-temp', name: { 'zh-CN': '弹出框内容为 template 形式', - 'en-US': 'template', + 'en-US': 'template' }, desc: { 'zh-CN': '

使用了ng-template方式自定义弹出框模板。

', - 'en-US': '

template

', + 'en-US': '

template

' }, - apis: ['TiModalConfig.properties.id'], + apis: ['TiModalConfig.properties.id'] }, { demoId: 'modal-content-comp', name: { 'zh-CN': '弹出框内容定义为组件形式', - 'en-US': 'component', + 'en-US': 'component' }, desc: { - 'zh-CN': - '

弹出框内容定义为组件形式时,弹出框中的内容组件需要在ngModule中定义其为entryComponents

', - 'en-US': '

component

', - }, - apis: [ - 'TiModalConfig.properties.context', - 'TiModalConfig.methods.close', - 'TiModalConfig.methods.dismiss', - ], + 'zh-CN': '

弹出框内容定义为组件形式时,open 方法传入对应的组件类即可。

', + 'en-US': '

component

' + }, + apis: ['TiModalConfig.properties.context', 'TiModalConfig.methods.close', 'TiModalConfig.methods.dismiss'] }, { demoId: 'modal-class', name: { 'zh-CN': '自定义弹出框样式', - 'en-US': 'modalClass', + 'en-US': 'modalClass' }, desc: { 'zh-CN': '

通过modalClass自定义弹出框样式。

', - 'en-US': 'modalClass', + 'en-US': 'modalClass' }, - apis: ['TiModalConfig.properties.modalClass'], + apis: ['TiModalConfig.properties.modalClass'] }, { demoId: 'modal-animation', name: { 'zh-CN': '显示/隐藏不带动画效果', - 'en-US': 'animation', + 'en-US': 'animation' }, desc: { - 'zh-CN': - '

通过animation控制弹出框显示/隐藏是否带动画效果。

', - 'en-US': 'animation', + 'zh-CN': '

通过animation控制弹出框显示/隐藏是否带动画效果。

', + 'en-US': 'animation' }, - apis: ['TiModalConfig.properties.animation'], + apis: ['TiModalConfig.properties.animation'] }, { demoId: 'modal-backdrop', name: { 'zh-CN': '不呈现模态背景', - 'en-US': 'backdrop', + 'en-US': 'backdrop' }, desc: { 'zh-CN': '

通过backdrop控制是否呈现模态背景。

', - 'en-US': 'backdrop', + 'en-US': 'backdrop' }, - apis: ['TiModalConfig.properties.backdrop'], + apis: ['TiModalConfig.properties.backdrop'] }, { demoId: 'modal-close-icon', name: { 'zh-CN': '头部不呈现关闭按钮', - 'en-US': 'closeIcon', + 'en-US': 'closeIcon' }, desc: { 'zh-CN': '

通过closeIcon头部是否有关闭按钮。

', - 'en-US': 'closeIcon', + 'en-US': 'closeIcon' }, - apis: ['TiModalConfig.properties.closeIcon'], + apis: ['TiModalConfig.properties.closeIcon'] }, { demoId: 'modal-draggable', name: { 'zh-CN': '不可拖拽', - 'en-US': 'draggable', + 'en-US': 'draggable' }, desc: { 'zh-CN': '

通过draggable控制弹出框是否可拖拽。

', - 'en-US': 'draggable', + 'en-US': 'draggable' }, - apis: ['TiModalConfig.properties.draggable'], + apis: ['TiModalConfig.properties.draggable'] }, { demoId: 'modal-esc', name: { 'zh-CN': 'Esc 键弹出框不关闭', - 'en-US': 'closeOnEsc', + 'en-US': 'closeOnEsc' }, desc: { - 'zh-CN': - '

通过closeOnEsc控制按 Esc 键弹出框是否关闭。

', - 'en-US': 'closeOnEsc', + 'zh-CN': '

通过closeOnEsc控制按 Esc 键弹出框是否关闭。

', + 'en-US': 'closeOnEsc' }, - apis: ['TiModalConfig.properties.closeOnEsc'], + apis: ['TiModalConfig.properties.closeOnEsc'] }, { demoId: 'modal-header-align', name: { 'zh-CN': '头部水平居中', - 'en-US': 'headerAlign', + 'en-US': 'headerAlign' }, desc: { - 'zh-CN': - '

通过headerAlign配置头部内容水平对齐方式。

', - 'en-US': 'headerAlign', + 'zh-CN': '

通过headerAlign配置头部内容水平对齐方式。

', + 'en-US': 'headerAlign' }, - apis: ['TiModalConfig.properties.headerAlign'], + apis: ['TiModalConfig.properties.headerAlign'] }, { demoId: 'modal-event', name: { 'zh-CN': '事件', - 'en-US': 'beforeClose', + 'en-US': 'beforeClose' }, desc: { - 'zh-CN': - '

通过beforeClose配置关闭弹出框前的回调函数。

', - 'en-US': 'beforeClose', - }, - apis: [ - 'TiModalConfig.methods.beforeClose', - 'TiModalConfig.methods.close', - 'TiModalConfig.methods.dismiss', - ], - }, - ], + 'zh-CN': '

通过beforeClose配置关闭弹出框前的回调函数。

', + 'en-US': 'beforeClose' + }, + apis: ['TiModalConfig.methods.beforeClose', 'TiModalConfig.methods.close', 'TiModalConfig.methods.dismiss'] + } + ] }; diff --git a/src/modal/lib/package.json b/src/modal/lib/package.json index 0e2b4aa41e2229a92eebe05f1f34f2e9d645da87..6d286e93762312ebe72e31d208b5bc070095775d 100644 --- a/src/modal/lib/package.json +++ b/src/modal/lib/package.json @@ -1,18 +1,18 @@ { "name": "@opentiny/ng-modal", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/router": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/animations": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.2", - "@opentiny/ng-renderer": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-popup": "~1.0.0-beta.2", - "@opentiny/ng-drag": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-outline": "~1.0.0-beta.2" + "@opentiny/ng-utils": "~1.0.2", + "@opentiny/ng-renderer": "~1.0.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-popup": "~1.0.2", + "@opentiny/ng-drag": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-outline": "~1.0.2" } } \ No newline at end of file diff --git a/src/modal/lib/src/TiModalComponent.ts b/src/modal/lib/src/TiModalComponent.ts index f9eacd635613310e2b18920998fce6942c0ff49c..e771911f9d30dbcbe9ddddff5139d083809253ea 100644 --- a/src/modal/lib/src/TiModalComponent.ts +++ b/src/modal/lib/src/TiModalComponent.ts @@ -22,7 +22,7 @@ import { ViewChild, ViewEncapsulation } from '@angular/core'; -import { NavigationEnd, Router, RouterEvent } from '@angular/router'; +import { NavigationEnd, Router } from '@angular/router'; import { filter } from 'rxjs/operators'; import { Subscription } from 'rxjs'; import { DOCUMENT } from '@angular/common'; @@ -124,7 +124,7 @@ export class TiModalComponent extends TiBaseComponent implements AfterContentIni protected renderer: Renderer2, @Optional() private router: Router, protected changeDetectorRef: ChangeDetectorRef, - @Inject(DOCUMENT) private document + @Inject(DOCUMENT) private document: any ) { super(ele, renderer); } @@ -214,15 +214,17 @@ export class TiModalComponent extends TiBaseComponent implements AfterContentIni return position; } }; - // 监听路由变化,关闭弹出框:hashchange监听不到通过routerLink/navigate路由跳转的场景 - this.modalSubscribe = this.router?.events.pipe(filter((event: RouterEvent) => event instanceof NavigationEnd)).subscribe(() => { - this.modalInstance._remove(); - }); + // 监听路由变化,关闭弹出框:hashchange监听不到通过routerLink/navigate路由跳转的场景 // 升级 ng16 去除 RouterEvent + this.modalSubscribe = this.router?.events + .pipe(filter((event: any /* : RouterEvent */) => event instanceof NavigationEnd)) + .subscribe(() => { + this.modalInstance._remove(); + }); } ngOnDestroy(): void { super.ngOnDestroy(); - this.modalSubscribe && this.modalSubscribe.unsubscribe(); + this.modalSubscribe?.unsubscribe(); } public dismissModal(): void { @@ -259,9 +261,8 @@ export class TiModalComponent extends TiBaseComponent implements AfterContentIni } /** * 设置弹框高度: - * 根据UCD3.0规范,modal最大高度不能超过弹框宽度,所以需要获取到modal的宽度值,用其减去modal的header和footer的高度 + * 根据规范,modal最大高度不能超过弹框宽度,所以需要获取到modal的宽度值,用其减去modal的header和footer的高度 * 后设为body的最大高度,当高度超出时,ti-modal-body垂直方向上出现滚动条 - * 10.1.1变更说明: * 根据规范变更,弹框高度可以超过弹框宽度,同时弹出框的最大高度是660px。 */ private setMaxHeight(): void { diff --git a/src/modal/lib/src/TiModalModule.ts b/src/modal/lib/src/TiModalModule.ts index b15e4d7a45cca2241fcc850f5a83f7559c2ff52d..a45c6e758f036508172a064b52af77fbfdf29c61 100644 --- a/src/modal/lib/src/TiModalModule.ts +++ b/src/modal/lib/src/TiModalModule.ts @@ -42,8 +42,7 @@ import { TiOutlineModule } from '@opentiny/ng-outline'; TiModalFooterComponent, TiModalBodyComponent, TiBackdropComponent - ], - entryComponents: [TiModalComponent, TiModalNoAnimationComponent, TiBackdropNoAnimationComponent, TiBackdropComponent] + ] }) export class TiModalModule {} diff --git a/src/modal/lib/src/TiModalService.ts b/src/modal/lib/src/TiModalService.ts index 1376c6e112f3aea4b5804657443ec4b64a69108b..9d6a2aca8986ecc963c33c19806c1bd7a7c9e14c 100644 --- a/src/modal/lib/src/TiModalService.ts +++ b/src/modal/lib/src/TiModalService.ts @@ -49,7 +49,7 @@ export class TiModalService { * 生成弹框方法 * * @param content 弹框内容,支持TemplateRef及组件形式,内容由ti-modal-header、ti-modal-body及ti-modal-footer组件构成弹框内容整体。 - * 不支持字符串形式,如果误传入字符串形式,不仅会有报错,还会存在XSS攻击风险,不过XSS攻击风险已在10.1.4版本已处理。 + * 不支持字符串形式,如果误传入字符串形式,不仅会有报错,还会存在XSS攻击风险,不过XSS攻击风险已处理。 * @param [config] 弹框配置信息 * @returns 弹框实例信息,使用该实例信息可调用弹框的close等方法;弹框内容为component类型时,也可通过该实例信息的content属性获取弹框内容数据 */ diff --git a/src/nav/lib/package.json b/src/nav/lib/package.json index da32e36f9e61d7a1968fb3555fb49a9483a13905..4d0a7e17727f5fce87b05236b4d25b4c14e668d7 100644 --- a/src/nav/lib/package.json +++ b/src/nav/lib/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/ng-nav", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", diff --git a/src/ng/demo/project.json b/src/ng/demo/project.json index 0cb3dc0e6d009d35a179db20c52e7d7dfd04de3c..fa73cd1337ec83521097c2c65b081771c5c04e81 100644 --- a/src/ng/demo/project.json +++ b/src/ng/demo/project.json @@ -95,13 +95,21 @@ }, "preview": { "executor": "@nrwl/workspace:run-commands", - "options": { - "commands": [ - { - "command": "node build/preview-demo.js ng" - } - ] - } + "configurations": { + "ng13": { + "command": "node build/preview-demo.js ng" + }, + "ng14": { + "command": "node build/preview-ngversion-demo.js ng14" + }, + "ng15": { + "command": "node build/preview-ngversion-demo.js ng15" + }, + "ng16": { + "command": "node build/preview-ngversion-demo.js ng16" + } + }, + "defaultConfiguration": "ng13" }, "test": { "builder": "@angular-devkit/build-angular:karma", diff --git a/src/ng/demo/src/app/AppWcModule.ts b/src/ng/demo/src/app/AppWcModule.ts index eb8e5e1d05f61af9053e10b5df137f692f7e7324..124115e344aeca96b890a48400bc28936f65e445 100644 --- a/src/ng/demo/src/app/AppWcModule.ts +++ b/src/ng/demo/src/app/AppWcModule.ts @@ -153,6 +153,8 @@ import { ButtonHasborderComponent } from './../../../../button/demo/src/app/butt import { ButtonIconComponent } from './../../../../button/demo/src/app/button/ButtonIconComponent'; +import { ButtonLabelComponent } from './../../../../button/demo/src/app/button/ButtonLabelComponent'; + import { ButtonLoadingComponent } from './../../../../button/demo/src/app/button/ButtonLoadingComponent'; import { ButtonOnlyiconComponent } from './../../../../button/demo/src/app/button/ButtonOnlyiconComponent'; @@ -1239,7 +1241,7 @@ import { TabLevel2Component } from './../../../../tab/demo/src/app/tab/TabLevel2 import { TabOverflowComponent } from './../../../../tab/demo/src/app/tab/TabOverflowComponent'; -import { TabRouteComponent } from './../../../../tab/demo/src/app/tab/TabRouteComponent'; +import { TabRouteWebsiteViewComponent } from './../../../../tab/demo/src/app/tab/website-views/TabRouteWebsiteViewComponent'; import { TabScrollComponent } from './../../../../tab/demo/src/app/tab/TabScrollComponent'; @@ -1441,6 +1443,8 @@ import { TagDisabledComponent } from './../../../../tag/demo/src/app/tag/TagDisa import { TagEditComponent } from './../../../../tag/demo/src/app/tag/TagEditComponent'; +import { TagEventsComponent } from './../../../../tag/demo/src/app/tag/TagEventsComponent'; + import { TagsinputBasicComponent } from './../../../../tagsinput/demo/src/app/tagsinput/TagsinputBasicComponent'; import { TagsinputDisabledComponent } from './../../../../tagsinput/demo/src/app/tagsinput/TagsinputDisabledComponent'; @@ -2096,6 +2100,11 @@ const WCS: any = [ { selector: 'website-tiny-button-icon', component: ButtonIconComponent }, + { + selector: 'website-tiny-button-label', + component: ButtonLabelComponent + }, + { selector: 'website-tiny-button-loading', component: ButtonLoadingComponent @@ -4236,7 +4245,7 @@ const WCS: any = [ { selector: 'website-tiny-tab-overflow', component: TabOverflowComponent }, - { selector: 'website-tiny-tab-route', component: TabRouteComponent }, + { selector: 'website-tiny-tab-route', component: TabRouteWebsiteViewComponent }, { selector: 'website-tiny-tab-scroll', component: TabScrollComponent }, @@ -4669,6 +4678,8 @@ const WCS: any = [ { selector: 'website-tiny-tag-edit', component: TagEditComponent }, + { selector: 'website-tiny-tag-events', component: TagEventsComponent }, + { selector: 'website-tiny-tagsinput-basic', component: TagsinputBasicComponent diff --git a/src/ng/demo/src/app/DemoModules.ts b/src/ng/demo/src/app/DemoModules.ts index 026a79b09dcda6751824446aec10f59609402070..21613fc44d8b550fcfb808fbeb2f84691f08abfc 100644 --- a/src/ng/demo/src/app/DemoModules.ts +++ b/src/ng/demo/src/app/DemoModules.ts @@ -79,7 +79,7 @@ import { SwitchTestModule } from '../../../../switch/demo/src/app/switch/SwitchT import { TabTestModule } from '../../../../tab/demo/src/app/tab/TabTestModule'; import { TableTestModule } from '../../../../table/demo/src/app/table/TableTestModule'; import { TagTestModule } from '../../../../tag/demo/src/app/tag/TagTestModule'; -import { TagsInputTestModule } from '../../../../tagsinput/demo/src/app/tagsinput/TagsInputTestModule'; +import { TagsinputTestModule } from '../../../../tagsinput/demo/src/app/tagsinput/TagsinputTestModule'; import { TextTestModule } from '../../../../text/demo/src/app/text/TextTestModule'; import { TextareaTestModule } from '../../../../textarea/demo/src/app/textarea/TextareaTestModule'; import { TimeTestModule } from '../../../../time/demo/src/app/time/TimeTestModule'; @@ -183,7 +183,7 @@ export class DemoModules { TabTestModule, TableTestModule, TagTestModule, - TagsInputTestModule, + TagsinputTestModule, TextTestModule, TextareaTestModule, TimeTestModule, diff --git a/src/ng/demo/src/webdoc/getstart.md b/src/ng/demo/src/webdoc/getstart.md index 770517d063d3cde9768a98ab0a690541d2716b77..a259b102650b50990570c43bb5e9a60fc6e3f1e6 100644 --- a/src/ng/demo/src/webdoc/getstart.md +++ b/src/ng/demo/src/webdoc/getstart.md @@ -71,8 +71,8 @@ export class AppModule {} { "build": { "styles": [ - "node_modules/@opentiny/ng/themes/styles.css", // 基础样式 - "node_modules/@opentiny/ng/themes/theme-default.css", // 主题样式 + "node_modules/@opentiny/ng-themes/styles.css", // 基础样式 + "node_modules/@opentiny/ng-themes/theme-default.css", // 主题样式 "src/styles.css" ] } diff --git a/src/ng/demo/src/webdoc/introduce.md b/src/ng/demo/src/webdoc/introduce.md index d4668a9d4ffb099d52fb3a68ee207dadd7eb8832..7706683d19bd2783bde11bbd74b22a666d66e880 100644 --- a/src/ng/demo/src/webdoc/introduce.md +++ b/src/ng/demo/src/webdoc/introduce.md @@ -24,7 +24,7 @@ title: 介绍 | TinyNG ### 支持环境 -| Edge
Edge | Firefox
Firefox | Chrome
Chrome | Safari
Safari | +|Edge |Firefox | Chrome | Safari | | --------- | --------- | --------- | --------- | | last 3 versions | last 3 versions | last 3 versions | last 2 versions | diff --git a/src/ng/demo/src/webdoc/menus.js b/src/ng/demo/src/webdoc/menus.js index dae3c51b1a81612cda5d6df759036aaf728f7125..8cd2d7cd49c0752bf2196a71b80dc5a892da8860 100644 --- a/src/ng/demo/src/webdoc/menus.js +++ b/src/ng/demo/src/webdoc/menus.js @@ -168,7 +168,6 @@ export const cmpMenus = [ { name: 'Rate', nameCn: '评分', key: 'rate' }, { name: 'Rights', nameCn: '权益', key: 'rights' }, { name: 'Skeleton', nameCn: '骨架屏', key: 'skeleton' }, - { name: 'Rate', nameCn: '评分', key: 'rate' }, { name: 'Guides', nameCn: '情景引导', key: 'guides' }, { name: 'Foldtext', nameCn: '折叠文本', key: 'foldtext' }, { name: 'Productpreview', nameCn: '商品预览', key: 'productpreview' }, diff --git a/src/ng/demo/src/webdoc/themedoc.md b/src/ng/demo/src/webdoc/themedoc.md index 7b25224ab34bc0c3db19c0980673793e791b9017..1ade4b177e985a1526d6c85832b41051db80fe15 100644 --- a/src/ng/demo/src/webdoc/themedoc.md +++ b/src/ng/demo/src/webdoc/themedoc.md @@ -12,7 +12,7 @@ TinyNG 支持一定程度的样式定制,以满足业务和品牌上多样化 ### 默认主题 -修改`angular.json`的`styles`字段,全量引入`"node_modules/@opentiny/ng/themes/styles.css"`和`"node_modules/@opentiny/ng/themes/theme-default.css"`。 +修改`angular.json`的`styles`字段,全量引入`"node_modules/@opentiny/ng-themes/styles.css"`和`"node_modules/@opentiny/ng-themes/theme-default.css"`。 ```json { @@ -21,8 +21,8 @@ TinyNG 支持一定程度的样式定制,以满足业务和品牌上多样化 "build": { ... "styles": [ - "node_modules/@opentiny/ng/themes/styles.css", - "node_modules/@opentiny/ng/themes/theme-default.css", + "node_modules/@opentiny/ng-themes/styles.css", + "node_modules/@opentiny/ng-themes/theme-default.css", "src/styles.css", ], ... @@ -41,7 +41,7 @@ TinyNG 支持一定程度的样式定制,以满足业务和品牌上多样化 - theme-purple.css - theme-red.css -修改`angular.json`的`styles`字段,全量引入`"node_modules/@opentiny/ng/themes/styles.css"`和`"node_modules/@opentiny/ng/themes/theme-xxx.css"`。 +修改`angular.json`的`styles`字段,全量引入`"node_modules/@opentiny/ng-themes/styles.css"`和`"node_modules/@opentiny/ng-themes/theme-xxx.css"`。 ```json { @@ -50,8 +50,8 @@ TinyNG 支持一定程度的样式定制,以满足业务和品牌上多样化 "build": { ... "styles": [ - "node_modules/@opentiny/ng/themes/styles.css", - "node_modules/@opentiny/ng/themes/theme-xxx.css", + "node_modules/@opentiny/ng-themes/styles.css", + "node_modules/@opentiny/ng-themes/theme-xxx.css", "src/styles.css", ], ... @@ -106,7 +106,7 @@ TinyNG 支持一定程度的样式定制,以满足业务和品牌上多样化 ### 步骤一:将`TinyNG`主题 CSS 文件,复制到`assets`下 -修改`angular.json`的`assets`字段,参考如下修改,下面`input`,`output`意思是打包时,`"node_modules/@opentiny/ng/themes/"`复制到`"/assets/tiny3/themes/"`。 +修改`angular.json`的`assets`字段,参考如下修改,下面`input`,`output`意思是打包时,`"node_modules/@opentiny/ng-themes/"`复制到`"/assets/tiny3/themes/"`。 ```json { @@ -119,7 +119,7 @@ TinyNG 支持一定程度的样式定制,以满足业务和品牌上多样化 "src/assets", { "glob": "**/*", - "input": "node_modules/@opentiny/ng/themes/", + "input": "node_modules/@opentiny/ng-themes/", "output": "/assets/tiny3/themes/" } ], @@ -130,9 +130,9 @@ TinyNG 支持一定程度的样式定制,以满足业务和品牌上多样化 } ``` -### 步骤二:添加基础样式`"node_modules/@opentiny/ng/themes/styles.css"` +### 步骤二:添加基础样式`"node_modules/@opentiny/ng-themes/styles.css"` -修改`angular.json`的`styles`字段,引入`"node_modules/@opentiny/ng/themes/styles.css"`。 +修改`angular.json`的`styles`字段,引入`"node_modules/@opentiny/ng-themes/styles.css"`。 ```json { @@ -141,7 +141,7 @@ TinyNG 支持一定程度的样式定制,以满足业务和品牌上多样化 "build": { ... "styles": [ - "node_modules/@opentiny/ng/themes/styles.css", + "node_modules/@opentiny/ng-themes/styles.css", "src/styles.css", ], ... diff --git a/src/ng/lib/README.md b/src/ng/lib/README.md new file mode 100644 index 0000000000000000000000000000000000000000..f38049832b4222e746a2de4c77be8a7c085dd6d3 --- /dev/null +++ b/src/ng/lib/README.md @@ -0,0 +1,32 @@ +--- +title: 介绍 | TinyNG +--- + +# 介绍 + +`TinyNG`是基于 Angular + TypeScript 的 web UI 组件库,可用于研发企业级前端页面。 + +### 特性 + +- 适合企业级 PC 端产品的交互语言和视觉风格。 + +- 70+ 开箱即用的高质量 Angular 组件库,几乎满足所有业务场景。 + +- 使用 TypeScript 进行开发,提供完整的类型定义。 + +- 支持 OnPush 模式,性能卓越。 + +- 支持 5 种国际化语言。 + +- 通过CSS variables 提供超细粒度的主题定制能力。 + + + +### 支持环境 + +Edge | Firefox |Chrome | Safari | +| --------- | --------- | --------- | --------- | +| last 3 versions | last 3 versions | last 3 versions | last 2 versions | + +### 支持 Angular 版本 +目前支持 Angular 版本 `>=13.0.0`。 diff --git a/src/ng/lib/ng-package.json b/src/ng/lib/ng-package.json index e740ca55b50f7c54bb250b3d033bce5254c9bdd9..af708b4f97baa32b7fd4913b1b46bb5d78f90b8b 100644 --- a/src/ng/lib/ng-package.json +++ b/src/ng/lib/ng-package.json @@ -3,5 +3,6 @@ "dest": "../../../dist/libs/ng", "lib": { "entryFile": "index.ts" - } + }, + "assets": ["README.md"] } diff --git a/src/ng/lib/package.json b/src/ng/lib/package.json index 2b62a0304f65838394f903a59a1b296bffef4015..d29cbe79c1fe9f1c229e5fe098f8a0d0d1de278e 100644 --- a/src/ng/lib/package.json +++ b/src/ng/lib/package.json @@ -1,111 +1,129 @@ { "name": "@opentiny/ng", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", + "description": "opentiny angular components", + "keywords": [ + "angular", + "components", + "typescript", + "ui", + "component", + "opentiny", + "ng" + ], + "repository": { + "type": "git", + "url": "git+https://github.com/opentiny/ng.git" + }, + "homepage": "https://opentiny.design/tiny-ng/overview", + "engines": { + "npm": ">=7.0.0" + }, "peerDependencies": { "@angular/common": ">=13.0.0", "@angular/core": ">=13.0.0", - "@opentiny/ng-accordion": "1.0.0-beta.2", - "@opentiny/ng-actionmenu": "1.0.0-beta.2", - "@opentiny/ng-alert": "1.0.0-beta.2", - "@opentiny/ng-anchor": "1.0.0-beta.2", - "@opentiny/ng-autocomplete": "1.0.0-beta.2", - "@opentiny/ng-avatar": "1.0.0-beta.2", - "@opentiny/ng-base": "1.0.0-beta.2", - "@opentiny/ng-button": "1.0.0-beta.2", - "@opentiny/ng-buttongroup": "1.0.0-beta.2", - "@opentiny/ng-card": "1.0.0-beta.2", - "@opentiny/ng-cascader": "1.0.0-beta.2", - "@opentiny/ng-checkbox": "1.0.0-beta.2", - "@opentiny/ng-collapse": "1.0.0-beta.2", - "@opentiny/ng-collapsebox": "1.0.0-beta.2", - "@opentiny/ng-collapsebutton": "1.0.0-beta.2", - "@opentiny/ng-copy": "1.0.0-beta.2", - "@opentiny/ng-crumb": "1.0.0-beta.2", - "@opentiny/ng-date": "1.0.0-beta.2", - "@opentiny/ng-datebase": "1.0.0-beta.2", - "@opentiny/ng-datedominator": "1.0.0-beta.2", - "@opentiny/ng-dateedit": "1.0.0-beta.2", - "@opentiny/ng-datepanel": "1.0.0-beta.2", - "@opentiny/ng-daterange": "1.0.0-beta.2", - "@opentiny/ng-datetime": "1.0.0-beta.2", - "@opentiny/ng-datetimerange": "1.0.0-beta.2", - "@opentiny/ng-dominator": "1.0.0-beta.2", - "@opentiny/ng-drag": "1.0.0-beta.2", - "@opentiny/ng-drop": "1.0.0-beta.2", - "@opentiny/ng-droplist": "1.0.0-beta.2", - "@opentiny/ng-dropsearch": "1.0.0-beta.2", - "@opentiny/ng-formfield": "1.0.0-beta.2", - "@opentiny/ng-foldtext": "1.0.0-beta.2", - "@opentiny/ng-grid": "1.0.0-beta.2", - "@opentiny/ng-halfmodal": "1.0.0-beta.2", - "@opentiny/ng-icon": "1.0.0-beta.2", - "@opentiny/ng-iconaction": "1.0.0-beta.2", - "@opentiny/ng-imagepreview": "1.0.0-beta.2", - "@opentiny/ng-include": "1.0.0-beta.2", - "@opentiny/ng-inputnumber": "1.0.0-beta.2", - "@opentiny/ng-intro": "1.0.0-beta.2", - "@opentiny/ng-ip": "1.0.0-beta.2", - "@opentiny/ng-ipsection": "1.0.0-beta.2", - "@opentiny/ng-layout": "1.0.0-beta.2", - "@opentiny/ng-leftmenu": "1.0.0-beta.2", - "@opentiny/ng-leftmenuthin": "1.0.0-beta.2", - "@opentiny/ng-list": "1.0.0-beta.2", - "@opentiny/ng-loading": "1.0.0-beta.2", - "@opentiny/ng-locale": "1.0.0-beta.2", - "@opentiny/ng-linkbutton": "1.0.0-beta.2", - "@opentiny/ng-menu": "1.0.0-beta.2", - "@opentiny/ng-message": "1.0.0-beta.2", - "@opentiny/ng-modal": "1.0.0-beta.2", - "@opentiny/ng-nav": "1.0.0-beta.2", - "@opentiny/ng-notification": "1.0.0-beta.2", - "@opentiny/ng-outline": "1.0.0-beta.2", - "@opentiny/ng-overflow": "1.0.0-beta.2", - "@opentiny/ng-pagination": "1.0.0-beta.2", - "@opentiny/ng-popconfirm": "1.0.0-beta.2", - "@opentiny/ng-popup": "1.0.0-beta.2", - "@opentiny/ng-progressbar": "1.0.0-beta.2", - "@opentiny/ng-progresspie": "1.0.0-beta.2", - "@opentiny/ng-radio": "1.0.0-beta.2", - "@opentiny/ng-rate": "1.0.0-beta.2", - "@opentiny/ng-renderer": "1.0.0-beta.2", - "@opentiny/ng-rights": "1.0.0-beta.2", - "@opentiny/ng-score": "1.0.0-beta.2", - "@opentiny/ng-scroll": "1.0.0-beta.2", - "@opentiny/ng-searchbox": "1.0.0-beta.2", - "@opentiny/ng-select": "1.0.0-beta.2", - "@opentiny/ng-skeleton": "1.0.0-beta.2", - "@opentiny/ng-slider": "1.0.0-beta.2", - "@opentiny/ng-spinner": "1.0.0-beta.2", - "@opentiny/ng-steps": "1.0.0-beta.2", - "@opentiny/ng-subtitle": "1.0.0-beta.2", - "@opentiny/ng-swiper": "1.0.0-beta.2", - "@opentiny/ng-switch": "1.0.0-beta.2", - "@opentiny/ng-tab": "1.0.0-beta.2", - "@opentiny/ng-table": "1.0.0-beta.2", - "@opentiny/ng-tag": "1.0.0-beta.2", - "@opentiny/ng-tagsinput": "1.0.0-beta.2", - "@opentiny/ng-text": "1.0.0-beta.2", - "@opentiny/ng-textarea": "1.0.0-beta.2", - "@opentiny/ng-time": "1.0.0-beta.2", - "@opentiny/ng-timeline": "1.0.0-beta.2", - "@opentiny/ng-tip": "1.0.0-beta.2", - "@opentiny/ng-transfer": "1.0.0-beta.2", - "@opentiny/ng-tree": "1.0.0-beta.2", - "@opentiny/ng-treeselect": "1.0.0-beta.2", - "@opentiny/ng-upload": "1.0.0-beta.2", - "@opentiny/ng-utils": "1.0.0-beta.2", - "@opentiny/ng-validation": "1.0.0-beta.2", - "@opentiny/ng-zoom": "1.0.0-beta.2", - "@opentiny/ng-themes": "1.0.0-beta.2", - "@opentiny/ng-guides": "1.0.0-beta.2", - "@opentiny/ng-labeleditor": "1.0.0-beta.2", - "@opentiny/ng-phonenumber": "1.0.0-beta.2", - "@opentiny/ng-selectgroup": "1.0.0-beta.2", - "@opentiny/ng-productpreview": "1.0.0-beta.2", - "@opentiny/ng-buttonselect": "1.0.0-beta.2", - "@opentiny/ng-collapsetext": "1.0.0-beta.2", - "@opentiny/ng-guidesteps": "1.0.0-beta.2", - "@opentiny/ng-path": "1.0.0-beta.2" + "@opentiny/ng-accordion": "1.0.2", + "@opentiny/ng-actionmenu": "1.0.2", + "@opentiny/ng-alert": "1.0.2", + "@opentiny/ng-anchor": "1.0.2", + "@opentiny/ng-autocomplete": "1.0.2", + "@opentiny/ng-avatar": "1.0.2", + "@opentiny/ng-base": "1.0.2", + "@opentiny/ng-button": "1.0.2", + "@opentiny/ng-buttongroup": "1.0.2", + "@opentiny/ng-card": "1.0.2", + "@opentiny/ng-cascader": "1.0.2", + "@opentiny/ng-checkbox": "1.0.2", + "@opentiny/ng-collapse": "1.0.2", + "@opentiny/ng-collapsebox": "1.0.2", + "@opentiny/ng-collapsebutton": "1.0.2", + "@opentiny/ng-copy": "1.0.2", + "@opentiny/ng-crumb": "1.0.2", + "@opentiny/ng-date": "1.0.2", + "@opentiny/ng-datebase": "1.0.2", + "@opentiny/ng-datedominator": "1.0.2", + "@opentiny/ng-dateedit": "1.0.2", + "@opentiny/ng-datepanel": "1.0.2", + "@opentiny/ng-daterange": "1.0.2", + "@opentiny/ng-datetime": "1.0.2", + "@opentiny/ng-datetimerange": "1.0.2", + "@opentiny/ng-dominator": "1.0.2", + "@opentiny/ng-drag": "1.0.2", + "@opentiny/ng-drop": "1.0.2", + "@opentiny/ng-droplist": "1.0.2", + "@opentiny/ng-dropsearch": "1.0.2", + "@opentiny/ng-formfield": "1.0.2", + "@opentiny/ng-foldtext": "1.0.2", + "@opentiny/ng-grid": "1.0.2", + "@opentiny/ng-halfmodal": "1.0.2", + "@opentiny/ng-icon": "1.0.2", + "@opentiny/ng-iconaction": "1.0.2", + "@opentiny/ng-imagepreview": "1.0.2", + "@opentiny/ng-include": "1.0.2", + "@opentiny/ng-inputnumber": "1.0.2", + "@opentiny/ng-intro": "1.0.2", + "@opentiny/ng-ip": "1.0.2", + "@opentiny/ng-ipsection": "1.0.2", + "@opentiny/ng-layout": "1.0.2", + "@opentiny/ng-leftmenu": "1.0.2", + "@opentiny/ng-leftmenuthin": "1.0.2", + "@opentiny/ng-list": "1.0.2", + "@opentiny/ng-loading": "1.0.2", + "@opentiny/ng-locale": "1.0.2", + "@opentiny/ng-linkbutton": "1.0.2", + "@opentiny/ng-menu": "1.0.2", + "@opentiny/ng-message": "1.0.2", + "@opentiny/ng-modal": "1.0.2", + "@opentiny/ng-nav": "1.0.2", + "@opentiny/ng-notification": "1.0.2", + "@opentiny/ng-outline": "1.0.2", + "@opentiny/ng-overflow": "1.0.2", + "@opentiny/ng-pagination": "1.0.2", + "@opentiny/ng-popconfirm": "1.0.2", + "@opentiny/ng-popup": "1.0.2", + "@opentiny/ng-progressbar": "1.0.2", + "@opentiny/ng-progresspie": "1.0.2", + "@opentiny/ng-radio": "1.0.2", + "@opentiny/ng-rate": "1.0.2", + "@opentiny/ng-renderer": "1.0.2", + "@opentiny/ng-rights": "1.0.2", + "@opentiny/ng-score": "1.0.2", + "@opentiny/ng-scroll": "1.0.2", + "@opentiny/ng-searchbox": "1.0.2", + "@opentiny/ng-select": "1.0.2", + "@opentiny/ng-skeleton": "1.0.2", + "@opentiny/ng-slider": "1.0.2", + "@opentiny/ng-spinner": "1.0.2", + "@opentiny/ng-steps": "1.0.2", + "@opentiny/ng-subtitle": "1.0.2", + "@opentiny/ng-swiper": "1.0.2", + "@opentiny/ng-switch": "1.0.2", + "@opentiny/ng-tab": "1.0.2", + "@opentiny/ng-table": "1.0.2", + "@opentiny/ng-tag": "1.0.2", + "@opentiny/ng-tagsinput": "1.0.2", + "@opentiny/ng-text": "1.0.2", + "@opentiny/ng-textarea": "1.0.2", + "@opentiny/ng-time": "1.0.2", + "@opentiny/ng-timeline": "1.0.2", + "@opentiny/ng-tip": "1.0.2", + "@opentiny/ng-transfer": "1.0.2", + "@opentiny/ng-tree": "1.0.2", + "@opentiny/ng-treeselect": "1.0.2", + "@opentiny/ng-upload": "1.0.2", + "@opentiny/ng-utils": "1.0.2", + "@opentiny/ng-validation": "1.0.2", + "@opentiny/ng-zoom": "1.0.2", + "@opentiny/ng-themes": "1.0.2", + "@opentiny/ng-guides": "1.0.2", + "@opentiny/ng-labeleditor": "1.0.2", + "@opentiny/ng-phonenumber": "1.0.2", + "@opentiny/ng-selectgroup": "1.0.2", + "@opentiny/ng-productpreview": "1.0.2", + "@opentiny/ng-buttonselect": "1.0.2", + "@opentiny/ng-collapsetext": "1.0.2", + "@opentiny/ng-guidesteps": "1.0.2", + "@opentiny/ng-path": "1.0.2" } -} +} \ No newline at end of file diff --git a/src/ng/ngversion/ng14/.browserslistrc b/src/ng/ngversion/ng14/.browserslistrc new file mode 100644 index 0000000000000000000000000000000000000000..3ccd6c95f2615804213d7e9c57142cd4811a65ae --- /dev/null +++ b/src/ng/ngversion/ng14/.browserslistrc @@ -0,0 +1,14 @@ +# This file is used by the build system to adjust CSS and JS output to support the specified browsers below. +# For additional information regarding the format and rule options, please see: +# https://github.com/browserslist/browserslist#queries + +# For the full list of supported browsers by the Angular framework, please see: +# https://angular.io/guide/browser-support + +# You can see what browsers were selected by your queries by running: +# npx browserslist + +last 3 Chrome versions +last 3 Firefox versions +last 2 Safari versions +Edge >=12 \ No newline at end of file diff --git a/src/ng/ngversion/ng14/angular.json b/src/ng/ngversion/ng14/angular.json new file mode 100644 index 0000000000000000000000000000000000000000..add8fddba727d7886d6efa19b32d22b3855c5575 --- /dev/null +++ b/src/ng/ngversion/ng14/angular.json @@ -0,0 +1,86 @@ +{ + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "version": 1, + "newProjectRoot": "projects", + "projects": { + "ng14-demo": { + "projectType": "application", + "schematics": {}, + "root": "", + "sourceRoot": "../../demo/src", + "prefix": "app", + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:browser", + "options": { + "outputPath": "../../../../dist/apps/ng14", + "index": "../../demo/src/index.html", + "main": "../../demo/src/main.ts", + "polyfills": "../../../polyfills.ts", + "tsConfig": "./tsconfig.app.json", + "assets": [ + "../../demo/src/favicon.ico", + "../../demo/src/assets", + { + "glob": "**/*", + "input": "node_modules/ionicons/dist/ionicons/svg", + "output": "/assets/ionicons/" + }, + { + "glob": "**/*", + "input": "node_modules/@opentiny/ng-themes/", + "output": "/assets/themes/" + } + ], + "styles": ["../../../themes/basic/build.less", "../../../themes/theme-default/build.less", "../../../styles.less"], + "scripts": [] + }, + "configurations": { + "production": { + "budgets": [ + { + "type": "initial", + "maximumWarning": "2mb", + "maximumError": "10mb" + }, + { + "type": "anyComponentStyle", + "maximumWarning": "6kb" + } + ], + "fileReplacements": [ + { + "replace": "../../../environments/environment.ts", + "with": "../../../environments/environment.prod.ts" + } + ], + "outputHashing": "all" + }, + "development": { + "buildOptimizer": false, + "optimization": false, + "vendorChunk": true, + "extractLicenses": false, + "sourceMap": true, + "namedChunks": true + } + }, + "defaultConfiguration": "production" + }, + "serve": { + "builder": "@angular-devkit/build-angular:dev-server", + "configurations": { + "production": { + "browserTarget": "ng14-demo:build:production" + }, + "development": { + "browserTarget": "ng14-demo:build:development" + } + }, + "defaultConfiguration": "development" + } + } + } + }, + "defaultProject": "ng14-demo" +} diff --git a/src/ng/ngversion/ng14/package.json b/src/ng/ngversion/ng14/package.json new file mode 100644 index 0000000000000000000000000000000000000000..ccf39f64ee22f2d0819d68cce56209a93a2f72b4 --- /dev/null +++ b/src/ng/ngversion/ng14/package.json @@ -0,0 +1,39 @@ +{ + "name": "tinyng-demo", + "version": "0.0.0", + "scripts": { + "ng": "ng", + "start": "ng serve", + "build": "ng build" + }, + "private": true, + "dependencies": { + "@angular/animations": "^14.0.1", + "@angular/cdk": "^14.0.1", + "@angular/common": "^14.0.1", + "@angular/compiler": "^14.0.1", + "@angular/core": "^14.0.1", + "@angular/elements": "^14.0.1", + "@angular/forms": "^14.0.1", + "@angular/platform-browser": "^14.0.1", + "@angular/platform-browser-dynamic": "^14.0.1", + "@angular/router": "^14.0.1", + "color": "4.2.3", + "css-vars-ponyfill": "^2.4.2", + "libphonenumber-js": "^1.10.7", + "rxjs": "~7.4.0", + "tslib": "^2.3.0", + "web-animations-js": "^2.3.2", + "zone.js": "~0.11.4" + }, + "devDependencies": { + "@angular-devkit/build-angular": "^14.0.1", + "@angular/cli": "^14.0.1", + "@angular/compiler-cli": "^14.0.1", + "@angular/language-service": "^14.0.1", + "@types/node": "^12.11.1", + "ionicons": "^6.0.4", + "rimraf": "^3.0.2", + "typescript": "~4.7.3" + } +} diff --git a/src/ng/ngversion/ng14/tsconfig.app.json b/src/ng/ngversion/ng14/tsconfig.app.json new file mode 100644 index 0000000000000000000000000000000000000000..c4e63cfb9ff2e7a08531a87e2115a0a198c6c61f --- /dev/null +++ b/src/ng/ngversion/ng14/tsconfig.app.json @@ -0,0 +1,10 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./out-tsc/app", + "types": [] + }, + "files": ["../../demo/src/main.ts", "../../../polyfills.ts"], + "include": ["../../demo/src/**/*.d.ts"] +} diff --git a/src/ng/ngversion/ng14/tsconfig.json b/src/ng/ngversion/ng14/tsconfig.json new file mode 100644 index 0000000000000000000000000000000000000000..61d245c1ff9365f7e06900160fdc4a6d95fa40cc --- /dev/null +++ b/src/ng/ngversion/ng14/tsconfig.json @@ -0,0 +1,35 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ +{ + "compileOnSave": false, + "compilerOptions": { + "baseUrl": "./", + "outDir": "./dist/out-tsc", + "forceConsistentCasingInFileNames": true, + //"strict": true, + //"noImplicitOverride": true, + //"noPropertyAccessFromIndexSignature": true, + //"noImplicitReturns": true, + //"noFallthroughCasesInSwitch": true, + "sourceMap": true, + "declaration": false, + "downlevelIteration": true, + "experimentalDecorators": true, + "moduleResolution": "node", + "importHelpers": true, + "target": "es2020", + "module": "es2020", + "lib": ["es2020", "dom"], + "paths": { + "@opentiny/*": ["./node_modules/@opentiny/*"], + "@angular/*": ["./node_modules/@angular/*"], + "rxjs": ["./node_modules/rxjs"], + "rxjs/*": ["./node_modules/rxjs/*"] + } + }, + "angularCompilerOptions": { + //"enableI18nLegacyMessageIdFormat": false, + "strictInjectionParameters": true + //"strictInputAccessModifiers": true, + //"strictTemplates": true + } +} diff --git a/src/ng/ngversion/ng15/angular.json b/src/ng/ngversion/ng15/angular.json new file mode 100644 index 0000000000000000000000000000000000000000..0ae5b093c3b46110a46ea17463b8ad89313cb0be --- /dev/null +++ b/src/ng/ngversion/ng15/angular.json @@ -0,0 +1,86 @@ +{ + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "version": 1, + "newProjectRoot": "projects", + "projects": { + "ng15-demo": { + "projectType": "application", + "schematics": {}, + "root": "", + "sourceRoot": "../../demo/src", + "prefix": "app", + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:browser", + "options": { + "outputPath": "../../../../dist/apps/ng15", + "index": "../../demo/src/index.html", + "main": "../../demo/src/main.ts", + "polyfills": "../../../polyfills.ts", + "tsConfig": "./tsconfig.app.json", + "assets": [ + "../../demo/src/favicon.ico", + "../../demo/src/assets", + { + "glob": "**/*", + "input": "node_modules/ionicons/dist/ionicons/svg", + "output": "/assets/ionicons/" + }, + { + "glob": "**/*", + "input": "node_modules/@opentiny/ng-themes/", + "output": "/assets/themes/" + } + ], + "styles": ["../../../themes/basic/build.less", "../../../themes/theme-default/build.less", "../../../styles.less"], + "scripts": [] + }, + "configurations": { + "production": { + "budgets": [ + { + "type": "initial", + "maximumWarning": "2mb", + "maximumError": "10mb" + }, + { + "type": "anyComponentStyle", + "maximumWarning": "6kb" + } + ], + "fileReplacements": [ + { + "replace": "../../../environments/environment.ts", + "with": "../../../environments/environment.prod.ts" + } + ], + "outputHashing": "all" + }, + "development": { + "buildOptimizer": false, + "optimization": false, + "vendorChunk": true, + "extractLicenses": false, + "sourceMap": true, + "namedChunks": true + } + }, + "defaultConfiguration": "production" + }, + "serve": { + "builder": "@angular-devkit/build-angular:dev-server", + "configurations": { + "production": { + "browserTarget": "ng15-demo:build:production" + }, + "development": { + "browserTarget": "ng15-demo:build:development" + } + }, + "defaultConfiguration": "development" + } + } + } + }, + "defaultProject": "ng15-demo" +} diff --git a/src/ng/ngversion/ng15/browserslist b/src/ng/ngversion/ng15/browserslist new file mode 100644 index 0000000000000000000000000000000000000000..a9ab781d0a1303ad07040474f32c021a9f4bfc0a --- /dev/null +++ b/src/ng/ngversion/ng15/browserslist @@ -0,0 +1,8 @@ +# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers +# For additional information regarding the format and rule options, please see: +# https://github.com/browserslist/browserslist#queries + +last 3 Chrome versions +last 3 Edge versions +last 3 Firefox versions +last 2 Safari versions \ No newline at end of file diff --git a/src/ng/ngversion/ng15/package.json b/src/ng/ngversion/ng15/package.json new file mode 100644 index 0000000000000000000000000000000000000000..a1d0fbfc98351b6e17832111771adf9ddfb031e5 --- /dev/null +++ b/src/ng/ngversion/ng15/package.json @@ -0,0 +1,38 @@ +{ + "name": "ng15-demo", + "version": "0.0.0", + "scripts": { + "ng": "ng", + "start": "ng serve", + "build": "ng build" + }, + "private": true, + "dependencies": { + "@angular/animations": "^15.0.2", + "@angular/cdk": "^15.0.1", + "@angular/common": "^15.0.2", + "@angular/compiler": "^15.0.2", + "@angular/core": "^15.0.2", + "@angular/elements": "^15.0.2", + "@angular/forms": "^15.0.2", + "@angular/platform-browser": "^15.0.2", + "@angular/platform-browser-dynamic": "^15.0.2", + "@angular/router": "^15.0.2", + "color": "4.2.3", + "libphonenumber-js": "^1.10.7", + "rxjs": "~7.4.0", + "tslib": "^2.3.0", + "web-animations-js": "^2.3.2", + "zone.js": "~0.11.4" + }, + "devDependencies": { + "@angular-devkit/build-angular": "^15.0.2", + "@angular/cli": "^15.0.2", + "@angular/compiler-cli": "^15.0.2", + "@angular/language-service": "^15.0.2", + "@types/node": "^12.11.1", + "ionicons": "^6.0.4", + "rimraf": "^3.0.2", + "typescript": "~4.8.4" + } +} diff --git a/src/ng/ngversion/ng15/tsconfig.app.json b/src/ng/ngversion/ng15/tsconfig.app.json new file mode 100644 index 0000000000000000000000000000000000000000..c4e63cfb9ff2e7a08531a87e2115a0a198c6c61f --- /dev/null +++ b/src/ng/ngversion/ng15/tsconfig.app.json @@ -0,0 +1,10 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./out-tsc/app", + "types": [] + }, + "files": ["../../demo/src/main.ts", "../../../polyfills.ts"], + "include": ["../../demo/src/**/*.d.ts"] +} diff --git a/src/ng/ngversion/ng15/tsconfig.json b/src/ng/ngversion/ng15/tsconfig.json new file mode 100644 index 0000000000000000000000000000000000000000..710c8c79a8efe431085d85ba5539d648a7a5bd01 --- /dev/null +++ b/src/ng/ngversion/ng15/tsconfig.json @@ -0,0 +1,33 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ +{ + "compileOnSave": false, + "compilerOptions": { + "baseUrl": "./", + "outDir": "./dist/out-tsc", + "forceConsistentCasingInFileNames": true, + //"strict": true, + //"noImplicitOverride": true, + //"noPropertyAccessFromIndexSignature": true, + //"noImplicitReturns": true, + //"noFallthroughCasesInSwitch": true, + "sourceMap": true, + "declaration": false, + "downlevelIteration": true, + "experimentalDecorators": true, + "moduleResolution": "node", + "importHelpers": true, + "target": "ES2022", + "module": "es2020", + "lib": ["es2020", "dom"], + "useDefineForClassFields": false, + "paths": { + "@opentiny/*": ["./node_modules/@opentiny/*"], + "@angular/*": ["./node_modules/@angular/*"], + "rxjs": ["./node_modules/rxjs"], + "rxjs/operators": ["./node_modules/rxjs/operators"] + } + }, + "angularCompilerOptions": { + "strictInjectionParameters": true + } +} diff --git a/src/ng/ngversion/ng16/.browserslistrc b/src/ng/ngversion/ng16/.browserslistrc new file mode 100644 index 0000000000000000000000000000000000000000..e007b500456199bf412ad6bf9845cc88b1f107ef --- /dev/null +++ b/src/ng/ngversion/ng16/.browserslistrc @@ -0,0 +1,14 @@ +# This file is used by the build system to adjust CSS and JS output to support the specified browsers below. +# For additional information regarding the format and rule options, please see: +# https://github.com/browserslist/browserslist#queries + +# For the full list of supported browsers by the Angular framework, please see: +# https://angular.io/guide/browser-support + +# You can see what browsers were selected by your queries by running: +# npx browserslist + +last 3 Chrome versions +last 3 Edge versions +last 3 Firefox versions +last 2 Safari versions \ No newline at end of file diff --git a/src/ng/ngversion/ng16/angular.json b/src/ng/ngversion/ng16/angular.json new file mode 100644 index 0000000000000000000000000000000000000000..f1327973137ee44d3f48157e512960ab33cb6849 --- /dev/null +++ b/src/ng/ngversion/ng16/angular.json @@ -0,0 +1,86 @@ +{ + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "version": 1, + "newProjectRoot": "projects", + "projects": { + "ng16-demo": { + "projectType": "application", + "schematics": {}, + "root": "", + "sourceRoot": "../../demo/src", + "prefix": "app", + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:browser", + "options": { + "outputPath": "../../../../dist/apps/ng16", + "index": "../../demo/src/index.html", + "main": "../../demo/src/main.ts", + "polyfills": "../../../polyfills.ts", + "tsConfig": "./tsconfig.app.json", + "assets": [ + "../../demo/src/favicon.ico", + "../../demo/src/assets", + { + "glob": "**/*", + "input": "node_modules/ionicons/dist/ionicons/svg", + "output": "/assets/ionicons/" + }, + { + "glob": "**/*", + "input": "node_modules/@opentiny/ng-themes/", + "output": "/assets/themes/" + } + ], + "styles": ["../../../themes/basic/build.less", "../../../themes/theme-default/build.less", "../../../styles.less"], + "scripts": [] + }, + "configurations": { + "production": { + "budgets": [ + { + "type": "initial", + "maximumWarning": "5mb", + "maximumError": "10mb" + }, + { + "type": "anyComponentStyle", + "maximumWarning": "6kb" + } + ], + "fileReplacements": [ + { + "replace": "../../../environments/environment.ts", + "with": "../../../environments/environment.prod.ts" + } + ], + "outputHashing": "all" + }, + "development": { + "buildOptimizer": false, + "optimization": false, + "vendorChunk": true, + "extractLicenses": false, + "sourceMap": true, + "namedChunks": true + } + }, + "defaultConfiguration": "production" + }, + "serve": { + "builder": "@angular-devkit/build-angular:dev-server", + "configurations": { + "production": { + "browserTarget": "ng16-demo:build:production" + }, + "development": { + "browserTarget": "ng16-demo:build:development" + } + }, + "defaultConfiguration": "development" + } + } + } + }, + "defaultProject": "ng16-demo" +} diff --git a/src/ng/ngversion/ng16/package.json b/src/ng/ngversion/ng16/package.json new file mode 100644 index 0000000000000000000000000000000000000000..37b9dd74f0443a1f041ad210a2b699de02996bc5 --- /dev/null +++ b/src/ng/ngversion/ng16/package.json @@ -0,0 +1,38 @@ +{ + "name": "ng16-demo", + "version": "0.0.0", + "scripts": { + "ng": "ng", + "start": "ng serve", + "build": "ng build" + }, + "private": true, + "dependencies": { + "@angular/animations": "^16.0.0", + "@angular/cdk": "^15.0.1", + "@angular/common": "^16.0.0", + "@angular/compiler": "^16.0.0", + "@angular/core": "^16.0.0", + "@angular/elements": "^16.0.0", + "@angular/forms": "^16.0.0", + "@angular/platform-browser": "^16.0.0", + "@angular/platform-browser-dynamic": "^16.0.0", + "@angular/router": "^16.0.0", + "color": "4.2.3", + "libphonenumber-js": "^1.10.7", + "rxjs": "~7.4.0", + "tslib": "^2.3.0", + "web-animations-js": "^2.3.2", + "zone.js": "~0.13.0" + }, + "devDependencies": { + "@angular-devkit/build-angular": "^16.0.0", + "@angular/cli": "^16.0.0", + "@angular/compiler-cli": "^16.0.0", + "@angular/language-service": "^16.0.0", + "@types/node": "^12.11.1", + "ionicons": "^6.0.4", + "rimraf": "^3.0.2", + "typescript": "~5.0.4" + } +} diff --git a/src/ng/ngversion/ng16/tsconfig.app.json b/src/ng/ngversion/ng16/tsconfig.app.json new file mode 100644 index 0000000000000000000000000000000000000000..c4e63cfb9ff2e7a08531a87e2115a0a198c6c61f --- /dev/null +++ b/src/ng/ngversion/ng16/tsconfig.app.json @@ -0,0 +1,10 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./out-tsc/app", + "types": [] + }, + "files": ["../../demo/src/main.ts", "../../../polyfills.ts"], + "include": ["../../demo/src/**/*.d.ts"] +} diff --git a/src/ng/ngversion/ng16/tsconfig.json b/src/ng/ngversion/ng16/tsconfig.json new file mode 100644 index 0000000000000000000000000000000000000000..d219330179f5c88bf7869134ef5f14b235570137 --- /dev/null +++ b/src/ng/ngversion/ng16/tsconfig.json @@ -0,0 +1,30 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ +{ + "compileOnSave": false, + "compilerOptions": { + "baseUrl": "./", + "outDir": "./dist/out-tsc", + "forceConsistentCasingInFileNames": true, + "sourceMap": true, + "declaration": false, + "downlevelIteration": true, + "experimentalDecorators": true, + "moduleResolution": "node", + "importHelpers": true, + "target": "ES2022", + "module": "es2020", + "lib": ["es2020", "dom"], + "paths": { + "@opentiny/*": ["./node_modules/@opentiny/*"], + "@angular/*": ["./node_modules/@angular/*"], + "rxjs": ["./node_modules/rxjs"], + "rxjs/operators": ["./node_modules/rxjs/operators"] + } + }, + "angularCompilerOptions": { + //"enableI18nLegacyMessageIdFormat": false, + "strictInjectionParameters": true + //"strictInputAccessModifiers": true, + //"strictTemplates": true + } +} diff --git a/src/notification/lib/package.json b/src/notification/lib/package.json index b16d198c30f83405b012f4124d7ebaf2fd7b1efd..c84d70beaf6b14c850fd681435146e8adf006b93 100644 --- a/src/notification/lib/package.json +++ b/src/notification/lib/package.json @@ -1,14 +1,14 @@ { "name": "@opentiny/ng-notification", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/animations": ">=13.0.0", "@angular/core": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.2", "@angular/cdk": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-alert": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2" + "@opentiny/ng-alert": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2" } } \ No newline at end of file diff --git a/src/outline/lib/package.json b/src/outline/lib/package.json index 36370738057cb4f5fe018ab243cdf8847faafff8..7af956d31eef1df96f513ee3ac5342ba121a1ac5 100644 --- a/src/outline/lib/package.json +++ b/src/outline/lib/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/ng-outline", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", diff --git a/src/overflow/lib/package.json b/src/overflow/lib/package.json index 4430ceffc96e3e4043025ad654f7fdc98ee5db22..d4074c935de76ea6ee5be6d1647f4d10e1266a11 100644 --- a/src/overflow/lib/package.json +++ b/src/overflow/lib/package.json @@ -1,12 +1,12 @@ { "name": "@opentiny/ng-overflow", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-tip": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-tip": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-renderer": "~1.0.0-beta.2" + "@opentiny/ng-renderer": "~1.0.2" } } \ No newline at end of file diff --git a/src/pagination/demo/src/app/pagination/PaginationEventComponent.ts b/src/pagination/demo/src/app/pagination/PaginationEventComponent.ts index 626bac451d3ee30cfe5d73a1b855c8228c31fb26..25f1202d9e0a74a3a085e22697728c48db11d755 100644 --- a/src/pagination/demo/src/app/pagination/PaginationEventComponent.ts +++ b/src/pagination/demo/src/app/pagination/PaginationEventComponent.ts @@ -25,7 +25,7 @@ export class PaginationEventComponent { this.myLogs = [...this.myLogs, str]; } - onTotalNumberChange(event: TiPaginationEvent): void { + onTotalNumberChange(event: number): void { const str: string = `onTotalNumberChange data=${JSON.stringify(event)}`; this.myLogs = [...this.myLogs, str]; } diff --git a/src/pagination/demo/src/app/pagination/PaginationTypeComponent.ts b/src/pagination/demo/src/app/pagination/PaginationTypeComponent.ts index 03c0798cedd183f618aec60d389962117264f1de..4fd0d5eb3b10964ae002f8f4d23ff4e44e573d7d 100644 --- a/src/pagination/demo/src/app/pagination/PaginationTypeComponent.ts +++ b/src/pagination/demo/src/app/pagination/PaginationTypeComponent.ts @@ -7,11 +7,11 @@ export class PaginationTypeComponent { currentPage: number = 10; totalNumber: number = 400; - typeSimple: string = 'simple'; + typeSimple: 'default' | 'simple' | 'mini' = 'simple'; currentPageSimple: number = 2; totalNumberSimple: number = 1600; - typeMini: string = 'mini'; + typeMini: 'default' | 'simple' | 'mini' = 'mini'; currentPageMini: number = 2; totalNumberMini: number = 300; } diff --git a/src/pagination/lib/package.json b/src/pagination/lib/package.json index 021f7976635374d6b95a7ea7f58e048acc009874..c063ef2ef9df87688a4b273a17d18d0588a9a4d4 100644 --- a/src/pagination/lib/package.json +++ b/src/pagination/lib/package.json @@ -1,18 +1,18 @@ { "name": "@opentiny/ng-pagination", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.2", - "@opentiny/ng-locale": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-table": "~1.0.0-beta.2", - "@opentiny/ng-select": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.2", + "@opentiny/ng-locale": "~1.0.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-table": "~1.0.2", + "@opentiny/ng-select": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-text": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-outline": "~1.0.0-beta.2" + "@opentiny/ng-text": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-outline": "~1.0.2" } } \ No newline at end of file diff --git a/src/path/demo/src/app/path/PathfieldIspanelComponent.ts b/src/path/demo/src/app/path/PathfieldIspanelComponent.ts index 2aa79c579a8bdc5ac1a364b18eb4da853f8bc150..85d04d21388e6760ddcbdb9ebb87ffcfcbb9d471 100644 --- a/src/path/demo/src/app/path/PathfieldIspanelComponent.ts +++ b/src/path/demo/src/app/path/PathfieldIspanelComponent.ts @@ -5,7 +5,6 @@ import { TiPathFieldItem } from '@opentiny/ng'; templateUrl: './pathfield-ispanel.html' }) export class PathfieldIspanelComponent { - isPanel: boolean = false; items: Array = [ { label: 'window' diff --git a/src/path/demo/src/app/path/PathfieldItemsComponent.ts b/src/path/demo/src/app/path/PathfieldItemsComponent.ts index 5baa9727319037de512cc82e9b8306e8002dad6c..c1f45116bb05233c21fe8e50365a2fcdaebd3b13 100644 --- a/src/path/demo/src/app/path/PathfieldItemsComponent.ts +++ b/src/path/demo/src/app/path/PathfieldItemsComponent.ts @@ -5,6 +5,7 @@ import { TiPathFieldItem } from '@opentiny/ng'; templateUrl: './pathfield-items.html' }) export class PathfieldItemsComponent { + isPanel: boolean = false; items: Array = [ { label: 'window' diff --git a/src/path/demo/src/app/path/path-select.html b/src/path/demo/src/app/path/path-select.html index 98b55fb319a7bb6221ec86908367cb6805079dce..901bf7abb44be3bdfdb8e05646915fe43ffd2c04 100644 --- a/src/path/demo/src/app/path/path-select.html +++ b/src/path/demo/src/app/path/path-select.html @@ -45,7 +45,7 @@ - - + {{row.label}} {{row.time}} diff --git a/src/path/demo/src/app/path/pathfield-ispanel.html b/src/path/demo/src/app/path/pathfield-ispanel.html index be4d4f4abb11732b347db0125635369ad1090629..967e5d3244f7dd5e3c1cd37648252df8e8f4aa9d 100644 --- a/src/path/demo/src/app/path/pathfield-ispanel.html +++ b/src/path/demo/src/app/path/pathfield-ispanel.html @@ -1,3 +1,3 @@
- +
diff --git a/src/path/demo/src/app/path/pathfield-items.html b/src/path/demo/src/app/path/pathfield-items.html index fa573920abdf7020dd1641456af06d3e0fc7b892..94c69f78cdc0c843e4a1a9c9b1824b74642f3491 100644 --- a/src/path/demo/src/app/path/pathfield-items.html +++ b/src/path/demo/src/app/path/pathfield-items.html @@ -1,3 +1,3 @@
- +
diff --git a/src/path/lib/package.json b/src/path/lib/package.json index 0de57f81476ffa5b3dc8325ee3105c33b00c8e3d..19942f6f9d2300c215d703bfe06339080ea91875 100644 --- a/src/path/lib/package.json +++ b/src/path/lib/package.json @@ -1,16 +1,16 @@ { "name": "@opentiny/ng-path", - "version": "1.0.0-beta.2", + "version": "1.0.2", "peerDependencies": { "@angular/common": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-droplist": "~1.0.0-beta.2", - "@opentiny/ng-renderer": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-droplist": "~1.0.2", + "@opentiny/ng-renderer": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-overflow": "~1.0.0-beta.2", - "@opentiny/ng-text": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2" + "@opentiny/ng-overflow": "~1.0.2", + "@opentiny/ng-text": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2" } } \ No newline at end of file diff --git a/src/path/lib/src/path-field.html b/src/path/lib/src/path-field.html index 0c94832c61104dbaca96bd8c1697fff276f9e9a3..b7bd8fba5364cad29c23fd9728d16ed203553e24 100644 --- a/src/path/lib/src/path-field.html +++ b/src/path/lib/src/path-field.html @@ -23,7 +23,14 @@ [id]="appendId('droplist')" > -
- -
+ diff --git a/src/path/lib/src/path-field.less b/src/path/lib/src/path-field.less index 98a8fbcc40f207c93ce20332bf440ba5e136c445..e818015e76ca247312a9ca0055e659829d9a8a7b 100644 --- a/src/path/lib/src/path-field.less +++ b/src/path/lib/src/path-field.less @@ -1,17 +1,17 @@ -::ng-deep :root { - --ti-pathField-height: 26px; - --ti-pathField-back-width: var(--ti-pathField-height); -} - :host { display: block; + --ti-pathfield-height: 26px; + --ti-pathfield-back-width: 26px; } .ti3-pathField-container { + color: var(--ti-common-color-text-primary); + font-size: var(--ti-common-font-size-base); + font-weight: var(--ti-common-font-weight-4); + line-height: var(--ti-pathfield-height); display: flex; - height: var(--ti-pathField-height); - line-height: var(--ti-pathField-height); - border: 1px solid var(--ti-common-color-line-normal); + height: var(--ti-pathfield-height); + border: var(--ti-common-border-weight-normal) var(--ti-common-border-style-solid) var(--ti-common-color-line-normal); border-radius: var(--ti-common-border-radius-normal); align-items: center; position: relative; @@ -19,11 +19,11 @@ .ti3-pathField-backIcon { display: block; - width: var(--ti-pathField-back-width); + width: var(--ti-pathfield-back-width); text-align: center; - font-size: 14px; + font-size: var(--ti-common-font-size-1); cursor: pointer; - border-right: 1px solid var(--ti-common-color-line-normal); + border-right: var(--ti-common-border-weight-normal) var(--ti-common-border-style-solid) var(--ti-common-color-line-normal); box-sizing: border-box; &:hover { color: var(--ti-common-color-bg-emphasize); @@ -32,8 +32,8 @@ .ti3-pathField-items { display: flex; flex: 1; - height: var(--ti-pathField-height); - padding: 0 var(--ti-common-space-10); + height: var(--ti-pathfield-height); + padding: var(--ti-common-space-0) var(--ti-common-space-10); box-sizing: border-box; user-select: none; overflow: hidden; @@ -50,7 +50,7 @@ } &:last-child { width: 100%; - font-weight: bold; + font-weight: var(--ti-common-font-weight-7); .ti3-pathField-item-label { max-width: none; } @@ -65,14 +65,12 @@ max-width: 160px; } .ti3-pathField-item-divid { - margin: 0 var(--ti-common-space-base); + margin: var(--ti-common-space-0) var(--ti-common-space-base); } -.ti3-pathField-Editor { - width: calc(100% + 2px); +input.ti3-pathField-Editor { + width: calc(100% + var(--ti-common-border-weight-normal) * 2); + height: calc(var(--ti-pathfield-height) + var(--ti-common-border-weight-normal) * 2); position: absolute; - left: -1px; - input { - width: 100%; - } + left: calc(0px - var(--ti-common-border-weight-normal)); } diff --git a/src/path/lib/src/path-list.less b/src/path/lib/src/path-list.less index a69651c797e19ba060310fc24352167cb46ea1e8..5c6a245d65599ce2e05340361fc2e3dd2ef181e0 100644 --- a/src/path/lib/src/path-list.less +++ b/src/path/lib/src/path-list.less @@ -1,7 +1,16 @@ +:host { + --ti-pathlist-item-padding-top: 5px; + --ti-pathlist-item-padding-bottom: 5px; + --ti-pathlist-close-width: 30px; +} + .ti3-pathList-item { - height: 28px; - line-height: 18px; - padding: 5px 36px 5px var(--ti-common-space-5x); + color: var(--ti-common-color-text-primary); + font-size: var(--ti-common-font-size-base); + font-weight: var(--ti-common-font-weight-4); + line-height: var(--ti-common-line-height-number); + height: var(--ti-common-size-7x); + padding: var(--ti-pathlist-item-padding-top) var(--ti-common-space-9x) var(--ti-pathlist-item-padding-bottom) var(--ti-common-space-5x); margin-bottom: var(--ti-common-space-base); background-color: var(--ti-common-color-bg-white-emphasize); box-sizing: border-box; @@ -16,7 +25,7 @@ } .ti3-pathList-index { - width: 16px; + width: var(--ti-common-size-4x); margin-right: var(--ti-common-space-3x); flex-shrink: 0; } @@ -29,8 +38,8 @@ .ti3-pathList-close { display: none; - width: 30px; - height: 28px; + width: var(--ti-pathlist-close-width); + height: var(--ti-common-space-7x); position: absolute; right: 0; justify-content: center; diff --git a/src/phonenumber/lib/package.json b/src/phonenumber/lib/package.json index a91cd842902e58b1c19568ca203fcaacf4fdc2ce..e7a3c20214b9cb192bb1c91d0d8a0ee66191330d 100644 --- a/src/phonenumber/lib/package.json +++ b/src/phonenumber/lib/package.json @@ -1,15 +1,15 @@ { "name": "@opentiny/ng-phonenumber", - "version": "1.0.0-beta.2", + "version": "1.0.2", "peerDependencies": { "@angular/core": ">=13.0.0", "libphonenumber-js": "1.10.7", - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-validation": "~1.0.0-beta.2", - "@opentiny/ng-select": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-validation": "~1.0.2", + "@opentiny/ng-select": "~1.0.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-locale": "~1.0.0-beta.2", + "@opentiny/ng-locale": "~1.0.2", "@angular/forms": ">=13.0.0", - "@opentiny/ng-text": "~1.0.0-beta.2" + "@opentiny/ng-text": "~1.0.2" } } \ No newline at end of file diff --git a/src/phonenumber/lib/src/phonenumber.less b/src/phonenumber/lib/src/phonenumber.less index 3007e0a8df4d804fb086641f339a24de693141bf..014a2dff5dc2a4b617fda19a541d9eb84a828afd 100644 --- a/src/phonenumber/lib/src/phonenumber.less +++ b/src/phonenumber/lib/src/phonenumber.less @@ -1,9 +1,9 @@ @import '../../../themes/basic/base-all.less'; -::ng-deep :root { +:host { --ti-phonenumber-width: 300px; // 组件整体宽度 --ti-phonenumber-input-width: 220px; // 输入框宽度 --ti-phonenumber-line-height: 14px; // 短竖线高度 - --ti-phonenumber-select-border-right-height: 26px; // select组件右边框竖线高度 + --ti-phonenumber-select-border-right-height: calc(var(--ti-common-size-7x) - 2px); // select组件右边框竖线高度 } .ti3-phonenumber-input(@border-color) { @@ -15,7 +15,7 @@ :host { display: inline-block; width: var(--ti-phonenumber-width); - height: var(--ti-input-height); + height: var(--ti-common-size-7x); } .ti3-phonenumber-container { @@ -63,6 +63,9 @@ input[tiText].ti3-phonenumber-input { width: var(--ti-phonenumber-input-width); z-index: 1; // 左边框被select遮挡,故需要提高权重 + color: var(--ti-common-color-text-primary); + font-size: var(--ti-common-font-size-base); + font-weight: var(--ti-common-font-weight-4); border-left: 0; border-top-left-radius: 0; border-bottom-left-radius: 0; diff --git a/src/popconfirm/lib/package.json b/src/popconfirm/lib/package.json index 86475662e169d340ba4ad61e35cdac37bacfb5bb..f65e4b0804268ac976f9deffeb331d28f68e29da 100644 --- a/src/popconfirm/lib/package.json +++ b/src/popconfirm/lib/package.json @@ -1,15 +1,15 @@ { "name": "@opentiny/ng-popconfirm", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-locale": "~1.0.0-beta.2", + "@opentiny/ng-locale": "~1.0.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.2", - "@opentiny/ng-tip": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-button": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-utils": "~1.0.2", + "@opentiny/ng-tip": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-button": "~1.0.2", + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/popup/lib/package.json b/src/popup/lib/package.json index 7668c682973c4af25d476c1bfc511f94dc631358..53779137648af813070009e8215aff8d888411ef 100644 --- a/src/popup/lib/package.json +++ b/src/popup/lib/package.json @@ -1,11 +1,11 @@ { "name": "@opentiny/ng-popup", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/common": ">=13.0.0", "@angular/platform-browser": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.2", "@angular/core": ">=13.0.0" } } \ No newline at end of file diff --git a/src/productpreview/lib/package.json b/src/productpreview/lib/package.json index 7a5cf5314929dbbc18f920e2041c0d3f4aedd335..7d66fbf13c8e3e4aa3338da1a05a2f6e217c3351 100644 --- a/src/productpreview/lib/package.json +++ b/src/productpreview/lib/package.json @@ -1,14 +1,14 @@ { "name": "@opentiny/ng-productpreview", - "version": "1.0.0-beta.2", + "version": "1.0.2", "peerDependencies": { - "@opentiny/ng-imagepreview": "~1.0.0-beta.2", - "@opentiny/ng-modal": "~1.0.0-beta.2", + "@opentiny/ng-imagepreview": "~1.0.2", + "@opentiny/ng-modal": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-zoom": "~1.0.0-beta.2", - "@opentiny/ng-outline": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-zoom": "~1.0.2", + "@opentiny/ng-outline": "~1.0.2", + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/productpreview/lib/src/productpreview.less b/src/productpreview/lib/src/productpreview.less index a6d023df1ed22f9f65147e1f309862d573987d3d..6d32b8ef7ae190cbb12904e9fc4ba565b996c89f 100644 --- a/src/productpreview/lib/src/productpreview.less +++ b/src/productpreview/lib/src/productpreview.less @@ -132,7 +132,6 @@ } } -// 10.0.4版本新增 // 分辨率<1440px @media screen and (max-width: 1440px) { .media(var(--ti-product-preview-main-small-size), var(--ti-product-preview-thumb-small-size)); diff --git a/src/progressbar/demo/src/app/progressbar/ProgressbarClassComponent.ts b/src/progressbar/demo/src/app/progressbar/ProgressbarClassComponent.ts index fb8c8c31f4395e9521a9b1f918273e15594c1034..2bb8d0a5f7daf348dbfec9aee0ab91febe0a749c 100644 --- a/src/progressbar/demo/src/app/progressbar/ProgressbarClassComponent.ts +++ b/src/progressbar/demo/src/app/progressbar/ProgressbarClassComponent.ts @@ -10,6 +10,16 @@ export class ProgressbarClassComponent { value: number = 80; value1: number = 50; max: number = 200; + + _progressClass: string; + get progressClass(): string { + if (this.value <= 150) { + return 'custom-progress-warn-bg'; + } else { + return 'success-bg'; + } + } + up(): void { if (this.value + STEP <= this.max) { this.value += STEP; diff --git a/src/progressbar/demo/src/app/progressbar/progressbar-class.html b/src/progressbar/demo/src/app/progressbar/progressbar-class.html index c85d9494e7ec8f5d2242642db2e6248eea295f16..52149eecc5f9cdedf5bdcae0abdb36a78a9416bb 100644 --- a/src/progressbar/demo/src/app/progressbar/progressbar-class.html +++ b/src/progressbar/demo/src/app/progressbar/progressbar-class.html @@ -1,7 +1,6 @@
- - +
{{100 * value / max }}%
@@ -9,8 +8,7 @@
- - +
{{100 * value1 / max }}%
diff --git a/src/progressbar/lib/package.json b/src/progressbar/lib/package.json index 4afb54c2e7cda42763ce4cf2435633f60cf9d44b..105f48277d2d3d5d96c2dc0a1c697383648c8e1e 100644 --- a/src/progressbar/lib/package.json +++ b/src/progressbar/lib/package.json @@ -1,10 +1,10 @@ { "name": "@opentiny/ng-progressbar", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/progresspie/lib/package.json b/src/progresspie/lib/package.json index 54b5edc64e9cd5b87e0cc8f286e1d000b2d60d26..1e53b8b0f75a102856b7992c4d9dd677582fc72d 100644 --- a/src/progresspie/lib/package.json +++ b/src/progresspie/lib/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/ng-progresspie", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0" diff --git a/src/radio/demo/src/app/radio/radio-group-validation.html b/src/radio/demo/src/app/radio/radio-group-validation.html index 1e4983bc798c1060627cff8611fafd9879e91334..acf32dbc91ade0cd4bb5a761b2d879dda3e475c9 100644 --- a/src/radio/demo/src/app/radio/radio-group-validation.html +++ b/src/radio/demo/src/app/radio/radio-group-validation.html @@ -6,11 +6,11 @@ name="formradio" [(ngModel)]="selected" [tiValidation]="validationConfig" - tiRequired + [tiRequired]="true" >
- +

2.响应式表单

diff --git a/src/radio/lib/package.json b/src/radio/lib/package.json index 925af4dc4fde4d7679aac047c51f76b292d18669..3d7e91bcb8fce47e096b1585d9d28be4282d8597 100644 --- a/src/radio/lib/package.json +++ b/src/radio/lib/package.json @@ -1,13 +1,13 @@ { "name": "@opentiny/ng-radio", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-checkbox": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-checkbox": "~1.0.2", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-outline": "~1.0.0-beta.2" + "@opentiny/ng-outline": "~1.0.2" } } \ No newline at end of file diff --git a/src/rate/lib/package.json b/src/rate/lib/package.json index 000feb910ea02eeb11212ea08026263b39a0668c..60630aae277924e55e9d4ba1015754d4cf45d3c8 100644 --- a/src/rate/lib/package.json +++ b/src/rate/lib/package.json @@ -1,11 +1,11 @@ { "name": "@opentiny/ng-rate", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/renderer/lib/package.json b/src/renderer/lib/package.json index 9fba5f0c07c2a7d4fc0b1a10f395c153ea69a46f..4bf2c2818dae845741aedddd01dadeeaba47a50c 100644 --- a/src/renderer/lib/package.json +++ b/src/renderer/lib/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/ng-renderer", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0" diff --git a/src/rights/lib/package.json b/src/rights/lib/package.json index 07880f495cab9019ea458405c635a9f03b32cec4..b34807ef1ea9f18edadf7fd7ba0ec9e606d0fd83 100644 --- a/src/rights/lib/package.json +++ b/src/rights/lib/package.json @@ -1,12 +1,12 @@ { "name": "@opentiny/ng-rights", - "version": "1.0.0-beta.2", + "version": "1.0.2", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-tip": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2" + "@opentiny/ng-tip": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2" } } \ No newline at end of file diff --git a/src/rights/lib/src/icon.less b/src/rights/lib/src/icon.less index e69563ea3e8f89e79096040b35ade1537addbf65..08fbc7ae4d87f6b2141ba4c499766ec4b222e545 100644 --- a/src/rights/lib/src/icon.less +++ b/src/rights/lib/src/icon.less @@ -21,12 +21,12 @@ -moz-osx-font-smoothing: grayscale; } -.tp-icon-cloud-action-support:before { +.ti3-icon-cloud-action-support:before { content: '\e900'; - color: #50d4ab; + color: var(--ti-common-color-success); } -.tp-icon-cloud-action-prompt:before { +.ti3-icon-cloud-action-prompt:before { content: '\e901'; - color: #adb0b8; + color: var(--ti-common-color-icon-disabled); } diff --git a/src/rights/lib/src/rights.html b/src/rights/lib/src/rights.html index 852cdc4b12c350483ac048af27c98952f0fb989d..9481d5c294d30cc9138d3666936b7b14efc72317 100644 --- a/src/rights/lib/src/rights.html +++ b/src/rights/lib/src/rights.html @@ -1,15 +1,15 @@ -
    +
    • - {{item.label}} + -->{{item.label}}
    diff --git a/src/rights/lib/src/rights.less b/src/rights/lib/src/rights.less index 11b4f00799a10cf9b5a0f379ce61f988ab13c37a..da8b20a424a8141e48d614924f698984142e5d4d 100644 --- a/src/rights/lib/src/rights.less +++ b/src/rights/lib/src/rights.less @@ -1,38 +1,43 @@ -.tp-rights-container { +:host { + --ti-rights-item-padding-vertical-default: 3px; + --ti-rights-page-padding-right-default: var(--ti-common-space-2x); +} +.ti3-rights-container { display: flex; } -.tp-rights-item { - color: #575d6c; +.ti3-rights-item { + color: var(--ti-common-color-text-secondary); margin-right: var(--ti-common-space-2x); - padding: 3px var(--ti-common-space-2x); + padding: var(--ti-rights-item-padding-vertical-default) var(--ti-rights-page-padding-right-default); cursor: pointer; &:last-child { margin-right: 0; } - .tp-rights-item-icon { + .ti3-rights-item-icon { font-size: 16px; vertical-align: -15%; //TODO:在tiny库设置'bottom'属性,图标可对齐,再该项目中无法对齐,暂使用百分比代替 } } -.tp-rights-item-param { +.ti3-rights-item-param { margin-right: var(--ti-common-space-5x); - padding: 3px 0; + padding: var(--ti-rights-item-padding-vertical-default) 0; } -.tp-rights-item-support { - background-color: #edfff9; +.ti3-rights-item-support { + background-color: var(--ti-common-color-success-bg); } -.tp-rights-item-nosupport { - background-color: #f5f5f6; +.ti3-rights-item-nosupport { + background-color: var(--ti-common-color-bg-disabled); } -.tp-rights-label { +.ti3-rights-label { display: inline-block; - line-height: 18px; + font-size: var(--ti-common-font-size-base); + line-height: calc(var(--ti-common-font-size-base) + var(--ti-rights-item-padding-vertical-default) * 2); margin-left: var(--ti-common-space-base); } diff --git a/src/score/lib/package.json b/src/score/lib/package.json index 5e7d5fb49903d3616120665e474306594bf5e780..621f4de5b055b892939eb406a1c687f7a53b7431 100644 --- a/src/score/lib/package.json +++ b/src/score/lib/package.json @@ -1,12 +1,12 @@ { "name": "@opentiny/ng-score", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-locale": "~1.0.0-beta.2", - "@opentiny/ng-outline": "~1.0.0-beta.2" + "@opentiny/ng-locale": "~1.0.2", + "@opentiny/ng-outline": "~1.0.2" } } \ No newline at end of file diff --git a/src/score/lib/src/score.less b/src/score/lib/src/score.less index aef834d608ea48b669b9a0986f1eac9f8939119f..54894ed5177597f77290022e396af865e294c8b3 100644 --- a/src/score/lib/src/score.less +++ b/src/score/lib/src/score.less @@ -1,13 +1,10 @@ -::ng-deep :root { - --ti3-score-item-height: 28px; +:host { + --ti-score-item-height: 28px; + --ti-score-item-margin-right: 2px; } :host { display: inline-block; - font-weight: normal; - font-size: var(--ti-common-font-size-base); - line-height: var(--ti-common-line-height-number); - color: var(--ti-common-color-text-primary); } // 每项评分样式 @@ -15,9 +12,12 @@ display: inline-block; text-align: center; cursor: pointer; - height: var(--ti3-score-item-height); - line-height: var(--ti3-score-item-height); - margin-right: 2px; + color: var(--ti-common-color-text-primary); + font-size: var(--ti-common-font-size-base); + font-weight: var(--ti-common-font-weight-4); + height: var(--ti-score-item-height); + line-height: var(--ti-score-item-height); + margin-right: var(--ti-score-item-margin-right); background-color: var(--ti-common-color-bg-light-normal); &:hover { @@ -44,5 +44,8 @@ display: flex; justify-content: space-between; color: var(--ti-common-color-text-weaken); + font-size: var(--ti-common-font-size-base); + font-weight: var(--ti-common-font-weight-4); + line-height: var(--ti-common-line-height-number); margin-bottom: var(--ti-common-space-2x); } diff --git a/src/scroll/lib/package.json b/src/scroll/lib/package.json index 9c285055c7e916abb44b176a4c4746190b78bf18..832570e1e2ef8a6f00bbe135942797ede78d1e3b 100644 --- a/src/scroll/lib/package.json +++ b/src/scroll/lib/package.json @@ -1,9 +1,9 @@ { "name": "@opentiny/ng-scroll", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.2" + "@opentiny/ng-utils": "~1.0.2" } } \ No newline at end of file diff --git a/src/searchbox/demo/src/app/searchbox/searchbox-trimmed.html b/src/searchbox/demo/src/app/searchbox/searchbox-trimmed.html index 4122e63a94d19bc572646c6710116565fcad85ee..578fde9cbd3cca8ee170ea93c3f3129d221b93af 100644 --- a/src/searchbox/demo/src/app/searchbox/searchbox-trimmed.html +++ b/src/searchbox/demo/src/app/searchbox/searchbox-trimmed.html @@ -9,5 +9,5 @@
    Current Value: {{ searchContent }}
    -
    Value length: {{ searchContent.length }}
    +
    Value length: {{ searchContent?.length }}
    diff --git a/src/searchbox/lib/package.json b/src/searchbox/lib/package.json index 4234f0fe1eb2c03a8f1129d7f15c387261123fa0..c4568a6799cf6d15e076ec19815a4cdebc49b525 100644 --- a/src/searchbox/lib/package.json +++ b/src/searchbox/lib/package.json @@ -1,18 +1,18 @@ { "name": "@opentiny/ng-searchbox", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-autocomplete": "~1.0.0-beta.2", + "@opentiny/ng-autocomplete": "~1.0.2", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-overflow": "~1.0.0-beta.2", - "@opentiny/ng-droplist": "~1.0.0-beta.2", - "@opentiny/ng-text": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-outline": "~1.0.0-beta.2", - "@opentiny/ng-locale": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-overflow": "~1.0.2", + "@opentiny/ng-droplist": "~1.0.2", + "@opentiny/ng-text": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-outline": "~1.0.2", + "@opentiny/ng-locale": "~1.0.2", + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/select/demo/src/app/select/select-beforesearch-test.html b/src/select/demo/src/app/select/select-beforesearch-test.html index e066b638dc9d1d0522279705b128bef4cf4a59d5..71c2dd465af705388e55c02981ae313dfa094e55 100644 --- a/src/select/demo/src/app/select/select-beforesearch-test.html +++ b/src/select/demo/src/app/select/select-beforesearch-test.html @@ -23,7 +23,7 @@

    2.多选 + 全选 + 后台搜索,下拉选项中有禁用的:


    -

    +

    国家: + + diff --git a/src/select/demo/src/app/select/select-pagin-beforesearch.html b/src/select/demo/src/app/select/select-pagin-beforesearch.html index f55fb191a2d637d3525774ba111d78c7c5954c79..de4795f672957768c09cf61b4668202b6f9b384d 100644 --- a/src/select/demo/src/app/select/select-pagin-beforesearch.html +++ b/src/select/demo/src/app/select/select-pagin-beforesearch.html @@ -1,5 +1,4 @@

    描述

    -

    10.0.3提供该功能

    1.Select的下拉选项如果需要分页显示,需要通过footer将分页添加到下拉面板,如果footer功能异常,参考“模板”示例。

    2.分页结合后台搜索的功能,需要开发者控制分页的 currentPage ,并且将对应页码的options数据传入组件。

    导入

    @@ -7,7 +6,7 @@

    示例

    设置options和自定义内容模板:

    -

    1.单选 + 搜索 + 分页:(10.1.16 版本参考该示例)

    +

    1.单选 + 搜索 + 分页:

    选中项:{{mySelected1 | json}}

    -

    2.单选 + 搜索 + 分页 + beforeOpen:(10.1.10~10.1.15 版本参考该示例)

    +

    2.单选 + 搜索 + 分页 + beforeOpen

    选中项:{{mySelected2 | json}}

    -

    3.多选 + 搜索 + 分页:(10.1.16 版本参考该示例)

    +

    3.多选 + 搜索 + 分页:


    选中项:{{mySelected3 | json}}

    -

    4.多选 + 搜索 + 分页 + beforeOpen:(10.1.10~10.1.15 版本参考该示例)

    +

    4.多选 + 搜索 + 分页 + beforeOpen:


    =13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-locale": "~1.0.0-beta.2" + "@opentiny/ng-locale": "~1.0.2" } } \ No newline at end of file diff --git a/src/selectgroup/demo/src/app/selectgroup/SelectgroupMultipleComponent.ts b/src/selectgroup/demo/src/app/selectgroup/SelectgroupMultipleComponent.ts index 39c82d83548d1bab1293b2d858c85206d1901ebf..2a41d61a0ef38db799cf334ecd14aab4c34c7b0d 100644 --- a/src/selectgroup/demo/src/app/selectgroup/SelectgroupMultipleComponent.ts +++ b/src/selectgroup/demo/src/app/selectgroup/SelectgroupMultipleComponent.ts @@ -5,7 +5,7 @@ import { TiSelectgroupItem } from '@opentiny/ng'; templateUrl: './selectgroup-multiple.html' }) export class SelectgroupMultipleComponent { - checkPosition: string = 'right-bottom'; + checkPosition: 'right-top' | 'right-bottom' = 'right-bottom'; items: Array = [ { title: 'Angular', diff --git a/src/selectgroup/demo/src/app/selectgroup/SelectgroupTestModule.ts b/src/selectgroup/demo/src/app/selectgroup/SelectgroupTestModule.ts index d293f065e9e7b932ead595c4e1294e39d7dfa548..8d022b94665a6eed4bdcb6f0fbebc8b2cf350045 100644 --- a/src/selectgroup/demo/src/app/selectgroup/SelectgroupTestModule.ts +++ b/src/selectgroup/demo/src/app/selectgroup/SelectgroupTestModule.ts @@ -27,8 +27,9 @@ import { TiSelectgroupModule, TiSelectModule, TiIconModule, TiSvgComponent } fro ] }) export class SelectgroupTestModule { + baseUrl: string = window['DEPLOY_URL'] + window['PUBLIC_URL']; constructor() { - TiSvgComponent.setPath('/assets/ionicons/'); + TiSvgComponent.setPath(`${this.baseUrl}assets/ionicons/`); } static readonly ROUTES: Routes = [ { path: 'selectgroup/selectgroup-basic', component: SelectgroupBasicComponent, data: { label: '基础' } }, diff --git a/src/selectgroup/demo/src/app/selectgroup/selectgroup-template.html b/src/selectgroup/demo/src/app/selectgroup/selectgroup-template.html index 3fd017b7fb0bf5e80c315714fe95cb252b1c2665..5f4d29bab060edbe5319113c22f6b1392d4d5230 100644 --- a/src/selectgroup/demo/src/app/selectgroup/selectgroup-template.html +++ b/src/selectgroup/demo/src/app/selectgroup/selectgroup-template.html @@ -1,10 +1,5 @@ - +
    {{item.title}}
    diff --git a/src/selectgroup/lib/package.json b/src/selectgroup/lib/package.json index 3342dc91cef74d3be6ba5ac0ec72da81920c7b98..becdd2c6c9caabff00e1388ceed22fa1ca810a9a 100644 --- a/src/selectgroup/lib/package.json +++ b/src/selectgroup/lib/package.json @@ -1,11 +1,11 @@ { "name": "@opentiny/ng-selectgroup", - "version": "1.0.0-beta.2", + "version": "1.0.2", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-overflow": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-overflow": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/skeleton/lib/package.json b/src/skeleton/lib/package.json index 58e8cdb33d60c0de1a1c468b371572e085e94631..65eb33dea23c0d6cf7ce3e212156c57e9bdfff34 100644 --- a/src/skeleton/lib/package.json +++ b/src/skeleton/lib/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/ng-skeleton", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", diff --git a/src/slider/demo/src/app/slider/SliderTipComponent.ts b/src/slider/demo/src/app/slider/SliderTipComponent.ts index df599ba1088d68d4094be2eb9cc278cb937b81b9..822a7e0f35c2a3ca7a38ccbc83793a2d05816dd6 100644 --- a/src/slider/demo/src/app/slider/SliderTipComponent.ts +++ b/src/slider/demo/src/app/slider/SliderTipComponent.ts @@ -12,7 +12,7 @@ export class SliderTipComponent { min: number = 1; max: number = 12; scales: Array = ['1个月', '2个月', '3个月', '4个月', '5个月', '6个月', '7个月', '8个月', '9个月', '1年', '2年', '3年']; - tipMode: string = 'always'; + tipMode: 'auto' | 'always' = 'always'; tipFormatterFn(value: number): string { if (value === 10) { return '付10个月费用,享1年优惠'; diff --git a/src/slider/lib/package.json b/src/slider/lib/package.json index df6bcdc1e0127eb4c130c4619139f9d1742272ac..c9eff5b752f4e797f8c54dd1592716e8a0f70437 100644 --- a/src/slider/lib/package.json +++ b/src/slider/lib/package.json @@ -1,15 +1,15 @@ { "name": "@opentiny/ng-slider", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/platform-browser": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.2", - "@opentiny/ng-renderer": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.2", + "@opentiny/ng-renderer": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-drag": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-drag": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/spinner/demo/src/app/spinner/spinner-correctable.html b/src/spinner/demo/src/app/spinner/spinner-correctable.html index ac3e893ca0763b5d207db62e7b14911153800eee..22e0d97911898414a8d1deaf4a3143d00ff4fa7d 100644 --- a/src/spinner/demo/src/app/spinner/spinner-correctable.html +++ b/src/spinner/demo/src/app/spinner/spinner-correctable.html @@ -1,5 +1,5 @@

    描述

    -

    自10.0.1版本起去掉屏蔽该接口,不想强转时不要设置最大最小值就行。

    +

    去掉屏蔽该接口,不想强转时不要设置最大最小值就行。

    失去焦点,是否强制转换。默认值为true,支持强制转换。当配置为false时,不支持强制转换!

    示例

    diff --git a/src/spinner/lib/package.json b/src/spinner/lib/package.json index 4bd6e63061efd88717da7f1514d62821d88ecd0e..57736548e053a520355cbea2e3d9e113d4f4a47d 100644 --- a/src/spinner/lib/package.json +++ b/src/spinner/lib/package.json @@ -1,17 +1,17 @@ { "name": "@opentiny/ng-spinner", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-locale": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-inputnumber": "~1.0.0-beta.2", + "@opentiny/ng-locale": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-inputnumber": "~1.0.2", "@angular/forms": ">=13.0.0", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-text": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-tip": "~1.0.0-beta.2" + "@opentiny/ng-text": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-tip": "~1.0.2" } } \ No newline at end of file diff --git a/src/spinner/lib/src/TiSpinnerComponent.ts b/src/spinner/lib/src/TiSpinnerComponent.ts index 6db4f003fe90a1bffefb4dfe7533d121a716b66a..5567d99a04fc36547e1be944cd5821c8e716c351 100644 --- a/src/spinner/lib/src/TiSpinnerComponent.ts +++ b/src/spinner/lib/src/TiSpinnerComponent.ts @@ -49,7 +49,7 @@ export class TiSpinnerComponent extends TiFormComponent { /** * 小数保留位数。使用 n + '数字' 形式,例如:'n4',代表保留4位小数。 * - * 不设置时,10.0.1 版本后小数保留位数最少 0 位,最多 3 位;10.0.0 版本前小数保留位数为 3 位 + * 不设置时小数保留位数最少 0 位,最多 3 位 */ @Input() format: string; /** @@ -71,7 +71,7 @@ export class TiSpinnerComponent extends TiFormComponent { /** * @ignore * - * 从 10.0.1 版本开始该接口不再开放。如果不想要组件根据最大最小值进行强制转换,那么不要设置最大最小值即可。 + * 该接口不再开放。如果不想要组件根据最大最小值进行强制转换,那么不要设置最大最小值即可。 * * 失去焦点是否支持根据最大最小值进行强制转换(默认值为 true, 支持强转; 当用户配置为 false 时,不支持强制转换) */ @@ -86,7 +86,6 @@ export class TiSpinnerComponent extends TiFormComponent { @Input() maxlength: number = 20; /** * @ignore - * 10.1.11版本之前服务使用tiTip指令自行实现提示 * * 此处做兼容性处理,添加该接口判断服务是否使用指令实现 * diff --git a/src/steps/demo/src/app/steps/steps-adaptive-test.html b/src/steps/demo/src/app/steps/steps-adaptive-test.html index 482fbabc9b414b1c4421bb25b1af6678c88c654d..cf38daa12ad75e10c181209dbd4e927a0d82e611 100644 --- a/src/steps/demo/src/app/steps/steps-adaptive-test.html +++ b/src/steps/demo/src/app/steps/steps-adaptive-test.html @@ -1,6 +1,6 @@

    描述

    - adaptive接口场景测试。设置为adaptive为true时,整体宽度会自适应撑满父容器,父容器宽度改变的时候steps也会调整(这个是10.1.2版本才会支持), + adaptive接口场景测试。设置为adaptive为true时,整体宽度会自适应撑满父容器,父容器宽度改变的时候steps也会调整, label改变时steps也会调整。

    示例

    diff --git a/src/steps/lib/package.json b/src/steps/lib/package.json index 12596e8172e432e54aa17318fc44c65fe5659a85..0b2a08ff5fc644b697041c35ebf315914f7a0ff4 100644 --- a/src/steps/lib/package.json +++ b/src/steps/lib/package.json @@ -1,14 +1,14 @@ { "name": "@opentiny/ng-steps", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-overflow": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-outline": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-overflow": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-outline": "~1.0.2", + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/steps/lib/src/TiStepsComponent.ts b/src/steps/lib/src/TiStepsComponent.ts index 6cceb022ff8508dfceb06811476629ddb437c2cc..2812609b048e3261518d0c6c945c150866f84edb 100644 --- a/src/steps/lib/src/TiStepsComponent.ts +++ b/src/steps/lib/src/TiStepsComponent.ts @@ -82,7 +82,7 @@ export class TiStepsComponent extends TiBaseComponent { */ @Input() labelKey: string = 'label'; /** - * 必选,当前激活步骤项,10.1.19 版本支持传入激活项的下标 + * 必选,当前激活步骤项,支持传入激活项的下标 */ @Input() activeStep: any; /** @@ -173,8 +173,8 @@ export class TiStepsComponent extends TiBaseComponent { super.ngAfterContentInit(); /** * 兼容旧版无命名模板: - * 10.1.16 版本到 10.1.22 之前只能内嵌一个模板,无命名。 - * 10.1.22 版本之后可以内嵌两个模板,#step #icon + * 兼容之前只能内嵌一个模板,无命名。 + * 可以内嵌两个模板,#step #icon */ if ( !this.stepTemplate && diff --git a/src/subtitle/demo/src/app/subtitle/subtitle-before-search.html b/src/subtitle/demo/src/app/subtitle/subtitle-before-search.html index 620caa7d32c094edbc280a1c15353243b64cfcfc..0c707bbcd19f6bf1220a6e52c6d71479f34599c7 100644 --- a/src/subtitle/demo/src/app/subtitle/subtitle-before-search.html +++ b/src/subtitle/demo/src/app/subtitle/subtitle-before-search.html @@ -2,7 +2,7 @@ href="" [items]="items" [(selected)]="selected" - searchable="true" + [searchable]="true" (beforeSearch)="beforeSearch($event)" (scrollToBottom)="loadMore($event)" > diff --git a/src/subtitle/demo/src/app/subtitle/subtitle-route.html b/src/subtitle/demo/src/app/subtitle/subtitle-route.html index 351421ffc429ea538584a8df139826fa99e5cac2..b6f76ee27d9e8e604e75e8dae3899c1c527082d0 100644 --- a/src/subtitle/demo/src/app/subtitle/subtitle-route.html +++ b/src/subtitle/demo/src/app/subtitle/subtitle-route.html @@ -1,7 +1,7 @@

    1 描述

    backRouterLink:设置图标点击后跳转路由,用于应用内跳转。如果配置了该参数,href和targe参数失效。

    queryParams: 设置跳转路由参数。

    -

    10.1.2版本接口routerLink变更为backRouterLink

    +

    接口routerLink变更为backRouterLink

    2 示例


    diff --git a/src/subtitle/lib/package.json b/src/subtitle/lib/package.json index ba770bc5a1c5ba14dd68b94da40a004253dc2d2d..1ae81b2476eeff75e198a56ae34f0062036173ae 100644 --- a/src/subtitle/lib/package.json +++ b/src/subtitle/lib/package.json @@ -1,18 +1,18 @@ { "name": "@opentiny/ng-subtitle", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/router": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-list": "~1.0.0-beta.2", - "@opentiny/ng-select": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-list": "~1.0.2", + "@opentiny/ng-select": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-overflow": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-tip": "~1.0.0-beta.2" + "@opentiny/ng-overflow": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-tip": "~1.0.2" } } \ No newline at end of file diff --git a/src/swiper/lib/package.json b/src/swiper/lib/package.json index fe6b12746c4565af36e3a0450d35c19cf831e894..7344a500791c83726f964be8a5069edea26b9f19 100644 --- a/src/swiper/lib/package.json +++ b/src/swiper/lib/package.json @@ -1,12 +1,12 @@ { "name": "@opentiny/ng-swiper", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-outline": "~1.0.0-beta.2" + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-outline": "~1.0.2" } } \ No newline at end of file diff --git a/src/switch/lib/package.json b/src/switch/lib/package.json index 3b3e61a59052a2071c59ebc58408d316d62d32af..bc2ca368c503b5e01b537692125bbe0c2cace1ca 100644 --- a/src/switch/lib/package.json +++ b/src/switch/lib/package.json @@ -1,10 +1,10 @@ { "name": "@opentiny/ng-switch", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/tab/demo/src/app/tab/TabTestModule.ts b/src/tab/demo/src/app/tab/TabTestModule.ts index fcc46a2adde92dbb3705fe32f261aed3a17ad8a8..23f870aeef22b4e1ce1fa466771f5c9894811301 100644 --- a/src/tab/demo/src/app/tab/TabTestModule.ts +++ b/src/tab/demo/src/app/tab/TabTestModule.ts @@ -18,6 +18,7 @@ import { TabBeforeactivechangeComponent } from './TabBeforeactivechangeComponent import { TabDarkComponent } from './TabDarkComponent'; import { CompanyComponent, Concert1Component, ConcertComponent, LibaryComponent, TabContentCompComponent } from './TabContentCompComponent'; import { TabScrollComponent } from './TabScrollComponent'; +import { TabRouteWebsiteViewComponent } from './website-views/TabRouteWebsiteViewComponent'; @NgModule({ imports: [CommonModule, RouterModule, TiTabModule, TiFormfieldModule, DemoLogModule, RouterModule.forChild(TabTestModule.ROUTES)], @@ -40,7 +41,8 @@ import { TabScrollComponent } from './TabScrollComponent'; Concert1Component, LibaryComponent, TabScrollComponent, - TabDarkComponent + TabDarkComponent, + TabRouteWebsiteViewComponent ] }) export class TabTestModule { @@ -97,6 +99,7 @@ export class TabTestModule { }, { path: 'tab/tab-default-test', component: TabDefaultTestComponent }, { path: 'tab/tab-level2-test', component: TabLevel2TestComponent }, - { path: 'tab/tab-scroll', component: TabScrollComponent } + { path: 'tab/tab-scroll', component: TabScrollComponent }, + { path: 'tab/tab-route-website-view', component: TabRouteWebsiteViewComponent } ]; } diff --git a/src/tab/demo/src/app/tab/tab-scroll.html b/src/tab/demo/src/app/tab/tab-scroll.html index d84939f952f93455ef4e795df43835d944595d1b..72181f7bcfc811dcd196299c69fdbd2611a2e28c 100644 --- a/src/tab/demo/src/app/tab/tab-scroll.html +++ b/src/tab/demo/src/app/tab/tab-scroll.html @@ -2,11 +2,11 @@

    本测试用例主要测试tab是否影响页面触发滚动条。

    问题 1:在有tab的页面,且tab的祖先级级元素display:none, 页面有滚动条时,将页面滚动条 - 拖至formfiled的头部不在视野范围内时,给formfield中添加数据后页面滚动条会异常跳动到顶部,正常滚动条应该不跳动。该问题在10.1.9版本修复 + 拖至formfiled的头部不在视野范围内时,给formfield中添加数据后页面滚动条会异常跳动到顶部,正常滚动条应该不跳动。

    问题 2:在有tab的页面,且使用了 ti-tab-header 标签, 页面有滚动条时,将页面滚动条 - 拖至formfiled的头部不在视野范围内时,给formfield中添加数据后页面滚动条会异常跳动到顶部,正常滚动条应该不跳动。该问题在10.1.9版本修复 + 拖至formfiled的头部不在视野范围内时,给formfield中添加数据后页面滚动条会异常跳动到顶部,正常滚动条应该不跳动。

    示例

    diff --git a/src/tab/demo/src/app/tab/website-views/TabRouteWebsiteViewComponent.ts b/src/tab/demo/src/app/tab/website-views/TabRouteWebsiteViewComponent.ts new file mode 100644 index 0000000000000000000000000000000000000000..5c4a7eff7102760290b4e04718c787f5be694470 --- /dev/null +++ b/src/tab/demo/src/app/tab/website-views/TabRouteWebsiteViewComponent.ts @@ -0,0 +1,27 @@ +import { Component } from '@angular/core'; + +@Component({ + template: `
    Welcome to School!
    ` +}) +export class SchoolComponent {} + +@Component({ + template: `
    Welcome to home!
    ` +}) +export class HomeComponent {} + +@Component({ + templateUrl: './tab-route-website-view.html' +}) +export class TabRouteWebsiteViewComponent { + tabs: any = [ + { + title: 'home', + active: false + }, + { + title: 'school', + active: true + } + ]; +} diff --git a/src/tab/demo/src/app/tab/website-views/tab-route-website-view.html b/src/tab/demo/src/app/tab/website-views/tab-route-website-view.html new file mode 100644 index 0000000000000000000000000000000000000000..c9e98f73ba1d6e27f72f67f3a251a2cb4b8504eb --- /dev/null +++ b/src/tab/demo/src/app/tab/website-views/tab-route-website-view.html @@ -0,0 +1,8 @@ + + +
    Welcome to home!
    +
    + +
    Welcome to School!
    +
    +
    diff --git a/src/tab/lib/package.json b/src/tab/lib/package.json index 164ba8e16ced164fbce1a6b47f93f927af04e3bf..de7c7a21c6f0993dad9a7c617c18b7f14be63ecf 100644 --- a/src/tab/lib/package.json +++ b/src/tab/lib/package.json @@ -1,16 +1,16 @@ { "name": "@opentiny/ng-tab", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-include": "~1.0.0-beta.2", - "@opentiny/ng-renderer": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-droplist": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2" + "@opentiny/ng-include": "~1.0.2", + "@opentiny/ng-renderer": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-droplist": "~1.0.2", + "@opentiny/ng-base": "~1.0.2" } } \ No newline at end of file diff --git a/src/table/demo/src/app/table/TableCheckboxComponent.ts b/src/table/demo/src/app/table/TableCheckboxComponent.ts index 918040d6b187137c78ba190185458b7703357c85..210a9dd54e1a6dc0eccc49581a1c3d928c20221e 100644 --- a/src/table/demo/src/app/table/TableCheckboxComponent.ts +++ b/src/table/demo/src/app/table/TableCheckboxComponent.ts @@ -5,7 +5,7 @@ import { TiTableColumns, TiTableRowData, TiTableSrcData } from '@opentiny/ng'; templateUrl: './table-checkbox.html' }) export class TableCheckboxComponent { - checkedList: Array = []; + checkedList: any = []; displayedData: Array = []; srcData: TiTableSrcData = { data: [ diff --git a/src/table/demo/src/app/table/TableSortBasicComponent.ts b/src/table/demo/src/app/table/TableSortBasicComponent.ts index 61b75a20f9a038ec833f3138b3743b31e001836a..ffb41a48f30a19c85984d69f72269b9361656618 100644 --- a/src/table/demo/src/app/table/TableSortBasicComponent.ts +++ b/src/table/demo/src/app/table/TableSortBasicComponent.ts @@ -84,7 +84,7 @@ export class TableSortBasicComponent implements OnInit { dataState.sort.asc = null; } - // 10.1.13 版本支持手动修改表格排序状态 + // 支持手动修改表格排序状态 changeSort(): void { const dataState: TiTableDataState = this.tableCom.getDataState(); dataState.sort.sortKey = 'firstName'; diff --git a/src/table/demo/src/app/table/TableSortTestComponent.ts b/src/table/demo/src/app/table/TableSortTestComponent.ts index f39d238575d2d2ad55ea2857c06ca8ffa1464f5d..8b07c62d50c625ba6c6cb75cec8e2669a61177e2 100644 --- a/src/table/demo/src/app/table/TableSortTestComponent.ts +++ b/src/table/demo/src/app/table/TableSortTestComponent.ts @@ -84,7 +84,7 @@ export class TableSortTestComponent implements OnInit { dataState.sort.asc = null; } - // 10.1.13 版本支持手动修改表格排序状态 + // 支持手动修改表格排序状态 changeSort(): void { const dataState: TiTableDataState = this.tableCom.getDataState(); dataState.sort.sortKey = 'firstName'; diff --git a/src/table/demo/src/app/table/TableStorageConfigComponent.ts b/src/table/demo/src/app/table/TableStorageConfigComponent.ts index a3600d4427e7b4394fb20f6c5eb88f2dfd0d2e78..a7c60273d03bfd8454b8c4b4c826d1f9f45830e5 100644 --- a/src/table/demo/src/app/table/TableStorageConfigComponent.ts +++ b/src/table/demo/src/app/table/TableStorageConfigComponent.ts @@ -55,7 +55,7 @@ export class TableStorageConfigComponent implements OnInit { sort: false, // pagination设置为false,表示当前页和每页个数都不记忆 // pagination设置为true,表示当前页和每页个数都要记忆 - // 10.1.2版本支持只记忆当前页或只记忆每页个数 + // 支持只记忆当前页或只记忆每页个数 pagination: { currentPage: false, itemsPerPage: true diff --git a/src/table/demo/src/app/table/table-actionmenu.html b/src/table/demo/src/app/table/table-actionmenu.html index 5a3b8409418e796d9a06e6169d3a80b5d5144fe9..690565cc162418162ffe9556d161951f901bf45a 100644 --- a/src/table/demo/src/app/table/table-actionmenu.html +++ b/src/table/demo/src/app/table/table-actionmenu.html @@ -12,7 +12,7 @@ {{row.operator}} {{row.state}} - + diff --git a/src/table/demo/src/app/table/table-checkbox-pagination.html b/src/table/demo/src/app/table/table-checkbox-pagination.html index 0d3c25eafd50ffd107037d2ce1f1893c792e6af0..722ba1c55db46c3701759b71e81cc14f83a2aa45 100644 --- a/src/table/demo/src/app/table/table-checkbox-pagination.html +++ b/src/table/demo/src/app/table/table-checkbox-pagination.html @@ -29,7 +29,7 @@ - @@ -71,7 +71,7 @@ - diff --git a/src/table/demo/src/app/table/table-details-nesttable.html b/src/table/demo/src/app/table/table-details-nesttable.html index 3875fea9de844eec072fd73d830ab6b38e8d6672..71e7c01f59cb42b7c8a619466dffd31832fdab9f 100644 --- a/src/table/demo/src/app/table/table-details-nesttable.html +++ b/src/table/demo/src/app/table/table-details-nesttable.html @@ -23,7 +23,7 @@
    - +
    diff --git a/src/table/demo/src/app/table/table-radio-test.html b/src/table/demo/src/app/table/table-radio-test.html index c0f37dc8526546cede6896d7e87b0226f839c9e7..54b095757cb56ead3c23f4f121b0f685cdb04c65 100644 --- a/src/table/demo/src/app/table/table-radio-test.html +++ b/src/table/demo/src/app/table/table-radio-test.html @@ -24,7 +24,7 @@ 'ti3-selected-tr': selectedValue === row.id}" > - 示例 - +

    diff --git a/src/table/demo/src/app/table/table-sort-test.html b/src/table/demo/src/app/table/table-sort-test.html index 73fce59ccea99ef61d59648d5cc01f53c6b75948..db746d3a031663a2bc0074909e6505c9e1abf87b 100644 --- a/src/table/demo/src/app/table/table-sort-test.html +++ b/src/table/demo/src/app/table/table-sort-test.html @@ -1,12 +1,12 @@

    描述

    表格排序要结合tiCellText组件和tiHeadSort组件来实现。ti-cell-text包裹的是表头单元格 文本,ti-head-sort为点击的排序图标。

    -

    10.1.14 版本 ti-head-sort 组件初始无序时(默认为null)兼容传入 undefined。

    +

    ti-head-sort 组件初始无序时(默认为null)兼容传入 undefined。

    注意:使用 tiOverflow 组件,请导入 TiOverflowModule。

    示例

    - +

    diff --git a/src/table/lib/package.json b/src/table/lib/package.json index 389e0c776017fd699533ef8e1b8fbb82ab31af79..a59c94b95a8c427151b21e11196e4062d280562e 100644 --- a/src/table/lib/package.json +++ b/src/table/lib/package.json @@ -1,28 +1,28 @@ { "name": "@opentiny/ng-table", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-renderer": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-renderer": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-select": "~1.0.0-beta.2", - "@opentiny/ng-locale": "~1.0.0-beta.2", - "@opentiny/ng-dropsearch": "~1.0.0-beta.2", - "@opentiny/ng-list": "~1.0.0-beta.2", - "@opentiny/ng-base": "~1.0.0-beta.2", - "@opentiny/ng-datebase": "~1.0.0-beta.2", - "@opentiny/ng-button": "~1.0.0-beta.2", - "@opentiny/ng-drop": "~1.0.0-beta.2", + "@opentiny/ng-select": "~1.0.2", + "@opentiny/ng-locale": "~1.0.2", + "@opentiny/ng-dropsearch": "~1.0.2", + "@opentiny/ng-list": "~1.0.2", + "@opentiny/ng-base": "~1.0.2", + "@opentiny/ng-datebase": "~1.0.2", + "@opentiny/ng-button": "~1.0.2", + "@opentiny/ng-drop": "~1.0.2", "@angular/cdk": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-date": "~1.0.0-beta.2", - "@opentiny/ng-datetime": "~1.0.0-beta.2", - "@opentiny/ng-searchbox": "~1.0.0-beta.2", - "@opentiny/ng-overflow": "~1.0.0-beta.2", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-tip": "~1.0.0-beta.2", - "@opentiny/ng-outline": "~1.0.0-beta.2" + "@opentiny/ng-date": "~1.0.2", + "@opentiny/ng-datetime": "~1.0.2", + "@opentiny/ng-searchbox": "~1.0.2", + "@opentiny/ng-overflow": "~1.0.2", + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-tip": "~1.0.2", + "@opentiny/ng-outline": "~1.0.2" } } \ No newline at end of file diff --git a/src/table/lib/src/TiColsToggleComponent.ts b/src/table/lib/src/TiColsToggleComponent.ts index 27b8e7959912e2050e23d13ef18f2a238da47d91..008b9e5b268a40965f082d23550ef75f83807907 100644 --- a/src/table/lib/src/TiColsToggleComponent.ts +++ b/src/table/lib/src/TiColsToggleComponent.ts @@ -67,7 +67,7 @@ export class TiColsToggleComponent extends TiSelectComponent { private static readonly MIN_PANEL_WIDTH: number = 200; /** * @ignore - * 10.0.3 版本之前服务使用 tiTip 指令自行实现提示,为做兼容性处理,添加该接口判断服务是否使用指令实现 + * 之前服务使用 tiTip 指令自行实现提示,为做兼容性处理,添加该接口判断服务是否使用指令实现 */ @Input() tiTip: string; /** diff --git a/src/tag/demo/src/app/tag/TagEventsComponent.ts b/src/tag/demo/src/app/tag/TagEventsComponent.ts new file mode 100644 index 0000000000000000000000000000000000000000..15b94021ca3854d52046d7c5c7d4bd70d3167df3 --- /dev/null +++ b/src/tag/demo/src/app/tag/TagEventsComponent.ts @@ -0,0 +1,12 @@ +import { Component } from '@angular/core'; + +@Component({ + templateUrl: './tag-events.html' +}) +export class TagEventsComponent { + myLogs: Array = []; + + onDelete(): void { + this.myLogs = [...this.myLogs, `onDelete() delete`]; + } +} diff --git a/src/tag/demo/src/app/tag/TagTestModule.ts b/src/tag/demo/src/app/tag/TagTestModule.ts index 68bde131cab17345658b9be219e05848f8b60051..afbcb6380784e14e40a4a6cb8f63ed141b349415 100644 --- a/src/tag/demo/src/app/tag/TagTestModule.ts +++ b/src/tag/demo/src/app/tag/TagTestModule.ts @@ -10,6 +10,7 @@ import { TagBasicComponent } from './TagBasicComponent'; import { TagDisabledComponent } from './TagDisabledComponent'; import { TagEditComponent } from './TagEditComponent'; import { TagDefaultComponent } from './TagDefaultComponent'; +import { TagEventsComponent } from './TagEventsComponent'; @NgModule({ imports: [ @@ -23,7 +24,7 @@ import { TagDefaultComponent } from './TagDefaultComponent'; DemoLogModule, RouterModule.forChild(TagTestModule.ROUTES) ], - declarations: [TagBasicComponent, TagDisabledComponent, TagEditComponent, TagDefaultComponent] + declarations: [TagBasicComponent, TagDisabledComponent, TagEditComponent, TagDefaultComponent, TagEventsComponent] }) export class TagTestModule { static readonly LINKS: Array = [{ href: 'components/TiTagComponent.html', label: 'Tag' }]; @@ -43,6 +44,10 @@ export class TagTestModule { { path: 'tag/tag-default', component: TagDefaultComponent + }, + { + path: 'tag/tag-events', + component: TagEventsComponent } ]; } diff --git a/src/tag/demo/src/app/tag/tag-events.html b/src/tag/demo/src/app/tag/tag-events.html new file mode 100644 index 0000000000000000000000000000000000000000..b2241191e0b8542af52706490e5ab841fd905e23 --- /dev/null +++ b/src/tag/demo/src/app/tag/tag-events.html @@ -0,0 +1 @@ +Events diff --git a/src/tag/lib/package.json b/src/tag/lib/package.json index ab449a3b8af06148590690071347e6cb1d67407c..43b9cf82a477edb2021484dc61b250ab825346bc 100644 --- a/src/tag/lib/package.json +++ b/src/tag/lib/package.json @@ -1,12 +1,12 @@ { "name": "@opentiny/ng-tag", - "version": "1.0.0-beta.2", + "version": "1.0.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.2", - "@opentiny/ng-utils": "~1.0.0-beta.2" + "@opentiny/ng-icon": "~1.0.2", + "@opentiny/ng-utils": "~1.0.2" } } \ No newline at end of file diff --git a/src/tagsinput/demo/src/app/AppModule.ts b/src/tagsinput/demo/src/app/AppModule.ts index ff6ffb1cd28dbbee87646bdce6ee21b839337cb9..4e84f00e8586f4b8720cc83e4e0ee3c1f8770e10 100644 --- a/src/tagsinput/demo/src/app/AppModule.ts +++ b/src/tagsinput/demo/src/app/AppModule.ts @@ -4,11 +4,11 @@ import { RouterModule } from '@angular/router'; import { AppComponent } from './AppComponent'; import { IndexComponent } from './IndexComponent'; -import { TagsInputTestModule } from './tagsinput/TagsInputTestModule'; +import { TagsinputTestModule } from './tagsinput/TagsinputTestModule'; @NgModule({ imports: [ - TagsInputTestModule, + TagsinputTestModule, BrowserModule.withServerTransition({ appId: 'serverApp' }), RouterModule.forRoot( [ diff --git a/src/tagsinput/demo/src/app/IndexComponent.ts b/src/tagsinput/demo/src/app/IndexComponent.ts index 2a3852c9c90a6ef73b1ddfe43d6aa9cf78e9569d..dcf45f21d8b5ce60d84063bc5501d94e9102a60c 100644 --- a/src/tagsinput/demo/src/app/IndexComponent.ts +++ b/src/tagsinput/demo/src/app/IndexComponent.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { TagsInputTestModule } from './tagsinput/TagsInputTestModule'; +import { TagsinputTestModule } from './tagsinput/TagsinputTestModule'; @Component({ template: `