diff --git a/vueJs/src/api/clients.ts b/vueJs/src/api/clients.ts index eb901b4d7..f867b9d37 100644 --- a/vueJs/src/api/clients.ts +++ b/vueJs/src/api/clients.ts @@ -1,5 +1,5 @@ import ApiService from './serviceBase' -import { FullAuditedEntityDto, PagedAndSortedResultRequestDto, ListResultDto, PagedResultDto, SecretBase, Claim } from './types' +import { FullAuditedEntityDto, PagedAndSortedResultRequestDto, ListResultDto, PagedResultDto, SecretBase, Claim, HashType } from './types' const sourceUrl = '/api/identity-server/clients' const serviceUrl = process.env.VUE_APP_BASE_API @@ -53,11 +53,6 @@ export default class ClientService { } } -export enum HashType { - Sha256 = 0, - Sha512 = 1 -} - export class SecretCreateOrUpdate extends SecretBase { hashType = HashType.Sha256 } @@ -138,13 +133,13 @@ export class Client extends FullAuditedEntityDto { postLogoutRedirectUris = new Array() identityProviderRestrictions = new Array() claims = new Array() - properties:{[key: string]: string} = {} + properties: {[key: string]: string} = {} } export class ClientCreateOrUpdate { clientId = '' clientName = '' - description? = '' + description?: string = '' allowedGrantTypes = new Array() } diff --git a/vueJs/src/api/organizationunit.ts b/vueJs/src/api/organizationunit.ts index 405973308..792613e54 100644 --- a/vueJs/src/api/organizationunit.ts +++ b/vueJs/src/api/organizationunit.ts @@ -1,7 +1,7 @@ import ApiService from './serviceBase' import { AuditedEntityDto, PagedResultDto, PagedAndSortedResultRequestDto, ListResultDto } from './types' import { RoleDto } from './roles' -import { UserDataDto } from './users' +import { User } from './users' /** 远程服务地址 */ const serviceUrl = process.env.VUE_APP_BASE_API @@ -154,7 +154,7 @@ export default class OrganizationUnitService { public static organizationUnitGetUsers(id: string) { let _url = '/api/identity/organization-units/management-users' _url += '?id=' + id - return ApiService.Get>(_url, serviceUrl) + return ApiService.Get>(_url, serviceUrl) } /** diff --git a/vueJs/src/components/EventBus/events.d.ts b/vueJs/src/components/EventBus/events.d.ts index 11416484f..8f9d2d803 100644 --- a/vueJs/src/components/EventBus/events.d.ts +++ b/vueJs/src/components/EventBus/events.d.ts @@ -13,9 +13,9 @@ export declare class VueEvents { once(event: string, callback: (eventData: any) => void): void - off(event:string, callback?: (eventData: any) => void): void + off(event: string, callback?: (eventData: any) => void): void - unlisten (event:string, callback?: (eventData: any) => void): void + unlisten (event: string, callback?: (eventData: any) => void): void removeAll(): void } diff --git a/vueJs/src/components/EventBus/index.d.ts b/vueJs/src/components/EventBus/index.d.ts index 551d2eac4..3509cf56c 100644 --- a/vueJs/src/components/EventBus/index.d.ts +++ b/vueJs/src/components/EventBus/index.d.ts @@ -1,4 +1,4 @@ -import './vue'; +import './vue' import * as E from './events' declare namespace VueEvents { diff --git a/vueJs/src/components/EventBus/vue.d.ts b/vueJs/src/components/EventBus/vue.d.ts index 47d0a9f40..63bad691e 100644 --- a/vueJs/src/components/EventBus/vue.d.ts +++ b/vueJs/src/components/EventBus/vue.d.ts @@ -1,4 +1,4 @@ -import VueEvents from './index'; +import VueEvents from './index' declare module 'vue/types/vue' { interface Vue { diff --git a/vueJs/src/views/admin/identityServer/api-resources/components/ApiResourceCreateOrEditForm.vue b/vueJs/src/views/admin/identityServer/api-resources/components/ApiResourceCreateOrEditForm.vue index c50597a2b..46bca0f1e 100644 --- a/vueJs/src/views/admin/identityServer/api-resources/components/ApiResourceCreateOrEditForm.vue +++ b/vueJs/src/views/admin/identityServer/api-resources/components/ApiResourceCreateOrEditForm.vue @@ -107,8 +107,8 @@ :user-claims="apiResourceClaims" :api-resource-scopes="apiResource.scopes" :secrets="apiResource.secrets" - :allowed-create="checkPermission(['AbpIdentityServer.ApiResources.ManageProperties'])" - :allowed-delete="checkPermission(['AbpIdentityServer.ApiResources.ManageProperties'])" + :allowed-create-prop="checkPermission(['AbpIdentityServer.ApiResources.ManageProperties'])" + :allowed-delete-prop="checkPermission(['AbpIdentityServer.ApiResources.ManageProperties'])" :allowed-create-secret="checkPermission(['AbpIdentityServer.ApiResources.ManageSecrets'])" :allowed-delete-secret="checkPermission(['AbpIdentityServer.ApiResources.ManageSecrets'])" :properties="apiResource.properties" @@ -120,45 +120,6 @@ @onDeleted="onPropertyDeleted" /> - diff --git a/vueJs/src/views/admin/identityServer/client/components/ClientEditForm.vue b/vueJs/src/views/admin/identityServer/client/components/ClientEditForm.vue index 8a6beb6c6..e69fba2d1 100644 --- a/vueJs/src/views/admin/identityServer/client/components/ClientEditForm.vue +++ b/vueJs/src/views/admin/identityServer/client/components/ClientEditForm.vue @@ -660,8 +660,8 @@ :secrets="client.clientSecrets" :client-claims="client.claims" :properties="client.properties" - :allowed-create="checkPermission(['AbpIdentityServer.Clients.ManageProperties'])" - :allowed-delete="checkPermission(['AbpIdentityServer.Clients.ManageProperties'])" + :allowed-create-prop="checkPermission(['AbpIdentityServer.Clients.ManageProperties'])" + :allowed-delete-prop="checkPermission(['AbpIdentityServer.Clients.ManageProperties'])" @onSecretCreated="onClientSecretCreated" @onSecretDeleted="onClientSecretDeleted" @onClientClaimCreated="onClientClaimCreated" diff --git a/vueJs/src/views/admin/identityServer/components/PropertiesEditForm.vue b/vueJs/src/views/admin/identityServer/components/PropertiesEditForm.vue index 69086d322..66f3ca24e 100644 --- a/vueJs/src/views/admin/identityServer/components/PropertiesEditForm.vue +++ b/vueJs/src/views/admin/identityServer/components/PropertiesEditForm.vue @@ -1,7 +1,7 @@