Skip to content

Commit

Permalink
chore: chore schematics
Browse files Browse the repository at this point in the history
  • Loading branch information
devcui committed Jul 3, 2024
1 parent f5c4d96 commit 5a8c071
Show file tree
Hide file tree
Showing 12 changed files with 49 additions and 13 deletions.
6 changes: 3 additions & 3 deletions packages/theme/layout-default/layout-nav.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -186,18 +186,18 @@ export class LayoutDefaultNavComponent implements OnInit, OnDestroy {
to(item: Menu): void {
this.select.emit(item);
if (item.disabled) return;

if (item.externalLink) {
if (item.target === '_blank') {
this.win.open(item.externalLink);
} else {
this.win.location.href = item.externalLink;
localStorage.setItem('iframeSrc', item.externalLink);
this.menuSrv.setRouterLink(item.externalLink);
this.router.navigate(['iframePage']);
}
return;
}
this.ngZone.run(() => this.router.navigateByUrl(item.link!));
}

toggleOpen(item: Nav): void {
this.menuSrv.toggleOpen(item);
}
Expand Down
2 changes: 2 additions & 0 deletions packages/theme/mixins.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import 'ng-zorro-antd/src/style/mixins/index.less';
@import './system/mixins/index.less';
10 changes: 10 additions & 0 deletions packages/theme/src/services/menu/menu.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ export class MenuService implements OnDestroy {
*/
openStrictly = false;

private $routerLink: BehaviorSubject<string> = new BehaviorSubject<string>('');

constructor() {
this.i18n$ = this.i18nSrv.change.subscribe(() => this.resume());
}
Expand Down Expand Up @@ -347,4 +349,12 @@ export class MenuService implements OnDestroy {
this._change$.unsubscribe();
this.i18n$?.unsubscribe();
}

setRouterLink(url: string): void {
this.$routerLink.next(url);
}

getRouterLink(): Observable<string> {
return this.$routerLink.asObservable();
}
}
12 changes: 11 additions & 1 deletion packages/theme/theme-btn/theme-btn.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import { YunzaiConfigService } from '@yelon/util/config';
import { NzDropDownDirective, NzDropdownMenuComponent } from 'ng-zorro-antd/dropdown';
import { NzMenuDirective, NzMenuItemComponent } from 'ng-zorro-antd/menu';
import { NzTooltipDirective } from 'ng-zorro-antd/tooltip';
import {NzIconModule} from "ng-zorro-antd/icon";
import {I18nPipe} from "@yelon/theme";

export interface ThemeBtnType {
key: string;
Expand All @@ -40,7 +42,15 @@ export const YUNZAI_THEME_BTN_KEYS = new InjectionToken<string>('YUNZAI_THEME_BT
},
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: true,
imports: [NzDropDownDirective, NzDropdownMenuComponent, NzMenuDirective, NzMenuItemComponent, NzTooltipDirective]
imports: [
NzDropDownDirective,
NzDropdownMenuComponent,
NzMenuDirective,
NzMenuItemComponent,
NzTooltipDirective,
NzIconModule,
I18nPipe
]
})
export class ThemeBtnComponent implements OnInit, OnDestroy {
private readonly doc = inject(DOCUMENT);
Expand Down
3 changes: 1 addition & 2 deletions packages/theme/theme-compact.less
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import './mixins.less';
@import 'ng-zorro-antd/src/style/themes/compact.less';
@import './system/theme-compact.less';
@import './layout-default/style/theme-compact.less';
@import './layout-blank/style/theme-compact.less';
@import '../abc/theme-compact.less';
@import '../bis/theme-compact.less';
@import '../bcs/theme-compact.less';
3 changes: 1 addition & 2 deletions packages/theme/theme-dark.less
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import './mixins.less';
@import 'ng-zorro-antd/src/style/themes/dark.less';
@import './system/theme-dark.less';
@import './layout-default/style/theme-dark.less';
@import './layout-blank/style/theme-dark.less';
@import '../abc/theme-dark.less';
@import '../bis/theme-dark.less';
@import '../bcs/theme-dark.less';
3 changes: 1 addition & 2 deletions packages/theme/theme-default.less
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import './mixins.less';
@import 'ng-zorro-antd/src/style/themes/default.less';
@import './system/theme-default.less';
@import './layout-default/style/theme-default.less';
@import './layout-blank/style/theme-default.less';
@import '../abc/theme-default.less';
@import '../bis/theme-default.less';
@import '../bcs/theme-default.less';
6 changes: 6 additions & 0 deletions packages/theme/theme-variable.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@import './mixins.less';
@import 'ng-zorro-antd/src/style/themes/variable.less';
@import './system/theme-variable.less';
@import './layout-default/style/theme-variable.less';
@import './layout-blank/style/theme-variable.less';
@import '../abc/theme-variable.less';
6 changes: 6 additions & 0 deletions packages/theme/variable.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@import './theme-variable.less';
@import './system/index.less';
@import './layout-default/style/index.less';
@import './layout-blank/style/index.less';
@import '../abc/index.less';
@import '../chart/index.less';
5 changes: 5 additions & 0 deletions schematics/ng-update/data/css-tokens.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { CssTokenUpgradeData, TargetVersion, VersionChanges } from '@angular/cdk/schematics';

export const cssTokens: VersionChanges<CssTokenUpgradeData> = {
[TargetVersion.V18]: []
};
2 changes: 1 addition & 1 deletion schematics/ng-update/data/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ export * from './input-names';
export * from './method-call-checks';
export * from './output-names';
export * from './property-names';
export * from './css-token'
export * from './css-tokens';
4 changes: 2 additions & 2 deletions schematics/ng-update/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { createMigrationSchematicRule, NullableDevkitMigration, TargetVersion }
import { chain, Rule, SchematicContext } from '@angular-devkit/schematics';

import { ruleUpgradeData } from './upgrade-data';
import { v18Rule } from './upgrade-rules/V18';
import { v18Rule } from './upgrade-rules/v18';

const migrations: NullableDevkitMigration[] = [];

Expand All @@ -20,7 +20,7 @@ export function postUpdate(context: SchematicContext, targetVersion: TargetVersi
if (hasFailures) {
context.logger.warn(
' ⚠ Some issues were detected but could not be fixed automatically. Please check the ' +
'output above and fix these issues manually.'
'output above and fix these issues manually.'
);
}
}

0 comments on commit 5a8c071

Please sign in to comment.