Change improper variable naming

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<string>()
   identityProviderRestrictions = new Array<string>()
   claims = new Array<ClientClaim>()
-  properties:{[key: string]: string} = {}
+  properties: {[key: string]: string} = {}
 }
 
 export class ClientCreateOrUpdate {
   clientId = ''
   clientName = ''
-  description? = ''
+  description?: string = ''
   allowedGrantTypes = new Array<string>()
 }
 

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<ListResultDto<UserDataDto>>(_url, serviceUrl)
+    return ApiService.Get<ListResultDto<User>>(_url, serviceUrl)
   }
 
   /**

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
 }

vueJs/src/components/EventBus/index.d.ts

@@ -1,4 +1,4 @@
-import './vue';
+import './vue'
 import * as E from './events'
 
 declare namespace VueEvents {

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 {

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"
             />
           </el-tab-pane>
-          <!-- <el-tab-pane
-            v-if="isEdit"
-            name="scopes"
-            :label="$t('AbpIdentityServer.Scope')"
-          >
-            <api-resource-scope-edit-form
-              :user-claims="apiResourceClaims"
-              :api-resource-scopes="apiResource.scopes"
-              @onScopeCreated="apiResourceScopeCreated"
-              @onScopeDeleted="apiResourceScopeDeleted"
-            />
-          </el-tab-pane>
-          <el-tab-pane
-            v-if="isEdit"
-            name="secrets"
-            :label="$t('AbpIdentityServer.Secret')"
-          >
-            <el-card>
-              <secret-edit-form
-                :secrets="apiResource.secrets"
-                @onSecretCreated="apiResourceSecretCreated"
-                @onSecretDeleted="apiResourceSecretDeleted"
-              />
-            </el-card>
-          </el-tab-pane>
-
-          <el-tab-pane
-            v-if="isEdit"
-            name="properties"
-            :label="$t('AbpIdentityServer.Propertites')"
-          >
-            <properties-edit-form
-              :allowed-create="checkPermission(['AbpIdentityServer.ApiResources.ManageProperties'])"
-              :allowed-delete="checkPermission(['AbpIdentityServer.ApiResources.ManageProperties'])"
-              :properties="apiResource.properties"
-              @onCreated="onPropertyCreated"
-              @onDeleted="onPropertyDeleted"
-            />
-          </el-tab-pane> -->
         </el-tabs>
 
         <el-form-item>

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"

vueJs/src/views/admin/identityServer/components/PropertiesEditForm.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-form
-      v-if="allowedCreate"
+      v-if="allowedCreateProp"
       ref="propertyEditForm"
       label-width="100px"
       :model="property"
@@ -88,7 +88,7 @@
           <el-button
             size="mini"
             type="danger"
-            :disabled="!allowedDelete"
+            :disabled="!allowedDeleteProp"
             icon="el-icon-delete"
             @click="onDelete(row.key)"
           />
@@ -123,10 +123,10 @@ export default class PropertiesEditForm extends Vue {
   private properties!: {[key: string]: string}
 
   @Prop({ default: false })
-  private allowedCreate!: boolean
+  private allowedCreateProp!: boolean
 
   @Prop({ default: false })
-  private allowedDelete!: boolean
+  private allowedDeleteProp!: boolean
 
   private editProperties = new Array<Property>()
   private property = new Property('', '')

vueJs/src/views/admin/identityServer/identity-resources/components/IdentityResourceCreateOrEditForm.vue

@@ -110,8 +110,8 @@
           >
             <properties-edit-form
               :properties="identityResource.properties"
-              :allowed-create="checkPermission(['AbpIdentityServer.IdentityResources.ManageProperties'])"
-              :allowed-delete="checkPermission(['AbpIdentityServer.IdentityResources.ManageProperties'])"
+              :allowed-create-prop="checkPermission(['AbpIdentityServer.IdentityResources.ManageProperties'])"
+              :allowed-delete-prop="checkPermission(['AbpIdentityServer.IdentityResources.ManageProperties'])"
               @onCreated="onPropertyCreated"
               @onDeleted="onPropertyDeleted"
             />