diff --git a/CHANGELOG.md b/CHANGELOG.md index 2886190b49e46af3450e87176d4534df3d9a81ae..04912c0944a2f0779b44a32058e0c668b8240151 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,14 @@ title: 更新日志 | TinyNG --- ## 更新日志 +### 1.0.0-beta.2 -### 14.0.0 +*2023-05-16* -*2022-11-15* +1. Latest version -1. Initial version +### 1.0.0-beta.1 + +*2023-04-19* + +1. Latest version diff --git a/README-zh_CN.md b/README-zh_CN.md index 1adb63e05078e49cedc18f32d7e5c5d266d4c9d7..ce9045dbe3773c27d9b2280a3bca2d6c68fd3ff3 100644 --- a/README-zh_CN.md +++ b/README-zh_CN.md @@ -26,7 +26,7 @@ TinyNG ## 支持环境 -* Angular `^14.0.0` +* Angular `>=13.0.0` * 现代浏览器 | Edge | Firefox | Chrome | Safari | diff --git a/README.md b/README.md index 3a22e52fc30602dc0d3a38e15fc7a5dc3fe49bf3..50977fdc4cf5720928fca42d1ce234123de2dd13 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ English | [简体中文](README-zh_CN.md) ## Environment Support -* Angular `^14.0.0` +* Angular `>=13.0.0` * Modern browsers | Edge | Firefox | Chrome | Safari | diff --git a/angular.json b/angular.json index 91f1dd04aa0abb79e0d0f39a06f236050ff9607d..93456c25268f3603f7e498c5456abf518c328d47 100644 --- a/angular.json +++ b/angular.json @@ -93,6 +93,8 @@ "layout-demo": "src/layout/demo", "leftmenu": "src/leftmenu/lib", "leftmenu-demo": "src/leftmenu/demo", + "leftmenuthin": "src/leftmenuthin/lib", + "leftmenuthin-demo": "src/leftmenuthin/demo", "linkbutton": "src/linkbutton/lib", "linkbutton-demo": "src/linkbutton/demo", "list": "src/list/lib", diff --git a/build/buildThemes.js b/build/buildThemes.js index 81f1a1a8d3a5441238b09a581a18483cb612d37d..f4808803b426aba881a086684f138106d56d4091 100644 --- a/build/buildThemes.js +++ b/build/buildThemes.js @@ -2,12 +2,12 @@ const { execSync } = require('child_process'); const path = require('path'); const fs = require('fs-extra'); -execSync('npx lessc src/themes/basic/build.less dist/libs/themes/styles.css'); +execSync('npx lessc src/themes/basic/build.less dist/libs/ng-themes/styles.css'); -execSync('npx lessc src/themes/theme-default/build.less dist/libs/themes/theme-default.css'); -execSync('npx lessc src/themes/theme-blue/build.less dist/libs/themes/theme-blue.css'); -execSync('npx lessc src/themes/theme-green/build.less dist/libs/themes/theme-green.css'); -execSync('npx lessc src/themes/theme-purple/build.less dist/libs/themes/theme-purple.css'); -execSync('npx lessc src/themes/theme-red/build.less dist/libs/themes/theme-red.css'); +execSync('npx lessc src/themes/theme-default/build.less dist/libs/ng-themes/theme-default.css'); +execSync('npx lessc src/themes/theme-blue/build.less dist/libs/ng-themes/theme-blue.css'); +execSync('npx lessc src/themes/theme-green/build.less dist/libs/ng-themes/theme-green.css'); +execSync('npx lessc src/themes/theme-purple/build.less dist/libs/ng-themes/theme-purple.css'); +execSync('npx lessc src/themes/theme-red/build.less dist/libs/ng-themes/theme-red.css'); -fs.copy(path.resolve(__dirname, '../src/themes/package.json') , path.resolve(__dirname, '../dist/libs/themes/package.json')); \ No newline at end of file +fs.copy(path.resolve(__dirname, '../src/themes/package.json') , path.resolve(__dirname, '../dist/libs/ng-themes/package.json')); \ No newline at end of file diff --git a/package.json b/package.json index 183949e0339a20c70d1f58f67de7d58132a27470..2c60b47c15d9f062aef13a956d1c980983eae636 100644 --- a/package.json +++ b/package.json @@ -33,11 +33,12 @@ "@angular/platform-browser": "~13.3.0", "@angular/platform-browser-dynamic": "~13.3.0", "@angular/router": "~13.3.0", + "libphonenumber-js": "^1.10.7", "rxjs": "^6.5.3 || ^7.4.0", "tslib": "^2.0.0", "web-animations-js": "^2.3.2", - "libphonenumber-js": "1.10.7", - "zone.js": "^0.11.8" + "zone.js": "^0.11.8", + "color":"4.2.3" }, "devDependencies": { "@angular-devkit/build-angular": "~13.3.0", diff --git a/src/accordion/lib/ng-package.json b/src/accordion/lib/ng-package.json index 6d70021736f2bd4c7e99fd7e9836cf7ce9096b27..d48e4c9561521b843d258a0b001bfa78180b5c08 100644 --- a/src/accordion/lib/ng-package.json +++ b/src/accordion/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/accordion", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-accordion", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/accordion/lib/package.json b/src/accordion/lib/package.json index 373d59927876dec711cc52eba7dd405ccf244c73..a93ead23fb49565e4408576b3277cc93a19ccc10 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/animations": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-outline": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0" + "@opentiny/ng-outline": "~1.0.0-beta.2", + "@opentiny/ng-icon": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/accordion/lib/project.json b/src/accordion/lib/project.json index c6d21a0d6aa3edd1344f9d1cc31717ca6e599980..43c5d5680f0e229eecab81da346cdf087313f9b7 100644 --- a/src/accordion/lib/project.json +++ b/src/accordion/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/accordion"], + "outputs": ["dist/libs/ng-accordion"], "options": { "project": "src/accordion/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/accordion"], + "outputs": ["dist/libs/ng-accordion"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/accordion && npm pack" + "command": "cd dist/libs/ng-accordion && npm pack" } ] } diff --git a/src/actionmenu/lib/ng-package.json b/src/actionmenu/lib/ng-package.json index 86956a387d40e7878ae85ed00097d7fb4f8fbe01..25a20e20f0e87a9106519d5c509f4f8597e35fa5 100644 --- a/src/actionmenu/lib/ng-package.json +++ b/src/actionmenu/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/actionmenu", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-actionmenu", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/actionmenu/lib/package.json b/src/actionmenu/lib/package.json index 11cad7394a247f88433913628640ee22393240b6..ad31380ccc9cb53126da1cf7921d90098b139d31 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-menu": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-menu": "~1.0.0-beta.2", + "@opentiny/ng-locale": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-tip": "~1.0.0-beta.0", - "@opentiny/ng-popconfirm": "~1.0.0-beta.0" + "@opentiny/ng-tip": "~1.0.0-beta.2", + "@opentiny/ng-popconfirm": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/actionmenu/lib/project.json b/src/actionmenu/lib/project.json index de4840e5cf517583adee33f3af15bbdc5470706d..076ffe1e4c1939f1073fd9362dcb15021f3d9fbc 100644 --- a/src/actionmenu/lib/project.json +++ b/src/actionmenu/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/actionmenu"], + "outputs": ["dist/libs/ng-actionmenu"], "options": { "project": "src/actionmenu/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/actionmenu"], + "outputs": ["dist/libs/ng-actionmenu"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/actionmenu && npm pack" + "command": "cd dist/libs/ng-actionmenu && npm pack" } ] } diff --git a/src/alert/lib/ng-package.json b/src/alert/lib/ng-package.json index adf546cf2364668890fd11388f5d2732abb4c908..8e369f0b87b35f1f9569a505c3a273476707c001 100644 --- a/src/alert/lib/ng-package.json +++ b/src/alert/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/alert", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-alert", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/alert/lib/package.json b/src/alert/lib/package.json index ec0436c6c3a63cc87ddcdea74e465b6ef6e9073b..b263f01875bd0c71086b1bb0316486a1820d38e1 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/common": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-outline": "~1.0.0-beta.0", + "@opentiny/ng-icon": "~1.0.0-beta.2", + "@opentiny/ng-outline": "~1.0.0-beta.2", "@angular/animations": ">=13.0.0" } } \ No newline at end of file diff --git a/src/alert/lib/project.json b/src/alert/lib/project.json index 951d92aebadd8990b8b5d5b189cba82a574f0c1e..f96ed1eda211e0f5e0b8bb92320a3773d9923397 100644 --- a/src/alert/lib/project.json +++ b/src/alert/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/alert"], + "outputs": ["dist/libs/ng-alert"], "options": { "project": "src/alert/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/alert"], + "outputs": ["dist/libs/ng-alert"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/alert && npm pack" + "command": "cd dist/libs/ng-alert && npm pack" } ] } diff --git a/src/anchor/lib/ng-package.json b/src/anchor/lib/ng-package.json index 3c5802db8e422006d2117f5c5ec5cffa70c5f9a6..88771fb9dc297fdc0da23b78d986962509a91867 100644 --- a/src/anchor/lib/ng-package.json +++ b/src/anchor/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/anchor", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-anchor", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/anchor/lib/package.json b/src/anchor/lib/package.json index 2c4a30524ccd28725c9972fb3050f7a78498fbfe..afe74b1d6cdcbe9126132aa96780059ade6e8d9d 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0" + "@opentiny/ng-base": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/anchor/lib/project.json b/src/anchor/lib/project.json index 637fbda722307830f08f9144f6bd4253fb4b531c..7ddecf0c5780053dd88127862c18a7129215d406 100644 --- a/src/anchor/lib/project.json +++ b/src/anchor/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/anchor"], + "outputs": ["dist/libs/ng-anchor"], "options": { "project": "src/anchor/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/anchor"], + "outputs": ["dist/libs/ng-anchor"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/anchor && npm pack" + "command": "cd dist/libs/ng-anchor && npm pack" } ] } diff --git a/src/autocomplete/demo/src/app/autocomplete/AutocompleteSuggestComponent.ts b/src/autocomplete/demo/src/app/autocomplete/AutocompleteSuggestComponent.ts new file mode 100644 index 0000000000000000000000000000000000000000..62fcc1109991ef1df0fa3e096c21d5b64eef89a9 --- /dev/null +++ b/src/autocomplete/demo/src/app/autocomplete/AutocompleteSuggestComponent.ts @@ -0,0 +1,106 @@ +import { Component, OnDestroy } from '@angular/core'; +import { TiAutocompleteComponent } from '@opentiny/ng'; + +@Component({ + templateUrl: './autocomplete-suggest.html' +}) +export class AutocompleteSuggestComponent implements OnDestroy { + value1: string = ''; + value2: string = ''; + timeout: any; + + // 设置建议项-加载有数据 + onSuggest1(autocomplete: TiAutocompleteComponent): void { + if (this.timeout) { + clearTimeout(this.timeout); + } + autocomplete.setLoading(true); + // 模拟后台异步请求 + this.getData(autocomplete.model).then((result: any) => { + autocomplete.setLoading(false); + autocomplete.setSuggestions(result.data); + }); + } + + // 设置建议项-加载无数据 + onSuggest2(autocomplete: TiAutocompleteComponent): void { + if (this.timeout) { + clearTimeout(this.timeout); + } + autocomplete.setLoading(true); + // 模拟后台异步请求 + this.getNoData(autocomplete.model).then((result: any) => { + autocomplete.setLoading(false); + autocomplete.setSuggestions(result.data); + }); + } + + private getSuggestionData(value: string): Array { + const options: Array = value + ? [ + { + label: value + '@a.com' + }, + { + label: value + '@b.com' + }, + { + label: value + '@c.com' + }, + { + label: value + '@d.com' + }, + { + label: value + '@e.com' + }, + { + label: value + '@f.com' + } + ] + : [ + { + label: '@a.com' + }, + { + label: '@b.com' + }, + { + label: '@c.com' + }, + { + label: '@d.com' + }, + { + label: '@e.com' + }, + { + label: '@f.com' + } + ]; + + return options; + } + + private getData(inputValue: string): Promise { + return new Promise((resolve: any, reject: any): any => { + let result: Array = this.getSuggestionData(inputValue); + this.timeout = setTimeout(() => { + resolve({ data: result }); + }, 1500); + }); + } + + private getNoData(inputValue: string): Promise { + return new Promise((resolve: any, reject: any): any => { + this.timeout = setTimeout(() => { + resolve({ data: [] }); + }, 1500); + }); + } + + ngOnDestroy(): void { + if (this.timeout) { + clearTimeout(this.timeout); + } + } +} diff --git a/src/autocomplete/demo/src/app/autocomplete/AutocompleteTestModule.ts b/src/autocomplete/demo/src/app/autocomplete/AutocompleteTestModule.ts index 60b1736f5778c6ba2d935a16768c3d858deb437c..3524b1509ef6996c73f2e97434891b05582921c1 100644 --- a/src/autocomplete/demo/src/app/autocomplete/AutocompleteTestModule.ts +++ b/src/autocomplete/demo/src/app/autocomplete/AutocompleteTestModule.ts @@ -26,6 +26,7 @@ import { AutocompleteTestComponent } from './AutocompleteTestComponent'; import { AutocompleteAppendtobodyComponent } from './AutocompleteAppendtobodyComponent'; import { AutocompleteTemplateComponent } from './AutocompleteTemplateComponent'; import { AutocompleteGroupComponent } from './AutocompleteGroupComponent'; +import { AutocompleteSuggestComponent } from './AutocompleteSuggestComponent'; @NgModule({ imports: [ @@ -53,7 +54,8 @@ import { AutocompleteGroupComponent } from './AutocompleteGroupComponent'; AutocompleteAppendtobodyComponent, AutocompleteTestComponent, AutocompleteTemplateComponent, - AutocompleteGroupComponent + AutocompleteGroupComponent, + AutocompleteSuggestComponent ] }) export class AutocompleteTestModule { @@ -106,6 +108,10 @@ export class AutocompleteTestModule { { path: 'autocomplete/autocomplete-test', component: AutocompleteTestComponent + }, + { + path: 'autocomplete/autocomplete-suggest', + component: AutocompleteSuggestComponent } ]; } diff --git a/src/autocomplete/demo/src/app/autocomplete/autocomplete-suggest.html b/src/autocomplete/demo/src/app/autocomplete/autocomplete-suggest.html new file mode 100644 index 0000000000000000000000000000000000000000..4d8cb64b19efc9254b574876a1f561a928e93e53 --- /dev/null +++ b/src/autocomplete/demo/src/app/autocomplete/autocomplete-suggest.html @@ -0,0 +1,17 @@ +

1.加载有数据

+ + +

2.加载无数据

+ diff --git a/src/autocomplete/demo/src/app/autocomplete/webdoc/autocomplete-demos.js b/src/autocomplete/demo/src/app/autocomplete/webdoc/autocomplete-demos.js index 246b5b20f76b560856042066eebd7a83c15ddd5b..7b8d1a4b85c3fba377245c145475fb4deda596c1 100644 --- a/src/autocomplete/demo/src/app/autocomplete/webdoc/autocomplete-demos.js +++ b/src/autocomplete/demo/src/app/autocomplete/webdoc/autocomplete-demos.js @@ -159,6 +159,19 @@ export default { 'en-US': '' }, apis: ['TiAutocompleteComponent.properties.options'] + }, + { + demoId: 'autocomplete-suggest', + name: { + 'zh-CN': '动态加载下拉项', + 'en-US': 'suggest' + }, + desc: { + 'zh-CN': + '

通过suggest事件配置当聚焦或值改变时触发事件，为开发者提供设置建议项的时机。通过setLoading()方法设置加载状态。

', + 'en-US': '' + }, + apis: ['TiAutocompleteComponent.methods.setLoading'] } ] }; diff --git a/src/autocomplete/lib/ng-package.json b/src/autocomplete/lib/ng-package.json index 424e693472b54d3ab315609a24f0e48d535fca64..58c53e615a5a3bc5932881e999648ecbd6fc68de 100644 --- a/src/autocomplete/lib/ng-package.json +++ b/src/autocomplete/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/autocomplete", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-autocomplete", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/autocomplete/lib/package.json b/src/autocomplete/lib/package.json index bac605b32328a7305f2a2912aec3c52c23b39e8a..74f4972101f4efdb55e3e21bfa1040a36abf9670 100644 --- a/src/autocomplete/lib/package.json +++ b/src/autocomplete/lib/package.json @@ -1,13 +1,13 @@ { "name": "@opentiny/ng-autocomplete", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-droplist": "~1.0.0-beta.0", - "@opentiny/ng-text": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-droplist": "~1.0.0-beta.2", + "@opentiny/ng-text": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0" } diff --git a/src/autocomplete/lib/project.json b/src/autocomplete/lib/project.json index fc677b49f733005f00dbdff782a7287955c91b8c..600a689fa48d6f95e433147cc0361af452ffdd73 100644 --- a/src/autocomplete/lib/project.json +++ b/src/autocomplete/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/autocomplete"], + "outputs": ["dist/libs/ng-autocomplete"], "options": { "project": "src/autocomplete/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/autocomplete"], + "outputs": ["dist/libs/ng-autocomplete"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/autocomplete && npm pack" + "command": "cd dist/libs/ng-autocomplete && npm pack" } ] } diff --git a/src/autocomplete/lib/src/TiAutocompleteComponent.ts b/src/autocomplete/lib/src/TiAutocompleteComponent.ts index 31c640f89cad94688abc2ad0fd2384c5af0df4ff..55420a11d2974b62fe2ea31624df9713b199947a 100644 --- a/src/autocomplete/lib/src/TiAutocompleteComponent.ts +++ b/src/autocomplete/lib/src/TiAutocompleteComponent.ts @@ -12,11 +12,10 @@ import { ChangeDetectionStrategy, Component, ContentChild, EventEmitter, Input, Output, TemplateRef, ViewChild } from '@angular/core'; import { TiFormComponent } from '@opentiny/ng-base'; import { TiDroplistComponent } from '@opentiny/ng-droplist'; -import { debounceTime, switchMap } from 'rxjs/operators'; +import { debounceTime, switchMap, tap } from 'rxjs/operators'; import { TiTextComponent } from '@opentiny/ng-text'; import { empty, Subject, Subscription } from 'rxjs'; -import { Util } from '@opentiny/ng-utils'; -import { TiPositionType } from '@opentiny/ng-utils'; +import { Util, TiPositionType } from '@opentiny/ng-utils'; import packageInfo from '../package.json'; /** @@ -122,6 +121,11 @@ export class TiAutocompleteComponent extends TiFormComponent { * 是否聚焦的标志位 */ public isFocused: boolean = false; + /** + * @ignore + * 控制loading状态 + */ + public loading: boolean; /** * 最后一次下拉建议项 */ @@ -162,7 +166,7 @@ export class TiAutocompleteComponent extends TiFormComponent { ngOnDestroy(): void { // 修正SSR报错：TypeError: Cannot read property 'unsubscribe' of undefined - this.inputChangeSub && this.inputChangeSub.unsubscribe(); + this.inputChangeSub?.unsubscribe(); } // 组件交互方法集合--start @@ -211,7 +215,7 @@ export class TiAutocompleteComponent extends TiFormComponent { // 问题根因：以上操作中当点击组件以外的地方，组件会有快速的聚焦再失焦的过程；聚焦时打开面板添加了延时处理，组件再失焦后时机早于聚焦，导致下拉面板无法隐藏； // 解决方案：失焦时也添加延时处理； setTimeout(() => { - this.dropListComp && this.dropListComp.hide(); + this.dropListComp?.hide(); this.isFocused = false; }, 0); } @@ -253,7 +257,7 @@ export class TiAutocompleteComponent extends TiFormComponent { * 防止原生input框select（选中文本）事件触发时，冒泡到ti-autocomplete的select（选中选项）事件 * */ - inputSelect(event: Event) { + inputSelect(event: Event): void { event.stopPropagation(); } @@ -267,6 +271,15 @@ export class TiAutocompleteComponent extends TiFormComponent { private createInputChangeObserve(): void { this.inputChangeSub = this.inputChangeObserve .pipe( + // 下拉建议项固定时，第一项即时更新 + tap((value: string) => { + if (this.isFocused && this.suggest.observers.length === 0 && this.options && this.options.length > 0) { + if (value) { + this.suggestions = [{ id: value, [this.labelKey]: value }]; + } + this.show(); + } + }), debounceTime(200), // 200ms延迟执行，解决请求太频繁问题 // TODO: 在点击清除按钮或者快捷键删除时数据不准确，可能导致在这些操作时触发不了下面的逻辑 // distinctUntilChanged(),避免前后两次相同数据重复处理，只有上次数据和200ms后的数据不相等时才触发后续动作。 @@ -277,10 +290,8 @@ export class TiAutocompleteComponent extends TiFormComponent { if (this.suggest.observers.length === 0) { this.lastSuggestions = this.suggestions; this.suggestions = this.filter(value); - if (this.suggestions.length > 0) { - this.show(); - } else { - this.dropListComp && this.dropListComp.hide(); + if (this.suggestions.length === 0) { + this.dropListComp?.hide(); } } else { this.suggest.emit(this); @@ -294,6 +305,18 @@ export class TiAutocompleteComponent extends TiFormComponent { ) .subscribe(); } + /** + * 设置加载状态 + * + * @param state true：加载中；false：加载结束 + */ + public setLoading(state: boolean): void { + this.loading = state; + if (state) { + this.suggestions = []; + this.show(); + } + } /** * 设置下拉建议项数据 * @@ -302,7 +325,7 @@ export class TiAutocompleteComponent extends TiFormComponent { public setSuggestions(value: Array): void { this.lastSuggestions = this.suggestions; this.suggestions = value; - if (this.suggestions.length > 0) { + if (this.suggestions.length > 0 || !Util.isUndefined(this.loading)) { this.show(); } else { this.dropListComp.hide(); diff --git a/src/autocomplete/lib/src/autocomplete.html b/src/autocomplete/lib/src/autocomplete.html index 1b23c0817073317cc19ca2528130d54ddaa80245..bf9336b05e682022ab196e4af365a912a9e8d40d 100644 --- a/src/autocomplete/lib/src/autocomplete.html +++ b/src/autocomplete/lib/src/autocomplete.html @@ -24,6 +24,7 @@ [tipPosition]="tipPosition" [tipMaxWidth]="tipMaxWidth" [referElem]="appendToBody ? undefined : nativeElement" + [loading]="loading" (ngModelChange)="onDroplistChange($event)" (select)="onSelect($event)" [id]="appendId('droplist')" diff --git a/src/avatar/lib/ng-package.json b/src/avatar/lib/ng-package.json index 42712673d5866626cf75cfa7b5f8ba8eadf8abf3..8cc45dd8a4384ac35747a9eaca8c3339b5241b51 100644 --- a/src/avatar/lib/ng-package.json +++ b/src/avatar/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/avatar", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-avatar", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/avatar/lib/package.json b/src/avatar/lib/package.json index b1f54bd52d3f2f3be52234fbe19e6c3db4af6d17..4335a92b720922ce6fd31841175a061313979e5e 100644 --- a/src/avatar/lib/package.json +++ b/src/avatar/lib/package.json @@ -1,11 +1,11 @@ { "name": "@opentiny/ng-avatar", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0" + "@opentiny/ng-icon": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/avatar/lib/project.json b/src/avatar/lib/project.json index e2994151f557cd663bfcd93dec3732f427a8c9f5..6292435f24d40f30488c15d74036c226f8bb7728 100644 --- a/src/avatar/lib/project.json +++ b/src/avatar/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/avatar"], + "outputs": ["dist/libs/ng-avatar"], "options": { "project": "src/avatar/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/avatar"], + "outputs": ["dist/libs/ng-avatar"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/avatar && npm pack" + "command": "cd dist/libs/ng-avatar && npm pack" } ] } diff --git a/src/base/lib/ng-package.json b/src/base/lib/ng-package.json index d8ff706d6e9505bc31e53e5c2b92830b3af3c866..ab333370177cfdbe37bff872d9886c7a52c4c1d2 100644 --- a/src/base/lib/ng-package.json +++ b/src/base/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/base", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-base", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/base/lib/package.json b/src/base/lib/package.json index 4e3f94bdac0d7a83d30082c8910376f0475f6f8e..81407b441e2242ac83c23949770c23d9ac10bd47 100644 --- a/src/base/lib/package.json +++ b/src/base/lib/package.json @@ -1,9 +1,9 @@ { "name": "@opentiny/ng-base", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.0", + "@opentiny/ng-utils": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", "@angular/forms": ">=13.0.0" } diff --git a/src/base/lib/project.json b/src/base/lib/project.json index 9d5dfd55124c7d962c1d43f2fd95a0515ca0590e..eb37722b7f9e6eeafa650099bd49de38769399e2 100644 --- a/src/base/lib/project.json +++ b/src/base/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/base"], + "outputs": ["dist/libs/ng-base"], "options": { "project": "src/base/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/base"], + "outputs": ["dist/libs/ng-base"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/base && npm pack" + "command": "cd dist/libs/ng-base && npm pack" } ] } diff --git a/src/button/lib/ng-package.json b/src/button/lib/ng-package.json index 573743fc76f9f7d5fbffddc86cf2f7b4e7701857..f8b56263971017428addbbfbce426406172e287b 100644 --- a/src/button/lib/ng-package.json +++ b/src/button/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/button", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-button", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/button/lib/package.json b/src/button/lib/package.json index 55a6ac7626782daa005e36a1711235e544e53b5c..e1dcd37527ee305c5a0a3aedf67a2cda2b6db6c7 100644 --- a/src/button/lib/package.json +++ b/src/button/lib/package.json @@ -1,12 +1,12 @@ { "name": "@opentiny/ng-button", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", "@angular/core": ">=13.0.0", - "@opentiny/ng-loading": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0" + "@opentiny/ng-loading": "~1.0.0-beta.2", + "@opentiny/ng-locale": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/button/lib/project.json b/src/button/lib/project.json index 93ea6a830d26012b4e06cf2cde70d0d220610a30..c2138928a390b6f348ce9349bb2b3b639186359b 100644 --- a/src/button/lib/project.json +++ b/src/button/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/button"], + "outputs": ["dist/libs/ng-button"], "options": { "project": "src/button/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/button"], + "outputs": ["dist/libs/ng-button"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/button && npm pack" + "command": "cd dist/libs/ng-button && npm pack" } ] } diff --git a/src/buttongroup/lib/ng-package.json b/src/buttongroup/lib/ng-package.json index 6233b974dfbc0623eb99dafefdcb0f6a272e135f..019916a89010e3805c22b5eef58fffd37259ad1f 100644 --- a/src/buttongroup/lib/ng-package.json +++ b/src/buttongroup/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/buttongroup", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-buttongroup", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/buttongroup/lib/package.json b/src/buttongroup/lib/package.json index 723297ac4a0f5fc933a9324f07bb376117f82fce..37f9575f65be174872c6f8c6b6427a14f4657e6c 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.0", + "@opentiny/ng-utils": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-tip": "~1.0.0-beta.0", - "@opentiny/ng-outline": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/buttongroup/lib/project.json b/src/buttongroup/lib/project.json index 68c6e9f95c51525c8af776fd8be08ad5f7e555f5..8226f69868e7c401ff2d06c56a4b2d2ffa3e610a 100644 --- a/src/buttongroup/lib/project.json +++ b/src/buttongroup/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/buttongroup"], + "outputs": ["dist/libs/ng-buttongroup"], "options": { "project": "src/buttongroup/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/buttongroup"], + "outputs": ["dist/libs/ng-buttongroup"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/buttongroup && npm pack" + "command": "cd dist/libs/ng-buttongroup && npm pack" } ] } diff --git a/src/buttonselect/lib/ng-package.json b/src/buttonselect/lib/ng-package.json index 51b93ccde59706b2ef3f6e92034e6962c034e004..9deff391619492743a707a73493a489c4f6586c8 100644 --- a/src/buttonselect/lib/ng-package.json +++ b/src/buttonselect/lib/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/buttonselect", + "dest": "../../../dist/libs/ng-buttonselect", "lib": { "entryFile": "./index.ts" } diff --git a/src/buttonselect/lib/package.json b/src/buttonselect/lib/package.json index df713933f345f9824a7b4dc807622d318fc81aab..b59b2bbd2a34cf4cb233d7d07da77c3cae3be12d 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.0", + "version": "1.0.0-beta.2", "peerDependencies": { - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-droplist": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-outline": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/buttonselect/lib/project.json b/src/buttonselect/lib/project.json index 3e6aba8b7cbe695c881f1d930c0a75ed3f2f78bd..097a48be993ad1cae2f43fc0eddfc70ad8488d62 100644 --- a/src/buttonselect/lib/project.json +++ b/src/buttonselect/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/buttonselect"], + "outputs": ["dist/libs/ng-buttonselect"], "options": { "project": "src/buttonselect/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/buttonselect"], + "outputs": ["dist/libs/ng-buttonselect"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/buttonselect && npm pack" + "command": "cd dist/libs/ng-buttonselect && npm pack" } ] } diff --git a/src/card/lib/ng-package.json b/src/card/lib/ng-package.json index 166205fd5bb4917eb6573eeb6bb01b533392fe3d..03ccce4ce79b9af07a2f8af0ad6e4c36f782eb82 100644 --- a/src/card/lib/ng-package.json +++ b/src/card/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/card", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-card", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/card/lib/package.json b/src/card/lib/package.json index 49b15c32c9b945f21a9448ba794c3417fc85eaea..6d97f7ec5be6652b8e7d0e444acfb011ea126455 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.0" + "@opentiny/ng-icon": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/card/lib/project.json b/src/card/lib/project.json index c3583c623c18e641ac1a63b9212a9b0ac92881cc..899c4ff98048ba94f57a14c1df16c8a5280789eb 100644 --- a/src/card/lib/project.json +++ b/src/card/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/card"], + "outputs": ["dist/libs/ng-card"], "options": { "project": "src/card/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/card"], + "outputs": ["dist/libs/ng-card"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/card && npm pack" + "command": "cd dist/libs/ng-card && npm pack" } ] } diff --git a/src/cascader/lib/ng-package.json b/src/cascader/lib/ng-package.json index a09450703e5b34f9692d6c62a16ff7ff913ea3d9..ebeba8dbed63aeb580173288be0708b5edc725f7 100644 --- a/src/cascader/lib/ng-package.json +++ b/src/cascader/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/cascader", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-cascader", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/cascader/lib/package.json b/src/cascader/lib/package.json index 15c5a6081ddb69f146162fbc92da71dff97ae751..284e8deee5fd8bfe7d5977e1edf46c5d7dc33aeb 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-dominator": "~1.0.0-beta.0", - "@opentiny/ng-drop": "~1.0.0-beta.0", - "@opentiny/ng-droplist": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-list": "~1.0.0-beta.0", + "@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", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-tip": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0" + "@opentiny/ng-tip": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/cascader/lib/project.json b/src/cascader/lib/project.json index 4d416579ed0d2e36743c4ded0eda66d037adc784..3dcf8f44446d42ed7accce0dbe913dd466e96a51 100644 --- a/src/cascader/lib/project.json +++ b/src/cascader/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/cascader"], + "outputs": ["dist/libs/ng-cascader"], "options": { "project": "src/cascader/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/cascader"], + "outputs": ["dist/libs/ng-cascader"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/cascader && npm pack" + "command": "cd dist/libs/ng-cascader && npm pack" } ] } diff --git a/src/checkbox/lib/ng-package.json b/src/checkbox/lib/ng-package.json index 898723324f994be360a0d5aee1595c78451d6d0a..5754115d0755ebf3389baf0bd428b7ea7974a52e 100644 --- a/src/checkbox/lib/ng-package.json +++ b/src/checkbox/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/checkbox", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-checkbox", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/checkbox/lib/package.json b/src/checkbox/lib/package.json index 2868d81f2587f1cccffa0ae9cb6fb30b8b534de2..710620d2786083c8ed0f111e82e4d380f4f9b19c 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-outline": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/checkbox/lib/project.json b/src/checkbox/lib/project.json index 48ecd3c57d0bdaf31f2721732b45da8e19eee0f7..f13ff6ecc22c53a9d0f97c86b51dec649795bfac 100644 --- a/src/checkbox/lib/project.json +++ b/src/checkbox/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/checkbox"], + "outputs": ["dist/libs/ng-checkbox"], "options": { "project": "src/checkbox/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/checkbox"], + "outputs": ["dist/libs/ng-checkbox"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/checkbox && npm pack" + "command": "cd dist/libs/ng-checkbox && npm pack" } ] } diff --git a/src/collapse/lib/ng-package.json b/src/collapse/lib/ng-package.json index 2b899ffb4bc275b2ac1771ab46d5ee9c6f869be5..ef7b23a9fc096cae2fc2945443855ad40466dcda 100644 --- a/src/collapse/lib/ng-package.json +++ b/src/collapse/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/collapse", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-collapse", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/collapse/lib/package.json b/src/collapse/lib/package.json index 6487d0006c8f380ca497320549b581e97194c3f6..24e914f989137fbe641080a1cd2431ad020a573c 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.0", + "version": "1.0.0-beta.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.0" + "@opentiny/ng-utils": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/collapse/lib/project.json b/src/collapse/lib/project.json index 21a76519fb18e39e46b354d0122f99099a6a4181..d3bff1ed89d9705074eb513a3492cd2e4d57a0bb 100644 --- a/src/collapse/lib/project.json +++ b/src/collapse/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/collapse"], + "outputs": ["dist/libs/ng-collapse"], "options": { "project": "src/collapse/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/collapse"], + "outputs": ["dist/libs/ng-collapse"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/collapse && npm pack" + "command": "cd dist/libs/ng-collapse && npm pack" } ] } diff --git a/src/collapsebox/lib/ng-package.json b/src/collapsebox/lib/ng-package.json index dc857d0527f9959c1e940d40607ff12239ee9cbb..6f41915044c6559c4467cd7694b60b77656a897e 100644 --- a/src/collapsebox/lib/ng-package.json +++ b/src/collapsebox/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/collapsebox", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-collapsebox", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/collapsebox/lib/package.json b/src/collapsebox/lib/package.json index acee3d4a57f687ec2033a261f12a0f21d2b09268..23c37216e291165147c4e0f0124f7ea8b7f68fc8 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-collapse": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-outline": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/collapsebox/lib/project.json b/src/collapsebox/lib/project.json index 18426dd125c88a3050fb94cf6cacfa990e4c4acc..fd4493fa7984f11f4ad53afa65a93fae414acc37 100644 --- a/src/collapsebox/lib/project.json +++ b/src/collapsebox/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/collapsebox"], + "outputs": ["dist/libs/ng-collapsebox"], "options": { "project": "src/collapsebox/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/collapsebox"], + "outputs": ["dist/libs/ng-collapsebox"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/collapsebox && npm pack" + "command": "cd dist/libs/ng-collapsebox && npm pack" } ] } diff --git a/src/collapsebutton/lib/ng-package.json b/src/collapsebutton/lib/ng-package.json index 39ff5111084c6455fb801f9934f66b6a8c7008d9..0827233a52ce59ceb1df90c044c47d76ffc8edb8 100644 --- a/src/collapsebutton/lib/ng-package.json +++ b/src/collapsebutton/lib/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/collapsebutton", + "dest": "../../../dist/libs/ng-collapsebutton", "lib": { "entryFile": "index.ts" } diff --git a/src/collapsebutton/lib/package.json b/src/collapsebutton/lib/package.json index 3473f5d37e6cfe3e39d60054a7d85f8df4c187f2..1f17b3d3ee84017856bcd51b0bf5e5999ad6d20d 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-button": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/collapsebutton/lib/project.json b/src/collapsebutton/lib/project.json index 3ae1ee5a94fd1078c60be558393ceb6e4542ea0f..2decef8ae78dc845118fff883756c51e316f55d4 100644 --- a/src/collapsebutton/lib/project.json +++ b/src/collapsebutton/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/collapsebutton"], + "outputs": ["dist/libs/ng-collapsebutton"], "options": { "project": "src/collapsebutton/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/collapsebutton"], + "outputs": ["dist/libs/ng-collapsebutton"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/collapsebutton && npm pack" + "command": "cd dist/libs/ng-collapsebutton && npm pack" } ] } diff --git a/src/collapsetext/lib/ng-package.json b/src/collapsetext/lib/ng-package.json index 04317276d380b52882a7631b7ebe21fb2caaef04..9296ed860b057cb3d921f8493c14b5452ada8ad6 100644 --- a/src/collapsetext/lib/ng-package.json +++ b/src/collapsetext/lib/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/collapsetext", + "dest": "../../../dist/libs/ng-collapsetext", "lib": { "entryFile": "./index.ts" } diff --git a/src/collapsetext/lib/package.json b/src/collapsetext/lib/package.json index e7bce86016f9e6a3690e356394a37841ee9bc20b..7282dfe16d77c8ff86acf476fa14081f6b94ce22 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.0", + "version": "1.0.0-beta.2", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0" diff --git a/src/collapsetext/lib/project.json b/src/collapsetext/lib/project.json index 47d2cda2cde51a1ba0e9d2cd546b7f3b1dbfb932..08094a9dbd1be91be2da37602579ba70b1091282 100644 --- a/src/collapsetext/lib/project.json +++ b/src/collapsetext/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/collapsetext"], + "outputs": ["dist/libs/ng-collapsetext"], "options": { "project": "src/collapsetext/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/collapsetext"], + "outputs": ["dist/libs/ng-collapsetext"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/collapsetext && npm pack" + "command": "cd dist/libs/ng-collapsetext && npm pack" } ] } diff --git a/src/copy/lib/ng-package.json b/src/copy/lib/ng-package.json index 130c397d5135e8d70cbfa45946f485d708911430..1be7aedcd63cce0eb565f5a1586903b5a42a72e9 100644 --- a/src/copy/lib/ng-package.json +++ b/src/copy/lib/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/copy", + "dest": "../../../dist/libs/ng-copy", "lib": { "entryFile": "index.ts" } diff --git a/src/copy/lib/package.json b/src/copy/lib/package.json index 4a817130a4c392578dfd7693384553eccab59bbd..ed69f86b344c1373e843b406c0b5a82ab254b35c 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-popup": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.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", "@angular/common": ">=13.0.0", - "@opentiny/ng-outline": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0" + "@opentiny/ng-outline": "~1.0.0-beta.2", + "@opentiny/ng-icon": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/copy/lib/project.json b/src/copy/lib/project.json index 7b5f1ccb4258a4230df621a8591de27e063e4f0d..fb7e909e9d5935a4a6fad946178f5588f9e0aba4 100644 --- a/src/copy/lib/project.json +++ b/src/copy/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/copy"], + "outputs": ["dist/libs/ng-copy"], "options": { "project": "src/copy/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/copy"], + "outputs": ["dist/libs/ng-copy"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/copy && npm pack" + "command": "cd dist/libs/ng-copy && npm pack" } ] } diff --git a/src/crumb/lib/ng-package.json b/src/crumb/lib/ng-package.json index f63bb216035d11ec26fde83527053ed0e85dfa1c..d3d02188711ed2381278c021cbfca4988739304b 100644 --- a/src/crumb/lib/ng-package.json +++ b/src/crumb/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/crumb", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-crumb", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/crumb/lib/package.json b/src/crumb/lib/package.json index 26d8506fb8f6ed28eca177cceb252eefd91c3e2a..0a5d447ccc32d606a44fdcb44f960a13e4e583b1 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.0", + "version": "1.0.0-beta.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.0" + "@opentiny/ng-base": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/crumb/lib/project.json b/src/crumb/lib/project.json index dbdbbb601354dce48c60d533b7fd91c3a5390dd2..f27196bd301ec8307372a16340d3ca7ec9a0f1a4 100644 --- a/src/crumb/lib/project.json +++ b/src/crumb/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/crumb"], + "outputs": ["dist/libs/ng-crumb"], "options": { "project": "src/crumb/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/crumb"], + "outputs": ["dist/libs/ng-crumb"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/crumb && npm pack" + "command": "cd dist/libs/ng-crumb && npm pack" } ] } diff --git a/src/date/demo/src/app/date/DateCustomizeComponent.ts b/src/date/demo/src/app/date/DateCustomizeComponent.ts index 30f78a2cce1b1be23960aadab9abab81c0b55fef..675d84cf306891738f2c2521706c7c0e6e23bab5 100644 --- a/src/date/demo/src/app/date/DateCustomizeComponent.ts +++ b/src/date/demo/src/app/date/DateCustomizeComponent.ts @@ -14,7 +14,7 @@ export class DateCustomizeComponent { { label: '今天', value: { - begin: this.nowTime + begin: new Date(this.nowYear, this.nowMonth, this.nowDate) } }, { @@ -33,6 +33,6 @@ export class DateCustomizeComponent { myLogs: Array = []; onCustomizeOptionClick(model: Date): void { - this.myLogs = [...this.myLogs, `customizeOptionClick() model = ${JSON.stringify(model)}`]; + this.myLogs = [...this.myLogs, `customizeOptionClick() model = ${model}`]; } } diff --git a/src/date/lib/ng-package.json b/src/date/lib/ng-package.json index 5ec3516693cf26b7e1e7c2a48b62eee214e8999f..d892462f69973951b89680a2e22034a31b6bf480 100644 --- a/src/date/lib/ng-package.json +++ b/src/date/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/date", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-date", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/date/lib/package.json b/src/date/lib/package.json index ceac4f5bfc401ab7f48a3d35481c6b50094eb85c..5cd569c7b94e0bcbf641139fb016adee03323150 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.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", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-drop": "~1.0.0-beta.0", - "@opentiny/ng-datepanel": "~1.0.0-beta.0", - "@opentiny/ng-button": "~1.0.0-beta.0", - "@opentiny/ng-datedominator": "~1.0.0-beta.0", - "@opentiny/ng-dateedit": "~1.0.0-beta.0", - "@opentiny/ng-datebase": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/date/lib/project.json b/src/date/lib/project.json index d576dc1fe0e1c7363ddf0ceaff22ab6a7bd3d86c..4e3e594c4350822fd2c996443fa7376c199d8231 100644 --- a/src/date/lib/project.json +++ b/src/date/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/date"], + "outputs": ["dist/libs/ng-date"], "options": { "project": "src/date/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/date"], + "outputs": ["dist/libs/ng-date"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/date && npm pack" + "command": "cd dist/libs/ng-date && npm pack" } ] } diff --git a/src/datebase/lib/ng-package.json b/src/datebase/lib/ng-package.json index 85eb656150df3254abf59c07b3d1e019e9214357..107bb892aaed083c906c070f5436412bbe1aa454 100644 --- a/src/datebase/lib/ng-package.json +++ b/src/datebase/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/datebase", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-datebase", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/datebase/lib/package.json b/src/datebase/lib/package.json index 3386ee2a7654ac0bc5106f0eb6e0f8bedfa33fd3..a6fbbeede26f31008619e099a2d4befa32f036e2 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/common": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-datedominator": "~1.0.0-beta.0", - "@opentiny/ng-drop": "~1.0.0-beta.0", - "@opentiny/ng-dateedit": "~1.0.0-beta.0", - "@opentiny/ng-button": "~1.0.0-beta.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", "@angular/core": ">=13.0.0", - "@opentiny/ng-text": "~1.0.0-beta.0" + "@opentiny/ng-text": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/datebase/lib/project.json b/src/datebase/lib/project.json index a1f0c97d4204fe2e5628670ea0273e35ba5b5e18..1e16bb24616b4821cf3243bab2c6c28ae947a107 100644 --- a/src/datebase/lib/project.json +++ b/src/datebase/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/datebase"], + "outputs": ["dist/libs/ng-datebase"], "options": { "project": "src/datebase/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/datebase"], + "outputs": ["dist/libs/ng-datebase"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/datebase && npm pack" + "command": "cd dist/libs/ng-datebase && npm pack" } ] } diff --git a/src/datedominator/lib/ng-package.json b/src/datedominator/lib/ng-package.json index 8a84427c0f591d207188a2d96cb862837b3279e3..2290fa900feb0a9d9d1d060e17c306789d19432d 100644 --- a/src/datedominator/lib/ng-package.json +++ b/src/datedominator/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/datedominator", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-datedominator", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/datedominator/lib/package.json b/src/datedominator/lib/package.json index 08f1afe7a4ef70565d388300030253055cd47b1b..4fa4ba21b5a0ec6d9ee4c50c2e462521e2f9e175 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-overflow": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/datedominator/lib/project.json b/src/datedominator/lib/project.json index 821799f64d05d72e8a740665b4717757b1747fc4..d45dddb1a65d2feb61efa72e612ceee68d13b783 100644 --- a/src/datedominator/lib/project.json +++ b/src/datedominator/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/datedominator"], + "outputs": ["dist/libs/ng-datedominator"], "options": { "project": "src/datedominator/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/datedominator"], + "outputs": ["dist/libs/ng-datedominator"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/datedominator && npm pack" + "command": "cd dist/libs/ng-datedominator && npm pack" } ] } diff --git a/src/dateedit/lib/ng-package.json b/src/dateedit/lib/ng-package.json index 2fad220811848ff7ea8ed92e87196e825a69a1fc..572a50b89d57e1eb9baa8beee34bbc1bbd9ff951 100644 --- a/src/dateedit/lib/ng-package.json +++ b/src/dateedit/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/dateedit", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-dateedit", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/dateedit/lib/package.json b/src/dateedit/lib/package.json index a0b7d5c6b7e44507e552fb7853855c1594f88b71..3adb44f3c744d03296d989562fc638f6c6834026 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", + "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-locale": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-text": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0" + "@opentiny/ng-text": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/dateedit/lib/project.json b/src/dateedit/lib/project.json index 76ec3f60d6301ab03093c14576dc676ce2305223..f70bb54105e3483572a3852bbee971a3959d3080 100644 --- a/src/dateedit/lib/project.json +++ b/src/dateedit/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/dateedit"], + "outputs": ["dist/libs/ng-dateedit"], "options": { "project": "src/dateedit/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/dateedit"], + "outputs": ["dist/libs/ng-dateedit"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/dateedit && npm pack" + "command": "cd dist/libs/ng-dateedit && npm pack" } ] } diff --git a/src/datepanel/lib/ng-package.json b/src/datepanel/lib/ng-package.json index d1dfec27eaa02b7d84802204ab9003088400ebfd..b922d29d321a9d57cf6dfceb70f1f82dc4e9aebb 100644 --- a/src/datepanel/lib/ng-package.json +++ b/src/datepanel/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/datepanel", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-datepanel", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/datepanel/lib/package.json b/src/datepanel/lib/package.json index 32fac87ad6c2d9d5953022dd5fc9a61ba2f62cef..5f72638cee4c065374ced25dbc498d8c62fce1fb 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-datebase": "~1.0.0-beta.0", - "@opentiny/ng-drop": "~1.0.0-beta.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-drop": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", "@angular/forms": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-list": "~1.0.0-beta.0" + "@opentiny/ng-icon": "~1.0.0-beta.2", + "@opentiny/ng-list": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/datepanel/lib/project.json b/src/datepanel/lib/project.json index b6e6e65fc63705f91505f91d3c8561f45157db17..0673633adb5c021da52db6e057ccb234cd56febb 100644 --- a/src/datepanel/lib/project.json +++ b/src/datepanel/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/datepanel"], + "outputs": ["dist/libs/ng-datepanel"], "options": { "project": "src/datepanel/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/datepanel"], + "outputs": ["dist/libs/ng-datepanel"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/datepanel && npm pack" + "command": "cd dist/libs/ng-datepanel && npm pack" } ] } diff --git a/src/daterange/demo/src/app/daterange/DaterangeCustomizeComponent.ts b/src/daterange/demo/src/app/daterange/DaterangeCustomizeComponent.ts index bc2e0144f1fe799af1653970e617d64052fb3405..7f69a6184c14c1abea24764963c8d8ed03b7c221 100644 --- a/src/daterange/demo/src/app/daterange/DaterangeCustomizeComponent.ts +++ b/src/daterange/demo/src/app/daterange/DaterangeCustomizeComponent.ts @@ -18,21 +18,21 @@ export class DaterangeCustomizeComponent { label: '最近一周', value: { begin: new Date(this.nowYear, this.nowMonth, this.nowDate - 6), - end: this.nowTime + end: new Date(this.nowYear, this.nowMonth, this.nowDate, 23, 59, 59, 999) } }, { label: '最近一个月', value: { begin: new Date(this.nowYear, this.nowMonth - 1, this.nowDate), - end: this.nowTime + end: new Date(this.nowYear, this.nowMonth, this.nowDate, 23, 59, 59, 999) } }, { label: '最近三个月', value: { begin: new Date(this.nowYear, this.nowMonth - 3, this.nowDate), - end: this.nowTime + end: new Date(this.nowYear, this.nowMonth, this.nowDate, 23, 59, 59, 999) } } ]; diff --git a/src/daterange/lib/ng-package.json b/src/daterange/lib/ng-package.json index 94683d7d7003796b35bf1c5fa49883b0b8603152..924f5acbae17dc8ec62337c37dda96fc75ac3c64 100644 --- a/src/daterange/lib/ng-package.json +++ b/src/daterange/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/daterange", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-daterange", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/daterange/lib/package.json b/src/daterange/lib/package.json index 27a9686a033a79c7e3bfd13d4341c2d11f91447d..5568c1627779ee312f65e49fc98d48a46ee1a60c 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-datebase": "~1.0.0-beta.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", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-drop": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-button": "~1.0.0-beta.0", - "@opentiny/ng-datepanel": "~1.0.0-beta.0", - "@opentiny/ng-dateedit": "~1.0.0-beta.0", - "@opentiny/ng-datedominator": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/daterange/lib/project.json b/src/daterange/lib/project.json index c1c6ea02f662ac7b80dd8b73af87eedd699b0f0f..89691cc0bd8b6ed1d2913802e9b784dd4752d6fa 100644 --- a/src/daterange/lib/project.json +++ b/src/daterange/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/daterange"], + "outputs": ["dist/libs/ng-daterange"], "options": { "project": "src/daterange/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/daterange"], + "outputs": ["dist/libs/ng-daterange"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/daterange && npm pack" + "command": "cd dist/libs/ng-daterange && npm pack" } ] } diff --git a/src/datetime/demo/src/app/datetime/DatetimeCustomizeComponent.ts b/src/datetime/demo/src/app/datetime/DatetimeCustomizeComponent.ts index 4fc2609fa58b38aefdd1de1aa164b515b333888f..7c374b1b4126c51b041fdae856400ad050a91734 100644 --- a/src/datetime/demo/src/app/datetime/DatetimeCustomizeComponent.ts +++ b/src/datetime/demo/src/app/datetime/DatetimeCustomizeComponent.ts @@ -35,6 +35,6 @@ export class DatetimeCustomizeComponent { myLogs: Array = []; onCustomizeOptionClick(model: Date): void { - this.myLogs = [...this.myLogs, `customizeOptionClick() model = ${JSON.stringify(model)}`]; + this.myLogs = [...this.myLogs, `customizeOptionClick() model = ${model}`]; } } diff --git a/src/datetime/lib/ng-package.json b/src/datetime/lib/ng-package.json index b6c465d988c54f606be4187123a0b1706b06f243..db0a56a5e11e6543445a18c127ecb1f7925dfe50 100644 --- a/src/datetime/lib/ng-package.json +++ b/src/datetime/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/datetime", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-datetime", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/datetime/lib/package.json b/src/datetime/lib/package.json index 11b8f9a4eee564584ef5010701261771285ea145..711d617c96b7d0b7ec678216c2a419ba19e507be 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-datebase": "~1.0.0-beta.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", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-drop": "~1.0.0-beta.0", - "@opentiny/ng-button": "~1.0.0-beta.0", - "@opentiny/ng-datepanel": "~1.0.0-beta.0", - "@opentiny/ng-dateedit": "~1.0.0-beta.0", - "@opentiny/ng-datedominator": "~1.0.0-beta.0", - "@opentiny/ng-text": "~1.0.0-beta.0", - "@opentiny/ng-time": "~1.0.0-beta.0", - "@opentiny/ng-select": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/datetime/lib/project.json b/src/datetime/lib/project.json index f0322965624c2aa2f735622cccd21b84eb8a4a2a..e37d763fe512facdce7ebd3e45e0cd38e49714ca 100644 --- a/src/datetime/lib/project.json +++ b/src/datetime/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/datetime"], + "outputs": ["dist/libs/ng-datetime"], "options": { "project": "src/datetime/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/datetime"], + "outputs": ["dist/libs/ng-datetime"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/datetime && npm pack" + "command": "cd dist/libs/ng-datetime && npm pack" } ] } diff --git a/src/datetimerange/lib/ng-package.json b/src/datetimerange/lib/ng-package.json index 48e3c1da4f31c86d5578ac912713ea10e892bdc1..1bce08da0618ef39604bbd275c9e7842af65f347 100644 --- a/src/datetimerange/lib/ng-package.json +++ b/src/datetimerange/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/datetimerange", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-datetimerange", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/datetimerange/lib/package.json b/src/datetimerange/lib/package.json index a5c6edafcf14faea04c69db7f54cc48d3736794b..d1f95306ae66bc438459cf6b45e294234c83c052 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-datebase": "~1.0.0-beta.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", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-drop": "~1.0.0-beta.0", - "@opentiny/ng-button": "~1.0.0-beta.0", - "@opentiny/ng-datepanel": "~1.0.0-beta.0", - "@opentiny/ng-dateedit": "~1.0.0-beta.0", - "@opentiny/ng-time": "~1.0.0-beta.0", - "@opentiny/ng-text": "~1.0.0-beta.0", - "@opentiny/ng-datedominator": "~1.0.0-beta.0", - "@opentiny/ng-select": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/datetimerange/lib/project.json b/src/datetimerange/lib/project.json index 8c8f6a53af4e27a193a066c46fa282b3b132548d..1fc8620379a63c34529081ee8b620d7279b278e1 100644 --- a/src/datetimerange/lib/project.json +++ b/src/datetimerange/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/datetimerange"], + "outputs": ["dist/libs/ng-datetimerange"], "options": { "project": "src/datetimerange/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/datetimerange"], + "outputs": ["dist/libs/ng-datetimerange"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/datetimerange && npm pack" + "command": "cd dist/libs/ng-datetimerange && npm pack" } ] } diff --git a/src/dominator/lib/ng-package.json b/src/dominator/lib/ng-package.json index 7d994560af7ace48efde3f6958c2cff1073b15ba..13e647a171da7a28d02ece434ad74bc80c4a9807 100644 --- a/src/dominator/lib/ng-package.json +++ b/src/dominator/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/dominator", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-dominator", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/dominator/lib/package.json b/src/dominator/lib/package.json index b1c682d238152f5d7344d233c7614551b33533a0..c08b429f66bd9a7ec1ce6b7e0ca211df0d103121 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-tip": "~1.0.0-beta.0", - "@opentiny/ng-tag": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/dominator/lib/project.json b/src/dominator/lib/project.json index 869d3db919445f2c32a43da350b169991a248a9f..6af368135633df097e484cf7ac97a12eacf9f2b5 100644 --- a/src/dominator/lib/project.json +++ b/src/dominator/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/dominator"], + "outputs": ["dist/libs/ng-dominator"], "options": { "project": "src/dominator/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/dominator"], + "outputs": ["dist/libs/ng-dominator"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/dominator && npm pack" + "command": "cd dist/libs/ng-dominator && npm pack" } ] } diff --git a/src/drag/lib/ng-package.json b/src/drag/lib/ng-package.json index 1f901909d33f3393d809b344bce31889633cbf7c..4164db373148018694a1b4078d50f9e2d986fb36 100644 --- a/src/drag/lib/ng-package.json +++ b/src/drag/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/drag", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-drag", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/drag/lib/package.json b/src/drag/lib/package.json index d1e76a89941b078cedc24d4aaac22cb81645aa66..7e6d4c860762463e3176227851952421d8ae9112 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-renderer": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0" + "@opentiny/ng-renderer": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/drag/lib/project.json b/src/drag/lib/project.json index 5f0f9f4e48271242404631f8c59ceb9932d5902e..5a8f6334a8e1d499e28d06e8cc7029242b7a6716 100644 --- a/src/drag/lib/project.json +++ b/src/drag/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/drag"], + "outputs": ["dist/libs/ng-drag"], "options": { "project": "src/drag/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/drag"], + "outputs": ["dist/libs/ng-drag"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/drag && npm pack" + "command": "cd dist/libs/ng-drag && npm pack" } ] } diff --git a/src/drop/lib/ng-package.json b/src/drop/lib/ng-package.json index cf4312f10b5225b7c4a74f74de00275f404f63fa..217063d76acb86affd158b907914d0590a41ebf1 100644 --- a/src/drop/lib/ng-package.json +++ b/src/drop/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/drop", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-drop", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/drop/lib/package.json b/src/drop/lib/package.json index 76aa470b9fd5caacdbdaccd2599e0645c1433c3f..be1a1564a7b35c0db64ca62d7cdc9939cd4691a4 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0" } diff --git a/src/drop/lib/project.json b/src/drop/lib/project.json index 46d3e8b0b54f04ad8ff5b0d725889d137907c495..cf8b7640a4c5dbcfb12af6b0ae1b889f0cfe22fb 100644 --- a/src/drop/lib/project.json +++ b/src/drop/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/drop"], + "outputs": ["dist/libs/ng-drop"], "options": { "project": "src/drop/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/drop"], + "outputs": ["dist/libs/ng-drop"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/drop && npm pack" + "command": "cd dist/libs/ng-drop && npm pack" } ] } diff --git a/src/drop/lib/src/TiDropComponent.ts b/src/drop/lib/src/TiDropComponent.ts index 59723e1a629c541d3b16ffe41a9b17a1944e8ed5..69d1160d8210602210df32b125bac00bd4ebf293 100644 --- a/src/drop/lib/src/TiDropComponent.ts +++ b/src/drop/lib/src/TiDropComponent.ts @@ -172,7 +172,11 @@ export class TiDropComponent extends TiBaseComponent { * 切换面板状态：打开/关闭 */ public toggle(): void { - this.isShow ? this.hide() : this.show(); + if (this.isShow) { + this.hide(); + } else { + this.show(); + } } /** * 打开面板 @@ -279,6 +283,7 @@ export class TiDropComponent extends TiBaseComponent { consoleHeaderHeight: this.consoleHeaderHeight, fixMaxHeight: this.fixMaxHeight, hOffset: this.hOffset, + bottomPostion: true, determinPositionFn }); this.position = result.position; diff --git a/src/droplist/lib/ng-package.json b/src/droplist/lib/ng-package.json index 645a9fa5be15f0a9b92c83d4acda185f7add4873..eba9791fe6340a72eb4ff9300359dc975a7a5c18 100644 --- a/src/droplist/lib/ng-package.json +++ b/src/droplist/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/droplist", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-droplist", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/droplist/lib/package.json b/src/droplist/lib/package.json index 983c21f6ebea030fde6c6f6c31c36c88f38f4845..45fbd62db1a17f7a0fef9852561a1abf069ef5c3 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-drop": "~1.0.0-beta.0", - "@opentiny/ng-list": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", + "@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", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-locale": "~1.0.0-beta.0" + "@opentiny/ng-locale": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/droplist/lib/project.json b/src/droplist/lib/project.json index fb27df4e583baa8799024f943ff8d2526380a7c8..001bfa277e78a888a5bc21084caf17c3aea8ee06 100644 --- a/src/droplist/lib/project.json +++ b/src/droplist/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/droplist"], + "outputs": ["dist/libs/ng-droplist"], "options": { "project": "src/droplist/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/droplist"], + "outputs": ["dist/libs/ng-droplist"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/droplist && npm pack" + "command": "cd dist/libs/ng-droplist && npm pack" } ] } diff --git a/src/droplist/lib/src/TiDroplistComponent.ts b/src/droplist/lib/src/TiDroplistComponent.ts index 789aa412c8227d87a556702744d20c980e4d553f..d83ae92820f27a282adc8721f17300257289b1de 100644 --- a/src/droplist/lib/src/TiDroplistComponent.ts +++ b/src/droplist/lib/src/TiDroplistComponent.ts @@ -16,7 +16,6 @@ import { ContentChild, ElementRef, EventEmitter, - HostListener, Input, NgZone, Output, @@ -28,8 +27,7 @@ import { import { TiFormComponent } from '@opentiny/ng-base'; import { TiDropComponent } from '@opentiny/ng-drop'; import { TiListComponent, TiListScrollLoad } from '@opentiny/ng-list'; -import { TiKeymap } from '@opentiny/ng-utils'; -import { TiPositionType } from '@opentiny/ng-utils'; +import { TiKeymap, TiPositionType } from '@opentiny/ng-utils'; import { TiLocale } from '@opentiny/ng-locale'; import packageInfo from '../package.json'; @@ -135,6 +133,11 @@ export class TiDroplistComponent extends TiFormComponent { * 用于定位的参照元素，如果该接口有值，表示drop不添加在body上，而是跟随宿主元素 */ @Input() referElem: Element; + /** + * @ignore + * 控制loading状态 + */ + @Input() loading: boolean = false; /** * 选中事件，向外通知option数据 diff --git a/src/droplist/lib/src/droplist.html b/src/droplist/lib/src/droplist.html index e5f66c78f3abb29051b886ceb6b5ef50db427899..50dd4e58a4a8f443cedceec1d2ff45c9e402b7ec 100644 --- a/src/droplist/lib/src/droplist.html +++ b/src/droplist/lib/src/droplist.html @@ -19,6 +19,7 @@ [tipMaxWidth]="tipMaxWidth" [noDataText]="noDataText" [virtual]="virtual" + [loading]="loading" [itemSize]="itemSize" [labelKey]="labelKey" [idKey]="idKey" diff --git a/src/dropsearch/lib/ng-package.json b/src/dropsearch/lib/ng-package.json index cee34e5d3a254d5ea43882bee99e2c7c1a814e0f..8a5fad1a90a03be2e56ab30568e0934f5367b2f7 100644 --- a/src/dropsearch/lib/ng-package.json +++ b/src/dropsearch/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/dropsearch", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-dropsearch", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/dropsearch/lib/package.json b/src/dropsearch/lib/package.json index f8c708513bf1118af53539562fd7f8f706fa094c..387135d2f93528c45133ecb16753cdfb869e1cc7 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-searchbox": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-drop": "~1.0.0-beta.0", - "@opentiny/ng-droplist": "~1.0.0-beta.0", + "@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", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-list": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0" + "@opentiny/ng-list": "~1.0.0-beta.2", + "@opentiny/ng-locale": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/dropsearch/lib/project.json b/src/dropsearch/lib/project.json index cdd0ec9b3ed427dd745348f5b4e38f0592acec68..ce854158c75756cf97e77f10a9275db19a6e2ed5 100644 --- a/src/dropsearch/lib/project.json +++ b/src/dropsearch/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/dropsearch"], + "outputs": ["dist/libs/ng-dropsearch"], "options": { "project": "src/dropsearch/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/dropsearch"], + "outputs": ["dist/libs/ng-dropsearch"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/dropsearch && npm pack" + "command": "cd dist/libs/ng-dropsearch && npm pack" } ] } diff --git a/src/foldtext/lib/ng-package.json b/src/foldtext/lib/ng-package.json index fe01211c3609a238ff7c315a702a96346e427748..bcbe4d41d1a77a2f3d2d63c3e5bebdad4c7141b8 100644 --- a/src/foldtext/lib/ng-package.json +++ b/src/foldtext/lib/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/foldtext", + "dest": "../../../dist/libs/ng-foldtext", "lib": { "entryFile": "./index.ts" } diff --git a/src/foldtext/lib/package.json b/src/foldtext/lib/package.json index 35eb03fdf49c5af37a9f5f04d09eb76928bd8800..56a5ac44d1732102ac16155b607d5fd7632f58ed 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.0", + "version": "1.0.0-beta.2", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-overflow": "~1.0.0-beta.0", - "@opentiny/ng-outline": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/foldtext/lib/project.json b/src/foldtext/lib/project.json index 59f7e553256da4294ef95d0cbb9ad0d0cadb3368..195972d3802ab1110cff546035f8ec737dedefb2 100644 --- a/src/foldtext/lib/project.json +++ b/src/foldtext/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/foldtext"], + "outputs": ["dist/libs/ng-foldtext"], "options": { "project": "src/foldtext/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/foldtext"], + "outputs": ["dist/libs/ng-foldtext"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/foldtext && npm pack" + "command": "cd dist/libs/ng-foldtext && npm pack" } ] } diff --git a/src/formfield/lib/ng-package.json b/src/formfield/lib/ng-package.json index f01efceaf19232e2f046fdb0a6576389ffcf99de..895f6204aa84acb01b3cb81fd3ed101e253e51c4 100644 --- a/src/formfield/lib/ng-package.json +++ b/src/formfield/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/formfield", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-formfield", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/formfield/lib/package.json b/src/formfield/lib/package.json index a33c374e577a88115a8d00196af476b5513939b0..a2ae05da6081098dfeff14dc0e333bb20ac93970 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-include": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0" + "@opentiny/ng-include": "~1.0.0-beta.2", + "@opentiny/ng-icon": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/formfield/lib/project.json b/src/formfield/lib/project.json index ac9428488eb93e66a4f530588c0ee6163d098b27..971d7bba6d3600e76528c327d5373b73761a0aa4 100644 --- a/src/formfield/lib/project.json +++ b/src/formfield/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/formfield"], + "outputs": ["dist/libs/ng-formfield"], "options": { "project": "src/formfield/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/formfield"], + "outputs": ["dist/libs/ng-formfield"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/formfield && npm pack" + "command": "cd dist/libs/ng-formfield && npm pack" } ] } diff --git a/src/grid/lib/ng-package.json b/src/grid/lib/ng-package.json index a7b0227ce794376d4ecad0019fc9a4ea462ca061..914e30110771f5504c05bb944a14d9ca7448dbf3 100644 --- a/src/grid/lib/ng-package.json +++ b/src/grid/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/grid", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-grid", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/grid/lib/package.json b/src/grid/lib/package.json index 98c345005c824ef85529d6e2b21e8ca9064e9ffa..c6328a3816f2622622bfbaa2784b1ac000ca077d 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0" diff --git a/src/grid/lib/project.json b/src/grid/lib/project.json index 27460e10c630b9093a720347763bb070dae68238..f1fbf707f2c7d7c60467d113b6136ad95732a8f8 100644 --- a/src/grid/lib/project.json +++ b/src/grid/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/grid"], + "outputs": ["dist/libs/ng-grid"], "options": { "project": "src/grid/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/grid"], + "outputs": ["dist/libs/ng-grid"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/grid && npm pack" + "command": "cd dist/libs/ng-grid && npm pack" } ] } diff --git a/src/guides/lib/ng-package.json b/src/guides/lib/ng-package.json index 52deb1e12d592f1465457790e6b0b860f81da02d..2891edd20a4eebd05c5db5eea83dc07623a13981 100644 --- a/src/guides/lib/ng-package.json +++ b/src/guides/lib/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/guides", + "dest": "../../../dist/libs/ng-guides", "lib": { "entryFile": "./index.ts" } diff --git a/src/guides/lib/package.json b/src/guides/lib/package.json index 98a2ced2e1feff9393d2a74fee13070234e1259a..c5e68eb7920f2ac8c027d6e8d661853b4ceb50ca 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.0", + "version": "1.0.0-beta.2", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-renderer": "~1.0.0-beta.0" + "@opentiny/ng-icon": "~1.0.0-beta.2", + "@opentiny/ng-renderer": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/guides/lib/project.json b/src/guides/lib/project.json index e980d2478dbc7684b19ae4095c741959580735ca..7e1039c5399aa591c0fdb110b9a25113ca29020e 100644 --- a/src/guides/lib/project.json +++ b/src/guides/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/guides"], + "outputs": ["dist/libs/ng-guides"], "options": { "project": "src/guides/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/guides"], + "outputs": ["dist/libs/ng-guides"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/guides && npm pack" + "command": "cd dist/libs/ng-guides && npm pack" } ] } diff --git a/src/guidesteps/lib/ng-package.json b/src/guidesteps/lib/ng-package.json index 4f228efcdd60d305146809f21f27876fc75711c5..5572700871695aee9f9bc5fe3b937bb208c2b565 100644 --- a/src/guidesteps/lib/ng-package.json +++ b/src/guidesteps/lib/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/guidesteps", + "dest": "../../../dist/libs/ng-guidesteps", "lib": { "entryFile": "./index.ts" } diff --git a/src/guidesteps/lib/package.json b/src/guidesteps/lib/package.json index 613df4a3376f7faa243e10de66ed6250f80c2d9c..8e9f9842e4ae92c8248125880558b8e8887fbccb 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.0", + "version": "1.0.0-beta.2", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/common": ">=13.0.0" } } \ No newline at end of file diff --git a/src/guidesteps/lib/project.json b/src/guidesteps/lib/project.json index dc5350110ea59f06ee300e48b338f1833db0077b..4accd3a34729f7241086b4457b211a63e86f0abc 100644 --- a/src/guidesteps/lib/project.json +++ b/src/guidesteps/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/guidesteps"], + "outputs": ["dist/libs/ng-guidesteps"], "options": { "project": "src/guidesteps/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/guidesteps"], + "outputs": ["dist/libs/ng-guidesteps"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/guidesteps && npm pack" + "command": "cd dist/libs/ng-guidesteps && npm pack" } ] } diff --git a/src/halfmodal/lib/ng-package.json b/src/halfmodal/lib/ng-package.json index 6e46960a17be14a9e95308dc1ca9c1636925eaba..dc0d958df6e4ed57e6f76f60216414a78b7522e1 100644 --- a/src/halfmodal/lib/ng-package.json +++ b/src/halfmodal/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/halfmodal", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-halfmodal", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/halfmodal/lib/package.json b/src/halfmodal/lib/package.json index b4ae9575e981b311949f6f6a3cb1d5bcf819ee32..869a9fc96fa61fe7401c0f04d08800fed114ebe8 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.0-beta.2", "@angular/animations": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-outline": "~1.0.0-beta.0", - "@opentiny/ng-popup": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/halfmodal/lib/project.json b/src/halfmodal/lib/project.json index 06be0f7279ee48f1374a0bb7d9cef494956eb5d7..6bff4397707a030d65f1331b64c2e3778baeb8d1 100644 --- a/src/halfmodal/lib/project.json +++ b/src/halfmodal/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/halfmodal"], + "outputs": ["dist/libs/ng-halfmodal"], "options": { "project": "src/halfmodal/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/halfmodal"], + "outputs": ["dist/libs/ng-halfmodal"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/halfmodal && npm pack" + "command": "cd dist/libs/ng-halfmodal && npm pack" } ] } diff --git a/src/icon/lib/ng-package.json b/src/icon/lib/ng-package.json index 7c72e63a3b3a39c5e067fc1f0c76dbfdb216d537..dc0b8f4d05fe93a23c4da416fed9aa6196e72e87 100644 --- a/src/icon/lib/ng-package.json +++ b/src/icon/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/icon", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-icon", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/icon/lib/package.json b/src/icon/lib/package.json index 433ce1f2e6e98603734a4630bf5236733bb5bc56..11499f142bd052c05790f00d79e7b05824b96c90 100644 --- a/src/icon/lib/package.json +++ b/src/icon/lib/package.json @@ -1,12 +1,11 @@ { "name": "@opentiny/ng-icon", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@angular/common/http": ">=13.0.0" + "@opentiny/ng-utils": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/icon/lib/project.json b/src/icon/lib/project.json index 2728696bda9d3493ce42a244a2459394c5d30905..643f8dd6e11a839d71275f735cdf76f91eebe886 100644 --- a/src/icon/lib/project.json +++ b/src/icon/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/icon"], + "outputs": ["dist/libs/ng-icon"], "options": { "project": "src/icon/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/icon"], + "outputs": ["dist/libs/ng-icon"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/icon && npm pack" + "command": "cd dist/libs/ng-icon && npm pack" } ] } diff --git a/src/iconaction/lib/ng-package.json b/src/iconaction/lib/ng-package.json index a0104668c28180b4945d060f047218691eb5e1dc..e598181ccee4bfe66b012c9890654859fc6fffb7 100644 --- a/src/iconaction/lib/ng-package.json +++ b/src/iconaction/lib/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/iconaction", + "dest": "../../../dist/libs/ng-iconaction", "lib": { "entryFile": "./index.ts" } diff --git a/src/iconaction/lib/package.json b/src/iconaction/lib/package.json index 7242a95fc37bc200fd81763a77f631f6b871bc47..f1d1302a777813c98f56ebc5fbc9d6c159d7b167 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.0", + "version": "1.0.0-beta.2", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0" + "@opentiny/ng-icon": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/iconaction/lib/project.json b/src/iconaction/lib/project.json index f8d98ba523bf39db990a4508368b7bb69b16d443..50b63d54dab175618e797a0d4d1645db4ccfa1f2 100644 --- a/src/iconaction/lib/project.json +++ b/src/iconaction/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/iconaction"], + "outputs": ["dist/libs/ng-iconaction"], "options": { "project": "src/iconaction/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/iconaction"], + "outputs": ["dist/libs/ng-iconaction"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/iconaction && npm pack" + "command": "cd dist/libs/ng-iconaction && npm pack" } ] } diff --git a/src/imagepreview/lib/ng-package.json b/src/imagepreview/lib/ng-package.json index 2ea71695317adcd6e9f22589259a2ff10e5664a2..c80b9b6b6e9cb0204bedd1df89a7d0148ed429af 100644 --- a/src/imagepreview/lib/ng-package.json +++ b/src/imagepreview/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/imagepreview", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-imagepreview", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/imagepreview/lib/package.json b/src/imagepreview/lib/package.json index 2467bff54c8b67bbd5e016dca7d98acf9b759ecf..071511e21639568b6cb92b7f0892ab69173fca6a 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.0", + "version": "1.0.0-beta.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.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-outline": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/imagepreview/lib/project.json b/src/imagepreview/lib/project.json index 2c98be61fbbf45244584be64573fadb78ddc35f4..8e173b115c5363cce73318f218e6f05217d33231 100644 --- a/src/imagepreview/lib/project.json +++ b/src/imagepreview/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/imagepreview"], + "outputs": ["dist/libs/ng-imagepreview"], "options": { "project": "src/imagepreview/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/imagepreview"], + "outputs": ["dist/libs/ng-imagepreview"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/imagepreview && npm pack" + "command": "cd dist/libs/ng-imagepreview && npm pack" } ] } diff --git a/src/include/lib/ng-package.json b/src/include/lib/ng-package.json index 8b7bb535734099a6ab73b058a83ada9653a935a7..9c9bd73196db64a61187b2257cca451c25298be3 100644 --- a/src/include/lib/ng-package.json +++ b/src/include/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/include", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-include", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/include/lib/package.json b/src/include/lib/package.json index 78e35944789e78cb445b8b9b7e97e45c0a0961c1..62811aa171e716636db2b8a49629dbdb35b6915f 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.0" + "@opentiny/ng-utils": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/include/lib/project.json b/src/include/lib/project.json index 7b0e2590549f02a912d10bb76496c702b981f822..8006a9bfc3c5d9ee83754aaf32804ceadf594f28 100644 --- a/src/include/lib/project.json +++ b/src/include/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/include"], + "outputs": ["dist/libs/ng-include"], "options": { "project": "src/include/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/include"], + "outputs": ["dist/libs/ng-include"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/include && npm pack" + "command": "cd dist/libs/ng-include && npm pack" } ] } diff --git a/src/inputnumber/lib/ng-package.json b/src/inputnumber/lib/ng-package.json index a6816ebb20e07b4956caddce0c76879e72916cee..f6cb6b03baee1b9ff8885db73da609384f4990c8 100644 --- a/src/inputnumber/lib/ng-package.json +++ b/src/inputnumber/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/inputnumber", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-inputnumber", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/inputnumber/lib/package.json b/src/inputnumber/lib/package.json index 3f0f99df20ff2d8dab137333b41708ae53f8eed8..63d8dcc0702c5107ce6c4c4a3462860ad1096c49 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.0", + "version": "1.0.0-beta.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.0", - "@opentiny/ng-utils": "~1.0.0-beta.0" + "@opentiny/ng-locale": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/inputnumber/lib/project.json b/src/inputnumber/lib/project.json index df423c9faf62ae6d5689c8fe1d52b81fb2e0dc22..5b26c4a8fdad639d2fa7b801fe88f4f826b5c418 100644 --- a/src/inputnumber/lib/project.json +++ b/src/inputnumber/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/inputnumber"], + "outputs": ["dist/libs/ng-inputnumber"], "options": { "project": "src/inputnumber/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/inputnumber"], + "outputs": ["dist/libs/ng-inputnumber"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/inputnumber && npm pack" + "command": "cd dist/libs/ng-inputnumber && npm pack" } ] } diff --git a/src/intro/lib/ng-package.json b/src/intro/lib/ng-package.json index ddd4a1f400a738fdc2c42609515aefdb8ea1de0b..f2eed919d0767493e522c368efbc132fc87be624 100644 --- a/src/intro/lib/ng-package.json +++ b/src/intro/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/intro", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-intro", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/intro/lib/package.json b/src/intro/lib/package.json index 54cd9c88b06b25531a852c9584a8d4442b8e7dd4..0ab330adb9fa375bb2752e42db57cf4cd3847bb3 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.0", + "@opentiny/ng-utils": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-button": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-modal": "~1.0.0-beta.0", - "@opentiny/ng-tip": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-outline": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/intro/lib/project.json b/src/intro/lib/project.json index 82a424b230663fcbb579971138653b2f4f8ece48..bb9ce907836d85045329391a4daa60a545f8654b 100644 --- a/src/intro/lib/project.json +++ b/src/intro/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/intro"], + "outputs": ["dist/libs/ng-intro"], "options": { "project": "src/intro/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/intro"], + "outputs": ["dist/libs/ng-intro"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/intro && npm pack" + "command": "cd dist/libs/ng-intro && npm pack" } ] } diff --git a/src/ip/lib/ng-package.json b/src/ip/lib/ng-package.json index 353978f990daf38b3ae11878433c6895163aea61..2a1edd5716e493b933dfffedb2aa19f2c39f5cb7 100644 --- a/src/ip/lib/ng-package.json +++ b/src/ip/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/ip", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-ip", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/ip/lib/package.json b/src/ip/lib/package.json index 2adba1decb6b467cb0df5e2c2c2d6360cffd3fee..0c9ab13a91c54f117919c760b0e23e912aea21db 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", + "@opentiny/ng-utils": "~1.0.0-beta.2", "@angular/forms": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-text": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0" + "@opentiny/ng-text": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/ip/lib/project.json b/src/ip/lib/project.json index 2f88f7ff8e5c3ce215c884e8b29654762a9b1953..25a1ebf47fced8177f8eed42b22570ccff462694 100644 --- a/src/ip/lib/project.json +++ b/src/ip/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/ip"], + "outputs": ["dist/libs/ng-ip"], "options": { "project": "src/ip/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/ip"], + "outputs": ["dist/libs/ng-ip"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/ip && npm pack" + "command": "cd dist/libs/ng-ip && npm pack" } ] } diff --git a/src/ipsection/lib/ng-package.json b/src/ipsection/lib/ng-package.json index bd5016c2d587ff54f692ad1c245bf03c4912d1cc..9a6956a7df362cb3bbfd4b5ae813f92225ea38a6 100644 --- a/src/ipsection/lib/ng-package.json +++ b/src/ipsection/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/ipsection", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-ipsection", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/ipsection/lib/package.json b/src/ipsection/lib/package.json index 98675426690be874ef0fc442d34338a0eb33ac68..22d0a56ddb787c203d9c7ab4ebba1ccd2a8906c4 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-validation": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-validation": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-select": "~1.0.0-beta.0", - "@opentiny/ng-text": "~1.0.0-beta.0" + "@opentiny/ng-select": "~1.0.0-beta.2", + "@opentiny/ng-text": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/ipsection/lib/project.json b/src/ipsection/lib/project.json index 884285db78c3614e254a5652c4bc7a65a60d1b3d..7d7b5d333c92579d51178da6a9085d26ee8428df 100644 --- a/src/ipsection/lib/project.json +++ b/src/ipsection/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/ipsection"], + "outputs": ["dist/libs/ng-ipsection"], "options": { "project": "src/ipsection/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/ipsection"], + "outputs": ["dist/libs/ng-ipsection"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/ipsection && npm pack" + "command": "cd dist/libs/ng-ipsection && npm pack" } ] } diff --git a/src/labeleditor/lib/ng-package.json b/src/labeleditor/lib/ng-package.json index 306040fea7d4793678b7d433dcc734e0227f9fc3..078fe2145565ee17053c43ffa356e42debd5145a 100644 --- a/src/labeleditor/lib/ng-package.json +++ b/src/labeleditor/lib/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/labeleditor", + "dest": "../../../dist/libs/ng-labeleditor", "lib": { "entryFile": "./index.ts" } diff --git a/src/labeleditor/lib/package.json b/src/labeleditor/lib/package.json index cd219b93c126c9590fb67eb3dc136b0d7ba79a42..9f1b374b5ef562972b59517d95e4687ae80b8724 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.0", + "version": "1.0.0-beta.2", "peerDependencies": { "@angular/forms": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-validation": "~1.0.0-beta.0", - "@opentiny/ng-text": "~1.0.0-beta.0", - "@opentiny/ng-textarea": "~1.0.0-beta.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", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-tip": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-outline": "~1.0.0-beta.0", - "@opentiny/ng-overflow": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/labeleditor/lib/project.json b/src/labeleditor/lib/project.json index 1e236a31612f6d09be9f131fd4aa8f4cc8bd59d9..c0aebdf77960036ca730c577facf8b7ba450056c 100644 --- a/src/labeleditor/lib/project.json +++ b/src/labeleditor/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/labeleditor"], + "outputs": ["dist/libs/ng-labeleditor"], "options": { "project": "src/labeleditor/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/labeleditor"], + "outputs": ["dist/libs/ng-labeleditor"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/labeleditor && npm pack" + "command": "cd dist/libs/ng-labeleditor && npm pack" } ] } diff --git a/src/layout/lib/ng-package.json b/src/layout/lib/ng-package.json index 7dde01e0b231ca04d644a5bdb8b1617885b78af9..d078ed1fee01b02ffd122ca431277991a0105144 100644 --- a/src/layout/lib/ng-package.json +++ b/src/layout/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/layout", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-layout", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/layout/lib/package.json b/src/layout/lib/package.json index b0fa160603aa3caa5a06362f5755bf86faf4bbe0..8db5dd0cc1852fac92ecb1781144ec0804b070f7 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", diff --git a/src/layout/lib/project.json b/src/layout/lib/project.json index d45109dc2a0b7512a0767f1dbf4cb94298385271..a13b3bf1909640088e8e85c753ae5c05b16f01da 100644 --- a/src/layout/lib/project.json +++ b/src/layout/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/layout"], + "outputs": ["dist/libs/ng-layout"], "options": { "project": "src/layout/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/layout"], + "outputs": ["dist/libs/ng-layout"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/layout && npm pack" + "command": "cd dist/libs/ng-layout && npm pack" } ] } diff --git a/src/leftmenu/lib/ng-package.json b/src/leftmenu/lib/ng-package.json index 64970cd9cff0725f63a5f6b44fc5d42562d97192..cd496d450f8cb38a404a3e118beb02d1fc5aaba9 100644 --- a/src/leftmenu/lib/ng-package.json +++ b/src/leftmenu/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/leftmenu", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-leftmenu", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/leftmenu/lib/package.json b/src/leftmenu/lib/package.json index 9efac3830b7c5b3e2b4bb5675865815e5c710dc5..c7b7e078854cc3ef265d5f75f2303188e2d360d1 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/router": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", "@angular/platform-browser": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-renderer": "~1.0.0-beta.0", - "@opentiny/ng-outline": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/leftmenu/lib/project.json b/src/leftmenu/lib/project.json index 8964023b746e7bdb486abd8072482fe14398abb9..f89f86cd4a5522e00c5748a893fe1fefe42bfd94 100644 --- a/src/leftmenu/lib/project.json +++ b/src/leftmenu/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/leftmenu"], + "outputs": ["dist/libs/ng-leftmenu"], "options": { "project": "src/leftmenu/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/leftmenu"], + "outputs": ["dist/libs/ng-leftmenu"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/leftmenu && npm pack" + "command": "cd dist/libs/ng-leftmenu && npm pack" } ] } diff --git a/src/leftmenuthin/demo/karma.conf.js b/src/leftmenuthin/demo/karma.conf.js new file mode 100644 index 0000000000000000000000000000000000000000..22d9d1a25144c64e0492677db9a198e1c522815a --- /dev/null +++ b/src/leftmenuthin/demo/karma.conf.js @@ -0,0 +1,41 @@ +// Karma configuration file, see link for more information +// https://karma-runner.github.io/1.0/config/configuration-file.html + +module.exports = function (config) { + config.set({ + basePath: '', + frameworks: ['jasmine', '@angular-devkit/build-angular'], + plugins: [ + require('karma-jasmine'), + require('karma-chrome-launcher'), + require('karma-jasmine-html-reporter'), + require('karma-coverage'), + require('@angular-devkit/build-angular/plugins/karma') + ], + client: { + jasmine: { + // you can add configuration options for Jasmine here + // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html + // for example, you can disable the random execution with `random: false` + // or set a specific seed with `seed: 4321` + }, + clearContext: false // leave Jasmine Spec Runner output visible in browser + }, + jasmineHtmlReporter: { + suppressAll: true // removes the duplicated traces + }, + coverageReporter: { + dir: require('path').join(__dirname, './coverage'), + subdir: '.', + reporters: [{ type: 'html' }, { type: 'text-summary' }] + }, + reporters: ['progress', 'kjhtml'], + port: 9876, + colors: true, + logLevel: config.LOG_INFO, + autoWatch: true, + browsers: ['Chrome'], + singleRun: false, + restartOnFileChange: true + }); +}; diff --git a/src/leftmenuthin/demo/project.json b/src/leftmenuthin/demo/project.json new file mode 100644 index 0000000000000000000000000000000000000000..6915474c90a35746183cd5efe973cdb3f0e91d61 --- /dev/null +++ b/src/leftmenuthin/demo/project.json @@ -0,0 +1,98 @@ +{ + "projectType": "application", + "root": "src/leftmenuthin/demo", + "sourceRoot": "src/leftmenuthin/demo/src", + "generators": { + "@schematics/angular:component": { + "style": "less" + } + }, + "targets": { + "build": { + "executor": "@angular-devkit/build-angular:browser", + "dependsOn": [], + "options": { + "outputPath": "dist/apps/leftmenuthin", + "index": "src/leftmenuthin/demo/src/index.html", + "main": "src/leftmenuthin/demo/src/main.ts", + "polyfills": "src/polyfills.ts", + "tsConfig": "src/leftmenuthin/demo/tsconfig.app.json", + "assets": [ + "src/leftmenuthin/demo/src/favicon.ico", + "src/leftmenuthin/demo/src/assets", + { + "glob": "**/*", + "input": "node_modules/ionicons/dist/ionicons/svg", + "output": "/assets/ionicons/" + } + ], + "styles": ["src/themes/basic/build.less", "src/themes/theme-default/build.less", "src/styles.less"], + "scripts": [] + }, + "configurations": { + "production": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + } + ], + "budgets": [ + { + "type": "initial", + "maximumWarning": "2mb", + "maximumError": "10mb" + }, + { + "type": "anyComponentStyle", + "maximumWarning": "6kb" + } + ] + }, + "development": { + "buildOptimizer": false, + "optimization": false, + "vendorChunk": true, + "extractLicenses": false, + "sourceMap": true, + "namedChunks": true + } + }, + "defaultConfiguration": "production" + }, + "serve": { + "executor": "@angular-devkit/build-angular:dev-server", + "configurations": { + "production": { + "browserTarget": "leftmenuthin-demo:build:production" + }, + "development": { + "browserTarget": "leftmenuthin-demo:build:development" + } + }, + "defaultConfiguration": "development" + }, + "preview": { + "executor": "@nrwl/workspace:run-commands", + "options": { + "commands": [ + { + "command": "node build/preview-demo.js leftmenuthin" + } + ] + } + }, + "test": { + "builder": "@angular-devkit/build-angular:karma", + "options": { + "main": "src/leftmenuthin/demo/test.ts", + "polyfills": "src/polyfills.ts", + "tsConfig": "src/leftmenuthin/demo/tsconfig.spec.json", + "karmaConfig": "src/leftmenuthin/demo/karma.conf.js", + "inlineStyleLanguage": "less", + "styles": ["src/styles.less"], + "scripts": [] + } + } + } +} diff --git a/src/leftmenuthin/demo/src/app/AppComponent.ts b/src/leftmenuthin/demo/src/app/AppComponent.ts new file mode 100644 index 0000000000000000000000000000000000000000..76c5465372c68284e51efbd99dd488d5481caf58 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/AppComponent.ts @@ -0,0 +1,7 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-root', + templateUrl: './app.html' +}) +export class AppComponent {} diff --git a/src/leftmenuthin/demo/src/app/AppModule.ts b/src/leftmenuthin/demo/src/app/AppModule.ts new file mode 100644 index 0000000000000000000000000000000000000000..d4233b3de6299f41c23cdd03ae05a69129cea4c1 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/AppModule.ts @@ -0,0 +1,26 @@ +import { BrowserModule } from '@angular/platform-browser'; +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { HttpClientModule } from '@angular/common/http'; + +import { AppComponent } from './AppComponent'; +import { IndexComponent } from './IndexComponent'; +import { LeftmenuthinTestModule } from './leftmenuthin/LeftmenuthinTestModule'; + +@NgModule({ + imports: [ + LeftmenuthinTestModule, + HttpClientModule, + BrowserModule.withServerTransition({ appId: 'serverApp' }), + RouterModule.forRoot( + [ + { path: '', component: IndexComponent }, // 路由地址为空 + { path: '**', component: IndexComponent } // 路由地址找不到。注意：放在数组最后 + ], + { useHash: true } // 使用#路由 + ) + ], + declarations: [AppComponent, IndexComponent], + bootstrap: [AppComponent] +}) +export class AppModule {} diff --git a/src/leftmenuthin/demo/src/app/IndexComponent.ts b/src/leftmenuthin/demo/src/app/IndexComponent.ts new file mode 100644 index 0000000000000000000000000000000000000000..9f593ef275ec2665a1bf6867c845a7462f17bf24 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/IndexComponent.ts @@ -0,0 +1,49 @@ +import { Component } from '@angular/core'; +import { LeftmenuthinTestModule } from './leftmenuthin/LeftmenuthinTestModule'; + +@Component({ + template: ` + + + + + + + +
{{ routes[0]?.path.split('/')[0] }} demo
+ + {{ path2name(route.path) }} + +
` +}) +export class IndexComponent { + routes: any = LeftmenuthinTestModule.ROUTES; + + path2name(path: string): string | undefined { + return path.split('/').pop(); + } +} diff --git a/src/leftmenuthin/demo/src/app/app.html b/src/leftmenuthin/demo/src/app/app.html new file mode 100644 index 0000000000000000000000000000000000000000..fb12cdbef582c362bdf7f0aaa446e59f7afb2fc4 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/app.html @@ -0,0 +1,3 @@ +
+ +
diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/LeftmenuthinBasicComponent.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/LeftmenuthinBasicComponent.ts new file mode 100644 index 0000000000000000000000000000000000000000..ad012cee300c2c211a36e88127f745395951a3bc --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/LeftmenuthinBasicComponent.ts @@ -0,0 +1,42 @@ +import { Component } from '@angular/core'; +import { TiLeftmenuthinItem } from '@opentiny/ng'; + +@Component({ + templateUrl: './leftmenuthin-basic.html' +}) +export class LeftmenuthinBasicComponent { + myLogs: Array = []; + items: Array = [ + { + router: ['./home'], + label: '主页', + iconName: 'home' + }, + { + router: ['./cart'], + label: '购物车', + iconName: 'cart' + }, + { + router: ['./favorite'], + label: '收藏', + iconName: 'star' + }, + { + router: ['./setting'], + label: '设置', + iconName: 'settings' + } + ]; + reloadState: boolean = true; + active: TiLeftmenuthinItem = this.items[2]; + onSelect(event: any): void { + this.myLogs = [...this.myLogs, `select => ${JSON.stringify(event)}`]; + } + onActiveChange(event: any): void { + this.myLogs = [...this.myLogs, `activeChange => ${JSON.stringify(event)}`]; + } + onReloadStateChange(event: any) { + this.myLogs = [...this.myLogs, `reloadStateChange => ${JSON.stringify(event)}`]; + } +} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/LeftmenuthinParamsComponent.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/LeftmenuthinParamsComponent.ts new file mode 100644 index 0000000000000000000000000000000000000000..23c0d3b719b43c3738c61ebb1125879638623a80 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/LeftmenuthinParamsComponent.ts @@ -0,0 +1,62 @@ +import { Component } from '@angular/core'; +import { TiLeftmenuthinItem } from '@opentiny/ng'; + +@Component({ + templateUrl: './leftmenuthin-params.html' +}) +export class LeftmenuthinParamsComponent { + public items: Array = [ + { + router: ['./home'], + label: '主页', + iconName: 'home', + params: 'ddd', + routerExtras: { + queryParams: { + local: 'zh-cn' + } + } + }, + { + router: ['./cart'], + label: '购物车', + iconName: 'cart', + routerExtras: { + queryParams: { + local: 'zh-cn', + size: 'large' + } + } + }, + { + router: ['./favorite'], + label: '收藏', + iconName: 'star', + routerExtras: { + queryParams: { + size: 'middle', + color: 'red' + }, + fragment: 'top' + } + }, + { + router: ['./setting'], + label: '设置', + iconName: 'settings', + routerExtras: { + queryParams: { + local: 'en-us', + color: 'red' + }, + fragment: 'top' + } + } + ]; + reloadState: boolean = true; + active: TiLeftmenuthinItem = this.items[3]; + myLogs: Array = []; + onSelect(event: any): void { + this.myLogs = [...this.myLogs, JSON.stringify(event)]; + } +} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/LeftmenuthinRouterlistComponent.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/LeftmenuthinRouterlistComponent.ts new file mode 100644 index 0000000000000000000000000000000000000000..83ec3c4c5e9baf1aecc614f530a8a71bff367163 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/LeftmenuthinRouterlistComponent.ts @@ -0,0 +1,38 @@ +import { Component } from '@angular/core'; +import { TiLeftmenuthinItem } from '@opentiny/ng'; + +@Component({ + templateUrl: './leftmenuthin-routerlist.html' +}) +export class LeftmenuthinRouterlistComponent { + public items: Array = [ + { + router: ['./home'], + label: '主页', + iconName: 'home' + }, + { + router: ['./cart'], + label: '购物车', + iconName: 'cart', + routerList: [['routerE']] + }, + { + router: ['./favorite'], + label: '收藏', + iconName: 'star', + routerList: [['routerF']] + }, + { + router: ['./setting'], + label: '设置', + iconName: 'settings' + } + ]; + public reloadState: boolean = true; + public active: TiLeftmenuthinItem = this.items[3]; + public myLogs: Array = []; + onSelect(event: any): void { + this.myLogs = [...this.myLogs, JSON.stringify(event)]; + } +} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/LeftmenuthinTestModule.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/LeftmenuthinTestModule.ts new file mode 100644 index 0000000000000000000000000000000000000000..8c4975c462e4e7094e7ed84d8a9b992b5d395449 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/LeftmenuthinTestModule.ts @@ -0,0 +1,98 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { RouterModule, Routes } from '@angular/router'; + +import { TiLeftmenuthinModule, TiSvgComponent } from '@opentiny/ng'; +import { DemoLogModule } from '../../../../../ng/demolog/DemoLogModule'; +import { LeftmenuthinBasicWebsiteViewsComponent } from './website-views/LeftmenuthinBasicWebsiteViewsComponent'; +import { LeftmenuthinRouterlistComponent } from './LeftmenuthinRouterlistComponent'; +import { LeftmenuthinParamsComponent } from './LeftmenuthinParamsComponent'; + +import { Router1Component } from './Router1Component'; +import { Router2Component } from './Router2Component'; +import { Router3Component } from './Router3Component'; +import { Router4Component } from './Router4Component'; +import { LeftmenuthinBasicComponent } from './LeftmenuthinBasicComponent'; +import { LeftmenuthinWebsiteModule } from './website-lib/LeftmenuthinWebsiteModule'; +import { LeftmenuthinParamsWebsiteViewsComponent } from './website-views/LeftmenuthinParamsWebsiteViewsComponent'; +import { LeftmenuthinRouterlistWebsiteViewsComponent } from './website-views/LeftmenuthinRouterlistWebsiteViewsComponent'; +import { RouterEComponent } from './RouterEComponent'; +import { RouterFComponent } from './RouterFComponent'; +import { Router1WebsiteViewsComponent } from './website-views/Router1Component'; +import { Router2WebsiteViewsComponent } from './website-views/Router2Component'; +import { Router3WebsiteViewsComponent } from './website-views/Router3Component'; +import { Router4WebsiteViewsComponent } from './website-views/Router4Component'; +import { RouterEWebsiteViewsComponent } from './website-views/RouterEComponent'; +import { RouterFWebsiteViewsComponent } from './website-views/RouterFComponent'; + +@NgModule({ + imports: [ + CommonModule, + LeftmenuthinWebsiteModule, + DemoLogModule, + TiLeftmenuthinModule, + RouterModule.forChild(LeftmenuthinTestModule.ROUTES) + ], + declarations: [ + LeftmenuthinBasicComponent, + LeftmenuthinParamsComponent, + LeftmenuthinRouterlistComponent, + LeftmenuthinBasicWebsiteViewsComponent, + LeftmenuthinParamsWebsiteViewsComponent, + LeftmenuthinRouterlistWebsiteViewsComponent, + Router1Component, + Router2Component, + Router3Component, + Router4Component, + RouterEComponent, + RouterFComponent, + Router1WebsiteViewsComponent, + Router2WebsiteViewsComponent, + Router3WebsiteViewsComponent, + Router4WebsiteViewsComponent, + RouterEWebsiteViewsComponent, + RouterFWebsiteViewsComponent + ] +}) +export class LeftmenuthinTestModule { + constructor() { + TiSvgComponent.setPath('/assets/ionicons/'); + } + static childrenRouter: Routes = [ + { path: 'home', component: Router1Component }, + { path: 'cart', component: Router2Component }, + { path: 'favorite', component: Router3Component }, + { path: 'setting', component: Router4Component }, + { path: 'routerE', component: RouterEComponent }, + { path: 'routerF', component: RouterFComponent } + ]; + static readonly ROUTES: Routes = [ + { + path: 'leftmenuthin/leftmenuthin-basic-test', + component: LeftmenuthinBasicComponent, + children: LeftmenuthinTestModule.childrenRouter + }, + { + path: 'leftmenuthin/leftmenuthin-params-test', + component: LeftmenuthinParamsComponent, + children: LeftmenuthinTestModule.childrenRouter + }, + { + path: 'leftmenuthin/leftmenuthin-routerlist-test', + component: LeftmenuthinRouterlistComponent, + children: LeftmenuthinTestModule.childrenRouter + }, + { + path: 'leftmenuthin/leftmenuthin-basic', + component: LeftmenuthinBasicWebsiteViewsComponent + }, + { + path: 'leftmenuthin/leftmenuthin-params', + component: LeftmenuthinParamsWebsiteViewsComponent + }, + { + path: 'leftmenuthin/leftmenuthin-routerlist', + component: LeftmenuthinRouterlistWebsiteViewsComponent + } + ]; +} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/Router1Component.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/Router1Component.ts new file mode 100644 index 0000000000000000000000000000000000000000..a2cf3b8b9bc3d3f65e044f1e6a9ab9a3cc22f3e7 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/Router1Component.ts @@ -0,0 +1,27 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; + +@Component({ + template: ` +
Welcome to {{ label }}页面!
+
参数token: {{ token }}
+
查询参数: {{ queryParams }}
+ ` +}) +export class Router1Component implements OnInit { + constructor(private activeRoute: ActivatedRoute) {} + label: string; + token: string; + queryParams: string; + ngOnInit(): void { + this.label = 'Home'; + this.activeRoute.paramMap.subscribe((paramMap: any) => { + this.token = JSON.stringify(paramMap.params); + }); + + // 直接获取queryParam + this.activeRoute.queryParamMap.subscribe((res: any) => { + this.queryParams = JSON.stringify(res.params); + }); + } +} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/Router2Component.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/Router2Component.ts new file mode 100644 index 0000000000000000000000000000000000000000..8a36841df87d2b80beb7346ad9d499cbf9bc4048 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/Router2Component.ts @@ -0,0 +1,27 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +@Component({ + template: ` +
Welcome to {{ label }} 页面!
+ 跳转至routerE(在当前路由的routerList中) +
参数token: {{ token }}
+
查询参数: {{ queryParams }}
+ ` +}) +export class Router2Component implements OnInit { + constructor(private activeRoute: ActivatedRoute) {} + label: string; + token: string; + queryParams: string; + ngOnInit(): void { + this.label = 'Cart'; + this.activeRoute.paramMap.subscribe((paramMap: any) => { + this.token = JSON.stringify(paramMap.params); + }); + + // 直接获取queryParam + this.activeRoute.queryParamMap.subscribe((res: any) => { + this.queryParams = JSON.stringify(res.params); + }); + } +} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/Router3Component.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/Router3Component.ts new file mode 100644 index 0000000000000000000000000000000000000000..4abc26880bcf1457b41d0f9d3e115c19e42e6501 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/Router3Component.ts @@ -0,0 +1,28 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; + +@Component({ + template: ` +
Welcome to {{ label }}页面!
+ 跳转至routerF(在当前路由的routerList中) +
参数token: {{ token }}
+
查询参数: {{ queryParams }}
+ ` +}) +export class Router3Component implements OnInit { + public label: string; + public token: string; + public queryParams: string; + constructor(private activeRoute: ActivatedRoute) {} + ngOnInit(): void { + this.label = 'Star'; + this.activeRoute.paramMap.subscribe((paramMap: any) => { + this.token = JSON.stringify(paramMap.params); + }); + + // 直接获取queryParam + this.activeRoute.queryParamMap.subscribe((res: any) => { + this.queryParams = JSON.stringify(res.params); + }); + } +} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/Router4Component.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/Router4Component.ts new file mode 100644 index 0000000000000000000000000000000000000000..98ee4152c78324d31b76dc92ca931a8993f2bb4b --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/Router4Component.ts @@ -0,0 +1,26 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +@Component({ + template: ` +
Welcome to {{ label }}页面!
+
参数token: {{ token }}
+
查询参数: {{ queryParams }}
+ ` +}) +export class Router4Component implements OnInit { + constructor(private activeRoute: ActivatedRoute) {} + label: string; + token: string; + queryParams: string; + ngOnInit(): void { + this.label = 'Setting'; + this.activeRoute.paramMap.subscribe((paramMap: any) => { + this.token = JSON.stringify(paramMap.params); + }); + + // 直接获取queryParam + this.activeRoute.queryParamMap.subscribe((res: any) => { + this.queryParams = JSON.stringify(res.params); + }); + } +} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/RouterEComponent.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/RouterEComponent.ts new file mode 100644 index 0000000000000000000000000000000000000000..487aceb40918b138024412b795d6a74276f9275f --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/RouterEComponent.ts @@ -0,0 +1,5 @@ +import { Component } from '@angular/core'; +@Component({ + template: `
Welcome to router E!
` +}) +export class RouterEComponent {} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/RouterFComponent.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/RouterFComponent.ts new file mode 100644 index 0000000000000000000000000000000000000000..fa99f9a6f750870ac68b94cd7448f3b1951f8a79 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/RouterFComponent.ts @@ -0,0 +1,5 @@ +import { Component } from '@angular/core'; +@Component({ + template: `
Welcome to router F!
` +}) +export class RouterFComponent {} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/leftmenuthin-basic.html b/src/leftmenuthin/demo/src/app/leftmenuthin/leftmenuthin-basic.html new file mode 100644 index 0000000000000000000000000000000000000000..8094d9dc828701f2aa0f07021b467f75f1e341dd --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/leftmenuthin-basic.html @@ -0,0 +1,13 @@ + +
+ +

事件日志：

+ +
diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/leftmenuthin-params.html b/src/leftmenuthin/demo/src/app/leftmenuthin/leftmenuthin-params.html new file mode 100644 index 0000000000000000000000000000000000000000..85bd612ce21d2c5546657594aa1cfff92ef98326 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/leftmenuthin-params.html @@ -0,0 +1,4 @@ + +
+ +
diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/leftmenuthin-routerlist.html b/src/leftmenuthin/demo/src/app/leftmenuthin/leftmenuthin-routerlist.html new file mode 100644 index 0000000000000000000000000000000000000000..94d70d3a9551fd612167f4b2e2d6b2b19b853e1d --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/leftmenuthin-routerlist.html @@ -0,0 +1,5 @@ + + +
+ +
diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/webdoc/leftmenuthin-demos.js b/src/leftmenuthin/demo/src/app/leftmenuthin/webdoc/leftmenuthin-demos.js new file mode 100644 index 0000000000000000000000000000000000000000..a544f50c601ea1eb02a8cd2152b465f6f85a35c1 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/webdoc/leftmenuthin-demos.js @@ -0,0 +1,48 @@ +export default { + column: '1', + demos: [ + { + demoId: 'leftmenuthin-basic', + name: { + 'zh-CN': '基本用法', + 'en-US': 'Basic usage' + }, + desc: { + 'zh-CN': 'Leftmenuthin 组件的最简用法。', + 'en-US': '' + }, + apis: [ + 'TiLeftmenuthinComponent.properties.active', + 'TiLeftmenuthinComponent.properties.items', + 'TiLeftmenuthinComponent.properties.reloadState', + 'TiLeftmenuthinComponent.events.select', + 'TiLeftmenuthinComponent.events.activeChange', + 'TiLeftmenuthinComponent.events.reloadStateChange' + ] + }, + { + demoId: 'leftmenuthin-params', + name: { + 'zh-CN': '路由携带参数', + 'en-US': '' + }, + desc: { + 'zh-CN': '给路由添加参数。', + 'en-US': '' + }, + apis: [] + }, + { + demoId: 'leftmenuthin-routerlist', + name: { + 'zh-CN': '对应多个路由', + 'en-US': '' + }, + desc: { + 'zh-CN': '一个路由对应多个路径。', + 'en-US': '' + }, + apis: [] + } + ] +}; diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/webdoc/leftmenuthin.cn.md b/src/leftmenuthin/demo/src/app/leftmenuthin/webdoc/leftmenuthin.cn.md new file mode 100644 index 0000000000000000000000000000000000000000..57ad2fc06f873b5af518751123471d6f06d48a13 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/webdoc/leftmenuthin.cn.md @@ -0,0 +1,19 @@ +--- +title: Leftmenuthin 左侧图标菜单 +--- + +# Leftmenuthin 左侧图标菜单 + +
+ +组件功能与leftMenu组件相似，支持配置图标。 + +- 宽度变窄。 + +- 可以配置图标。 + +```typescript +import { TiLeftmenuthinModule } from '@opentiny/ng'; +``` + +
diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/webdoc/leftmenuthin.en.md b/src/leftmenuthin/demo/src/app/leftmenuthin/webdoc/leftmenuthin.en.md new file mode 100644 index 0000000000000000000000000000000000000000..a6e2b76842f4023860977d83f76a18f97172cc7c --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/webdoc/leftmenuthin.en.md @@ -0,0 +1,13 @@ +--- +title: Leftmenuthin +--- + +# Leftmenuthin + +
+ +```typescript +import { TiLeftmenuthinModule } from '@opentiny/ng'; +``` + +
diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/website-lib/LeftmenuthinWebsiteComponent.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/website-lib/LeftmenuthinWebsiteComponent.ts new file mode 100644 index 0000000000000000000000000000000000000000..443c19d671e6eaa521655861bb938293aca0788e --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/website-lib/LeftmenuthinWebsiteComponent.ts @@ -0,0 +1,30 @@ +import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; +import { TiBaseComponent, TiLeftmenuthinItem } from '@opentiny/ng'; +/** + * 原组件依赖router变化，新官网多个示例路由冲突，复写一个简单的组件去完成新官网展示 + */ +@Component({ + templateUrl: './leftmenuthin-website.html', + styleUrls: ['./leftmenuthin.less'], + selector: 'website-leftmenuthin', + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class LeftmenuthinWebsiteComponent extends TiBaseComponent { + @Input() active: TiLeftmenuthinItem; + @Output() readonly activeChange: EventEmitter = new EventEmitter(); + @Output() readonly select: EventEmitter = new EventEmitter(); + @Input() reloadState: boolean = true; + @Input() items: Array; + @Output() readonly reloadStateChange: EventEmitter = new EventEmitter(); + selectFn(item: TiLeftmenuthinItem) { + if (this.active !== item) { + this.activeChange.emit(item); + } else if (this.active === item) { + this.reloadStateChange.emit(false); + setTimeout(() => { + this.reloadStateChange.emit(true); + }, 500); + } + this.select.emit(this.active); + } +} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/website-lib/LeftmenuthinWebsiteModule.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/website-lib/LeftmenuthinWebsiteModule.ts new file mode 100644 index 0000000000000000000000000000000000000000..8eae9041f59165df03a97f2e624f531d7061478c --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/website-lib/LeftmenuthinWebsiteModule.ts @@ -0,0 +1,13 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { LeftmenuthinWebsiteComponent } from './LeftmenuthinWebsiteComponent'; +import { TiIconModule } from '@opentiny/ng-icon'; +import { TiOutlineModule } from '@opentiny/ng-outline'; + +@NgModule({ + imports: [CommonModule, TiIconModule, TiOutlineModule], + exports: [LeftmenuthinWebsiteComponent], + declarations: [LeftmenuthinWebsiteComponent] +}) +export class LeftmenuthinWebsiteModule {} +export { LeftmenuthinWebsiteComponent } from './LeftmenuthinWebsiteComponent'; diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/website-lib/leftmenuthin-website.html b/src/leftmenuthin/demo/src/app/leftmenuthin/website-lib/leftmenuthin-website.html new file mode 100644 index 0000000000000000000000000000000000000000..78d3bebdfbfb6bd6a797fbf0c0cab6efd16323a2 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/website-lib/leftmenuthin-website.html @@ -0,0 +1,15 @@ +
+
+ +
{{item.label}}
+
+
diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/website-lib/leftmenuthin.less b/src/leftmenuthin/demo/src/app/leftmenuthin/website-lib/leftmenuthin.less new file mode 100644 index 0000000000000000000000000000000000000000..ea59db230ed36954781a90e5b115249d557611e0 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/website-lib/leftmenuthin.less @@ -0,0 +1,43 @@ +.web-leftmenuthin-content { + position: fixed; + top: 0; + bottom: 0; + z-index: 1000; + width: 80px; + background-color: #ffffff; +} + +.web-leftmenuthin-level { + width: 80px; + height: 78px; + padding-top: 12px; + text-align: center; + color: #575d6c; + cursor: pointer; + box-sizing: border-box; + + .web-leftmenuthin-icon { + font-size: 32px; + line-height: 1; + } + + .web-leftmenuthin-level-text { + font-size: 12px; + line-height: 1.5; + text-align: center; + margin-top: 4px; + } + + &:hover { + background-color: #f2f5fc; + color: #5e7ce0; + } +} + +.web-leftmenuthin-level.web-leftmenuthin-level-active { + color: #ffffff; + background-color: #5e7ce0; + .web-leftmenuthin-icon { + color: #ffffff; + } +} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/LeftmenuthinBasicWebsiteViewsComponent.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/LeftmenuthinBasicWebsiteViewsComponent.ts new file mode 100644 index 0000000000000000000000000000000000000000..c8e0ce6ed094bddc9c59b44a3c30f9c5445deb3e --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/LeftmenuthinBasicWebsiteViewsComponent.ts @@ -0,0 +1,43 @@ +import { Component } from '@angular/core'; +import { TiLeftmenuthinItem } from '@opentiny/ng'; + +@Component({ + templateUrl: './leftmenuthin-basic-website-views.html', + styleUrls: ['./router.less'] +}) +export class LeftmenuthinBasicWebsiteViewsComponent { + myLogs: Array = []; + items: Array = [ + { + router: ['./home'], + label: '主页', + iconName: 'home' + }, + { + router: ['./cart'], + label: '购物车', + iconName: 'cart' + }, + { + router: ['./favorite'], + label: '收藏', + iconName: 'star' + }, + { + router: ['./setting'], + label: '设置', + iconName: 'settings' + } + ]; + reloadState: boolean = true; + active: TiLeftmenuthinItem = this.items[0]; + onSelect(event: any): void { + this.myLogs = [...this.myLogs, `select => ${JSON.stringify(event)}`]; + } + onActiveChange(event: any): void { + this.myLogs = [...this.myLogs, `activeChange => ${JSON.stringify(event)}`]; + } + onReloadStateChange(event: any) { + this.myLogs = [...this.myLogs, `reloadStateChange => ${JSON.stringify(event)}`]; + } +} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/LeftmenuthinParamsWebsiteViewsComponent.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/LeftmenuthinParamsWebsiteViewsComponent.ts new file mode 100644 index 0000000000000000000000000000000000000000..da524afa8526e643f2ea9470e668276a3946a49d --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/LeftmenuthinParamsWebsiteViewsComponent.ts @@ -0,0 +1,62 @@ +import { Component } from '@angular/core'; +import { TiLeftmenuthinItem } from '@opentiny/ng'; + +@Component({ + templateUrl: './leftmenuthin-params-website-views.html', + styleUrls: ['./router.less'] +}) +export class LeftmenuthinParamsWebsiteViewsComponent { + items: Array = [ + { + router: ['./home'], + label: '主页', + iconName: 'home', + params: 'ddd', + routerExtras: { + queryParams: { + local: 'zh-cn' + } + } + }, + { + router: ['./cart'], + label: '购物车', + iconName: 'cart', + routerExtras: { + queryParams: { + local: 'zh-cn', + size: 'large' + } + } + }, + { + router: ['./favorite'], + label: '收藏', + iconName: 'star', + routerExtras: { + queryParams: { + size: 'middle', + color: 'red' + }, + fragment: 'top' + } + }, + { + router: ['./setting'], + label: '设置', + iconName: 'settings', + routerExtras: { + queryParams: { + local: 'en-us', + color: 'red' + }, + fragment: 'top' + } + } + ]; + reloadState: boolean = true; + active: TiLeftmenuthinItem = this.items[0]; + toJson(obj: Object): string { + return JSON.stringify(obj); + } +} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/LeftmenuthinRouterlistWebsiteViewsComponent.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/LeftmenuthinRouterlistWebsiteViewsComponent.ts new file mode 100644 index 0000000000000000000000000000000000000000..629f1cb69badbbe5ef3835d5b488cc02fde5a80b --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/LeftmenuthinRouterlistWebsiteViewsComponent.ts @@ -0,0 +1,42 @@ +import { Component } from '@angular/core'; +import { TiLeftmenuthinItem } from '@opentiny/ng'; + +@Component({ + templateUrl: './leftmenuthin-routerlist-website-views.html', + styleUrls: ['./router.less'] +}) +export class LeftmenuthinRouterlistWebsiteViewsComponent { + items: Array = [ + { + router: ['./home'], + label: '主页', + iconName: 'home' + }, + { + router: ['./cart'], + label: '购物车', + iconName: 'cart', + routerList: [['routerE']] + }, + { + router: ['./favorite'], + label: '收藏', + iconName: 'star', + routerList: [['routerF']] + }, + { + router: ['./setting'], + label: '设置', + iconName: 'settings' + } + ]; + reloadState: boolean = true; + active: TiLeftmenuthinItem = this.items[1]; + childRouter: boolean = false; + onSelect(event: TiLeftmenuthinItem) { + this.childRouter = false; + } + childChange() { + this.childRouter = true; + } +} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/Router1Component.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/Router1Component.ts new file mode 100644 index 0000000000000000000000000000000000000000..b37965eb6fb1c97debbed21e63505010b7053831 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/Router1Component.ts @@ -0,0 +1,13 @@ +import { Component } from '@angular/core'; +import { RouterBaseWebsiteViewsComponent } from './RouterBaseComponent'; + +@Component({ + template: ` +
Welcome to {{ label }}页面!
+
查询参数: {{ queryParams }}
+ `, + selector: 'web-home' +}) +export class Router1WebsiteViewsComponent extends RouterBaseWebsiteViewsComponent { + label: string = 'home'; +} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/Router2Component.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/Router2Component.ts new file mode 100644 index 0000000000000000000000000000000000000000..5983853bc51442477c53facae8c08c0cc0b8f9c1 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/Router2Component.ts @@ -0,0 +1,13 @@ +import { Component } from '@angular/core'; +import { RouterBaseWebsiteViewsComponent } from './RouterBaseComponent'; +@Component({ + template: ` +
Welcome to {{ label }} 页面!
+ 跳转至routerE(在当前路由的routerList中) +
查询参数: {{ queryParams }}
+ `, + selector: 'web-cart' +}) +export class Router2WebsiteViewsComponent extends RouterBaseWebsiteViewsComponent { + label: string = 'cart'; +} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/Router3Component.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/Router3Component.ts new file mode 100644 index 0000000000000000000000000000000000000000..c39e978fb4a04e39139409193e6571f0ad08f81a --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/Router3Component.ts @@ -0,0 +1,13 @@ +import { Component } from '@angular/core'; +import { RouterBaseWebsiteViewsComponent } from './RouterBaseComponent'; +@Component({ + template: ` +
Welcome to {{ label }}页面!
+ 跳转至routerF(在当前路由的routerList中) +
查询参数: {{ queryParams }}
+ `, + selector: 'web-star' +}) +export class Router3WebsiteViewsComponent extends RouterBaseWebsiteViewsComponent { + public label: string = 'star'; +} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/Router4Component.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/Router4Component.ts new file mode 100644 index 0000000000000000000000000000000000000000..440b0058f2456393666bbcf4114c1960b8ab21ab --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/Router4Component.ts @@ -0,0 +1,12 @@ +import { Component } from '@angular/core'; +import { RouterBaseWebsiteViewsComponent } from './RouterBaseComponent'; +@Component({ + template: ` +
Welcome to {{ label }}页面!
+
查询参数: {{ queryParams }}
+ `, + selector: 'web-setting' +}) +export class Router4WebsiteViewsComponent extends RouterBaseWebsiteViewsComponent { + public label: string = 'setting'; +} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/RouterBaseComponent.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/RouterBaseComponent.ts new file mode 100644 index 0000000000000000000000000000000000000000..3881e0d5eb3b9ba0f3bd25aa1f6c6cbf5f04f0c4 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/RouterBaseComponent.ts @@ -0,0 +1,11 @@ +import { Component, EventEmitter, Input, Output } from '@angular/core'; +@Component({ + template: '' +}) +export class RouterBaseWebsiteViewsComponent { + @Input() queryParams: string; + @Output() readonly routerChange: EventEmitter = new EventEmitter(); + onClick(): void { + this.routerChange.emit(); + } +} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/RouterEComponent.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/RouterEComponent.ts new file mode 100644 index 0000000000000000000000000000000000000000..74d988fc6c4eb834eac65902db0724b4f0dd130a --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/RouterEComponent.ts @@ -0,0 +1,6 @@ +import { Component } from '@angular/core'; +@Component({ + template: `
Welcome to router E!
`, + selector: 'web-router-e' +}) +export class RouterEWebsiteViewsComponent {} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/RouterFComponent.ts b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/RouterFComponent.ts new file mode 100644 index 0000000000000000000000000000000000000000..a5e48b9a9fa42c8638533604ba0c444359f73096 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/RouterFComponent.ts @@ -0,0 +1,6 @@ +import { Component } from '@angular/core'; +@Component({ + template: `
Welcome to router F!
`, + selector: 'web-router-f' +}) +export class RouterFWebsiteViewsComponent {} diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/leftmenuthin-basic-website-views.html b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/leftmenuthin-basic-website-views.html new file mode 100644 index 0000000000000000000000000000000000000000..88f4a3347e0f5b00c42a45a45e87c9d8b12f9667 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/leftmenuthin-basic-website-views.html @@ -0,0 +1,27 @@ +
+ {{reloadState}} + +
+ + + + + + + + + + + + +

事件日志：

+ +
+
diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/leftmenuthin-params-website-views.html b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/leftmenuthin-params-website-views.html new file mode 100644 index 0000000000000000000000000000000000000000..6a246b9151e3fc47ef99836816e87a4f6b01afdf --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/leftmenuthin-params-website-views.html @@ -0,0 +1,18 @@ +
+ {{reloadState}} + +
+ + + + + + + + + + + + +
+
diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/leftmenuthin-routerlist-website-views.html b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/leftmenuthin-routerlist-website-views.html new file mode 100644 index 0000000000000000000000000000000000000000..4d63f7ff74037c4dd572ffd75ea62bc164a4067a --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/leftmenuthin-routerlist-website-views.html @@ -0,0 +1,25 @@ +
+ {{reloadState}} + +
+ + + + + + + + + + + + + + +
+
diff --git a/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/router.less b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/router.less new file mode 100644 index 0000000000000000000000000000000000000000..a1f6e0e5111219ffd5af5742d3ae7c26792689d6 --- /dev/null +++ b/src/leftmenuthin/demo/src/app/leftmenuthin/website-views/router.less @@ -0,0 +1,6 @@ +.clear-transform { + background-color: #f5f2f0; + transform: scale(1, 1); + height: 460px; + overflow: auto; +} diff --git a/src/leftmenuthin/demo/src/favicon.ico b/src/leftmenuthin/demo/src/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..d7a7af634ee6d643ac81d81feadff569ac25de3d Binary files /dev/null and b/src/leftmenuthin/demo/src/favicon.ico differ diff --git a/src/leftmenuthin/demo/src/index.html b/src/leftmenuthin/demo/src/index.html new file mode 100644 index 0000000000000000000000000000000000000000..d0e32a8c93104c5c389c3ed24b50059a7293a6f6 --- /dev/null +++ b/src/leftmenuthin/demo/src/index.html @@ -0,0 +1,16 @@ + + + + + + + Tiny + + + + + + + + + diff --git a/src/leftmenuthin/demo/src/main.ts b/src/leftmenuthin/demo/src/main.ts new file mode 100644 index 0000000000000000000000000000000000000000..67a86e91a4171f30e9c67bb8649e6d63c3e81933 --- /dev/null +++ b/src/leftmenuthin/demo/src/main.ts @@ -0,0 +1,13 @@ +import { enableProdMode } from '@angular/core'; + +import { AppModule } from './app/AppModule'; +import { environment } from '../../../environments/environment'; +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +if (environment.production) { + enableProdMode(); +} + +platformBrowserDynamic() + .bootstrapModule(AppModule) + .catch((err: any) => console.error(err)); diff --git a/src/leftmenuthin/demo/test.ts b/src/leftmenuthin/demo/test.ts new file mode 100644 index 0000000000000000000000000000000000000000..1822c8b9bf81fc0bf747dbb39e15a1fd9e9f8d5f --- /dev/null +++ b/src/leftmenuthin/demo/test.ts @@ -0,0 +1,24 @@ +// This file is required by karma.conf.js and loads recursively all the .spec and framework files + +import 'zone.js/testing'; +import { getTestBed } from '@angular/core/testing'; +import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; + +declare const require: { + context( + path: string, + deep?: boolean, + filter?: RegExp + ): { + (id: string): T; + keys(): string[]; + }; +}; + +// First, initialize the Angular testing environment. +getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting()); + +// Then we find all the tests. +const context = require.context('./src/app/', true, /\.spec\.ts$/); +// And load the modules. +context.keys().forEach(context); diff --git a/src/leftmenuthin/demo/tsconfig.app.json b/src/leftmenuthin/demo/tsconfig.app.json new file mode 100644 index 0000000000000000000000000000000000000000..36c60b6ac54cc7ebcb5db4ca87995878e97510a2 --- /dev/null +++ b/src/leftmenuthin/demo/tsconfig.app.json @@ -0,0 +1,10 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "outDir": "../../../dist/out-tsc", + "moduleResolution": "node", + "types": [] + }, + "files": ["src/main.ts", "../../polyfills.ts"], + "include": ["src/**/*.d.ts"] +} diff --git a/src/leftmenuthin/demo/tsconfig.spec.json b/src/leftmenuthin/demo/tsconfig.spec.json new file mode 100644 index 0000000000000000000000000000000000000000..e12f108fb7ee2a45299a97b98a97cac0b42c3b9f --- /dev/null +++ b/src/leftmenuthin/demo/tsconfig.spec.json @@ -0,0 +1,15 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ +{ + "extends": "./tsconfig.app.json", + "compilerOptions": { + "outDir": "../../../dist/out-tsc/spec", + "types": ["jasmine"] + }, + "files": ["./test.ts", "../../polyfills.ts"], + "include": [ + "./src/**/*.spec.ts", + "./src/**/*.d.ts", + "../../../node_modules/@types/jasmine/index.d.ts", + "../../../node_modules/karma-viewport/dist/index.d.ts" + ] +} diff --git a/src/leftmenuthin/lib/index.ts b/src/leftmenuthin/lib/index.ts new file mode 100644 index 0000000000000000000000000000000000000000..69ef82fd7f0a3095abe1cbf4ae1b3c909ed40ffe --- /dev/null +++ b/src/leftmenuthin/lib/index.ts @@ -0,0 +1,2 @@ +export * from './src/TiLeftmenuthinModule'; +export * from './src/TiLeftmenuthinComponent'; diff --git a/src/leftmenuthin/lib/ng-package.json b/src/leftmenuthin/lib/ng-package.json new file mode 100644 index 0000000000000000000000000000000000000000..8696c7ab483e7d74aa22285fce9a5c4ca3bb016e --- /dev/null +++ b/src/leftmenuthin/lib/ng-package.json @@ -0,0 +1,7 @@ +{ + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-leftmenuthin", + "lib": { + "entryFile": "./index.ts" + } +} diff --git a/src/leftmenuthin/lib/package.json b/src/leftmenuthin/lib/package.json new file mode 100644 index 0000000000000000000000000000000000000000..e4339ba67717ed88e9897b01d5927c867f91cac3 --- /dev/null +++ b/src/leftmenuthin/lib/package.json @@ -0,0 +1,8 @@ +{ + "name": "@opentiny/ng-leftmenuthin", + "version": "1.0.0-beta.2", + "peerDependencies": { + "@angular/common": ">=13.0.0", + "@angular/core": ">=13.0.0" + } +} diff --git a/src/leftmenuthin/lib/project.json b/src/leftmenuthin/lib/project.json new file mode 100644 index 0000000000000000000000000000000000000000..e5ca0b8fee0a6df46e8d9006ea9e9ba33bfbc299 --- /dev/null +++ b/src/leftmenuthin/lib/project.json @@ -0,0 +1,51 @@ +{ + "projectType": "library", + "root": "src/leftmenuthin/lib", + "sourceRoot": "src/leftmenuthin/lib/src", + "targets": { + "default-build": { + "executor": "@nrwl/angular:package", + "outputs": ["dist/libs/ng-leftmenuthin"], + "options": { + "project": "src/leftmenuthin/lib/ng-package.json" + }, + "configurations": { + "production": { + "tsConfig": "src/tsconfig.lib.prod.json" + }, + "development": { + "tsConfig": "src/tsconfig.lib.json" + } + }, + "defaultConfiguration": "production" + }, + "build": { + "executor": "@nrwl/workspace:run-commands", + "outputs": ["dist/libs/ng-leftmenuthin"], + "options": { + "commands": [ + { + "command": "node build/add-default-theme.js leftmenuthin" + }, + { + "command": "ng default-build leftmenuthin" + }, + { + "command": "node build/clear-default-theme.js leftmenuthin" + } + ], + "parallel": false + } + }, + "pack": { + "executor": "@nrwl/workspace:run-commands", + "options": { + "commands": [ + { + "command": "cd dist/libs/ng-leftmenuthin && npm pack" + } + ] + } + } + } +} diff --git a/src/leftmenuthin/lib/src/TiLeftmenuthinComponent.ts b/src/leftmenuthin/lib/src/TiLeftmenuthinComponent.ts new file mode 100644 index 0000000000000000000000000000000000000000..5f5ce0619867c83f3acfde39569d793be153c93d --- /dev/null +++ b/src/leftmenuthin/lib/src/TiLeftmenuthinComponent.ts @@ -0,0 +1,255 @@ +/** + * Copyright (c) 2022 - present TinyUI Authors. + * Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd. + * + * Use of this source code is governed by an MIT-style license. + * + * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, + * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR + * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. + * + */ + +import { + ChangeDetectionStrategy, + Component, + EventEmitter, + Input, + Output, + SimpleChange, + SimpleChanges, + ElementRef, + Renderer2, + Optional +} from '@angular/core'; +import { Util } from '@opentiny/ng-utils'; +import { TiBaseComponent } from '@opentiny/ng-base'; +import { ActivatedRoute, NavigationEnd, NavigationExtras, Router, UrlTree } from '@angular/router'; +import { Subscription } from 'rxjs'; + +export interface TiLeftmenuthinItem { + /** + * 设置当前菜单项对应的路由，与 Router.navigate方法的第一个参数一致 + */ + router: Array; + // routerExtras?: { relativeTo?: string, queryParams?: Object, fragment?: string }; + /** + * 设置当前菜单项对应路由的配置信息，与 Router.navigate方法的第二个参数一致 + */ + routerExtras?: NavigationExtras; + /** + * 设置一个router路由列表，当该列表中的路由被激活时，其对应的菜单项被激活处于高亮状态。 + * 其使用场景为多个路由对应同一个左侧菜单项。 + * + * routerList 数组中每一个元素与 Router.navigate方法的第一个参数一致 + */ + routerList?: Array>; + /** + * 选项label + */ + label: string; + /** + * 选项图标名称 + */ + iconName?: string; + /** + * 允许有多余的属性字段 + */ + [propName: string]: any; +} +/** + * 组件功能与leftmenu组件相似，可以配置图标。 + * + */ +@Component({ + selector: 'ti-leftmenuthin', + templateUrl: './leftmenuthin.html', + styleUrls: ['./leftmenuthin.less'], + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class TiLeftmenuthinComponent extends TiBaseComponent { + /** + * 设置激活菜单项。 + * + * 此接口是双向绑定的，设置时中括号“[]”和圆括号“()”要同时使用 + */ + @Input() active: TiLeftmenuthinItem; + /** + * 激活菜单项改变时向外通知 + */ + @Output() readonly activeChange: EventEmitter = new EventEmitter(); + /** + * 点击菜单项触发此事件 + */ + @Output() readonly select: EventEmitter = new EventEmitter(); + /** + * 当重复点击当前激活菜单项时，是否刷新右侧内容区； + * + * 该接口是双向绑定的，当重复点击当前激活菜单项时，reloadState的值会经历 true(上次的值) -> false -> true + * 的变化过程，开发者给该接口与其右侧区域容器上ngIf接口绑定的是同一个变量，所以ngIf的值也会经历同样的变化， + * 从而做到右侧内容区的刷新。 + */ + @Input() reloadState: boolean = true; + /** + * 菜单数据列表 + */ + @Input() items: Array; + /** + * 右侧内容区是否需要刷新的状态值改变时向外通知 + */ + @Output() readonly reloadStateChange: EventEmitter = new EventEmitter(); + /** + * @ignore + */ + public readonly resolvedPromise: Promise = Promise.resolve(null); + /** + * 标志量，是否为url改变(需要去改变active) + */ + private isUrlChange: boolean = false; + private navigationSubscription: Subscription; + constructor( + @Optional() private router: Router, + @Optional() private activeRoute: ActivatedRoute, + protected hostRef: ElementRef, + protected renderer: Renderer2 + ) { + super(hostRef, renderer); + } + ngOnInit(): void { + super.ngOnInit(); + // 初始时右侧内容区默认显示，需使外部用户的reloadState值为true。 + // 双向绑定数据时，对初始传入的值立即修改并传出时会报错， + // 此处参考ngModel源码setValue的处理，使用promise延后执行时序 + this.resolvedPromise.then(() => { + this.reloadStateChange.emit(true); + }); + } + ngAfterViewInit(): void { + // 直接输入url(刷新页面)改变状态时，leftmenu能同步修改激活状态 + const urlActiveItem: TiLeftmenuthinItem = this.getActiveItemByUrl(this.items); + if (urlActiveItem) { + // 双向绑定数据时，对初始传入的值立即修改并传出时会报错， + // 此处参考ngModel源码setValue的处理，使用promise延后执行时序 + this.resolvedPromise.then(() => { + if (urlActiveItem !== this.active) { + this.isUrlChange = true; + this.active = urlActiveItem; + this.activeChange.emit(this.active); + } + }); + } else { + this.link(); + } + // 从非leftMenu处跳转改变状态时，leftmenu能同步修改激活状态 + this.navigationSubscription = this.router.events.subscribe((evt: any) => { + if (evt instanceof NavigationEnd) { + const newActiveItem: TiLeftmenuthinItem = this.getActiveItemByUrl(this.items); + if (newActiveItem && newActiveItem !== this.active) { + this.active = newActiveItem; + this.activeChange.emit(this.active); + this.isUrlChange = true; + } + } + }); + } + ngOnChanges(changes: SimpleChanges): void { + const activeObj: SimpleChange = changes['active']; + if (activeObj && !activeObj.firstChange) { + if (!this.isUrlChange) { + this.link(); + this.isUrlChange = false; + } else { + this.navigate(activeObj.currentValue); + } + } + } + ngOnDestroy(): void { + if (this.navigationSubscription) { + this.navigationSubscription.unsubscribe(); + } + } + /** + * @ignore + * 模板中使用 + */ + public selectFn(item: any): void { + const oldactive: TiLeftmenuthinItem = this.active; + const newactive: TiLeftmenuthinItem = item; + // 点击当前已经激活的item时，刷新对应路由 + if (newactive === oldactive) { + this.triggerReload(item); + } else if (newactive !== oldactive) { + this.active = newactive; + this.navigate(item); + this.activeChange.emit(this.active); + } + this.select.emit(item); + } + /** + * @ignore + * 点击当前选中项时，触发内容区重载 + * @param item 当前点击项 + */ + public triggerReload(item: TiLeftmenuthinItem): void { + // 使reloadState由false变为true,配合内容区的ngIf做到内容区的重载 + this.reloadStateChange.emit(false); + setTimeout(() => { + this.reloadStateChange.emit(true); + this.navigate(item); + }, 0); + } + private navigate(item: TiLeftmenuthinItem): void { + this.router.navigate(item.router, this.getNavigationExtras(item.routerExtras)); + } + private getNavigationExtras(routerExtras: Object): Object { + return { relativeTo: this.activeRoute, ...routerExtras }; + } + private getActiveItemByUrl(arr: Array): TiLeftmenuthinItem { + let resultItem: TiLeftmenuthinItem; + for (const item of arr) { + if (this.isActived(item)) { + resultItem = item; + + return resultItem; + } + } + + return resultItem; + } + private isActived(item: TiLeftmenuthinItem): boolean { + const relativeRoute: NavigationExtras = this.getRelativeRoute(item.routerExtras); + if (this.isMatchCurrentUrl(item.router, relativeRoute)) { + return true; + } + + if (Util.isArray(item.routerList) && item.routerList.length > 0) { + for (const router of item.routerList) { + if (this.isMatchCurrentUrl(router, relativeRoute)) { + return true; + } + } + } + + return false; + } + private getRelativeRoute(routerExtras: Object): NavigationExtras { + if (!routerExtras || !routerExtras['relativeTo']) { + return { relativeTo: this.activeRoute }; + } + + return { relativeTo: routerExtras['relativeTo'] }; + } + private isMatchCurrentUrl(router: Array, relativeRoute: NavigationExtras): boolean { + if (!Util.isArray(router)) { + return false; + } + const itemUrlTree: UrlTree = this.router.createUrlTree(router, relativeRoute); + + return this.router.isActive(itemUrlTree, false); + } + private link(): void { + if (this.active) { + this.navigate(this.active); + } + } +} diff --git a/src/leftmenuthin/lib/src/TiLeftmenuthinModule.ts b/src/leftmenuthin/lib/src/TiLeftmenuthinModule.ts new file mode 100644 index 0000000000000000000000000000000000000000..d8335f3db2603bea04c646b048aa37381e146be3 --- /dev/null +++ b/src/leftmenuthin/lib/src/TiLeftmenuthinModule.ts @@ -0,0 +1,25 @@ +/** + * Copyright (c) 2022 - present TinyUI Authors. + * Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd. + * + * Use of this source code is governed by an MIT-style license. + * + * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, + * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR + * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. + * + */ + +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { TiLeftmenuthinComponent } from './TiLeftmenuthinComponent'; +import { TiIconModule } from '@opentiny/ng-icon'; +import { TiOutlineModule } from '@opentiny/ng-outline'; + +@NgModule({ + imports: [CommonModule, TiIconModule, TiOutlineModule], + exports: [TiLeftmenuthinComponent], + declarations: [TiLeftmenuthinComponent] +}) +export class TiLeftmenuthinModule {} +export { TiLeftmenuthinComponent, TiLeftmenuthinItem } from './TiLeftmenuthinComponent'; diff --git a/src/leftmenuthin/lib/src/leftmenuthin.html b/src/leftmenuthin/lib/src/leftmenuthin.html new file mode 100644 index 0000000000000000000000000000000000000000..ba96cc5988a511b8588059ca77231f6ec84fc5da --- /dev/null +++ b/src/leftmenuthin/lib/src/leftmenuthin.html @@ -0,0 +1,15 @@ +
+
+ +
{{item.label}}
+
+
diff --git a/src/leftmenuthin/lib/src/leftmenuthin.less b/src/leftmenuthin/lib/src/leftmenuthin.less new file mode 100644 index 0000000000000000000000000000000000000000..c39ff3d3fa32e108e3df4cc30002aca599fe1d4e --- /dev/null +++ b/src/leftmenuthin/lib/src/leftmenuthin.less @@ -0,0 +1,49 @@ +@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); + padding-top: var(--ti-common-space-3x); + 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; + } + + .ti-leftmenuthin-level-text { + font-size: var(--ti-common-font-size-base); + line-height: var(--ti-common-line-height-number); + text-align: center; + margin-top: var(--ti-common-space-base); + } + + &:hover { + background-color: var(--ti-common-color-bg-white-emphasize); + color: var(--ti-common-color-icon-hover); + } +} + +.ti-leftmenuthin-level.ti-leftmenuthin-level-active { + color: var(--ti-common-color-text-white); + background-color: var(--ti-common-color-bg-emphasize); + .ti-leftmenuthin-icon { + color: var(--ti-common-color-icon-white); + } +} diff --git a/src/linkbutton/lib/ng-package.json b/src/linkbutton/lib/ng-package.json index 51cc62e97aa3af664512db455e8564ca87520985..0aa040a479d7a8fc908ea32afc1ea0a8971e2e22 100644 --- a/src/linkbutton/lib/ng-package.json +++ b/src/linkbutton/lib/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/linkbutton", + "dest": "../../../dist/libs/ng-linkbutton", "lib": { "entryFile": "index.ts" } diff --git a/src/linkbutton/lib/package.json b/src/linkbutton/lib/package.json index e11986325f53430ee3c594503efd0e01fc0bd1d6..5eb066b1246847dcf7aa6dfbe44124c149c59c70 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0" + "@opentiny/ng-icon": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/linkbutton/lib/project.json b/src/linkbutton/lib/project.json index 0cf76388452587557a9998303f6fcdc1f4297826..d819a3ca95f19c72b69540e499880ce83625f118 100644 --- a/src/linkbutton/lib/project.json +++ b/src/linkbutton/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/linkbutton"], + "outputs": ["dist/libs/ng-linkbutton"], "options": { "project": "src/linkbutton/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/linkbutton"], + "outputs": ["dist/libs/ng-linkbutton"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/linkbutton && npm pack" + "command": "cd dist/libs/ng-linkbutton && npm pack" } ] } diff --git a/src/list/lib/ng-package.json b/src/list/lib/ng-package.json index f48833c5a010cde78624c8572e6c6857a1765679..7d5e7173c527204ebda28dd1efec35e0d45b7e72 100644 --- a/src/list/lib/ng-package.json +++ b/src/list/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/list", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-list", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/list/lib/package.json b/src/list/lib/package.json index f59bd12ffc35615edafc2eebc7a894a6094d2253..2a97ab30eb208f18ecf08e56f222dcc5a25d7eb7 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/cdk": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-tip": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-loading": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/list/lib/project.json b/src/list/lib/project.json index aec2ef0983aacb86f540d306b43d2d07a89f5c66..3b0029d0bb20451a14b70348bd66c31d633efd12 100644 --- a/src/list/lib/project.json +++ b/src/list/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/list"], + "outputs": ["dist/libs/ng-list"], "options": { "project": "src/list/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/list"], + "outputs": ["dist/libs/ng-list"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/list && npm pack" + "command": "cd dist/libs/ng-list && npm pack" } ] } diff --git a/src/list/lib/src/TiListComponent.ts b/src/list/lib/src/TiListComponent.ts index ba7865bda99bc2d49e192b82d178776438330a70..4c15a349e99db43d5a57d16a034318a71db05022 100644 --- a/src/list/lib/src/TiListComponent.ts +++ b/src/list/lib/src/TiListComponent.ts @@ -108,6 +108,10 @@ export class TiListComponent extends TiFormComponent { * 该接口暂不对外开放，后续如果业务场景labelKey对应的值确实有重复时，再对外开放该接口。 */ @Input() idKey: string; + /** + * 控制加载状态 + */ + @Input() loading: boolean = false; /** * 选中事件，向外通知option数据 diff --git a/src/list/lib/src/list.html b/src/list/lib/src/list.html index e4a28a45e7d23eb4d99f0b88ba8196370b1264fc..1c771e6ff39357fd9a0cccc6b9145db2b5d58a7d 100644 --- a/src/list/lib/src/list.html +++ b/src/list/lib/src/list.html @@ -2,6 +2,7 @@
+ + +
+ + + + + +
+ + + diff --git a/src/list/lib/src/list.less b/src/list/lib/src/list.less index 65b3fc95d03369bc5620d8bc2cbf84c60c6080a8..4fe7ce2e2e41135b960c864fd4cc4bf29670708c 100644 --- a/src/list/lib/src/list.less +++ b/src/list/lib/src/list.less @@ -147,3 +147,10 @@ ::ng-deep .ti3-virtual-scroll-list-viewport.ti3-virtual-scroll-list-viewport-with-selectall .cdk-virtual-scroll-spacer { top: calc(var(--ti-list-container-vertical-padding) * 2 + 30px); } +.ti3-list-loading { + display: flex; + padding: var(--ti-common-space-6) var(--ti-common-space-10); +} +::ng-deep .ti3-virtual-scroll-list .ti3-list-loading { + padding: var(--ti-common-space-10); +} diff --git a/src/loading/lib/ng-package.json b/src/loading/lib/ng-package.json index 6c0c0ea87594c481f2c53f0d78d15d24d6dc251f..703cf41c96720dbeb530cd720c2698af2e4e57c8 100644 --- a/src/loading/lib/ng-package.json +++ b/src/loading/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/loading", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-loading", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/loading/lib/package.json b/src/loading/lib/package.json index 3a1b3f813573e9f03d122f352c0a6ede6f8818e9..89337102393b7026ec4282919e6a25c8b11887ea 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-locale": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.0" + "@opentiny/ng-icon": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/loading/lib/project.json b/src/loading/lib/project.json index 660828d845495b4d30abdb8d570d670f2978e482..e3c637bdc792d3f9f1643614f7ffd99705eca267 100644 --- a/src/loading/lib/project.json +++ b/src/loading/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/loading"], + "outputs": ["dist/libs/ng-loading"], "options": { "project": "src/loading/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/loading"], + "outputs": ["dist/libs/ng-loading"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/loading && npm pack" + "command": "cd dist/libs/ng-loading && npm pack" } ] } diff --git a/src/locale/lib/ng-package.json b/src/locale/lib/ng-package.json index e2df576681c0cce9b1b81ce32c5fd7960fec14ea..8b426dcb4ac248b8e434f42ec64ea20ab51cc378 100644 --- a/src/locale/lib/ng-package.json +++ b/src/locale/lib/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/locale", + "dest": "../../../dist/libs/ng-locale", "lib": { "entryFile": "index.ts" } diff --git a/src/locale/lib/package.json b/src/locale/lib/package.json index 13fef715fbd3943c78fa625ab51f93b399f1e16f..8e8e106290cdfc029d6f97ff8d5fe0e260f06dd6 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/common": ">=13.0.0", "@angular/core": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.0" + "@opentiny/ng-utils": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/locale/lib/project.json b/src/locale/lib/project.json index 6aca8a8ae941942a2f7432f8293f66d0edaa30a8..fc32e64e4bbbed4210f056a2dae987470cd7662e 100644 --- a/src/locale/lib/project.json +++ b/src/locale/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/locale"], + "outputs": ["dist/libs/ng-locale"], "options": { "project": "src/locale/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/locale"], + "outputs": ["dist/libs/ng-locale"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/locale && npm pack" + "command": "cd dist/libs/ng-locale && npm pack" } ] } diff --git a/src/menu/lib/ng-package.json b/src/menu/lib/ng-package.json index 448e7b04f3fa2d60c27aa6b2b441252c0f285187..54e51165e1e7956a6dfad759d8a4154dc50a854b 100644 --- a/src/menu/lib/ng-package.json +++ b/src/menu/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/menu", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-menu", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/menu/lib/package.json b/src/menu/lib/package.json index a8cbb39ff0a03341630fc527fdc73a03bc07e682..2926f86aab6ac61157cf98ae28ba18044617e39a 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-drop": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-drop": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", - "@opentiny/ng-list": "~1.0.0-beta.0", + "@opentiny/ng-list": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-tip": "~1.0.0-beta.0" + "@opentiny/ng-tip": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/menu/lib/project.json b/src/menu/lib/project.json index c45abc4e2a3d9720e6ed2d72ded9f47cb6b34975..dd34517a082d5bdc519f03ec0471a27ca40066d3 100644 --- a/src/menu/lib/project.json +++ b/src/menu/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/menu"], + "outputs": ["dist/libs/ng-menu"], "options": { "project": "src/menu/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/menu"], + "outputs": ["dist/libs/ng-menu"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/menu && npm pack" + "command": "cd dist/libs/ng-menu && npm pack" } ] } diff --git a/src/message/lib/ng-package.json b/src/message/lib/ng-package.json index d393c26a1690e482743e0a052ed86838a8bca60e..e9b7b55fe8a975084453129aae2d39c1bb2e0774 100644 --- a/src/message/lib/ng-package.json +++ b/src/message/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/message", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-message", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/message/lib/package.json b/src/message/lib/package.json index fd838a5380609efa16e022b4410db2b34c90cee9..c1dbb2bcc884f71bfc45a85bedacd161a9d21902 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-modal": "~1.0.0-beta.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", "@angular/common": ">=13.0.0", - "@opentiny/ng-button": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-popup": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/message/lib/project.json b/src/message/lib/project.json index 72b0a13049a4eca7dc3172c50c81041f0c2c2135..0806090d3e2d45f9b0c68608dcc568eaab58e73b 100644 --- a/src/message/lib/project.json +++ b/src/message/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/message"], + "outputs": ["dist/libs/ng-message"], "options": { "project": "src/message/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/message"], + "outputs": ["dist/libs/ng-message"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/message && npm pack" + "command": "cd dist/libs/ng-message && npm pack" } ] } diff --git a/src/modal/lib/ng-package.json b/src/modal/lib/ng-package.json index e042faab188ce5887f8f45cab1c9a96d8a7df1bb..6cabb7745209460fc6be3eb01d1a824742493c35 100644 --- a/src/modal/lib/ng-package.json +++ b/src/modal/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/modal", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-modal", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/modal/lib/package.json b/src/modal/lib/package.json index b292be569ced51cd3997d697adec8b23fdb24696..0e2b4aa41e2229a92eebe05f1f34f2e9d645da87 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.0", + "version": "1.0.0-beta.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.0", - "@opentiny/ng-renderer": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-popup": "~1.0.0-beta.0", - "@opentiny/ng-drag": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-outline": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/modal/lib/project.json b/src/modal/lib/project.json index b975f65e17b113e920fddaeb827873708b68d4c4..6ad98a13af30fd4462baba2032f61f92ff1dc778 100644 --- a/src/modal/lib/project.json +++ b/src/modal/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/modal"], + "outputs": ["dist/libs/ng-modal"], "options": { "project": "src/modal/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/modal"], + "outputs": ["dist/libs/ng-modal"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/modal && npm pack" + "command": "cd dist/libs/ng-modal && npm pack" } ] } diff --git a/src/nav/lib/ng-package.json b/src/nav/lib/ng-package.json index cab05b2828680f7909017e37b14a7ebc816ef7f8..dc211c8b0e4bc8c78498a9636ae907026523fdeb 100644 --- a/src/nav/lib/ng-package.json +++ b/src/nav/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/nav", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-nav", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/nav/lib/package.json b/src/nav/lib/package.json index ec26573f78b55f8214d76cee4e75d6b1618b4dc8..da32e36f9e61d7a1968fb3555fb49a9483a13905 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", diff --git a/src/nav/lib/project.json b/src/nav/lib/project.json index cc49048069c396b5b5b3c954a2f4da4e51783b8f..4742526db24993a997fb18ac3ecfd48c269a2341 100644 --- a/src/nav/lib/project.json +++ b/src/nav/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/nav"], + "outputs": ["dist/libs/ng-nav"], "options": { "project": "src/nav/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/nav"], + "outputs": ["dist/libs/ng-nav"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/nav && npm pack" + "command": "cd dist/libs/ng-nav && npm pack" } ] } diff --git a/src/ng/demo/src/app/AppWcModule.ts b/src/ng/demo/src/app/AppWcModule.ts index 86c26ecf7651e1002bd99c4d9b00e93aff601471..eb8e5e1d05f61af9053e10b5df137f692f7e7324 100644 --- a/src/ng/demo/src/app/AppWcModule.ts +++ b/src/ng/demo/src/app/AppWcModule.ts @@ -125,6 +125,8 @@ import { AutocompleteValidComponent } from './../../../../autocomplete/demo/src/ import { AutocompleteGroupComponent } from './../../../../autocomplete/demo/src/app/autocomplete/AutocompleteGroupComponent'; +import { AutocompleteSuggestComponent } from './../../../../autocomplete/demo/src/app/autocomplete/AutocompleteSuggestComponent'; + import { AvatarImageErrorTestComponent } from './../../../../avatar/demo/src/app/avatar/AvatarImageErrorTestComponent'; import { AvatarImageComponent } from './../../../../avatar/demo/src/app/avatar/AvatarImageComponent'; @@ -680,6 +682,11 @@ import { LeftmenuRouterlistWebsiteViewComponent } from './../../../../leftmenu/d import { LeftmenuToggleableWebsiteViewComponent } from './../../../../leftmenu/demo/src/app/leftmenu/website-views/LeftmenuToggleableWebsiteViewComponent'; +import { LeftmenuthinBasicWebsiteViewsComponent } from './../../../../leftmenuthin/demo/src/app/leftmenuthin/website-views/LeftmenuthinBasicWebsiteViewsComponent'; + +import { LeftmenuthinParamsWebsiteViewsComponent } from './../../../../leftmenuthin/demo/src/app/leftmenuthin/website-views/LeftmenuthinParamsWebsiteViewsComponent'; + +import { LeftmenuthinRouterlistWebsiteViewsComponent } from './../../../../leftmenuthin/demo/src/app/leftmenuthin/website-views/LeftmenuthinRouterlistWebsiteViewsComponent'; import { LoadingAreaComponent } from './../../../../loading/demo/src/app/loading/LoadingAreaComponent'; import { LoadingBasicComponent } from './../../../../loading/demo/src/app/loading/LoadingBasicComponent'; @@ -1748,6 +1755,8 @@ import { LogUsageComponent } from './../../../../utils/demo/src/app/log/LogUsage import { ThemeBasicComponent } from './../../../../utils/demo/src/app/theme/ThemeBasicComponent'; +import { ThemePaletteComponent } from './../../../../utils/demo/src/app/theme/ThemePaletteComponent'; + import { ValidationAsyncCheckTestComponent } from './../../../../validation/demo/src/app/validation/ValidationAsyncCheckTestComponent'; import { ValidationAsyncCheckComponent } from './../../../../validation/demo/src/app/validation/ValidationAsyncCheckComponent'; @@ -2047,6 +2056,8 @@ const WCS: any = [ { selector: 'website-tiny-autocomplete-group', component: AutocompleteGroupComponent }, + { selector: 'website-tiny-autocomplete-suggest', component: AutocompleteSuggestComponent }, + { selector: 'website-tiny-avatar-image-error-test', component: AvatarImageErrorTestComponent @@ -3216,6 +3227,11 @@ const WCS: any = [ component: LeftmenuToggleableWebsiteViewComponent }, + { selector: 'website-tiny-leftmenuthin-basic', component: LeftmenuthinBasicWebsiteViewsComponent }, + + { selector: 'website-tiny-leftmenuthin-params', component: LeftmenuthinParamsWebsiteViewsComponent }, + + { selector: 'website-tiny-leftmenuthin-routerlist', component: LeftmenuthinRouterlistWebsiteViewsComponent }, { selector: 'website-tiny-loading-area', component: LoadingAreaComponent }, { selector: 'website-tiny-loading-basic', component: LoadingBasicComponent }, @@ -5279,6 +5295,8 @@ const WCS: any = [ { selector: 'website-tiny-theme-basic', component: ThemeBasicComponent }, + { selector: 'website-tiny-theme-palette', component: ThemePaletteComponent }, + { selector: 'website-tiny-validation-async-check-test', component: ValidationAsyncCheckTestComponent diff --git a/src/ng/demo/src/app/DemoModules.ts b/src/ng/demo/src/app/DemoModules.ts index 95ae0830874198d3804c1af876235c87727002bf..026a79b09dcda6751824446aec10f59609402070 100644 --- a/src/ng/demo/src/app/DemoModules.ts +++ b/src/ng/demo/src/app/DemoModules.ts @@ -44,6 +44,7 @@ import { IpsectionTestModule } from '../../../../ipsection/demo/src/app/ipsectio import { LabeleditorTestModule } from '../../../../labeleditor/demo/src/app/labeleditor/LabeleditorTestModule'; import { LayoutTestModule } from '../../../../layout/demo/src/app/layout/LayoutTestModule'; import { LeftmenuTestModule } from '../../../../leftmenu/demo/src/app/leftmenu/LeftmenuTestModule'; +import { LeftmenuthinTestModule } from '../../../../leftmenuthin/demo/src/app/leftmenuthin/LeftmenuthinTestModule'; import { ListTestModule } from '../../../../list/demo/src/app/list/ListTestModule'; import { LoadingTestModule } from '../../../../loading/demo/src/app/loading/LoadingTestModule'; import { LocaleTestModule } from '../../../../locale/demo/src/app/locale/LocaleTestModule'; @@ -147,6 +148,7 @@ export class DemoModules { LabeleditorTestModule, LayoutTestModule, LeftmenuTestModule, + LeftmenuthinTestModule, ListTestModule, LoadingTestModule, LocaleTestModule, diff --git a/src/ng/demo/src/webdoc/introduce.md b/src/ng/demo/src/webdoc/introduce.md index 1c7a56b6e3c9dbec395e72f080851863262f76ba..d4668a9d4ffb099d52fb3a68ee207dadd7eb8832 100644 --- a/src/ng/demo/src/webdoc/introduce.md +++ b/src/ng/demo/src/webdoc/introduce.md @@ -29,6 +29,6 @@ title: 介绍 | TinyNG | last 3 versions | last 3 versions | last 3 versions | last 2 versions | ### 支持 Angular 版本 -目前支持 Angular `^14.0.0`版本。 +目前支持 Angular 版本 `>=13.0.0`。 ### [最新版本](./changelog) \ No newline at end of file diff --git a/src/ng/demo/src/webdoc/menus.js b/src/ng/demo/src/webdoc/menus.js index 9e63dedc11cc4c4ba469c63eeadbd87aa788e2ab..dae3c51b1a81612cda5d6df759036aaf728f7125 100644 --- a/src/ng/demo/src/webdoc/menus.js +++ b/src/ng/demo/src/webdoc/menus.js @@ -118,6 +118,7 @@ export const cmpMenus = [ key: 'cmp_nav', children: [ { name: 'Leftmenu', nameCn: '左侧菜单', key: 'leftmenu' }, + { name: 'Leftmenuthin', nameCn: '左侧图标菜单', key: 'leftmenuthin' }, { name: 'Menu', nameCn: '下拉菜单', key: 'menu' }, { name: 'Nav', nameCn: '顶部导航', key: 'nav' }, { name: 'Actionmenu', nameCn: '菜单按钮', key: 'actionmenu' }, diff --git a/src/ng/lib/index.ts b/src/ng/lib/index.ts index ff297b4d97dea90df7f8a06d49c5933efe8f6b97..0e84cd0e5213210c1f09a07014d66e3ee3503de0 100644 --- a/src/ng/lib/index.ts +++ b/src/ng/lib/index.ts @@ -91,6 +91,7 @@ export * from '@opentiny/ng-validation'; export * from '@opentiny/ng-zoom'; export * from '@opentiny/ng-guides'; export * from '@opentiny/ng-labeleditor'; +export * from '@opentiny/ng-leftmenuthin'; export * from '@opentiny/ng-phonenumber'; export * from '@opentiny/ng-selectgroup'; export * from '@opentiny/ng-productpreview'; diff --git a/src/ng/lib/package.json b/src/ng/lib/package.json index 5936a90ae0600c68dc8613369abf9ed4afa6d21e..2b62a0304f65838394f903a59a1b296bffef4015 100644 --- a/src/ng/lib/package.json +++ b/src/ng/lib/package.json @@ -1,110 +1,111 @@ { "name": "@opentiny/ng", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/common": ">=13.0.0", "@angular/core": ">=13.0.0", - "@opentiny/ng-accordion": "1.0.0-beta.0", - "@opentiny/ng-actionmenu": "1.0.0-beta.0", - "@opentiny/ng-alert": "1.0.0-beta.0", - "@opentiny/ng-anchor": "1.0.0-beta.0", - "@opentiny/ng-autocomplete": "1.0.0-beta.0", - "@opentiny/ng-avatar": "1.0.0-beta.0", - "@opentiny/ng-base": "1.0.0-beta.0", - "@opentiny/ng-button": "1.0.0-beta.0", - "@opentiny/ng-buttongroup": "1.0.0-beta.0", - "@opentiny/ng-card": "1.0.0-beta.0", - "@opentiny/ng-cascader": "1.0.0-beta.0", - "@opentiny/ng-checkbox": "1.0.0-beta.0", - "@opentiny/ng-collapse": "1.0.0-beta.0", - "@opentiny/ng-collapsebox": "1.0.0-beta.0", - "@opentiny/ng-collapsebutton": "1.0.0-beta.0", - "@opentiny/ng-copy": "1.0.0-beta.0", - "@opentiny/ng-crumb": "1.0.0-beta.0", - "@opentiny/ng-date": "1.0.0-beta.0", - "@opentiny/ng-datebase": "1.0.0-beta.0", - "@opentiny/ng-datedominator": "1.0.0-beta.0", - "@opentiny/ng-dateedit": "1.0.0-beta.0", - "@opentiny/ng-datepanel": "1.0.0-beta.0", - "@opentiny/ng-daterange": "1.0.0-beta.0", - "@opentiny/ng-datetime": "1.0.0-beta.0", - "@opentiny/ng-datetimerange": "1.0.0-beta.0", - "@opentiny/ng-dominator": "1.0.0-beta.0", - "@opentiny/ng-drag": "1.0.0-beta.0", - "@opentiny/ng-drop": "1.0.0-beta.0", - "@opentiny/ng-droplist": "1.0.0-beta.0", - "@opentiny/ng-dropsearch": "1.0.0-beta.0", - "@opentiny/ng-formfield": "1.0.0-beta.0", - "@opentiny/ng-foldtext": "1.0.0-beta.0", - "@opentiny/ng-grid": "1.0.0-beta.0", - "@opentiny/ng-halfmodal": "1.0.0-beta.0", - "@opentiny/ng-icon": "1.0.0-beta.0", - "@opentiny/ng-iconaction": "1.0.0-beta.0", - "@opentiny/ng-imagepreview": "1.0.0-beta.0", - "@opentiny/ng-include": "1.0.0-beta.0", - "@opentiny/ng-inputnumber": "1.0.0-beta.0", - "@opentiny/ng-intro": "1.0.0-beta.0", - "@opentiny/ng-ip": "1.0.0-beta.0", - "@opentiny/ng-ipsection": "1.0.0-beta.0", - "@opentiny/ng-layout": "1.0.0-beta.0", - "@opentiny/ng-leftmenu": "1.0.0-beta.0", - "@opentiny/ng-list": "1.0.0-beta.0", - "@opentiny/ng-loading": "1.0.0-beta.0", - "@opentiny/ng-locale": "1.0.0-beta.0", - "@opentiny/ng-linkbutton": "1.0.0-beta.0", - "@opentiny/ng-menu": "1.0.0-beta.0", - "@opentiny/ng-message": "1.0.0-beta.0", - "@opentiny/ng-modal": "1.0.0-beta.0", - "@opentiny/ng-nav": "1.0.0-beta.0", - "@opentiny/ng-notification": "1.0.0-beta.0", - "@opentiny/ng-outline": "1.0.0-beta.0", - "@opentiny/ng-overflow": "1.0.0-beta.0", - "@opentiny/ng-pagination": "1.0.0-beta.0", - "@opentiny/ng-popconfirm": "1.0.0-beta.0", - "@opentiny/ng-popup": "1.0.0-beta.0", - "@opentiny/ng-progressbar": "1.0.0-beta.0", - "@opentiny/ng-progresspie": "1.0.0-beta.0", - "@opentiny/ng-radio": "1.0.0-beta.0", - "@opentiny/ng-rate": "1.0.0-beta.0", - "@opentiny/ng-renderer": "1.0.0-beta.0", - "@opentiny/ng-rights": "1.0.0-beta.0", - "@opentiny/ng-score": "1.0.0-beta.0", - "@opentiny/ng-scroll": "1.0.0-beta.0", - "@opentiny/ng-searchbox": "1.0.0-beta.0", - "@opentiny/ng-select": "1.0.0-beta.0", - "@opentiny/ng-skeleton": "1.0.0-beta.0", - "@opentiny/ng-slider": "1.0.0-beta.0", - "@opentiny/ng-spinner": "1.0.0-beta.0", - "@opentiny/ng-steps": "1.0.0-beta.0", - "@opentiny/ng-subtitle": "1.0.0-beta.0", - "@opentiny/ng-swiper": "1.0.0-beta.0", - "@opentiny/ng-switch": "1.0.0-beta.0", - "@opentiny/ng-tab": "1.0.0-beta.0", - "@opentiny/ng-table": "1.0.0-beta.0", - "@opentiny/ng-tag": "1.0.0-beta.0", - "@opentiny/ng-tagsinput": "1.0.0-beta.0", - "@opentiny/ng-text": "1.0.0-beta.0", - "@opentiny/ng-textarea": "1.0.0-beta.0", - "@opentiny/ng-time": "1.0.0-beta.0", - "@opentiny/ng-timeline": "1.0.0-beta.0", - "@opentiny/ng-tip": "1.0.0-beta.0", - "@opentiny/ng-transfer": "1.0.0-beta.0", - "@opentiny/ng-tree": "1.0.0-beta.0", - "@opentiny/ng-treeselect": "1.0.0-beta.0", - "@opentiny/ng-upload": "1.0.0-beta.0", - "@opentiny/ng-utils": "1.0.0-beta.0", - "@opentiny/ng-validation": "1.0.0-beta.0", - "@opentiny/ng-zoom": "1.0.0-beta.0", - "@opentiny/ng-themes": "1.0.0-beta.0", - "@opentiny/ng-guides": "1.0.0-beta.0", - "@opentiny/ng-labeleditor": "1.0.0-beta.0", - "@opentiny/ng-phonenumber": "1.0.0-beta.0", - "@opentiny/ng-selectgroup": "1.0.0-beta.0", - "@opentiny/ng-productpreview": "1.0.0-beta.0", - "@opentiny/ng-buttonselect": "1.0.0-beta.0", - "@opentiny/ng-collapsetext": "1.0.0-beta.0", - "@opentiny/ng-guidesteps": "1.0.0-beta.0", - "@opentiny/ng-path": "1.0.0-beta.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" } } diff --git a/src/notification/lib/ng-package.json b/src/notification/lib/ng-package.json index f701fe4606e86e1cb74b62f996f767d0d4be5c54..704d31ac77c157427c7ad247559fb0ef126635fe 100644 --- a/src/notification/lib/ng-package.json +++ b/src/notification/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/notification", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-notification", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/notification/lib/package.json b/src/notification/lib/package.json index cae90dd8f0b991a22b1070b478fac360b750377f..b16d198c30f83405b012f4124d7ebaf2fd7b1efd 100644 --- a/src/notification/lib/package.json +++ b/src/notification/lib/package.json @@ -1,15 +1,14 @@ { "name": "@opentiny/ng-notification", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/animations": ">=13.0.0", "@angular/core": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@angular/cdk/overlay": ">=13.0.0", + "@opentiny/ng-utils": "~1.0.0-beta.2", + "@angular/cdk": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-alert": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@angular/cdk/portal": ">=13.0.0" + "@opentiny/ng-alert": "~1.0.0-beta.2", + "@opentiny/ng-icon": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/notification/lib/project.json b/src/notification/lib/project.json index 2498b39e1042ca1ce467defeee15a5e089010f0b..57f5569472a15d602031a158d06e203c5bb559a5 100644 --- a/src/notification/lib/project.json +++ b/src/notification/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/notification"], + "outputs": ["dist/libs/ng-notification"], "options": { "project": "src/notification/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/notification"], + "outputs": ["dist/libs/ng-notification"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/notification && npm pack" + "command": "cd dist/libs/ng-notification && npm pack" } ] } diff --git a/src/outline/lib/ng-package.json b/src/outline/lib/ng-package.json index f47b6dd08cdc791ea2ad1df926178868e5607a39..368f94365c6b47ec1012439081de5f0689df1726 100644 --- a/src/outline/lib/ng-package.json +++ b/src/outline/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/outline", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-outline", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/outline/lib/package.json b/src/outline/lib/package.json index fb63c20ec63a2ce8ab81b27e8ff90c05ed1e0b44..36370738057cb4f5fe018ab243cdf8847faafff8 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", diff --git a/src/outline/lib/project.json b/src/outline/lib/project.json index 50de63670fe531b4dbc2101c77a672e34a39cc3b..88ecb39de3f431ef10c0fe1afc61daad4370dcee 100644 --- a/src/outline/lib/project.json +++ b/src/outline/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/outline"], + "outputs": ["dist/libs/ng-outline"], "options": { "project": "src/outline/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/outline"], + "outputs": ["dist/libs/ng-outline"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/outline && npm pack" + "command": "cd dist/libs/ng-outline && npm pack" } ] } diff --git a/src/overflow/lib/ng-package.json b/src/overflow/lib/ng-package.json index 411701176339ed7b33b076105ade0b1e61ab3e96..4adcb37e9ca9b6067fb5ce73f69529b5fc5d6a19 100644 --- a/src/overflow/lib/ng-package.json +++ b/src/overflow/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/overflow", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-overflow", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/overflow/lib/package.json b/src/overflow/lib/package.json index 8677ef11a623d1703e682fbd658c32a47e90d23e..4430ceffc96e3e4043025ad654f7fdc98ee5db22 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-tip": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", + "@opentiny/ng-tip": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-renderer": "~1.0.0-beta.0" + "@opentiny/ng-renderer": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/overflow/lib/project.json b/src/overflow/lib/project.json index 9a3e6a6e7ca0ee62c7ea6bdae438b10ddc8818c0..6f75cbe6cf52d8c8efcb11f3c9470cc6fc64ad27 100644 --- a/src/overflow/lib/project.json +++ b/src/overflow/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/overflow"], + "outputs": ["dist/libs/ng-overflow"], "options": { "project": "src/overflow/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/overflow"], + "outputs": ["dist/libs/ng-overflow"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/overflow && npm pack" + "command": "cd dist/libs/ng-overflow && npm pack" } ] } diff --git a/src/pagination/lib/ng-package.json b/src/pagination/lib/ng-package.json index 35c4d3b7283d030b2e8d74a2d42dc6cd767fc2d7..cb21738ad840bdfc7f1573fd70343905ae8da1ed 100644 --- a/src/pagination/lib/ng-package.json +++ b/src/pagination/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/pagination", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-pagination", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/pagination/lib/package.json b/src/pagination/lib/package.json index ef22cf8d596269deddb064ae08437876e4e53cdd..021f7976635374d6b95a7ea7f58e048acc009874 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-table": "~1.0.0-beta.0", - "@opentiny/ng-select": "~1.0.0-beta.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-table": "~1.0.0-beta.2", + "@opentiny/ng-select": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-text": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-outline": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/pagination/lib/project.json b/src/pagination/lib/project.json index 0299b311fb8967d1adb3e05c034acc30998241ac..868f65ab9e91ae382e0803d5cd00f43f90f73412 100644 --- a/src/pagination/lib/project.json +++ b/src/pagination/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/pagination"], + "outputs": ["dist/libs/ng-pagination"], "options": { "project": "src/pagination/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/pagination"], + "outputs": ["dist/libs/ng-pagination"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/pagination && npm pack" + "command": "cd dist/libs/ng-pagination && npm pack" } ] } diff --git a/src/path/lib/ng-package.json b/src/path/lib/ng-package.json index 86ac57bc6915ffbfec9fe001fc7acdd30d5b9082..e4ef49944294898aceb4f57a785b04759dca67c2 100644 --- a/src/path/lib/ng-package.json +++ b/src/path/lib/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/path", + "dest": "../../../dist/libs/ng-path", "lib": { "entryFile": "./index.ts" } diff --git a/src/path/lib/package.json b/src/path/lib/package.json index 96b7bde5c94b64fe161f73a00c3407d876b204d3..0de57f81476ffa5b3dc8325ee3105c33b00c8e3d 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.0", + "version": "1.0.0-beta.2", "peerDependencies": { "@angular/common": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-droplist": "~1.0.0-beta.0", - "@opentiny/ng-renderer": "~1.0.0-beta.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", "@angular/core": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-overflow": "~1.0.0-beta.0", - "@opentiny/ng-text": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/path/lib/project.json b/src/path/lib/project.json index 2b5569b1600d410e495fe099983bfb0d8a403f45..7c2a362c07ae7241207ec608fb30fcffee452559 100644 --- a/src/path/lib/project.json +++ b/src/path/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/path"], + "outputs": ["dist/libs/ng-path"], "options": { "project": "src/path/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/path"], + "outputs": ["dist/libs/ng-path"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/path && npm pack" + "command": "cd dist/libs/ng-path && npm pack" } ] } diff --git a/src/phonenumber/lib/ng-package.json b/src/phonenumber/lib/ng-package.json index 019c0af4ada8c3b36c95d4570b4d9c12bff1086a..23e112d1da468a1fe348014c9f89d1ebc226f66d 100644 --- a/src/phonenumber/lib/ng-package.json +++ b/src/phonenumber/lib/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/phonenumber", + "dest": "../../../dist/libs/ng-phonenumber", "lib": { "entryFile": "./index.ts" } diff --git a/src/phonenumber/lib/package.json b/src/phonenumber/lib/package.json index 20b7c77d0b8ab0e67c1f6f502ee8001ff8962a6c..a91cd842902e58b1c19568ca203fcaacf4fdc2ce 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.0", + "version": "1.0.0-beta.2", "peerDependencies": { "@angular/core": ">=13.0.0", - "libphonenumber-js/max": "1.10.7", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-validation": "~1.0.0-beta.0", - "@opentiny/ng-select": "~1.0.0-beta.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", "@angular/common": ">=13.0.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", + "@opentiny/ng-locale": "~1.0.0-beta.2", "@angular/forms": ">=13.0.0", - "@opentiny/ng-text": "~1.0.0-beta.0" + "@opentiny/ng-text": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/phonenumber/lib/project.json b/src/phonenumber/lib/project.json index 47299b2feecc7d899748e130a4a6c49bbf2a13da..ea957b4ec8a0a661ec87c4c0f8d68eafba33e725 100644 --- a/src/phonenumber/lib/project.json +++ b/src/phonenumber/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/phonenumber"], + "outputs": ["dist/libs/ng-phonenumber"], "options": { "project": "src/phonenumber/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/phonenumber"], + "outputs": ["dist/libs/ng-phonenumber"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/phonenumber && npm pack" + "command": "cd dist/libs/ng-phonenumber && npm pack" } ] } diff --git a/src/popconfirm/lib/ng-package.json b/src/popconfirm/lib/ng-package.json index 8fcc72731bb799332375f82b03f711d1bbaca14d..a6eaaf6dfc7652a25d9d5207dc55b0285e309fbc 100644 --- a/src/popconfirm/lib/ng-package.json +++ b/src/popconfirm/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/popconfirm", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-popconfirm", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/popconfirm/lib/package.json b/src/popconfirm/lib/package.json index 2d58f06ddb536335329585cbb42253175c4a4e98..86475662e169d340ba4ad61e35cdac37bacfb5bb 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", + "@opentiny/ng-locale": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-tip": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-button": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/popconfirm/lib/project.json b/src/popconfirm/lib/project.json index f7e0e526320de873437f520184e1715e4b9eac91..b5edaa7ecb72614d2954e378de2c7bfb8275f9c0 100644 --- a/src/popconfirm/lib/project.json +++ b/src/popconfirm/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/popconfirm"], + "outputs": ["dist/libs/ng-popconfirm"], "options": { "project": "src/popconfirm/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/popconfirm"], + "outputs": ["dist/libs/ng-popconfirm"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/popconfirm && npm pack" + "command": "cd dist/libs/ng-popconfirm && npm pack" } ] } diff --git a/src/popup/lib/ng-package.json b/src/popup/lib/ng-package.json index 731317e27582a95f7b0baad0ab8ec8b12d3f6cf8..511c2ba6631eafd42e5bf97088fab8e757e4b960 100644 --- a/src/popup/lib/ng-package.json +++ b/src/popup/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/popup", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-popup", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/popup/lib/package.json b/src/popup/lib/package.json index 78ba41161a8e913f7e77f917836caafa1ab24170..7668c682973c4af25d476c1bfc511f94dc631358 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/common": ">=13.0.0", "@angular/platform-browser": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", + "@opentiny/ng-utils": "~1.0.0-beta.2", "@angular/core": ">=13.0.0" } } \ No newline at end of file diff --git a/src/popup/lib/project.json b/src/popup/lib/project.json index eff9f4ca774b604a6ceb541aaf46aaaff446e24b..64ed198384d62b952e864dbb018acd95dbbd38aa 100644 --- a/src/popup/lib/project.json +++ b/src/popup/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/popup"], + "outputs": ["dist/libs/ng-popup"], "options": { "project": "src/popup/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/popup"], + "outputs": ["dist/libs/ng-popup"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/popup && npm pack" + "command": "cd dist/libs/ng-popup && npm pack" } ] } diff --git a/src/productpreview/lib/ng-package.json b/src/productpreview/lib/ng-package.json index bd966957dd774da9f6a487b4eca57a4e278c8124..535c0ba49b2b36bac184e6864afc907430b08b03 100644 --- a/src/productpreview/lib/ng-package.json +++ b/src/productpreview/lib/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/productpreview", + "dest": "../../../dist/libs/ng-productpreview", "lib": { "entryFile": "./index.ts" } diff --git a/src/productpreview/lib/package.json b/src/productpreview/lib/package.json index bd6771d4955e3c25270cf48845467d92ad73ccb6..7a5cf5314929dbbc18f920e2041c0d3f4aedd335 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.0", + "version": "1.0.0-beta.2", "peerDependencies": { - "@opentiny/ng-imagepreview": "~1.0.0-beta.0", - "@opentiny/ng-modal": "~1.0.0-beta.0", + "@opentiny/ng-imagepreview": "~1.0.0-beta.2", + "@opentiny/ng-modal": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-zoom": "~1.0.0-beta.0", - "@opentiny/ng-outline": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/productpreview/lib/project.json b/src/productpreview/lib/project.json index 7d8414b3d3eb7fc261b605a6f9a70c8126faf499..548be4d2be6ca81c8f8ef04ac97646543c62814a 100644 --- a/src/productpreview/lib/project.json +++ b/src/productpreview/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/productpreview"], + "outputs": ["dist/libs/ng-productpreview"], "options": { "project": "src/productpreview/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/productpreview"], + "outputs": ["dist/libs/ng-productpreview"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/productpreview && npm pack" + "command": "cd dist/libs/ng-productpreview && npm pack" } ] } diff --git a/src/progressbar/lib/ng-package.json b/src/progressbar/lib/ng-package.json index ccd205302dd7b6693a89fa5b625322a4605a27e7..8ea9cf8bff47e2947a7663b57dd907c8b0d5f8b6 100644 --- a/src/progressbar/lib/ng-package.json +++ b/src/progressbar/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/progressbar", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-progressbar", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/progressbar/lib/package.json b/src/progressbar/lib/package.json index fd256b02c78ebe38b21fea7d18befdc0c44ed6c5..4afb54c2e7cda42763ce4cf2435633f60cf9d44b 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0" + "@opentiny/ng-base": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/progressbar/lib/project.json b/src/progressbar/lib/project.json index be0dfb441309ffe658503e21c449cd9646b88125..758824e3ce5ab4f4a17fd7c842516a6431561f45 100644 --- a/src/progressbar/lib/project.json +++ b/src/progressbar/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/progressbar"], + "outputs": ["dist/libs/ng-progressbar"], "options": { "project": "src/progressbar/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/progressbar"], + "outputs": ["dist/libs/ng-progressbar"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/progressbar && npm pack" + "command": "cd dist/libs/ng-progressbar && npm pack" } ] } diff --git a/src/progresspie/lib/ng-package.json b/src/progresspie/lib/ng-package.json index e9da0074932321ceff3ce70830bd66b66078ffc3..10002362ecddba7c2b531a9de44cfe0232fee810 100644 --- a/src/progresspie/lib/ng-package.json +++ b/src/progresspie/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/progresspie", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-progresspie", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/progresspie/lib/package.json b/src/progresspie/lib/package.json index 06e3288d709af3a0bd0b35c8b77b00f5db5bd274..54b5edc64e9cd5b87e0cc8f286e1d000b2d60d26 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0" diff --git a/src/progresspie/lib/project.json b/src/progresspie/lib/project.json index 88e228ab5ecadc5f03c19c5835707604ed2d25b6..195cbaac31975b8e5e4b96621a5db14f582c9676 100644 --- a/src/progresspie/lib/project.json +++ b/src/progresspie/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/progresspie"], + "outputs": ["dist/libs/ng-progresspie"], "options": { "project": "src/progresspie/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/progresspie"], + "outputs": ["dist/libs/ng-progresspie"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/progresspie && npm pack" + "command": "cd dist/libs/ng-progresspie && npm pack" } ] } diff --git a/src/radio/lib/ng-package.json b/src/radio/lib/ng-package.json index 791d024859edb98ec5c189322f94b88d2bca8da1..958605d0a600c49e83b230d2c67bee42407147c6 100644 --- a/src/radio/lib/ng-package.json +++ b/src/radio/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/radio", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-radio", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/radio/lib/package.json b/src/radio/lib/package.json index 333d75c176226a3b7f7424e86460de32fef9a798..925af4dc4fde4d7679aac047c51f76b292d18669 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-checkbox": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-checkbox": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-outline": "~1.0.0-beta.0" + "@opentiny/ng-outline": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/radio/lib/project.json b/src/radio/lib/project.json index 0cdae9617f1b7ae29af9e9e135149f93a0bff07a..e781b24fdc159e551f276e445762a0faac7441ab 100644 --- a/src/radio/lib/project.json +++ b/src/radio/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/radio"], + "outputs": ["dist/libs/ng-radio"], "options": { "project": "src/radio/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/radio"], + "outputs": ["dist/libs/ng-radio"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/radio && npm pack" + "command": "cd dist/libs/ng-radio && npm pack" } ] } diff --git a/src/rate/lib/ng-package.json b/src/rate/lib/ng-package.json index 235478fd7d89159720af369165c299972716d4b5..1974870dd97268c67eebcd79df8d9360a25758fd 100644 --- a/src/rate/lib/ng-package.json +++ b/src/rate/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/rate", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-rate", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/rate/lib/package.json b/src/rate/lib/package.json index 1b38fae72b5e7f1d44b335513a61190355b3f215..000feb910ea02eeb11212ea08026263b39a0668c 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0" + "@opentiny/ng-icon": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/rate/lib/project.json b/src/rate/lib/project.json index 3b46d04ff949082d3613d23917e6bfe147696c8b..63b0def2105bf959e482300f6d20f8a799d9f489 100644 --- a/src/rate/lib/project.json +++ b/src/rate/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/rate"], + "outputs": ["dist/libs/ng-rate"], "options": { "project": "src/rate/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/rate"], + "outputs": ["dist/libs/ng-rate"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/rate && npm pack" + "command": "cd dist/libs/ng-rate && npm pack" } ] } diff --git a/src/renderer/lib/ng-package.json b/src/renderer/lib/ng-package.json index 2a54afc2338ddd050f0fec6431ce5dc1ecb097a7..472c846a88471733df36e0cdf972aa8f05be3f82 100644 --- a/src/renderer/lib/ng-package.json +++ b/src/renderer/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/renderer", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-renderer", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/renderer/lib/package.json b/src/renderer/lib/package.json index afd422596f2e9a36422ba575eb2823bfcd970370..9fba5f0c07c2a7d4fc0b1a10f395c153ea69a46f 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0" diff --git a/src/renderer/lib/project.json b/src/renderer/lib/project.json index 8ea699a3d98a7d41d43b50c4c0970ae703391361..7af85bc38210a9beaf797d6eb60ea6550582d9ec 100644 --- a/src/renderer/lib/project.json +++ b/src/renderer/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/renderer"], + "outputs": ["dist/libs/ng-renderer"], "options": { "project": "src/renderer/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/renderer"], + "outputs": ["dist/libs/ng-renderer"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/renderer && npm pack" + "command": "cd dist/libs/ng-renderer && npm pack" } ] } diff --git a/src/rights/lib/ng-package.json b/src/rights/lib/ng-package.json index d403c5f42a1e5cb83265fa09d047ab7c2dd3a7b8..0782a52e4d5fd30b84d4e524818a73a19495d6a6 100644 --- a/src/rights/lib/ng-package.json +++ b/src/rights/lib/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/rights", + "dest": "../../../dist/libs/ng-rights", "lib": { "entryFile": "./index.ts" } diff --git a/src/rights/lib/package.json b/src/rights/lib/package.json index 18fc3bbb10cd9a7eb317120ce30edbf26b56dbb2..07880f495cab9019ea458405c635a9f03b32cec4 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.0", + "version": "1.0.0-beta.2", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-tip": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/rights/lib/project.json b/src/rights/lib/project.json index 71fa8d8bfeb4d5ef8457008043edcdb2c4e1cbf2..7708d8fb38e006e006e5b068fd3a1e0666f946b1 100644 --- a/src/rights/lib/project.json +++ b/src/rights/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/rights"], + "outputs": ["dist/libs/ng-rights"], "options": { "project": "src/rights/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/rights"], + "outputs": ["dist/libs/ng-rights"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/rights && npm pack" + "command": "cd dist/libs/ng-rights && npm pack" } ] } diff --git a/src/score/lib/ng-package.json b/src/score/lib/ng-package.json index da4d0a7218f0dafd2ac85966baf7f82f18750707..af76987b402092e4abbfb542ac908bfd036b6c8d 100644 --- a/src/score/lib/ng-package.json +++ b/src/score/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/score", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-score", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/score/lib/package.json b/src/score/lib/package.json index 02de7cb569c416e30202e60e3f21366be7304e3f..5e7d5fb49903d3616120665e474306594bf5e780 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-outline": "~1.0.0-beta.0" + "@opentiny/ng-locale": "~1.0.0-beta.2", + "@opentiny/ng-outline": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/score/lib/project.json b/src/score/lib/project.json index da34bcfc1b7920c6e666435098e68a1fa279149c..3ac3c5113f82c52cff222e1c02c5843e9285ace1 100644 --- a/src/score/lib/project.json +++ b/src/score/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/score"], + "outputs": ["dist/libs/ng-score"], "options": { "project": "src/score/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/score"], + "outputs": ["dist/libs/ng-score"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/score && npm pack" + "command": "cd dist/libs/ng-score && npm pack" } ] } diff --git a/src/scroll/lib/ng-package.json b/src/scroll/lib/ng-package.json index f1d85f4bfa426667a962bc02b9822bd717ad088a..a2803537ef2420bbc7b747733279b9d1f27b750a 100644 --- a/src/scroll/lib/ng-package.json +++ b/src/scroll/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/scroll", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-scroll", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/scroll/lib/package.json b/src/scroll/lib/package.json index 1a24b5387c8a0f12df0687c73cc8644aaec1c4f8..9c285055c7e916abb44b176a4c4746190b78bf18 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.0" + "@opentiny/ng-utils": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/scroll/lib/project.json b/src/scroll/lib/project.json index 5913177953f31f3d5c6ece42b801e36e5259c9eb..3ab700128c1f41d2238701fc554f6d65766a0d95 100644 --- a/src/scroll/lib/project.json +++ b/src/scroll/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/scroll"], + "outputs": ["dist/libs/ng-scroll"], "options": { "project": "src/scroll/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/scroll"], + "outputs": ["dist/libs/ng-scroll"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/scroll && npm pack" + "command": "cd dist/libs/ng-scroll && npm pack" } ] } diff --git a/src/searchbox/demo/src/app/searchbox/SearchboxSuggestComponent.ts b/src/searchbox/demo/src/app/searchbox/SearchboxSuggestComponent.ts index dbf505a7452270fb6f5c3e843b83ea555bb155d1..a98b9e2e4a262edfecfc36e238aa74a3da15bccf 100644 --- a/src/searchbox/demo/src/app/searchbox/SearchboxSuggestComponent.ts +++ b/src/searchbox/demo/src/app/searchbox/SearchboxSuggestComponent.ts @@ -1,31 +1,112 @@ -import { Component } from '@angular/core'; +import { Component, OnDestroy } from '@angular/core'; import { TiSearchboxComponent } from '@opentiny/ng'; @Component({ templateUrl: './searchbox-suggest.html' }) -export class SearchboxSuggestComponent { +export class SearchboxSuggestComponent implements OnDestroy { value: string = ''; + value1: string = ''; + value2: string = '3345266'; + timeout: any; onSuggest(searchbox: TiSearchboxComponent): void { + if (this.timeout) { + clearTimeout(this.timeout); + } searchbox.setSuggestions(this.getSuggestion(searchbox.model)); } + onSuggest1(searchbox: TiSearchboxComponent): void { + if (this.timeout) { + clearTimeout(this.timeout); + } + searchbox.setLoading(true); + // 模拟后台异步请求 + this.getData(searchbox.model).then((result: any) => { + searchbox.setLoading(false); + searchbox.setSuggestions(result.data); + }); + } + + onSuggest2(searchbox: TiSearchboxComponent): void { + if (this.timeout) { + clearTimeout(this.timeout); + } + searchbox.setLoading(true); + // 模拟后台异步请求 + this.getNoData(searchbox.model).then((result: any) => { + searchbox.setLoading(false); + searchbox.setSuggestions(result.data); + }); + } + private getSuggestion(value: string): Array { const options: Array = value ? [ { - label: value + '@example.com' + label: value + '@a.com' + }, + { + label: value + '@b.com' + }, + { + label: value + '@c.com' + }, + { + label: value + '@d.com' }, { - label: value + '@example.com' + label: value + '@e.com' }, { - label: value + '@example.com' + label: value + '@f.com' } ] - : []; + : [ + { + label: '@a.com' + }, + { + label: '@b.com' + }, + { + label: '@c.com' + }, + { + label: '@d.com' + }, + { + label: '@e.com' + }, + { + label: '@f.com' + } + ]; return options; } + + private getData(searchWord: string): Promise { + return new Promise((resolve: any, reject: any): any => { + let result: Array = this.getSuggestion(searchWord); + this.timeout = setTimeout(() => { + resolve({ data: result }); + }, 1500); + }); + } + + private getNoData(searchWord: string): Promise { + return new Promise((resolve: any, reject: any): any => { + this.timeout = setTimeout(() => { + resolve({ data: [] }); + }, 1500); + }); + } + + ngOnDestroy(): void { + if (this.timeout) { + clearTimeout(this.timeout); + } + } } diff --git a/src/searchbox/demo/src/app/searchbox/searchbox-suggest.html b/src/searchbox/demo/src/app/searchbox/searchbox-suggest.html index 6ff5730238263564361013e9ff06f0d839ce7ee6..bc73cac8802b3875010de6bcf9a9fe9933a9dbdd 100644 --- a/src/searchbox/demo/src/app/searchbox/searchbox-suggest.html +++ b/src/searchbox/demo/src/app/searchbox/searchbox-suggest.html @@ -1,5 +1,17 @@ +

1.无加载状态

- 
Current Value: {{ value }}
+ +

2.加载有数据

+ +
+ 
Current Value: {{ value1 }}
+
+ +

3.加载无数据

+ +
+ 
Current Value: {{ value2 }}
+
diff --git a/src/searchbox/demo/src/app/searchbox/webdoc/searchbox-demos.js b/src/searchbox/demo/src/app/searchbox/webdoc/searchbox-demos.js index ae1fc9a728367a15092f1260595906738ca39de0..33985139b3ff748e8cb4f52c312d53386ba282e7 100644 --- a/src/searchbox/demo/src/app/searchbox/webdoc/searchbox-demos.js +++ b/src/searchbox/demo/src/app/searchbox/webdoc/searchbox-demos.js @@ -70,10 +70,15 @@ export default { 'en-US': 'item' }, desc: { - 'zh-CN': '

通过suggest事件配置当聚焦或值改变时触发事件，为开发者提供设置建议项的时机。

', + 'zh-CN': + '

通过suggest事件配置当聚焦或值改变时触发事件，为开发者提供设置建议项的时机。通过setLoading()方法设置加载状态。

', 'en-US': '

item

' }, - apis: ['TiSearchboxComponent.events.suggest', 'TiSearchboxComponent.methods.setSuggestions'] + apis: [ + 'TiSearchboxComponent.events.suggest', + 'TiSearchboxComponent.methods.setSuggestions', + 'TiSearchboxComponent.methods.setLoading' + ] }, { demoId: 'searchbox-maxlength', diff --git a/src/searchbox/lib/ng-package.json b/src/searchbox/lib/ng-package.json index 5f866fac01e75fd482e1e6455f53869941ead48f..700f53871d2a138d03312df60892ea0b748fc321 100644 --- a/src/searchbox/lib/ng-package.json +++ b/src/searchbox/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/searchbox", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-searchbox", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/searchbox/lib/package.json b/src/searchbox/lib/package.json index 69404bbe3c07b8538f43d1346722da9c1057ff04..4234f0fe1eb2c03a8f1129d7f15c387261123fa0 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-autocomplete": "~1.0.0-beta.0", + "@opentiny/ng-autocomplete": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-overflow": "~1.0.0-beta.0", - "@opentiny/ng-droplist": "~1.0.0-beta.0", - "@opentiny/ng-text": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-outline": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/searchbox/lib/project.json b/src/searchbox/lib/project.json index 9f7088d3350439511d04301a8134c00b55f56d65..7f47a7eb1af2fd1d59c0e25b9099c1fb09844dc6 100644 --- a/src/searchbox/lib/project.json +++ b/src/searchbox/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/searchbox"], + "outputs": ["dist/libs/ng-searchbox"], "options": { "project": "src/searchbox/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/searchbox"], + "outputs": ["dist/libs/ng-searchbox"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/searchbox && npm pack" + "command": "cd dist/libs/ng-searchbox && npm pack" } ] } diff --git a/src/searchbox/lib/src/searchbox.html b/src/searchbox/lib/src/searchbox.html index 5781f0f53d29af7af71dbfce7b8803f2785c2cb3..d848cba39353de47cfc5da7d93579e769a126bfd 100644 --- a/src/searchbox/lib/src/searchbox.html +++ b/src/searchbox/lib/src/searchbox.html @@ -34,6 +34,7 @@ [panelWidth]="panelWidth" [referElem]="appendToBody ? undefined : nativeElement" [virtual]="virtual" + [loading]="loading" (ngModelChange)="onDroplistChange($event)" (select)="onSelect($event)" [id]="appendId('droplist')" diff --git a/src/select/lib/ng-package.json b/src/select/lib/ng-package.json index cbc5c84e3c8f3af7ccaea8eec62492a6bdb66f94..0c4c591fa3b89e193a17d41f2192d43b8a557cd9 100644 --- a/src/select/lib/ng-package.json +++ b/src/select/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/select", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-select", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/select/lib/package.json b/src/select/lib/package.json index fa4f9098ce8639f77c805d603adf7b0f54d0cd6b..e747d0f460d64c118712af3bd9eb4b7ff3478fc7 100644 --- a/src/select/lib/package.json +++ b/src/select/lib/package.json @@ -1,17 +1,17 @@ { "name": "@opentiny/ng-select", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-dominator": "~1.0.0-beta.0", - "@opentiny/ng-drop": "~1.0.0-beta.0", - "@opentiny/ng-dropsearch": "~1.0.0-beta.0", - "@opentiny/ng-list": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-dominator": "~1.0.0-beta.2", + "@opentiny/ng-drop": "~1.0.0-beta.2", + "@opentiny/ng-dropsearch": "~1.0.0-beta.2", + "@opentiny/ng-list": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-locale": "~1.0.0-beta.0" + "@opentiny/ng-locale": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/select/lib/project.json b/src/select/lib/project.json index 785d86f92dd0ef9696e1e889eeb0d9d7ba08c26e..3b5b9b01e858201455c04581169d9caadffc624c 100644 --- a/src/select/lib/project.json +++ b/src/select/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/select"], + "outputs": ["dist/libs/ng-select"], "options": { "project": "src/select/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/select"], + "outputs": ["dist/libs/ng-select"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/select && npm pack" + "command": "cd dist/libs/ng-select && npm pack" } ] } diff --git a/src/selectgroup/lib/ng-package.json b/src/selectgroup/lib/ng-package.json index 34516a071e136063421776d1f73549b3f24f573e..3f6b62ba80609027c3c0430b8ef4f5bc4273eadb 100644 --- a/src/selectgroup/lib/ng-package.json +++ b/src/selectgroup/lib/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/selectgroup", + "dest": "../../../dist/libs/ng-selectgroup", "lib": { "entryFile": "./index.ts" } diff --git a/src/selectgroup/lib/package.json b/src/selectgroup/lib/package.json index 26812fd4ee739e884355307e0274ba51e4320c83..3342dc91cef74d3be6ba5ac0ec72da81920c7b98 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.0", + "version": "1.0.0-beta.2", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-overflow": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/selectgroup/lib/project.json b/src/selectgroup/lib/project.json index 50567fb5eed99dcd418e43d8d52d676e25ab9f85..2ea1ee6ec83a23180eb9e27a51b5a1d10b498177 100644 --- a/src/selectgroup/lib/project.json +++ b/src/selectgroup/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/selectgroup"], + "outputs": ["dist/libs/ng-selectgroup"], "options": { "project": "src/selectgroup/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/selectgroup"], + "outputs": ["dist/libs/ng-selectgroup"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/selectgroup && npm pack" + "command": "cd dist/libs/ng-selectgroup && npm pack" } ] } diff --git a/src/skeleton/lib/ng-package.json b/src/skeleton/lib/ng-package.json index 0037f39d467b2314bffd4faee0e06ab8f3b1dc53..7be0385680afbc00aeb66f6a4ab1861b31303fa4 100644 --- a/src/skeleton/lib/ng-package.json +++ b/src/skeleton/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/skeleton", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-skeleton", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/skeleton/lib/package.json b/src/skeleton/lib/package.json index 7235b21a278c84e187ab53bb6d321014db939c7b..58e8cdb33d60c0de1a1c468b371572e085e94631 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", diff --git a/src/skeleton/lib/project.json b/src/skeleton/lib/project.json index fac4d7129e5ee268d867619491924415b99e493a..e99175608e2c723b9cfb35cfe1a7fb9cfbeff682 100644 --- a/src/skeleton/lib/project.json +++ b/src/skeleton/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/skeleton"], + "outputs": ["dist/libs/ng-skeleton"], "options": { "project": "src/skeleton/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/skeleton"], + "outputs": ["dist/libs/ng-skeleton"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/skeleton && npm pack" + "command": "cd dist/libs/ng-skeleton && npm pack" } ] } diff --git a/src/slider/lib/ng-package.json b/src/slider/lib/ng-package.json index 6d1f1587b7597f781a8cab2d4b70fb10477f7a2c..53157a795b90a76afebcb5923afa933815256444 100644 --- a/src/slider/lib/ng-package.json +++ b/src/slider/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/slider", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-slider", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/slider/lib/package.json b/src/slider/lib/package.json index 741087411bc4c57105670b0180e798bef1d47ec7..df6bcdc1e0127eb4c130c4619139f9d1742272ac 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/platform-browser": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-renderer": "~1.0.0-beta.0", + "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-renderer": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-drag": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/slider/lib/project.json b/src/slider/lib/project.json index f341207a63f6beb5ee012dbdcce7e1b8adc643b2..f886483333c090556c0e9a76625091ab08f36e19 100644 --- a/src/slider/lib/project.json +++ b/src/slider/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/slider"], + "outputs": ["dist/libs/ng-slider"], "options": { "project": "src/slider/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/slider"], + "outputs": ["dist/libs/ng-slider"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/slider && npm pack" + "command": "cd dist/libs/ng-slider && npm pack" } ] } diff --git a/src/spinner/lib/ng-package.json b/src/spinner/lib/ng-package.json index 5ce85f5d00406762ea443387ef86cd6024276f62..7af472b3f834101e956240297e2f643bd72ddae6 100644 --- a/src/spinner/lib/ng-package.json +++ b/src/spinner/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/spinner", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-spinner", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/spinner/lib/package.json b/src/spinner/lib/package.json index e35a8a182c4c27a961560c5cbcfbf91ccfd6f1c3..4bd6e63061efd88717da7f1514d62821d88ecd0e 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-inputnumber": "~1.0.0-beta.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-inputnumber": "~1.0.0-beta.2", "@angular/forms": ">=13.0.0", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-text": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-tip": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/spinner/lib/project.json b/src/spinner/lib/project.json index f49d9c2c3eeaabf496d01b35a49df4c16b2c72bc..a6e48828290f2624985f59e1aa35c4183ca16428 100644 --- a/src/spinner/lib/project.json +++ b/src/spinner/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/spinner"], + "outputs": ["dist/libs/ng-spinner"], "options": { "project": "src/spinner/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/spinner"], + "outputs": ["dist/libs/ng-spinner"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/spinner && npm pack" + "command": "cd dist/libs/ng-spinner && npm pack" } ] } diff --git a/src/steps/lib/ng-package.json b/src/steps/lib/ng-package.json index ad914a307226f621ef62ff79dd5401c86c3b6728..6845a1e68b511733d032d894da3e0594bc6a7990 100644 --- a/src/steps/lib/ng-package.json +++ b/src/steps/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/steps", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-steps", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/steps/lib/package.json b/src/steps/lib/package.json index ded6800602e892b2da4f8c8635b68918f2d72693..12596e8172e432e54aa17318fc44c65fe5659a85 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.0", + "@opentiny/ng-utils": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-overflow": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-outline": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/steps/lib/project.json b/src/steps/lib/project.json index 065c1738870973a031c6c56babb2bcd210d93de5..2f01d5c4ebc7756d0860535926dd10b2d6cef3d6 100644 --- a/src/steps/lib/project.json +++ b/src/steps/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/steps"], + "outputs": ["dist/libs/ng-steps"], "options": { "project": "src/steps/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/steps"], + "outputs": ["dist/libs/ng-steps"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/steps && npm pack" + "command": "cd dist/libs/ng-steps && npm pack" } ] } diff --git a/src/subtitle/lib/ng-package.json b/src/subtitle/lib/ng-package.json index ab082c89c552fc6ec0ddc6309a0bac13a8743d50..ef431e6676f4707ad6c9664acd51d3fb0852036f 100644 --- a/src/subtitle/lib/ng-package.json +++ b/src/subtitle/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/subtitle", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-subtitle", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/subtitle/lib/package.json b/src/subtitle/lib/package.json index c526a4191ecf13a0668d77d8a049bc2e8b2a561e..ba770bc5a1c5ba14dd68b94da40a004253dc2d2d 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/router": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-list": "~1.0.0-beta.0", - "@opentiny/ng-select": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.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", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-overflow": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-tip": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/subtitle/lib/project.json b/src/subtitle/lib/project.json index 7da3405bd02988eb60d6ec46290eb1df41994375..34d32cd87f4029c7e84d30f197424dc144c9c422 100644 --- a/src/subtitle/lib/project.json +++ b/src/subtitle/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/subtitle"], + "outputs": ["dist/libs/ng-subtitle"], "options": { "project": "src/subtitle/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/subtitle"], + "outputs": ["dist/libs/ng-subtitle"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/subtitle && npm pack" + "command": "cd dist/libs/ng-subtitle && npm pack" } ] } diff --git a/src/swiper/lib/ng-package.json b/src/swiper/lib/ng-package.json index 723dd1564df4334d1ee7e1ffc02df415216ee71c..8e3ce3db3e2e427aa27fb3620f57ea331d634733 100644 --- a/src/swiper/lib/ng-package.json +++ b/src/swiper/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/swiper", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-swiper", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/swiper/lib/package.json b/src/swiper/lib/package.json index 6c8cda29c952115517778ceaf6c51eb074a4a46c..fe6b12746c4565af36e3a0450d35c19cf831e894 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-outline": "~1.0.0-beta.0" + "@opentiny/ng-icon": "~1.0.0-beta.2", + "@opentiny/ng-outline": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/swiper/lib/project.json b/src/swiper/lib/project.json index 4742d17342b1897ab18383d6af0ea7c589a1b135..f8d0943ea7d0bfe67516d055648b55020cd9b3b4 100644 --- a/src/swiper/lib/project.json +++ b/src/swiper/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/swiper"], + "outputs": ["dist/libs/ng-swiper"], "options": { "project": "src/swiper/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/swiper"], + "outputs": ["dist/libs/ng-swiper"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/swiper && npm pack" + "command": "cd dist/libs/ng-swiper && npm pack" } ] } diff --git a/src/switch/lib/ng-package.json b/src/switch/lib/ng-package.json index 66797ddc385ae2f0906cf666d252034a2d0c095c..52549d27f1f7add9e1d10675320d5a69d503f619 100644 --- a/src/switch/lib/ng-package.json +++ b/src/switch/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/switch", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-switch", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/switch/lib/package.json b/src/switch/lib/package.json index ccbe22f408f101d2a0eee9c55d9fb19523bca980..3b3e61a59052a2071c59ebc58408d316d62d32af 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0" + "@opentiny/ng-base": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/switch/lib/project.json b/src/switch/lib/project.json index eb9a67053382821b1f3cad74609f2e246b465fa7..bb5b8a5dd15e9ae26c83d6f8948aa1525a515a00 100644 --- a/src/switch/lib/project.json +++ b/src/switch/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/switch"], + "outputs": ["dist/libs/ng-switch"], "options": { "project": "src/switch/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/switch"], + "outputs": ["dist/libs/ng-switch"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/switch && npm pack" + "command": "cd dist/libs/ng-switch && npm pack" } ] } diff --git a/src/tab/lib/ng-package.json b/src/tab/lib/ng-package.json index 5116880c92a1963f961867d2b2fee941ec1526bb..8705a2634e18413272ae5d2d45bbd3cdf6b5136a 100644 --- a/src/tab/lib/ng-package.json +++ b/src/tab/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/tab", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-tab", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/tab/lib/package.json b/src/tab/lib/package.json index 5d8d430bbfbdc599645a71e978a4e471ac2f0865..164ba8e16ced164fbce1a6b47f93f927af04e3bf 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.0", + "@opentiny/ng-utils": "~1.0.0-beta.2", "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-include": "~1.0.0-beta.0", - "@opentiny/ng-renderer": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-droplist": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/tab/lib/project.json b/src/tab/lib/project.json index fa1fa591ee142ba37e223756ae261e39c4b4a680..e37e50a8c1061e80dee719275e4d22a1c7adf655 100644 --- a/src/tab/lib/project.json +++ b/src/tab/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/tab"], + "outputs": ["dist/libs/ng-tab"], "options": { "project": "src/tab/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/tab"], + "outputs": ["dist/libs/ng-tab"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/tab && npm pack" + "command": "cd dist/libs/ng-tab && npm pack" } ] } diff --git a/src/table/lib/ng-package.json b/src/table/lib/ng-package.json index 973474d94fabc1cb35bc344e04c3aa0ea3fe9b8e..70bdd201172a6e40526f4a131fb97a7e550a2d3e 100644 --- a/src/table/lib/ng-package.json +++ b/src/table/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/table", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-table", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/table/lib/package.json b/src/table/lib/package.json index 007c7833a0dfd1abfe2af3246b87f013d302582a..389e0c776017fd699533ef8e1b8fbb82ab31af79 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-renderer": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", + "@opentiny/ng-renderer": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-select": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-dropsearch": "~1.0.0-beta.0", - "@opentiny/ng-list": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-datebase": "~1.0.0-beta.0", - "@opentiny/ng-button": "~1.0.0-beta.0", - "@opentiny/ng-drop": "~1.0.0-beta.0", - "@angular/cdk/scrolling": ">=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", + "@angular/cdk": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-date": "~1.0.0-beta.0", - "@opentiny/ng-datetime": "~1.0.0-beta.0", - "@opentiny/ng-searchbox": "~1.0.0-beta.0", - "@opentiny/ng-overflow": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-tip": "~1.0.0-beta.0", - "@opentiny/ng-outline": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/table/lib/project.json b/src/table/lib/project.json index 76cc3d8b6b847dff92992cb3d80a91fff655b4f8..9d8f5326747478a0a53aaafbb2382bf2d1576e81 100644 --- a/src/table/lib/project.json +++ b/src/table/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/table"], + "outputs": ["dist/libs/ng-table"], "options": { "project": "src/table/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/table"], + "outputs": ["dist/libs/ng-table"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/table && npm pack" + "command": "cd dist/libs/ng-table && npm pack" } ] } diff --git a/src/tag/lib/ng-package.json b/src/tag/lib/ng-package.json index 6c45b6c3c93f35c41bc57d37db35efa34396eca8..7f0fcb35b6356922b9a4c54f785b161e9315e089 100644 --- a/src/tag/lib/ng-package.json +++ b/src/tag/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/tag", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-tag", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/tag/lib/package.json b/src/tag/lib/package.json index 5b31f1a0d6faf138834a56f28797e0c774f6a6b8..ab449a3b8af06148590690071347e6cb1d67407c 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.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0" + "@opentiny/ng-icon": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/tag/lib/project.json b/src/tag/lib/project.json index cc0dd9182725a0e4aed3b5bf15a6081d55b0d768..f3ea55a28d18488c787ea6f8b91919561aad7ca7 100644 --- a/src/tag/lib/project.json +++ b/src/tag/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/tag"], + "outputs": ["dist/libs/ng-tag"], "options": { "project": "src/tag/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/tag"], + "outputs": ["dist/libs/ng-tag"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/tag && npm pack" + "command": "cd dist/libs/ng-tag && npm pack" } ] } diff --git a/src/tagsinput/lib/ng-package.json b/src/tagsinput/lib/ng-package.json index 8fed06b5e74f826c01e06b735a0037b5eb6b9762..7ee79bf35152879f7afa05fd581ffc741c5233ec 100644 --- a/src/tagsinput/lib/ng-package.json +++ b/src/tagsinput/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/tagsinput", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-tagsinput", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/tagsinput/lib/package.json b/src/tagsinput/lib/package.json index aa2b6c73125b31f3f50e4ac5aa3d5c2d7296482c..56202c3e3d8e2df9ac1900ee0c3ef75e4e192a41 100644 --- a/src/tagsinput/lib/package.json +++ b/src/tagsinput/lib/package.json @@ -1,15 +1,15 @@ { "name": "@opentiny/ng-tagsinput", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-dominator": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-dropsearch": "~1.0.0-beta.0", + "@opentiny/ng-dominator": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-dropsearch": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-text": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0" + "@opentiny/ng-text": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/tagsinput/lib/project.json b/src/tagsinput/lib/project.json index 0947c6e3eca0038adf0432e45ca49d161f39105a..dcf974916a2bc6eb155b1173061da72cd0037928 100644 --- a/src/tagsinput/lib/project.json +++ b/src/tagsinput/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/tagsinput"], + "outputs": ["dist/libs/ng-tagsinput"], "options": { "project": "src/tagsinput/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/tagsinput"], + "outputs": ["dist/libs/ng-tagsinput"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/tagsinput && npm pack" + "command": "cd dist/libs/ng-tagsinput && npm pack" } ] } diff --git a/src/text/lib/ng-package.json b/src/text/lib/ng-package.json index 3b60e5795356569fec6ce7c0fcb8d913b755cfef..d35d12af913950f69b2fe0b07eac26b86e38c948 100644 --- a/src/text/lib/ng-package.json +++ b/src/text/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/text", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-text", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/text/lib/package.json b/src/text/lib/package.json index 0dc62cea07c0a7ddc078ebb5fb89507d65f9ce42..1f851ba5692088818dd61bb0dd4c63b6548ef63a 100644 --- a/src/text/lib/package.json +++ b/src/text/lib/package.json @@ -1,13 +1,13 @@ { "name": "@opentiny/ng-text", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-renderer": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.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", "@angular/common": ">=13.0.0" } } \ No newline at end of file diff --git a/src/text/lib/project.json b/src/text/lib/project.json index cdf1fffbff89a691554922aa4259ea787da31d97..b17450adce8ef108623d7f6c83cab6884fb1ebbb 100644 --- a/src/text/lib/project.json +++ b/src/text/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/text"], + "outputs": ["dist/libs/ng-text"], "options": { "project": "src/text/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/text"], + "outputs": ["dist/libs/ng-text"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/text && npm pack" + "command": "cd dist/libs/ng-text && npm pack" } ] } diff --git a/src/textarea/lib/ng-package.json b/src/textarea/lib/ng-package.json index 4aad4e86747a2e3edad17275c51fc4e0f1ae3b8f..0557e7c7b9f799a3434c6314d5c96e3765fe6761 100644 --- a/src/textarea/lib/ng-package.json +++ b/src/textarea/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/textarea", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-textarea", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/textarea/lib/package.json b/src/textarea/lib/package.json index 3e89886d2e73b6902dbf9b017c5f21c73098e090..05c1edcb11409a1f861850903d47221503a8638c 100644 --- a/src/textarea/lib/package.json +++ b/src/textarea/lib/package.json @@ -1,14 +1,14 @@ { "name": "@opentiny/ng-textarea", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/forms": ">=13.0.0", - "@opentiny/ng-renderer": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0" + "@opentiny/ng-renderer": "~1.0.0-beta.2", + "@opentiny/ng-locale": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/textarea/lib/project.json b/src/textarea/lib/project.json index 78e16a6129b319ed92fb40277f586cb1020ad69b..267b68ad8761470f3d201652c667459e16a14451 100644 --- a/src/textarea/lib/project.json +++ b/src/textarea/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/textarea"], + "outputs": ["dist/libs/ng-textarea"], "options": { "project": "src/textarea/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/textarea"], + "outputs": ["dist/libs/ng-textarea"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/textarea && npm pack" + "command": "cd dist/libs/ng-textarea && npm pack" } ] } diff --git a/src/themes/package.json b/src/themes/package.json index 9c815b13b7152a6e73aa253f7583cecbacb81ec5..043c965945ab5bc25bb5a3bec2d297152c9f2eb4 100644 --- a/src/themes/package.json +++ b/src/themes/package.json @@ -1,5 +1,5 @@ { "name": "@opentiny/ng-themes", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT" } \ No newline at end of file diff --git a/src/themes/project.json b/src/themes/project.json index f1b81dd0a5686ef90e96f87d02450aab528953e0..008ba9957eaa61645ec1781433df4111ce7be417 100644 --- a/src/themes/project.json +++ b/src/themes/project.json @@ -5,7 +5,7 @@ "targets": { "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/themes"], + "outputs": ["dist/libs/ng-themes"], "options": { "commands": [ { @@ -19,7 +19,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/themes && npm pack" + "command": "cd dist/libs/ng-themes && npm pack" } ] } diff --git a/src/time/lib/ng-package.json b/src/time/lib/ng-package.json index 5802f0c761e79b66f4cfd464c9f5a332468993c5..335bd5a983d692ff91c3f80fbfc270a1a5a4ab75 100644 --- a/src/time/lib/ng-package.json +++ b/src/time/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/time", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-time", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/time/lib/package.json b/src/time/lib/package.json index 4bc7df64e81276b359c7617adecb3c5a6281343b..dcb350ab65070195c2453fb3201056ff6de071e3 100644 --- a/src/time/lib/package.json +++ b/src/time/lib/package.json @@ -1,18 +1,18 @@ { "name": "@opentiny/ng-time", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-drop": "~1.0.0-beta.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-drop": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", "@angular/core": ">=13.0.0", - "@opentiny/ng-datedominator": "~1.0.0-beta.0", - "@opentiny/ng-list": "~1.0.0-beta.0", - "@opentiny/ng-text": "~1.0.0-beta.0", - "@opentiny/ng-button": "~1.0.0-beta.0" + "@opentiny/ng-datedominator": "~1.0.0-beta.2", + "@opentiny/ng-list": "~1.0.0-beta.2", + "@opentiny/ng-text": "~1.0.0-beta.2", + "@opentiny/ng-button": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/time/lib/project.json b/src/time/lib/project.json index 7c9934966cca7c61aaf82ca96bfc311ad2f014b5..2eebf713ba55a044e0e8c5790546505306b73650 100644 --- a/src/time/lib/project.json +++ b/src/time/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/time"], + "outputs": ["dist/libs/ng-time"], "options": { "project": "src/time/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/time"], + "outputs": ["dist/libs/ng-time"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/time && npm pack" + "command": "cd dist/libs/ng-time && npm pack" } ] } diff --git a/src/timeline/lib/ng-package.json b/src/timeline/lib/ng-package.json index bfd1328aec7ac63ffee92f55228d7f2680bf5c88..8edea9ac6f1d02f5394e3897a8ebece09dcdce8c 100644 --- a/src/timeline/lib/ng-package.json +++ b/src/timeline/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/timeline", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-timeline", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/timeline/lib/package.json b/src/timeline/lib/package.json index 046eab5bd2361e128a5c7397b92a39f1d0790ee3..b7e8720e305e37c6cd520c3d4cda9e04c39b82e8 100644 --- a/src/timeline/lib/package.json +++ b/src/timeline/lib/package.json @@ -1,13 +1,13 @@ { "name": "@opentiny/ng-timeline", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", "@angular/core": ">=13.0.0", - "@opentiny/ng-tip": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.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" } } \ No newline at end of file diff --git a/src/timeline/lib/project.json b/src/timeline/lib/project.json index 8f6d71c6dd4dd17904657da7c4d75a8ca4ade7c0..11c281d4f264a1150294c8cb8f527c7a9ba558f4 100644 --- a/src/timeline/lib/project.json +++ b/src/timeline/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/timeline"], + "outputs": ["dist/libs/ng-timeline"], "options": { "project": "src/timeline/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/timeline"], + "outputs": ["dist/libs/ng-timeline"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/timeline && npm pack" + "command": "cd dist/libs/ng-timeline && npm pack" } ] } diff --git a/src/tip/lib/ng-package.json b/src/tip/lib/ng-package.json index 371691be48899fe9dda17f435eea192c2f2882be..6412d7468b8ad0e67a7125d91295d7512d2b46f4 100644 --- a/src/tip/lib/ng-package.json +++ b/src/tip/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/tip", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-tip", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/tip/lib/package.json b/src/tip/lib/package.json index 9baf2b3a021ac79187b4163fbb95eb0b92d7278c..8d3cf63fd11f8033ad5aab9165d645c525e0ba39 100644 --- a/src/tip/lib/package.json +++ b/src/tip/lib/package.json @@ -1,13 +1,13 @@ { "name": "@opentiny/ng-tip", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", + "@opentiny/ng-utils": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", "@angular/router": ">=13.0.0", - "@opentiny/ng-popup": "~1.0.0-beta.0", - "@opentiny/ng-renderer": "~1.0.0-beta.0" + "@opentiny/ng-popup": "~1.0.0-beta.2", + "@opentiny/ng-renderer": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/tip/lib/project.json b/src/tip/lib/project.json index 18e5ef4c50940b795eb03d0d13dfd99ac67fe129..5d57a73acda7cd524dab55bce2065b2143f4f82e 100644 --- a/src/tip/lib/project.json +++ b/src/tip/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/tip"], + "outputs": ["dist/libs/ng-tip"], "options": { "project": "src/tip/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/tip"], + "outputs": ["dist/libs/ng-tip"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/tip && npm pack" + "command": "cd dist/libs/ng-tip && npm pack" } ] } diff --git a/src/transfer/lib/ng-package.json b/src/transfer/lib/ng-package.json index b1d24dd7642751ca42950cf4fb401d17eb475471..57c4c65335fd66e1a1f6fa63f08f7a7db0e6a82a 100644 --- a/src/transfer/lib/ng-package.json +++ b/src/transfer/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/transfer", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-transfer", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/transfer/lib/package.json b/src/transfer/lib/package.json index 20ba4a3b8d8dd8a8685e84ac5ef7c6b83f0b26b4..8284d5cd9861d9887c0227d18ec2201cbc141df3 100644 --- a/src/transfer/lib/package.json +++ b/src/transfer/lib/package.json @@ -1,22 +1,22 @@ { "name": "@opentiny/ng-transfer", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-locale": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-dropsearch": "~1.0.0-beta.0", - "@opentiny/ng-drop": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-list": "~1.0.0-beta.0", - "@opentiny/ng-searchbox": "~1.0.0-beta.0", - "@opentiny/ng-table": "~1.0.0-beta.0", - "@opentiny/ng-overflow": "~1.0.0-beta.0", - "@opentiny/ng-checkbox": "~1.0.0-beta.0", - "@opentiny/ng-pagination": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0" + "@opentiny/ng-dropsearch": "~1.0.0-beta.2", + "@opentiny/ng-drop": "~1.0.0-beta.2", + "@opentiny/ng-icon": "~1.0.0-beta.2", + "@opentiny/ng-list": "~1.0.0-beta.2", + "@opentiny/ng-searchbox": "~1.0.0-beta.2", + "@opentiny/ng-table": "~1.0.0-beta.2", + "@opentiny/ng-overflow": "~1.0.0-beta.2", + "@opentiny/ng-checkbox": "~1.0.0-beta.2", + "@opentiny/ng-pagination": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/transfer/lib/project.json b/src/transfer/lib/project.json index 264feaf63c44fefbf829260459fad3db91395da0..d838d8a0fb88fe78702d5ab0d59be96f5ef6e79f 100644 --- a/src/transfer/lib/project.json +++ b/src/transfer/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/transfer"], + "outputs": ["dist/libs/ng-transfer"], "options": { "project": "src/transfer/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/transfer"], + "outputs": ["dist/libs/ng-transfer"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/transfer && npm pack" + "command": "cd dist/libs/ng-transfer && npm pack" } ] } diff --git a/src/tree/lib/ng-package.json b/src/tree/lib/ng-package.json index 550b1e218e17790ddf03a3d2663e27ae2dd30781..8084202fc6a4db02168672eeebed703d247a0884 100644 --- a/src/tree/lib/ng-package.json +++ b/src/tree/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/tree", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-tree", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/tree/lib/package.json b/src/tree/lib/package.json index 132c20ab50fd43d89df28b7a909af602092e0250..c602a2124b3b52d0e28be2d50e8bcadb5e29fd98 100644 --- a/src/tree/lib/package.json +++ b/src/tree/lib/package.json @@ -1,20 +1,20 @@ { "name": "@opentiny/ng-tree", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/cdk": ">=13.0.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-renderer": "~1.0.0-beta.0", + "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-locale": "~1.0.0-beta.2", + "@opentiny/ng-renderer": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", "@angular/forms": ">=13.0.0", - "@opentiny/ng-checkbox": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-loading": "~1.0.0-beta.0", - "@opentiny/ng-text": "~1.0.0-beta.0", - "@opentiny/ng-validation": "~1.0.0-beta.0" + "@opentiny/ng-checkbox": "~1.0.0-beta.2", + "@opentiny/ng-icon": "~1.0.0-beta.2", + "@opentiny/ng-loading": "~1.0.0-beta.2", + "@opentiny/ng-text": "~1.0.0-beta.2", + "@opentiny/ng-validation": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/tree/lib/project.json b/src/tree/lib/project.json index 0bfa362593dca289a387df32f009b4a6abbd4bea..b68ec064c5a7f356017a8db8ab41b90d16dfcaee 100644 --- a/src/tree/lib/project.json +++ b/src/tree/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/tree"], + "outputs": ["dist/libs/ng-tree"], "options": { "project": "src/tree/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/tree"], + "outputs": ["dist/libs/ng-tree"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/tree && npm pack" + "command": "cd dist/libs/ng-tree && npm pack" } ] } diff --git a/src/treeselect/lib/ng-package.json b/src/treeselect/lib/ng-package.json index 74219ada533e042349e836ad32dac247c4bfcd6e..677891442973d46fd71fbc6cada4f75c0c5af2fc 100644 --- a/src/treeselect/lib/ng-package.json +++ b/src/treeselect/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/treeselect", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-treeselect", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/treeselect/lib/package.json b/src/treeselect/lib/package.json index 6d32b67f1133f0a15e935f4cc0cfc4c510f64ed9..233ce3314950f4e9ea0bb5f80e260621ead706c7 100644 --- a/src/treeselect/lib/package.json +++ b/src/treeselect/lib/package.json @@ -1,20 +1,20 @@ { "name": "@opentiny/ng-treeselect", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-tree": "~1.0.0-beta.0", - "@opentiny/ng-dominator": "~1.0.0-beta.0", - "@opentiny/ng-drop": "~1.0.0-beta.0", - "@opentiny/ng-searchbox": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-select": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-tree": "~1.0.0-beta.2", + "@opentiny/ng-dominator": "~1.0.0-beta.2", + "@opentiny/ng-drop": "~1.0.0-beta.2", + "@opentiny/ng-searchbox": "~1.0.0-beta.2", + "@opentiny/ng-locale": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-select": "~1.0.0-beta.2", "@angular/forms": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-dropsearch": "~1.0.0-beta.0", - "@opentiny/ng-checkbox": "~1.0.0-beta.0" + "@opentiny/ng-dropsearch": "~1.0.0-beta.2", + "@opentiny/ng-checkbox": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/treeselect/lib/project.json b/src/treeselect/lib/project.json index 9cfb9ca9635104326c9d7abaf058362262e9acfd..778cc4e53c7119d13cedc6b374bb17b1611b931a 100644 --- a/src/treeselect/lib/project.json +++ b/src/treeselect/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/treeselect"], + "outputs": ["dist/libs/ng-treeselect"], "options": { "project": "src/treeselect/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/treeselect"], + "outputs": ["dist/libs/ng-treeselect"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/treeselect && npm pack" + "command": "cd dist/libs/ng-treeselect && npm pack" } ] } diff --git a/src/upload/lib/ng-package.json b/src/upload/lib/ng-package.json index 9c9092e43e0b8ac11899f59d06a5714a6b3979a8..c26a5439a12ece9497572bae3d5c249a16aba2fc 100644 --- a/src/upload/lib/ng-package.json +++ b/src/upload/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/upload", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-upload", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/upload/lib/package.json b/src/upload/lib/package.json index b27c394cd16811dabec1d732afb711a05a0865a7..72720ea7f223656ddc6f86d6c95399411c64afb9 100644 --- a/src/upload/lib/package.json +++ b/src/upload/lib/package.json @@ -1,23 +1,23 @@ { "name": "@opentiny/ng-upload", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", - "@opentiny/ng-base": "~1.0.0-beta.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-utils": "~1.0.0-beta.0", - "@opentiny/ng-overflow": "~1.0.0-beta.0", - "@opentiny/ng-modal": "~1.0.0-beta.0", - "@opentiny/ng-imagepreview": "~1.0.0-beta.0", + "@opentiny/ng-base": "~1.0.0-beta.2", + "@opentiny/ng-locale": "~1.0.0-beta.2", + "@opentiny/ng-utils": "~1.0.0-beta.2", + "@opentiny/ng-overflow": "~1.0.0-beta.2", + "@opentiny/ng-modal": "~1.0.0-beta.2", + "@opentiny/ng-imagepreview": "~1.0.0-beta.2", "@angular/platform-browser": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-tip": "~1.0.0-beta.0", - "@opentiny/ng-progresspie": "~1.0.0-beta.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-validation": "~1.0.0-beta.0", - "@opentiny/ng-progressbar": "~1.0.0-beta.0", - "@opentiny/ng-button": "~1.0.0-beta.0", - "@opentiny/ng-outline": "~1.0.0-beta.0" + "@opentiny/ng-tip": "~1.0.0-beta.2", + "@opentiny/ng-progresspie": "~1.0.0-beta.2", + "@opentiny/ng-icon": "~1.0.0-beta.2", + "@opentiny/ng-validation": "~1.0.0-beta.2", + "@opentiny/ng-progressbar": "~1.0.0-beta.2", + "@opentiny/ng-button": "~1.0.0-beta.2", + "@opentiny/ng-outline": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/upload/lib/project.json b/src/upload/lib/project.json index 11ddb62225989534db3ea065036423ddb95d6e6f..71067420023d7f008e6ac1f6a9c29e68f884ae07 100644 --- a/src/upload/lib/project.json +++ b/src/upload/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/upload"], + "outputs": ["dist/libs/ng-upload"], "options": { "project": "src/upload/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/upload"], + "outputs": ["dist/libs/ng-upload"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/upload && npm pack" + "command": "cd dist/libs/ng-upload && npm pack" } ] } diff --git a/src/utils/demo/src/app/theme/ThemePaletteComponent.ts b/src/utils/demo/src/app/theme/ThemePaletteComponent.ts new file mode 100644 index 0000000000000000000000000000000000000000..8a0ce91bfea7f5d4bdf98b92b6d9c0c7721e621e --- /dev/null +++ b/src/utils/demo/src/app/theme/ThemePaletteComponent.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; +import { TiTheme } from '@opentiny/ng'; +@Component({ + templateUrl: './theme-palette.html' +}) +export class ThemePaletteComponent { + tiBaseColorBrand6: any = '#3b9656'; + ngModelChange(): void { + TiTheme.setBrandColor(this.tiBaseColorBrand6); + } +} diff --git a/src/utils/demo/src/app/theme/ThemeTestModule.ts b/src/utils/demo/src/app/theme/ThemeTestModule.ts index 16e360c6197236080bc8bca722877f7a9fe447c6..862778f74ba913e73484305de61ebcea2e31b5c2 100644 --- a/src/utils/demo/src/app/theme/ThemeTestModule.ts +++ b/src/utils/demo/src/app/theme/ThemeTestModule.ts @@ -6,10 +6,11 @@ import { FormsModule } from '@angular/forms'; import { TiButtonModule, TiSwitchModule } from '@opentiny/ng'; import { ThemeBasicComponent } from './ThemeBasicComponent'; +import { ThemePaletteComponent } from './ThemePaletteComponent'; @NgModule({ imports: [CommonModule, FormsModule, TiButtonModule, TiSwitchModule, RouterModule.forChild(ThemeTestModule.ROUTES)], - declarations: [ThemeBasicComponent] + declarations: [ThemeBasicComponent, ThemePaletteComponent] }) export class ThemeTestModule { static readonly LINKS: Array = [{ href: 'classes/TiThemeUtil.html', label: 'Theme' }]; @@ -17,6 +18,10 @@ export class ThemeTestModule { { path: 'theme/theme-basic', component: ThemeBasicComponent + }, + { + path: 'theme/theme-palette', + component: ThemePaletteComponent } ]; } diff --git a/src/utils/demo/src/app/theme/theme-palette.html b/src/utils/demo/src/app/theme/theme-palette.html new file mode 100644 index 0000000000000000000000000000000000000000..062920f9b2480ce9d52637d633601e6cba01b551 --- /dev/null +++ b/src/utils/demo/src/app/theme/theme-palette.html @@ -0,0 +1,3 @@ +
+ + diff --git a/src/utils/demo/src/app/theme/webdoc/theme-demos.js b/src/utils/demo/src/app/theme/webdoc/theme-demos.js index 61e1c88ce064e5bf8b64fd635d3d0b9bf82ae5b2..6692e537fbdb60f8ef3882b9cf70bd886480418d 100644 --- a/src/utils/demo/src/app/theme/webdoc/theme-demos.js +++ b/src/utils/demo/src/app/theme/webdoc/theme-demos.js @@ -5,13 +5,25 @@ export default { demoId: 'theme-basic', name: { 'zh-CN': '基本用法', - 'en-US': 'theme-basic', + 'en-US': 'theme-basic' }, desc: { 'zh-CN': '在线换肤能力展示。（仅支持生产环境，不支持调试环境）', - 'en-US': '

theme basic

', + 'en-US': '

theme basic

' }, - apis: ['TiTheme.methods.loadCss'], + apis: ['TiTheme.methods.loadCss'] }, - ], + { + demoId: 'theme-palette', + name: { + 'zh-CN': '自动生成调色板', + 'en-US': 'theme-palette' + }, + desc: { + 'zh-CN': '根据一个色值，生成调色板。', + 'en-US': '

theme basic

' + }, + apis: ['TiTheme.methods.setBrandColors'] + } + ] }; diff --git a/src/utils/lib/ng-package.json b/src/utils/lib/ng-package.json index be81921f2bfcc3677c3a178215b25bde50b85929..4ff6bf8efaf0b19073b9e3dab5d7ec1d237690eb 100644 --- a/src/utils/lib/ng-package.json +++ b/src/utils/lib/ng-package.json @@ -1,6 +1,6 @@ { "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/utils", + "dest": "../../../dist/libs/ng-utils", "lib": { "entryFile": "index.ts" } diff --git a/src/utils/lib/package.json b/src/utils/lib/package.json index 7e6b4a49d470dce4a01a19f4864ff2bbd78b38ef..47dd1f0d4554b97139c662298e038fb2a210c72b 100644 --- a/src/utils/lib/package.json +++ b/src/utils/lib/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/ng-utils", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/platform-browser-dynamic": ">=13.0.0" diff --git a/src/utils/lib/project.json b/src/utils/lib/project.json index c67be66816e62dde57c4ab54e49d645aaadabc6f..7b4933c4c50d3a9ce509885c79a7cd46a03bda21 100644 --- a/src/utils/lib/project.json +++ b/src/utils/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/utils"], + "outputs": ["dist/libs/ng-utils"], "options": { "project": "src/utils/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/utils"], + "outputs": ["dist/libs/ng-utils"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/utils && npm pack" + "command": "cd dist/libs/ng-utils && npm pack" } ] } diff --git a/src/utils/lib/src/Position.ts b/src/utils/lib/src/Position.ts index 96d20d8c8d350370ff6044747724356122ba46d1..8f2526a82d6c03ffe73ed1f39ec0d4eb9ababd00 100644 --- a/src/utils/lib/src/Position.ts +++ b/src/utils/lib/src/Position.ts @@ -71,11 +71,13 @@ export interface TiPositionResult { interface TiLayoutParams { left: number; top: number; + bottom?: number; avilableHeight: number; } interface TiVerticalParams { avilableHeight: number; top: number; + bottom?: number; } /** * @ignore @@ -132,6 +134,7 @@ export class Position { hOffset?: number; // 自定义水平方向的偏移（在定位基础上的水平偏移，向左偏移为负值，向右偏移为正值） fixMaxHeight?: boolean; // 定位元素最大高度是否固定不变(显示不下时不用压缩高度) hasOffsetFix?: boolean; // 是否存在定位偏差量（针对 tip 组件：当被提示元素尺寸较小时，保证 tip 的箭头在被提示元素的中间） + bottomPostion?: boolean; // 计算位置的结果在上方时，以bottom属性定位，不用top定位，只在定位drop时使用 determinPositionFn?(layout: any): string; }): TiPositionResult { // 入参非有效元素情况下，不做处理 @@ -160,6 +163,7 @@ export class Position { const elePos: TiLayoutParams = Position.getLayoutParam( curLayout, position, + options.bottomPostion, hostSpace, options.browserSpace || 0, options.hasOffsetFix || false @@ -472,11 +476,17 @@ export class Position { // fixed定位情况下，滚动条对其不受影响，因此此处需要减掉滚动条的位置影响 // 如果是跟随宿主元素，也不能改为fixed定位，会脱离文档流，定位偏离 ele.style.position = 'fixed'; + const top: string = position.top !== undefined ? `${position.top - window.pageYOffset}px` : ''; + const bottom: string = position.bottom !== undefined ? `${position.bottom + window.pageYOffset}px` : ''; ele.style.left = `${position.left - window.pageXOffset + hOffset}px`; - ele.style.top = `${position.top - window.pageYOffset}px`; + ele.style.top = top; + ele.style.bottom = bottom; } else { + const top: string = position.top !== undefined ? `${position.top}px` : ''; + const bottom: string = position.bottom !== undefined ? `${position.bottom}px` : ''; ele.style.left = `${position.left + hOffset}px`; - ele.style.top = `${position.top}px`; + ele.style.top = top; + ele.style.bottom = bottom; } } // 设置提示弹窗的MaxHeight @@ -597,17 +607,26 @@ export class Position { private static getLayoutParam( layout: TiPositionLayout, position: string, + bottomPostion: boolean, hostSpace: number, browserSpace: number, hasOffsetFix: boolean ): TiLayoutParams { const positionArr: Array = position.split('-'); // 跟上面静态变量重名,最好改一下 const left: number = Position.getHorizionParam(layout, positionArr, hostSpace, hasOffsetFix); - const verticalParam: TiVerticalParams = Position.getVerticalParam(layout, positionArr, hostSpace, browserSpace, hasOffsetFix); + const verticalParam: TiVerticalParams = Position.getVerticalParam( + layout, + positionArr, + bottomPostion, + hostSpace, + browserSpace, + hasOffsetFix + ); return { left, top: verticalParam.top, + bottom: verticalParam.bottom, avilableHeight: verticalParam.avilableHeight }; } @@ -654,6 +673,7 @@ export class Position { private static getVerticalParam( curLayout: TiPositionLayout, posArr: Array, + bottomPostion: boolean, hostSpace: number, browserSpace: number, hasOffsetFix: boolean @@ -671,12 +691,20 @@ export class Position { // 弹出元素下边线与宿主元素上边线相接后，弹出元素向上延伸情况，对应位置包含'top', 'top-left', 'top-right' if (posArr[0] === 'top') { const avilableHeight: number = avilableLayout.top - hostSpace - browserSpace; - const top: number = - avilableHeight >= targetLayout.height ? hostTop - targetLayout.height - hostSpace : hostTop - avilableLayout.top + browserSpace; + let bottom: number; + let top: number; + if (bottomPostion) { + // 有hostOffsetLayout，target跟随宿主元素定位 否则target插入body； + bottom = hostOffsetLayout ? hostHeight + hostSpace : avilableLayout.bottom + hostHeight + hostSpace - window.scrollY; + } else { + top = + avilableHeight >= targetLayout.height ? hostTop - targetLayout.height - hostSpace : hostTop - avilableLayout.top + browserSpace; + } return { avilableHeight, - top + top, + bottom }; } // 弹出元素上边线与宿主元素下边线相接后，弹出元素向下延伸情况，对应位置包含'bottom', 'bottom-left', 'bottom-right' diff --git a/src/utils/lib/src/TiBrowser.ts b/src/utils/lib/src/TiBrowser.ts index ca99498554f0b8287a8f82dd1994d6f9453151fc..1535c3a086b292466c32d1baba995ad33a25a16e 100644 --- a/src/utils/lib/src/TiBrowser.ts +++ b/src/utils/lib/src/TiBrowser.ts @@ -155,7 +155,7 @@ export class TiBrowser { TiBrowser._browser = TiBrowser.OTHER; } // 版本号取整 - TiBrowser._version = aAgentInfo !== null ? parseInt(aAgentInfo[1].split('.')[0], 10) : 0; + TiBrowser._version = aAgentInfo ? parseInt(aAgentInfo[1].split('.')[0], 10) : 0; // 改变初始化值 TiBrowser.isInit = true; } diff --git a/src/utils/lib/src/TiTheme.ts b/src/utils/lib/src/TiTheme.ts index 8ce6648164ad8a52e92a0311759d705ac446560e..39c269127a60538079836146fa5efe16f9d4a7ce 100644 --- a/src/utils/lib/src/TiTheme.ts +++ b/src/utils/lib/src/TiTheme.ts @@ -10,6 +10,7 @@ * */ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; +import Color from 'color'; export class TiTheme { /** * 加载CSS文件，挂在head link @@ -59,4 +60,84 @@ export class TiTheme { .bootstrapModule(app) .catch((err: any) => console.error(err)); } + + public static formats: Array = ['hex', 'rgb', 'hsl']; + public static setBrandColor(tiBaseColorBrand6: string): any { + const listA: any = []; + const func: any = TiTheme.colorPalette; + for (let i: number = 1; i <= 8; i++) { + listA.push(func(tiBaseColorBrand6, i)); + } + + for (let i: number = 0; i < listA.length + 1; i++) { + document.documentElement.style.setProperty(`--ti-base-color-brand-${i + 1}`, listA[i]); + } + } + + private static getNewHue(color, isLight, i): number { + const h = color.hue(); + const hueStep: number = 2; + let hue; + if (h >= 60 && h <= 240) { + hue = isLight ? h - hueStep * i : h + hueStep * i; + } else { + hue = isLight ? h + hueStep * i : h - hueStep * i; + } + if (hue < 0) { + hue += 360; + } else if (hue >= 360) { + hue -= 360; + } + return Math.round(hue); // 取整：获取最近的整数 + } + + private static getNewSaturation(color, isLight, i) { + let newSaturation; + const maxSaturationStep = 100; + const minSaturationStep = 9; + + const s = color.saturationv(); + if (isLight) { + newSaturation = s <= minSaturationStep ? s : s - ((s - minSaturationStep) / 5) * i; + } else { + newSaturation = s + ((maxSaturationStep - s) / 4) * i; + } + return newSaturation; + } + + private static getNewValue(color, isLight, i) { + const maxValue = 100; + const minValue = 30; + const v = color.value(); + return isLight ? v + ((maxValue - v) / 5) * i : v <= minValue ? v : v - ((v - minValue) / 4) * i; + } + + private static getColorString(color, format): string { + const innerFormat = TiTheme.getFormat(format); + + if (innerFormat === 'hex') { + return color[innerFormat](); + } + return color[innerFormat]().round().string(); + } + + private static getFormat(format?: string): string { + if (!format || TiTheme.formats.indexOf(format) < 0) { + return 'hex'; + } + return format; + } + + private static colorPalette(originColor, i, format?): string { + const color = Color(originColor); + + const isLight = i < 6; + const index = isLight ? 6 - i : i - 6; + const h = TiTheme.getNewHue(color, isLight, index); + const s = TiTheme.getNewSaturation(color, isLight, index); + const v = TiTheme.getNewValue(color, isLight, index); + const retColor = i === 6 ? color : Color({ h, s, v }); + + return TiTheme.getColorString(retColor, format); + } } diff --git a/src/validation/lib/ng-package.json b/src/validation/lib/ng-package.json index 15d4be97091e59d30e42639cd844cb578d4e93e3..282fe71f98360a1ccd4920cb1c0804017041ca5c 100644 --- a/src/validation/lib/ng-package.json +++ b/src/validation/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/validation", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-validation", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/validation/lib/package.json b/src/validation/lib/package.json index 3f17f5e73f0be3cfc33db9c97d51f7c31463daa6..93c808c52d42c4c42aa388407d6340339dd444a7 100644 --- a/src/validation/lib/package.json +++ b/src/validation/lib/package.json @@ -1,18 +1,18 @@ { "name": "@opentiny/ng-validation", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { - "@opentiny/ng-utils": "~1.0.0-beta.0", + "@opentiny/ng-utils": "~1.0.0-beta.2", "@angular/forms": ">=13.0.0", "@angular/core": ">=13.0.0", - "@opentiny/ng-locale": "~1.0.0-beta.0", - "@opentiny/ng-renderer": "~1.0.0-beta.0", - "@opentiny/ng-popup": "~1.0.0-beta.0", - "@opentiny/ng-tip": "~1.0.0-beta.0", - "@opentiny/ng-base": "~1.0.0-beta.0", + "@opentiny/ng-locale": "~1.0.0-beta.2", + "@opentiny/ng-renderer": "~1.0.0-beta.2", + "@opentiny/ng-popup": "~1.0.0-beta.2", + "@opentiny/ng-tip": "~1.0.0-beta.2", + "@opentiny/ng-base": "~1.0.0-beta.2", "@angular/common": ">=13.0.0", - "@opentiny/ng-icon": "~1.0.0-beta.0", - "@opentiny/ng-loading": "~1.0.0-beta.0" + "@opentiny/ng-icon": "~1.0.0-beta.2", + "@opentiny/ng-loading": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/validation/lib/project.json b/src/validation/lib/project.json index 348a21d9dd7d552aa5df351ea451708891647e2c..8af8730c29ad2da0a07c06cdc4e5c9b7116313ac 100644 --- a/src/validation/lib/project.json +++ b/src/validation/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/validation"], + "outputs": ["dist/libs/ng-validation"], "options": { "project": "src/validation/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/validation"], + "outputs": ["dist/libs/ng-validation"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/validation && npm pack" + "command": "cd dist/libs/ng-validation && npm pack" } ] } diff --git a/src/zoom/lib/ng-package.json b/src/zoom/lib/ng-package.json index 6f5e1d02ade435d9fb383e67e7e4a848e8808207..42a62d587e63c9170cd0f9829a6571089e984021 100644 --- a/src/zoom/lib/ng-package.json +++ b/src/zoom/lib/ng-package.json @@ -1,7 +1,7 @@ { - "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", - "dest": "../../../dist/libs/zoom", - "lib": { - "entryFile": "index.ts" - } -} \ No newline at end of file + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../dist/libs/ng-zoom", + "lib": { + "entryFile": "index.ts" + } +} diff --git a/src/zoom/lib/package.json b/src/zoom/lib/package.json index 9aebea75e4ea6e929cc5b28968bec4e128364025..f9965f6235f0ff2d0940cc9ab00325bc9a7a46ff 100644 --- a/src/zoom/lib/package.json +++ b/src/zoom/lib/package.json @@ -1,10 +1,10 @@ { "name": "@opentiny/ng-zoom", - "version": "1.0.0-beta.0", + "version": "1.0.0-beta.2", "license": "MIT", "peerDependencies": { "@angular/core": ">=13.0.0", "@angular/common": ">=13.0.0", - "@opentiny/ng-renderer": "~1.0.0-beta.0" + "@opentiny/ng-renderer": "~1.0.0-beta.2" } } \ No newline at end of file diff --git a/src/zoom/lib/project.json b/src/zoom/lib/project.json index 99c8fabd49712d082a35be2953aebf95649421e1..6d2c4e639d05c4a93ca9e0d32f8821e530f024a3 100644 --- a/src/zoom/lib/project.json +++ b/src/zoom/lib/project.json @@ -5,7 +5,7 @@ "targets": { "default-build": { "executor": "@nrwl/angular:package", - "outputs": ["dist/libs/zoom"], + "outputs": ["dist/libs/ng-zoom"], "options": { "project": "src/zoom/lib/ng-package.json", "updateBuildableProjectDepsInPackageJson": false @@ -22,7 +22,7 @@ }, "build": { "executor": "@nrwl/workspace:run-commands", - "outputs": ["dist/libs/zoom"], + "outputs": ["dist/libs/ng-zoom"], "options": { "commands": [ { @@ -43,7 +43,7 @@ "options": { "commands": [ { - "command": "cd dist/libs/zoom && npm pack" + "command": "cd dist/libs/ng-zoom && npm pack" } ] } diff --git a/tsconfig.base.json b/tsconfig.base.json index e38d1d389e7d33a49a9ce68c3afef214ae39792f..77e50311f7d9666625face46d3dc65d748a8e3b0 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -68,6 +68,7 @@ "@opentiny/ng-labeleditor": ["src/labeleditor/lib/index.ts"], "@opentiny/ng-layout": ["src/layout/lib/index.ts"], "@opentiny/ng-leftmenu": ["src/leftmenu/lib/index.ts"], + "@opentiny/ng-leftmenuthin": ["src/leftmenuthin/lib/index.ts"], "@opentiny/ng-linkbutton": ["src/linkbutton/lib/index.ts"], "@opentiny/ng-list": ["src/list/lib/index.ts"], "@opentiny/ng-loading": ["src/loading/lib/index.ts"],