Browse Source

Merge pull request #12741 from abpframework/issue-12546-hotfix

Fix linx error on core package
pull/12748/head
Muhammed Altuğ 4 years ago
committed by GitHub
parent
commit
c1730ff2ff
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      npm/ng-packs/packages/core/src/lib/directives/form-submit.directive.ts
  2. 8
      npm/ng-packs/packages/core/src/lib/proxy/pages/abp/multi-tenancy/abp-tenant.service.ts
  3. 6
      npm/ng-packs/packages/core/src/lib/proxy/volo/abp/asp-net-core/mvc/api-exploring/abp-api-definition.service.ts
  4. 6
      npm/ng-packs/packages/core/src/lib/proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-configuration.service.ts
  5. 2
      npm/ng-packs/packages/core/src/lib/services/config-state.service.ts

10
npm/ng-packs/packages/core/src/lib/directives/form-submit.directive.ts

@ -26,9 +26,9 @@ export class FormSubmitDirective implements OnInit {
@Input()
notValidateOnSubmit: string | boolean;
@Input()
markAsDirtyWhenSubmit: boolean = true
markAsDirtyWhenSubmit = true
@Output() readonly ngSubmit = new EventEmitter();
@ -39,14 +39,14 @@ export class FormSubmitDirective implements OnInit {
private host: ElementRef<HTMLFormElement>,
private cdRef: ChangeDetectorRef,
private subscription: SubscriptionService,
) {}
) { }
ngOnInit() {
this.subscription.addOne(this.formGroupDirective.ngSubmit, () => {
if(this.markAsDirtyWhenSubmit){
if (this.markAsDirtyWhenSubmit) {
this.markAsDirty();
}
this.executedNgSubmit = true;
});

8
npm/ng-packs/packages/core/src/lib/proxy/pages/abp/multi-tenancy/abp-tenant.service.ts

@ -1,5 +1,5 @@
import { RestService } from '@abp/ng.core';
import { Injectable } from '@angular/core';
import { RestService } from '../../../../services/rest.service';
import type { FindTenantResultDto } from '../../../volo/abp/asp-net-core/mvc/multi-tenancy/models';
@Injectable({
@ -13,14 +13,14 @@ export class AbpTenantService {
method: 'GET',
url: `/api/abp/multi-tenancy/tenants/by-id/${id}`,
},
{ apiName: this.apiName });
{ apiName: this.apiName });
findTenantByName = (name: string) =>
this.restService.request<any, FindTenantResultDto>({
method: 'GET',
url: `/api/abp/multi-tenancy/tenants/by-name/${name}`,
},
{ apiName: this.apiName });
{ apiName: this.apiName });
constructor(private restService: RestService) {}
constructor(private restService: RestService) { }
}

6
npm/ng-packs/packages/core/src/lib/proxy/volo/abp/asp-net-core/mvc/api-exploring/abp-api-definition.service.ts

@ -1,4 +1,4 @@
import { RestService } from '@abp/ng.core';
import { RestService } from '../../../../../../services/rest.service';
import { Injectable } from '@angular/core';
import type { ApplicationApiDescriptionModel, ApplicationApiDescriptionModelRequestDto } from '../../../http/modeling/models';
@ -14,7 +14,7 @@ export class AbpApiDefinitionService {
url: '/api/abp/api-definition',
params: { includeTypes: model.includeTypes },
},
{ apiName: this.apiName });
{ apiName: this.apiName });
constructor(private restService: RestService) {}
constructor(private restService: RestService) { }
}

6
npm/ng-packs/packages/core/src/lib/proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-configuration.service.ts

@ -1,5 +1,5 @@
import type { ApplicationConfigurationDto } from './models';
import { RestService } from '@abp/ng.core';
import { RestService } from '../../../../../../services/rest.service';
import { Injectable } from '@angular/core';
@Injectable({
@ -13,7 +13,7 @@ export class AbpApplicationConfigurationService {
method: 'GET',
url: '/api/abp/application-configuration',
},
{ apiName: this.apiName });
{ apiName: this.apiName });
constructor(private restService: RestService) {}
constructor(private restService: RestService) { }
}

2
npm/ng-packs/packages/core/src/lib/services/config-state.service.ts

@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { Observable, Subject } from 'rxjs';
import { map, switchMap, take } from 'rxjs/operators';
import { AbpApplicationConfigurationService } from '../proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-configuration.service';
import { ApplicationConfigurationDto } from '../proxy/volo/abp/asp-net-core/mvc/application-configurations/models';
import { ApplicationConfigurationDto, ApplicationGlobalFeatureConfigurationDto } from '../proxy/volo/abp/asp-net-core/mvc/application-configurations/models';
import { InternalStore } from '../utils/internal-store-utils';
@Injectable({

Loading…
Cancel
Save