Browse Source
Merge pull request #15466 from abpframework/auto-merge/rel-7-0/1674
Merge branch dev with rel-7.0
pull/15565/head
liangshiwei
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
4 additions and
7 deletions
-
npm/ng-packs/apps/dev-app/src/app/home/home.component.ts
-
npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts
-
npm/ng-packs/packages/schematics/src/models/api-definition.ts
-
npm/ng-packs/packages/schematics/src/utils/methods.ts
|
|
|
@ -6,7 +6,7 @@ import { Component } from '@angular/core'; |
|
|
|
templateUrl: './home.component.html', |
|
|
|
}) |
|
|
|
export class HomeComponent { |
|
|
|
loading: boolean = false; |
|
|
|
loading = false; |
|
|
|
get hasLoggedIn(): boolean { |
|
|
|
return this.authService.isAuthenticated; |
|
|
|
} |
|
|
|
|
|
|
|
@ -1,4 +1,4 @@ |
|
|
|
import { Rule, SchematicContext, SchematicsException, Tree } from '@angular-devkit/schematics'; |
|
|
|
import { Rule, SchematicsException } from '@angular-devkit/schematics'; |
|
|
|
import { isLibrary, updateWorkspace, WorkspaceDefinition } from '../../utils'; |
|
|
|
import { allStyles, styleMap } from './style-map'; |
|
|
|
import { ProjectDefinition } from '@angular-devkit/core/src/workspace'; |
|
|
|
@ -7,7 +7,7 @@ import { ChangeThemeOptions } from './model'; |
|
|
|
import { ThemeOptionsEnum } from './theme-options.enum'; |
|
|
|
|
|
|
|
export default function (_options: ChangeThemeOptions): Rule { |
|
|
|
return async (_: Tree, __: SchematicContext) => { |
|
|
|
return async () => { |
|
|
|
const targetThemeName = _options.name; |
|
|
|
const selectedProject = _options.targetProject; |
|
|
|
if (!targetThemeName) { |
|
|
|
|
|
|
|
@ -77,7 +77,6 @@ export interface ParameterInSignature { |
|
|
|
typeSimple: string; |
|
|
|
isOptional: boolean; |
|
|
|
// eslint-disable-next-line
|
|
|
|
// @typescript-eslint/no-explicit-any
|
|
|
|
defaultValue: any; |
|
|
|
} |
|
|
|
|
|
|
|
@ -89,7 +88,6 @@ export interface ParameterInBody { |
|
|
|
typeSimple: string; |
|
|
|
isOptional: boolean; |
|
|
|
// eslint-disable-next-line
|
|
|
|
// @typescript-eslint/no-explicit-any
|
|
|
|
defaultValue: any; |
|
|
|
constraintTypes: string[] | null; |
|
|
|
bindingSourceId: eBindingSourceId; |
|
|
|
|
|
|
|
@ -1,6 +1,5 @@ |
|
|
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
|
|
import { camel } from './text'; |
|
|
|
|
|
|
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
|
|
const shouldQuote = require('should-quote'); |
|
|
|
export const getParamName = (paramName: string) => |
|
|
|
shouldQuote(paramName) ? `["${paramName}"]` : paramName; |
|
|
|
|