tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #16927 from abpframework/auto-merge/rel-7-3/2025 

Merge branch dev with rel-7.3
pull/16930/head
Masum ULU 3 years ago
committed by GitHub
parent
a6a91ef7aa eda684541b
commit
86bf231719
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 51 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      npm/ng-packs/packages/core/src/lib/directives/caps-lock.directive.ts
  2. 1
      npm/ng-packs/packages/core/src/lib/services/index.ts
  3. 20
      npm/ng-packs/packages/core/src/lib/services/window.service.ts
  4. 18
      templates/app-nolayers/angular/package.json
  5. 18
      templates/app/angular/package.json
  6. 20
      templates/module/angular/package.json

4
npm/ng-packs/packages/core/src/lib/directives/caps-lock.directive.ts
View File

@ -5,7 +5,7 @@ import { Directive, EventEmitter, HostListener, Output } from '@angular/core';
selector: '[abpCapsLock]',
})
export class TrackCapsLockDirective {
@Output('abpCapsLock') capsLock = new EventEmitter<Boolean>();
@Output('abpCapsLock') capsLock = new EventEmitter<boolean>();
@HostListener('window:keydown', ['$event'])
onKeyDown(event: KeyboardEvent): void {
@ -17,7 +17,7 @@ export class TrackCapsLockDirective {
}
isCapsLockOpen(e): boolean {
var s = String.fromCharCode(e.which);
const s = String.fromCharCode(e.which);
if (
(s.toUpperCase() === s && s.toLowerCase() !== s && e.shiftKey) ||
(s.toUpperCase() !== s && s.toLowerCase() === s && e.shiftKey) ||

1
npm/ng-packs/packages/core/src/lib/services/index.ts
View File

@ -19,3 +19,4 @@ export * from './session-state.service';
export * from './subscription.service';
export * from './track-by.service';
export * from './local-storage.service';
export * from './window.service';

20
npm/ng-packs/packages/core/src/lib/services/window.service.ts
View File

@ -0,0 +1,20 @@
import { Injectable, inject } from '@angular/core';
import { DOCUMENT } from '@angular/common';
@Injectable({ providedIn: 'root' })
export class AbpWindowService {
protected readonly window = inject(DOCUMENT).defaultView;
protected readonly navigator = this.window.navigator;
copyToClipboard(text: string): Promise<void> {
return this.navigator.clipboard.writeText(text);
}
open(url?: string | URL, target?: string, features?: string): Window {
return this.window.open(url, target, features);
}
reloadPage(): void {
this.window.location.reload();
}
}

18
templates/app-nolayers/angular/package.json
View File

@ -12,14 +12,14 @@
},
"private": true,
"dependencies": {
"@abp/ng.account": "~7.3.0-rc.1",
"@abp/ng.components": "~7.3.0-rc.1",
"@abp/ng.core": "~7.3.0-rc.1",
"@abp/ng.oauth": "~7.3.0-rc.1",
"@abp/ng.identity": "~7.3.0-rc.1",
"@abp/ng.setting-management": "~7.3.0-rc.1",
"@abp/ng.tenant-management": "~7.3.0-rc.1",
"@abp/ng.theme.shared": "~7.3.0-rc.1",
"@abp/ng.account": "~7.3.0-rc.2",
"@abp/ng.components": "~7.3.0-rc.2",
"@abp/ng.core": "~7.3.0-rc.2",
"@abp/ng.oauth": "~7.3.0-rc.2",
"@abp/ng.identity": "~7.3.0-rc.2",
"@abp/ng.setting-management": "~7.3.0-rc.2",
"@abp/ng.tenant-management": "~7.3.0-rc.2",
"@abp/ng.theme.shared": "~7.3.0-rc.2",
"@abp/ng.theme.lepton-x": "~2.3.0-rc.1",
"@angular/animations": "^16.0.2",
"@angular/common": "^16.0.2",
@ -36,7 +36,7 @@
"zone.js": "~0.13.0"
},
"devDependencies": {
"@abp/ng.schematics": "~7.3.0-rc.1",
"@abp/ng.schematics": "~7.3.0-rc.2",
"@angular-devkit/build-angular": "~16.0.0",
"@angular-eslint/builder": "~16.0.0",
"@angular-eslint/eslint-plugin": "~16.0.0",

18
templates/app/angular/package.json
View File

@ -12,14 +12,14 @@
},
"private": true,
"dependencies": {
"@abp/ng.account": "7.3.0-rc.1",
"@abp/ng.components": "7.3.0-rc.1",
"@abp/ng.core": "7.3.0-rc.1",
"@abp/ng.oauth": "7.3.0-rc.1",
"@abp/ng.identity": "7.3.0-rc.1",
"@abp/ng.setting-management": "7.3.0-rc.1",
"@abp/ng.tenant-management": "7.3.0-rc.1",
"@abp/ng.theme.shared": "7.3.0-rc.1",
"@abp/ng.account": "~7.3.0-rc.2",
"@abp/ng.components": "~7.3.0-rc.2",
"@abp/ng.core": "~7.3.0-rc.2",
"@abp/ng.oauth": "~7.3.0-rc.2",
"@abp/ng.identity": "~7.3.0-rc.2",
"@abp/ng.setting-management": "~7.3.0-rc.2",
"@abp/ng.tenant-management": "~7.3.0-rc.2",
"@abp/ng.theme.shared": "~7.3.0-rc.2",
"@abp/ng.theme.lepton-x": "~2.3.0-rc.1",
"@angular/animations": "^16.0.2",
"@angular/common": "^16.0.2",
@ -42,7 +42,7 @@
"@angular-eslint/eslint-plugin-template": "^16.0.2",
"@angular-eslint/schematics": "^16.0.2",
"@angular-eslint/template-parser": "^16.0.2",
"@abp/ng.schematics": "7.3.0-rc.1",
"@abp/ng.schematics": "~7.3.0-rc.2",
"@angular/cli": "^16.0.2",
"@angular/compiler-cli": "^16.0.2",
"@angular/language-service": "^16.0.2",

20
templates/module/angular/package.json
View File

@ -15,15 +15,15 @@
},
"private": true,
"dependencies": {
"@abp/ng.account": "~7.3.0-rc.1",
"@abp/ng.components": "~7.3.0-rc.1",
"@abp/ng.core": "~7.3.0-rc.1",
"@abp/ng.oauth": "~7.3.0-rc.1",
"@abp/ng.identity": "~7.3.0-rc.1",
"@abp/ng.setting-management": "~7.3.0-rc.1",
"@abp/ng.tenant-management": "~7.3.0-rc.1",
"@abp/ng.theme.basic": "~7.3.0-rc.1",
"@abp/ng.theme.shared": "~7.3.0-rc.1",
"@abp/ng.account": "~7.3.0-rc.2",
"@abp/ng.components": "~7.3.0-rc.2",
"@abp/ng.core": "~7.3.0-rc.2",
"@abp/ng.oauth": "~7.3.0-rc.2",
"@abp/ng.identity": "~7.3.0-rc.2",
"@abp/ng.setting-management": "~7.3.0-rc.2",
"@abp/ng.tenant-management": "~7.3.0-rc.2",
"@abp/ng.theme.basic": "~7.3.0-rc.2",
"@abp/ng.theme.shared": "~7.3.0-rc.2",
"@angular/animations": "^16.0.2",
"@angular/common": "^16.0.2",
"@angular/compiler": "^16.0.2",
@ -38,7 +38,7 @@
"zone.js": "~0.13.0"
},
"devDependencies": {
"@abp/ng.schematics": "~7.3.0-rc.1",
"@abp/ng.schematics": "~7.3.0-rc.2",
"@angular-devkit/build-angular": "~16.0.1",
"@angular-eslint/builder": "~16.0.0",
"@angular-eslint/eslint-plugin": "~16.0.0",

Write Preview
Loading…
Cancel
Save