diff --git a/apps/vue/src/api/abp/model/appModel.ts b/apps/vue/src/api/abp/model/appModel.ts index 60a3378fe..33b744e99 100644 --- a/apps/vue/src/api/abp/model/appModel.ts +++ b/apps/vue/src/api/abp/model/appModel.ts @@ -1,4 +1,4 @@ -import { INameValue, Available } from '../../model/baseModel'; +import { Available } from '../../model/baseModel'; /** 授权 */ export class Auth { @@ -119,9 +119,9 @@ export class Localization { /** 本地化资源集合 */ values: { [key: string]: { [key: string]: string } } = {}; /** 语言映射集合 */ - languagesMap: { [key: string]: INameValue[] } = {}; + languagesMap: { [key: string]: NameValue[] } = {}; /** 语言文档映射集合 */ - languageFilesMap: { [key: string]: INameValue[] } = {}; + languageFilesMap: { [key: string]: NameValue[] } = {}; } /** 多租户配置 */ diff --git a/apps/vue/src/api/account/accounts.ts b/apps/vue/src/api/account/accounts.ts index eed2096fe..3e6cab714 100644 --- a/apps/vue/src/api/account/accounts.ts +++ b/apps/vue/src/api/account/accounts.ts @@ -1,7 +1,6 @@ import { defAbpHttp } from '/@/utils/http/abp'; import { Register, PhoneRegister, PhoneResetPassword } from './model/accountsModel'; import { User } from '/@/api/identity/model/userModel'; -import { ListResultDto } from '../model/baseModel'; import { format } from '/@/utils/strings'; enum Api { diff --git a/apps/vue/src/api/account/model/profilesModel.ts b/apps/vue/src/api/account/model/profilesModel.ts index 6f3f8b912..e065c79c6 100644 --- a/apps/vue/src/api/account/model/profilesModel.ts +++ b/apps/vue/src/api/account/model/profilesModel.ts @@ -1,5 +1,3 @@ -import { ExtensibleObject, IHasConcurrencyStamp } from '../../model/baseModel'; - interface Profile extends ExtensibleObject, IHasConcurrencyStamp { userName: string; email: string; diff --git a/apps/vue/src/api/auditing/auditLog.ts b/apps/vue/src/api/auditing/auditLog.ts index 01964380f..e0bbc9e39 100644 --- a/apps/vue/src/api/auditing/auditLog.ts +++ b/apps/vue/src/api/auditing/auditLog.ts @@ -7,7 +7,6 @@ import { EntityChangeGetByPagedRequest, EntityChangeGetWithUsernameInput } from './model/auditLogModel'; -import { ListResultDto } from '../model/baseModel'; enum Api { RemoteService = 'AbpAuditing', diff --git a/apps/vue/src/api/auditing/model/auditLogModel.ts b/apps/vue/src/api/auditing/model/auditLogModel.ts index c853aeeee..ac69dfbac 100644 --- a/apps/vue/src/api/auditing/model/auditLogModel.ts +++ b/apps/vue/src/api/auditing/model/auditLogModel.ts @@ -1,5 +1,3 @@ -import { PagedAndSortedResultRequestDto } from '../../model/baseModel'; - export enum ChangeType { Created = 0, Updated = 1, @@ -22,7 +20,7 @@ export interface EntityChange { entityId?: string; entityTypeFullName?: string; propertyChanges?: PropertyChange[]; - extraProperties?: { [key: string]: any }; + extraProperties?: ExtraPropertyDictionary; } export interface EntityChangeWithUsername { @@ -37,7 +35,7 @@ export interface Action { parameters?: string; executionTime: Date; executionDuration?: number; - extraProperties?: { [key: string]: any }; + extraProperties?: ExtraPropertyDictionary; } export interface AuditLog { @@ -63,7 +61,7 @@ export interface AuditLog { httpStatusCode?: number; entityChanges?: EntityChange[]; actions?: Action[]; - extraProperties?: { [key: string]: any }; + extraProperties?: ExtraPropertyDictionary; } export interface GetAuditLogPagedRequest extends PagedAndSortedResultRequestDto { diff --git a/apps/vue/src/api/caching-management/cache/model/index.ts b/apps/vue/src/api/caching-management/cache/model/index.ts index 423851bf8..204ae31cd 100644 --- a/apps/vue/src/api/caching-management/cache/model/index.ts +++ b/apps/vue/src/api/caching-management/cache/model/index.ts @@ -7,7 +7,7 @@ export interface CacheValue { type: string; size: number; expiration?: Date; - values: {[key:string]: any}; + values: Dictionary; } export interface CacheRefreshRequest { diff --git a/apps/vue/src/api/identity-server/clients.ts b/apps/vue/src/api/identity-server/clients.ts index 4288bce2a..6150883a8 100644 --- a/apps/vue/src/api/identity-server/clients.ts +++ b/apps/vue/src/api/identity-server/clients.ts @@ -8,7 +8,6 @@ import { ClientPagedResult, } from './model/clientsModel'; import { format } from '/@/utils/strings'; -import { ListResultDto } from '../model/baseModel'; enum Api { Clone = '/api/identity-server/clients/{id}/clone', diff --git a/apps/vue/src/api/identity-server/model/apiResourcesModel.ts b/apps/vue/src/api/identity-server/model/apiResourcesModel.ts index 97ea1e27e..0acee8aa5 100644 --- a/apps/vue/src/api/identity-server/model/apiResourcesModel.ts +++ b/apps/vue/src/api/identity-server/model/apiResourcesModel.ts @@ -1,9 +1,4 @@ -import { - ExtensibleAuditedEntity, - PagedAndSortedResultRequestDto, - PagedResultDto, - SecretBase, -} from '/@/api/model/baseModel'; +import { SecretBase } from '/@/api/model/baseModel'; import { UserClaim, Property } from './basicModel'; export type ApiResourceSecret = SecretBase; @@ -25,7 +20,7 @@ export interface ApiResourceSecretCreateOrUpdate extends SecretBase { hashType: HashType; } -export interface ApiResource extends ExtensibleAuditedEntity { +export interface ApiResource extends ExtensibleAuditedEntityDto { name: string; displayName: string; description: string; @@ -56,8 +51,8 @@ export interface ApiResourceCreate extends ApiResourceCreateOrUpdate { export type ApiResourceUpdate = ApiResourceCreateOrUpdate; -export class ApiResourcePagedResult extends PagedResultDto {} +export interface ApiResourcePagedResult extends PagedResultDto {} -export class GetApiResourcePagedRequest extends PagedAndSortedResultRequestDto { - filter = ''; +export interface GetApiResourcePagedRequest extends PagedAndSortedResultRequestDto { + filter?: string; } diff --git a/apps/vue/src/api/identity-server/model/apiScopesModel.ts b/apps/vue/src/api/identity-server/model/apiScopesModel.ts index b66f1aed8..f9abd8a18 100644 --- a/apps/vue/src/api/identity-server/model/apiScopesModel.ts +++ b/apps/vue/src/api/identity-server/model/apiScopesModel.ts @@ -1,15 +1,10 @@ -import { - ExtensibleAuditedEntity, - PagedAndSortedResultRequestDto, - PagedResultDto, -} from '/@/api/model/baseModel'; import { UserClaim, Property } from './basicModel'; export type ApiScopeClaim = UserClaim; export type ApiScopeProperty = Property; -export interface ApiScope extends ExtensibleAuditedEntity { +export interface ApiScope extends ExtensibleAuditedEntityDto { enabled: boolean; name: string; displayName: string; @@ -38,8 +33,8 @@ export interface ApiScopeCreate extends ApiScopeCreateOrUpdate { export type ApiScopeUpdate = ApiScopeCreateOrUpdate; -export class ApiScopePagedResult extends PagedResultDto {} +export interface ApiScopePagedResult extends PagedResultDto {} -export class GetApiScopePagedRequest extends PagedAndSortedResultRequestDto { - filter = ''; +export interface GetApiScopePagedRequest extends PagedAndSortedResultRequestDto { + filter?: string; } diff --git a/apps/vue/src/api/identity-server/model/clientsModel.ts b/apps/vue/src/api/identity-server/model/clientsModel.ts index ebdef67c0..34a207b65 100644 --- a/apps/vue/src/api/identity-server/model/clientsModel.ts +++ b/apps/vue/src/api/identity-server/model/clientsModel.ts @@ -1,9 +1,4 @@ -import { - ExtensibleAuditedEntity, - PagedAndSortedResultRequestDto, - PagedResultDto, - SecretBase, -} from '/@/api/model/baseModel'; +import { SecretBase } from '/@/api/model/baseModel'; import { UserClaim, Property } from './basicModel'; export interface ClientClaim extends UserClaim { @@ -38,7 +33,7 @@ export type ClientSecret = SecretBase; export type ClientProperty = Property; -export interface Client extends ExtensibleAuditedEntity { +export interface Client extends ExtensibleAuditedEntityDto { clientId: string; clientName: string; description: string; @@ -161,8 +156,8 @@ export interface ClientClone { CopyIdentityProviderRestriction: boolean; } -export class ClientPagedResult extends PagedResultDto {} +export interface ClientPagedResult extends PagedResultDto {} -export class GetClientPagedRequest extends PagedAndSortedResultRequestDto { - filter = ''; +export interface GetClientPagedRequest extends PagedAndSortedResultRequestDto { + filter?: string; } diff --git a/apps/vue/src/api/identity-server/model/identityResourcesModel.ts b/apps/vue/src/api/identity-server/model/identityResourcesModel.ts index b0a1801da..661822bd4 100644 --- a/apps/vue/src/api/identity-server/model/identityResourcesModel.ts +++ b/apps/vue/src/api/identity-server/model/identityResourcesModel.ts @@ -1,15 +1,10 @@ -import { - ExtensibleAuditedEntity, - PagedAndSortedResultRequestDto, - PagedResultDto, -} from '/@/api/model/baseModel'; import { UserClaim, Property } from './basicModel'; export type IdentityResourceClaim = UserClaim; export type IdentityResourceProperty = Property; -export interface IdentityResource extends ExtensibleAuditedEntity { +export interface IdentityResource extends ExtensibleAuditedEntityDto { name: string; displayName: string; description: string; @@ -37,8 +32,8 @@ export type IdentityResourceCreate = IdentityResourceCreateOrUpdate; export type IdentityResourceUpdate = IdentityResourceCreateOrUpdate; -export class IdentityResourcePagedResult extends PagedResultDto {} +export interface IdentityResourcePagedResult extends PagedResultDto {} -export class GetIdentityResourcePagedRequest extends PagedAndSortedResultRequestDto { - filter = ''; +export interface GetIdentityResourcePagedRequest extends PagedAndSortedResultRequestDto { + filter?: string; } diff --git a/apps/vue/src/api/identity-server/model/persistedGrantsModel.ts b/apps/vue/src/api/identity-server/model/persistedGrantsModel.ts index 3fbd6fcb6..e1a32aef3 100644 --- a/apps/vue/src/api/identity-server/model/persistedGrantsModel.ts +++ b/apps/vue/src/api/identity-server/model/persistedGrantsModel.ts @@ -1,10 +1,4 @@ -import { - ExtensibleEntity, - PagedAndSortedResultRequestDto, - PagedResultDto, -} from '/@/api/model/baseModel'; - -export interface PersistedGrant extends ExtensibleEntity { +export interface PersistedGrant extends ExtensibleEntityDto { key: string; type: string; subjectId: string; @@ -17,9 +11,9 @@ export interface PersistedGrant extends ExtensibleEntity { data: string; } -export class PersistedGrantPagedResult extends PagedResultDto {} +export interface PersistedGrantPagedResult extends PagedResultDto {} -export class GetPersistedGrantPagedRequest extends PagedAndSortedResultRequestDto { - filter = ''; - subjectId = ''; +export interface GetPersistedGrantPagedRequest extends PagedAndSortedResultRequestDto { + filter?: string; + subjectId?: string; } diff --git a/apps/vue/src/api/identity/model/claimModel.ts b/apps/vue/src/api/identity/model/claimModel.ts index ee5988598..0657aed54 100644 --- a/apps/vue/src/api/identity/model/claimModel.ts +++ b/apps/vue/src/api/identity/model/claimModel.ts @@ -1,11 +1,3 @@ -import { - ExtensibleEntity, - ExtensibleObject, - ListResultDto, - PagedAndSortedResultRequestDto, - PagedResultDto, -} from '../../model/baseModel'; - export enum ValueType { String = 0, Int = 1, @@ -13,51 +5,51 @@ export enum ValueType { DateTime = 3, } -export class IdentityClaimType extends ExtensibleEntity { - name!: string; - required!: boolean; - isStatic!: boolean; +export interface IdentityClaimType extends ExtensibleEntityDto { + name: string; + required: boolean; + isStatic: boolean; regex?: string; regexDescription?: string; description?: string; - valueType!: ValueType; + valueType: ValueType; } -export class CreateOrUpdateIdentityClaimType extends ExtensibleObject { - required = false; - regex?: string = ''; - regexDescription?: string = ''; - description?: string = ''; +export interface CreateOrUpdateIdentityClaimType extends ExtensibleObject { + required: boolean; + regex?: string; + regexDescription?: string; + description?: string; } -export class CreateIdentityClaimType extends CreateOrUpdateIdentityClaimType { - name!: string; - isStatic!: boolean; - valueType!: ValueType; +export interface CreateIdentityClaimType extends CreateOrUpdateIdentityClaimType { + name: string; + isStatic: boolean; + valueType: ValueType; } -export class UpdateIdentityClaimType extends CreateOrUpdateIdentityClaimType {} +export interface UpdateIdentityClaimType extends CreateOrUpdateIdentityClaimType {} -export class GetIdentityClaimTypePagedRequest extends PagedAndSortedResultRequestDto { - filter = ''; +export interface GetIdentityClaimTypePagedRequest extends PagedAndSortedResultRequestDto { + filter?: string; } -export class IdentityClaimTypeListResult extends ListResultDto {} +export interface IdentityClaimTypeListResult extends ListResultDto {} -export class IdentityClaimTypePagedResult extends PagedResultDto {} +export interface IdentityClaimTypePagedResult extends PagedResultDto {} -export class IdentityClaim { - claimType = ''; - claimValue = ''; +export interface IdentityClaim { + claimType: string; + claimValue: string; } -export class DeleteIdentityClaim { - claimType = ''; - claimValue = ''; +export interface DeleteIdentityClaim { + claimType: string; + claimValue: string; } -export class CreateIdentityClaim extends IdentityClaim {} +export interface CreateIdentityClaim extends IdentityClaim {} -export class UpdateIdentityClaim extends IdentityClaim { - newClaimValue!: string; +export interface UpdateIdentityClaim extends IdentityClaim { + newClaimValue: string; } diff --git a/apps/vue/src/api/identity/model/organizationUnitsModel.ts b/apps/vue/src/api/identity/model/organizationUnitsModel.ts index d39577ad0..789df89fa 100644 --- a/apps/vue/src/api/identity/model/organizationUnitsModel.ts +++ b/apps/vue/src/api/identity/model/organizationUnitsModel.ts @@ -1,56 +1,47 @@ -import { - AuditedEntityDto, - PagedAndSortedResultRequestDto, - ListResultDto, - PagedResultDto, -} from '../../model/baseModel'; - /** 组织机构 */ -export class OrganizationUnit extends AuditedEntityDto { - /** 标识 */ - id!: string; +export interface OrganizationUnit extends AuditedEntityDto { /** 父节点标识 */ parentId?: string; /** 编号 */ - code!: string; + code: string; /** 显示名称 */ - displayName!: string; + displayName: string; } /** 组织机构分页查询对象 */ -export class GetOrganizationUnitPagedRequest extends PagedAndSortedResultRequestDto { +export interface GetOrganizationUnitPagedRequest extends PagedAndSortedResultRequestDto { /** 过滤字符 */ - filter!: string; + filter?: string; } /** 组织结构分页返回结果 */ -export class OrganizationUnitPagedResult extends PagedResultDto {} +export interface OrganizationUnitPagedResult extends PagedResultDto {} /** 组织结构列表返回结果 */ -export class OrganizationUnitListResult extends ListResultDto {} +export interface OrganizationUnitListResult extends ListResultDto {} /** 组织机构创建对象 */ -export class CreateOrganizationUnit { +export interface CreateOrganizationUnit { /** 显示名称 */ - displayName!: string; + displayName: string; /** 父节点标识 */ parentId?: string; } /** 组织机构变更对象 */ -export class UpdateOrganizationUnit { +export interface UpdateOrganizationUnit { /** 显示名称 */ - displayName!: string; + displayName: string; } /** 组织机构增加部门对象 */ -export class OrganizationUnitAddRole { +export interface OrganizationUnitAddRole { /** 角色标识列表 */ - roleIds: string[] = []; + roleIds: string[]; } /** 组织机构增加用户对象 */ -export class OrganizationUnitAddUser { +export interface OrganizationUnitAddUser { /** 用户标识列表 */ - userIds: string[] = []; + userIds: string[]; } diff --git a/apps/vue/src/api/identity/model/roleModel.ts b/apps/vue/src/api/identity/model/roleModel.ts index cc00a93e5..2fab0b2ca 100644 --- a/apps/vue/src/api/identity/model/roleModel.ts +++ b/apps/vue/src/api/identity/model/roleModel.ts @@ -1,46 +1,38 @@ -import { - ListResultDto, - PagedAndSortedResultRequestDto, - PagedResultDto, -} from '../../model/baseModel'; import { IdentityClaim } from './claimModel'; -export class RoleBase { - name!: string; - isDefault!: boolean; - isPublic!: boolean; +export interface RoleBase { + name: string; + isDefault: boolean; + isPublic: boolean; } -export class Role extends RoleBase { - id!: string; - isStatic!: boolean; +export interface Role extends RoleBase { + id: string; + isStatic: boolean; concurrencyStamp?: string; } -export class RoleListResult extends ListResultDto {} +export interface RoleListResult extends ListResultDto {} -export class RolePagedResult extends PagedResultDto {} +export interface RolePagedResult extends PagedResultDto {} -export class GetRolePagedRequest extends PagedAndSortedResultRequestDto { - filter = ''; +export interface GetRolePagedRequest extends PagedAndSortedResultRequestDto { + filter?: string; } -export class CreateRole extends RoleBase { - isDefault = false; - isPublic = true; - name = ''; +export interface CreateRole extends RoleBase { } -export class UpdateRole extends RoleBase { +export interface UpdateRole extends RoleBase { concurrencyStamp?: string; } -export class ChangeRoleOrganizationUnitDto { - organizationUnitIds: string[] = []; +export interface ChangeRoleOrganizationUnitDto { + organizationUnitIds: string[]; } -export class RoleClaim extends IdentityClaim { - id!: string; +export interface RoleClaim extends IdentityClaim { + id: string; } -export class RoleClaimListResult extends ListResultDto {} +export interface RoleClaimListResult extends ListResultDto {} diff --git a/apps/vue/src/api/identity/model/securityLogModel.ts b/apps/vue/src/api/identity/model/securityLogModel.ts index bdd9d6a60..48920a715 100644 --- a/apps/vue/src/api/identity/model/securityLogModel.ts +++ b/apps/vue/src/api/identity/model/securityLogModel.ts @@ -1,6 +1,4 @@ -import { PagedAndSortedResultRequestDto } from '../../model/baseModel'; - -export interface SecurityLog { +export interface SecurityLog extends ExtensibleObject { id: string; applicationName?: string; identity?: string; @@ -13,7 +11,6 @@ export interface SecurityLog { clientIpAddress?: string; browserInfo?: string; creationTime?: Date; - extraProperties?: { [key: string]: any }; } export interface GetSecurityLogPagedRequest extends PagedAndSortedResultRequestDto { diff --git a/apps/vue/src/api/identity/model/userLookupModel.ts b/apps/vue/src/api/identity/model/userLookupModel.ts index f3ad29648..1fed076be 100644 --- a/apps/vue/src/api/identity/model/userLookupModel.ts +++ b/apps/vue/src/api/identity/model/userLookupModel.ts @@ -1,5 +1,3 @@ -import { ListResultDto, PagedAndSortedResultRequestDto } from '../../model/baseModel'; - export interface IUserData { id: string; tenantId?: string; diff --git a/apps/vue/src/api/identity/model/userModel.ts b/apps/vue/src/api/identity/model/userModel.ts index eee5c67fd..131c3be2b 100644 --- a/apps/vue/src/api/identity/model/userModel.ts +++ b/apps/vue/src/api/identity/model/userModel.ts @@ -1,10 +1,3 @@ -import { - ExtensibleObject, - FullAuditedEntityDto, - ListResultDto, - PagedAndSortedResultRequestDto, - PagedResultDto, -} from '../../model/baseModel'; import { IdentityClaim } from './claimModel'; /** 用户对象接口 */ @@ -35,74 +28,53 @@ export interface SetPassword { } /** 用户对象 */ -export class User extends FullAuditedEntityDto implements IUser { - /** 用户名 */ - name = ''; - /** 用户账户 */ - userName = ''; - /** 用户简称 */ - surname = ''; - /** 邮件地址 */ - email = ''; - /** 联系方式 */ - phoneNumber = ''; - /** 双因素验证 */ - twoFactorEnabled = false; - /** 登录锁定 */ - lockoutEnabled = false; - /** 用户标识 */ - id = ''; +export interface User extends FullAuditedEntityDto, IUser, IHasConcurrencyStamp { /** 租户标识 */ - tenentId? = ''; + tenentId?: string; /** 邮箱已验证 */ - emailConfirmed = false; + emailConfirmed: boolean; /** 联系方式已验证 */ - phoneNumberConfirmed = false; + phoneNumberConfirmed: boolean; /** 锁定截止时间 */ - lockoutEnd?: Date = undefined; - /** 并发令牌 */ - concurrencyStamp = ''; + lockoutEnd?: Date; /** 已激活的用户 */ - isActive = true; + isActive: boolean; /** 角色列表 */ - roleNames: string[] = []; + roleNames: string[]; } -export class CreateOrUpdateUser extends ExtensibleObject { - /** 用户名 */ - name = ''; - /** 用户账户 */ - userName = ''; - /** 用户简称 */ - surname = ''; - /** 邮件地址 */ - email = ''; - /** 联系方式 */ - phoneNumber = ''; - /** 登录锁定 */ - lockoutEnabled = false; +export interface CreateOrUpdateUser extends ExtensibleObject { + /** 用户名 */ + name: string; + /** 用户账户 */ + userName: string; + /** 用户简称 */ + surname?: string; + /** 邮件地址 */ + email: string; + /** 联系方式 */ + phoneNumber?: string; + /** 登录锁定 */ + lockoutEnabled: boolean; /** 角色列表 */ - roleNames: string[] | null = null; + roleNames?: string[]; /** 密码 */ - password: string | null = null; + password?: string; } /** 变更用户对象 */ -export class UpdateUser extends CreateOrUpdateUser { - /** 并发令牌 */ - concurrencyStamp = ''; -} +export interface UpdateUser extends CreateOrUpdateUser {} -export class CreateUser extends CreateOrUpdateUser {} +export interface CreateUser extends CreateOrUpdateUser {} -export class GetUserPagedRequest extends PagedAndSortedResultRequestDto { - filter = ''; +export interface GetUserPagedRequest extends PagedAndSortedResultRequestDto { + filter?: string; } -export class UserPagedResult extends PagedResultDto {} +export interface UserPagedResult extends PagedResultDto {} -export class UserClaim extends IdentityClaim { - id!: string; +export interface UserClaim extends IdentityClaim { + id: string; } -export class UserClaimListResult extends ListResultDto {} +export interface UserClaimListResult extends ListResultDto {} diff --git a/apps/vue/src/api/localization/model/languagesModel.ts b/apps/vue/src/api/localization/model/languagesModel.ts index 4fad258c4..7b2d9a9a5 100644 --- a/apps/vue/src/api/localization/model/languagesModel.ts +++ b/apps/vue/src/api/localization/model/languagesModel.ts @@ -1,12 +1,4 @@ -import { - AuditedEntityDto, - ListResultDto, - PagedAndSortedResultRequestDto, - PagedResultDto, -} from '/@/api/model/baseModel'; - -export interface Language extends AuditedEntityDto { - id: string; +export interface Language extends AuditedEntityDto { enable: boolean; cultureName: string; uiCultureName: string; @@ -22,10 +14,10 @@ export interface LanguageCreateOrUpdate { flagIcon: string; } -export class LanguageListResult extends ListResultDto {} +export interface LanguageListResult extends ListResultDto {} -export class LanguagePagedResult extends PagedResultDto {} +export interface LanguagePagedResult extends PagedResultDto {} -export class GetLanguagePagedRequest extends PagedAndSortedResultRequestDto { - filter = ''; +export interface GetLanguagePagedRequest extends PagedAndSortedResultRequestDto { + filter?: string; } diff --git a/apps/vue/src/api/localization/model/resourcesModel.ts b/apps/vue/src/api/localization/model/resourcesModel.ts index b5549032e..ce2d9e1a4 100644 --- a/apps/vue/src/api/localization/model/resourcesModel.ts +++ b/apps/vue/src/api/localization/model/resourcesModel.ts @@ -1,9 +1,3 @@ -import { - ListResultDto, - PagedAndSortedResultRequestDto, - PagedResultDto, -} from '/@/api/model/baseModel'; - export interface Resource { name: string; displayName: string; @@ -17,10 +11,10 @@ export interface ResourceCreateOrUpdate { description: string; } -export class ResourceListResult extends ListResultDto {} +export interface ResourceListResult extends ListResultDto {} -export class ResourcePagedResult extends PagedResultDto {} +export interface ResourcePagedResult extends PagedResultDto {} -export class GetResourcePagedRequest extends PagedAndSortedResultRequestDto { - filter = ''; +export interface GetResourcePagedRequest extends PagedAndSortedResultRequestDto { + filter?: string; } diff --git a/apps/vue/src/api/localization/model/textsModel.ts b/apps/vue/src/api/localization/model/textsModel.ts index 1452057e6..1f62a32cb 100644 --- a/apps/vue/src/api/localization/model/textsModel.ts +++ b/apps/vue/src/api/localization/model/textsModel.ts @@ -1,5 +1,3 @@ -import { ListResultDto } from '/@/api/model/baseModel'; - export interface Text { key: boolean; value: string; @@ -23,7 +21,7 @@ export interface SetTextInput { resourceName: string; } -export class TextListResult extends ListResultDto {} +export interface TextListResult extends ListResultDto {} export interface GetTextByKey { key: boolean; diff --git a/apps/vue/src/api/logging/model/loggingModel.ts b/apps/vue/src/api/logging/model/loggingModel.ts index b7a716cd8..7c39a1e78 100644 --- a/apps/vue/src/api/logging/model/loggingModel.ts +++ b/apps/vue/src/api/logging/model/loggingModel.ts @@ -1,5 +1,3 @@ -import { PagedAndSortedResultRequestDto, PagedResultDto } from '../../model/baseModel'; - export interface LogException { depth: number; class: string; @@ -61,4 +59,4 @@ export interface GetLogPagedRequest extends PagedAndSortedResultRequestDto { hasException?: boolean; } -export class LogPagedResult extends PagedResultDto {} +export interface LogPagedResult extends PagedResultDto {} diff --git a/apps/vue/src/api/messages/model/friendsModel.ts b/apps/vue/src/api/messages/model/friendsModel.ts index b0e389061..8e73fd8ac 100644 --- a/apps/vue/src/api/messages/model/friendsModel.ts +++ b/apps/vue/src/api/messages/model/friendsModel.ts @@ -1,8 +1,3 @@ -import { - ListResultDto, - PagedAndSortedResultRequestDto, - PagedResultDto, -} from '../../model/baseModel'; import { UserCard } from './baseModel'; export interface UserFriend extends UserCard { diff --git a/apps/vue/src/api/messages/model/groupModel.ts b/apps/vue/src/api/messages/model/groupModel.ts index 28e869e05..9136239fc 100644 --- a/apps/vue/src/api/messages/model/groupModel.ts +++ b/apps/vue/src/api/messages/model/groupModel.ts @@ -1,5 +1,3 @@ -import { PagedAndSortedResultRequestDto, PagedResultDto } from '../../model/baseModel'; - export interface Group { id: string; name: string; diff --git a/apps/vue/src/api/messages/model/messagesModel.ts b/apps/vue/src/api/messages/model/messagesModel.ts index 7fb9ea3cb..b209daa0c 100644 --- a/apps/vue/src/api/messages/model/messagesModel.ts +++ b/apps/vue/src/api/messages/model/messagesModel.ts @@ -1,12 +1,3 @@ -import { - ExtensibleObject, - ILimitedResultRequest, - ISortedResultRequest, - ListResultDto, - PagedAndSortedResultRequestDto, - PagedResultDto, -} from '../../model/baseModel'; - export enum MessageType { Text = 0, Image = 10, @@ -61,7 +52,7 @@ export interface LastChatMessage { source: MessageSourceTye; } -export interface GetUserLastMessageRequest extends ILimitedResultRequest, ISortedResultRequest { +export interface GetUserLastMessageRequest extends LimitedResultRequestDto, SortedResultRequest { state?: MessageState; } diff --git a/apps/vue/src/api/messages/model/notificationsModel.ts b/apps/vue/src/api/messages/model/notificationsModel.ts index 23c01900f..14c76b9ea 100644 --- a/apps/vue/src/api/messages/model/notificationsModel.ts +++ b/apps/vue/src/api/messages/model/notificationsModel.ts @@ -1,9 +1,3 @@ -import { - ListResultDto, - PagedAndSortedResultRequestDto, - PagedResultDto, -} from '../../model/baseModel'; - export enum NotificationLifetime { Persistent = 0, OnlyOne = 1, @@ -56,11 +50,11 @@ export interface NotificationGroup { }[]; } -export class GetNotificationPagedRequest extends PagedAndSortedResultRequestDto { - reverse = true; - readState = NotificationReadState.UnRead; +export interface GetNotificationPagedRequest extends PagedAndSortedResultRequestDto { + reverse?: boolean; + readState?: NotificationReadState; } -export class NotificationPagedResult extends PagedResultDto {} +export interface NotificationPagedResult extends PagedResultDto {} -export class NotificationGroupListResult extends ListResultDto {} +export interface NotificationGroupListResult extends ListResultDto {} diff --git a/apps/vue/src/api/messages/model/subscribesModel.ts b/apps/vue/src/api/messages/model/subscribesModel.ts index 2fae24b8a..4c3efcbbf 100644 --- a/apps/vue/src/api/messages/model/subscribesModel.ts +++ b/apps/vue/src/api/messages/model/subscribesModel.ts @@ -1,9 +1,3 @@ -import { - ListResultDto, - PagedAndSortedResultRequestDto, - PagedResultDto, -} from '../../model/baseModel'; - export interface UserSubscreNotification { name: string; } diff --git a/apps/vue/src/api/model/baseModel.ts b/apps/vue/src/api/model/baseModel.ts index 6a411e534..05e33218c 100644 --- a/apps/vue/src/api/model/baseModel.ts +++ b/apps/vue/src/api/model/baseModel.ts @@ -8,11 +8,6 @@ export interface BasicFetchResult { total: number; } -export interface INameValue { - name: string; - value: T; -} - export interface IAvailable { isAvailable: boolean; } @@ -29,173 +24,6 @@ export interface IPermission { isGranted: boolean; } -/** 分页排序查询对象 */ -export class PagedAndSortedResultRequestDto implements IPagedResultRequest, ISortedResultRequest { - /** 查询页码 */ - skipCount: number; - /** 单页最大返回数量 */ - maxResultCount: number; - /** 排序字段 */ - sorting: string | undefined; - - constructor() { - this.sorting = ''; - this.skipCount = 1; - this.maxResultCount = 10; - } -} - -/** 创建实体审计对象 */ -export class CreationAuditedEntityDto implements IMayHaveCreator { - creatorId: string | undefined; - creationTime!: Date; -} - -export class EntityDto { - id!: TKey; -} - -/** 实体审计对象 */ -export class AuditedEntityDto implements CreationAuditedEntityDto, IModificationAuditedObject { - lastModifierId: string | undefined; - lastModificationTime: Date | undefined; - creatorId: string | undefined; - creationTime!: Date; -} - -/** 所有实体审计对象 */ -export class FullAuditedEntityDto implements AuditedEntityDto, IDeletionAuditedObject { - lastModifierId: string | undefined; - lastModificationTime: Date | undefined; - creatorId: string | undefined; - creationTime!: Date; - deleterId!: string; - deletionTime: Date | undefined; - isDeleted!: boolean; -} - -/** 通用分页请求接口 */ -export class PagedResultRequestDto implements IPagedResultRequest { - skipCount: number; - maxResultCount: number; - - constructor() { - this.skipCount = 1; - this.maxResultCount = 25; - } -} - -export class PagedResultDto implements ListResultDto, IPagedResult { - items!: T[]; - totalCount!: number; -} - -/** 列表接口Dto */ -export class ListResultDto implements IListResult { - items!: T[]; -} - -export class ExtensibleObject implements IHasExtraProperties { - extraProperties!: { [key: string]: any }; -} - -export class ExtensibleEntity extends ExtensibleObject { - id!: TKey; -} - -export class ExtensibleCreationAuditedEntity extends ExtensibleEntity { - creationTime!: Date; - creatorId?: string; -} - -export class ExtensibleAuditedEntity extends ExtensibleCreationAuditedEntity { - lastModificationTime?: Date; - lastModifierId?: string; -} - -export interface IHasConcurrencyStamp { - concurrencyStamp: string; -} - -export interface IHasExtraProperties { - extraProperties: { [key: string]: any }; -} - -/** 分页请求接口 */ -export interface IPagedResultRequest extends ILimitedResultRequest { - /** 当前页 */ - skipCount: number; -} - -/** 最大请求接口 */ -export interface ILimitedResultRequest { - /** 当前页 */ - maxResultCount: number; -} - -/** 返回列表接口 */ -export interface IListResult { - /** 列表项 */ - items: T[]; -} - -/** 分页请求接口 */ -export interface IPagedResult extends IListResult { - /** 最大数据大小 */ - totalCount: number; -} - -/** 排序请求接口 */ -export interface ISortedResultRequest { - /** 排序字段 */ - sorting: string | undefined; -} - -/** 分页排序请求接口 */ -export interface IPagedAndSortedResultRequest extends IPagedResultRequest, ISortedResultRequest {} - -/** 创建人接口 */ -export interface IMayHaveCreator extends IHasCreationTime { - /** 创建人标识 */ - creatorId: string | undefined; -} - -/** 创建时间接口 */ -export interface IHasCreationTime { - /** 创建时间 */ - creationTime: Date; -} - -/** 修改人接口 */ -export interface IModificationAuditedObject extends IHasModificationTime { - /** 上次修改人标识 */ - lastModifierId: string | undefined; -} - -/** 修改时间接口 */ -export interface IHasModificationTime { - /** 上次修改时间 */ - lastModificationTime: Date | undefined; -} - -/** 删除人接口 */ -export interface IDeletionAuditedObject extends IHasDeletionTime { - /** 删除人标识 */ - deleterId: string; -} - -/** 删除时间接口 */ -export interface IHasDeletionTime extends ISoftDelete { - /** 删除时间 */ - deletionTime: Date | undefined; -} - -/** 软删除接口 */ -export interface ISoftDelete { - /** 是否已删除 */ - isDeleted: boolean; -} - /** 作用于接口 */ export interface IScope { /** 作用域 */ diff --git a/apps/vue/src/api/multi-tenancy/models/tenantModel.ts b/apps/vue/src/api/multi-tenancy/models/tenantModel.ts index 2db8da259..fb2508bce 100644 --- a/apps/vue/src/api/multi-tenancy/models/tenantModel.ts +++ b/apps/vue/src/api/multi-tenancy/models/tenantModel.ts @@ -1,9 +1,7 @@ -import { FullAuditedEntityDto, PagedAndSortedResultRequestDto } from '/@/api/model/baseModel'; - /** 租户查询过滤对象 */ -export class TenantGetByPaged extends PagedAndSortedResultRequestDto { +export interface TenantGetByPaged extends PagedAndSortedResultRequestDto { /** 查询过滤字段 */ - filter = ''; + filter?: string; } /** 租户创建对象 */ @@ -21,11 +19,9 @@ export class TenantCreateOrEdit { } /** 租户对象 */ -export class TenantDto extends FullAuditedEntityDto { - /** 租户标识 */ - id!: string; +export interface TenantDto extends FullAuditedEntityDto { /** 租户名称 */ - name!: string; + name: string; } /** 租户连接字符串 */ diff --git a/apps/vue/src/api/oss-management/model/ossModel.ts b/apps/vue/src/api/oss-management/model/ossModel.ts index c55cfb610..8acc6963c 100644 --- a/apps/vue/src/api/oss-management/model/ossModel.ts +++ b/apps/vue/src/api/oss-management/model/ossModel.ts @@ -1,5 +1,3 @@ -import { PagedAndSortedResultRequestDto } from '../../model/baseModel'; - export enum FileType { Folder = 0, File = 1, @@ -90,17 +88,17 @@ export interface MyFileShare { maxAccessCount: number; } -export class GetOssContainerPagedRequest extends PagedAndSortedResultRequestDto { - prefix = ''; - marker = ''; +export interface GetOssContainerPagedRequest extends PagedAndSortedResultRequestDto { + prefix?: string; + marker?: string; } -export class GetOssObjectPagedRequest extends PagedAndSortedResultRequestDto { - bucket = ''; - prefix = ''; - delimiter = ''; - marker = ''; - encodingType = ''; +export interface GetOssObjectPagedRequest extends PagedAndSortedResultRequestDto { + bucket?: string; + prefix?: string; + delimiter?: string; + marker?: string; + encodingType?: string; } export interface GetOssObjectRequest { diff --git a/apps/vue/src/api/oss-management/private.ts b/apps/vue/src/api/oss-management/private.ts index b6713eced..bf8e5fc70 100644 --- a/apps/vue/src/api/oss-management/private.ts +++ b/apps/vue/src/api/oss-management/private.ts @@ -2,7 +2,6 @@ import { defHttp } from '/@/utils/http/axios'; import { FileShare, FileShareInput, MyFileShare, OssObject } from './model/ossModel'; import { format } from '/@/utils/strings'; import { AxiosResponse } from 'axios'; -import { ListResultDto } from '../model/baseModel'; enum Api { Upload = '/api/api/files/private', diff --git a/apps/vue/src/api/oss-management/public.ts b/apps/vue/src/api/oss-management/public.ts index 939e0f487..fe765cf6e 100644 --- a/apps/vue/src/api/oss-management/public.ts +++ b/apps/vue/src/api/oss-management/public.ts @@ -2,7 +2,6 @@ import { defHttp } from '/@/utils/http/axios'; import { OssObject } from './model/ossModel'; import { format } from '/@/utils/strings'; import { AxiosResponse } from 'axios'; -import { ListResultDto } from '../model/baseModel'; enum Api { Upload = '/api/api/files/public/{path}/{name}', diff --git a/apps/vue/src/api/platform/model/dataModel.ts b/apps/vue/src/api/platform/model/dataModel.ts index d6623a66b..ac008e450 100644 --- a/apps/vue/src/api/platform/model/dataModel.ts +++ b/apps/vue/src/api/platform/model/dataModel.ts @@ -1,8 +1,3 @@ -import { - PagedAndSortedResultRequestDto, - PagedResultDto, - ListResultDto, -} from '../../model/baseModel'; import { DataItem } from './dataItemModel'; export interface Data { @@ -25,13 +20,13 @@ export enum ValueType { Object = 6, } -export class GetDataByPaged extends PagedAndSortedResultRequestDto { - filter = ''; +export interface GetDataByPaged extends PagedAndSortedResultRequestDto { + filter?: string; } -export class DataPagedResult extends PagedResultDto {} +export interface DataPagedResult extends PagedResultDto {} -export class DataListResult extends ListResultDto {} +export interface DataListResult extends ListResultDto {} export class CreateOrUpdateData { name = ''; diff --git a/apps/vue/src/api/platform/model/layoutModel.ts b/apps/vue/src/api/platform/model/layoutModel.ts index cfb971a14..05a14a516 100644 --- a/apps/vue/src/api/platform/model/layoutModel.ts +++ b/apps/vue/src/api/platform/model/layoutModel.ts @@ -1,8 +1,3 @@ -import { - PagedAndSortedResultRequestDto, - ListResultDto, - PagedResultDto, -} from '../../model/baseModel'; import { Route } from './basicModel'; export class Layout extends Route { @@ -10,9 +5,9 @@ export class Layout extends Route { dataId!: string; } -export class LayoutListResult extends ListResultDto {} +export interface LayoutListResult extends ListResultDto {} -export class LayoutPagedResult extends PagedResultDto {} +export interface LayoutPagedResult extends PagedResultDto {} export class CreateOrUpdateLayout { name!: string; @@ -29,8 +24,8 @@ export class CreateLayout extends CreateOrUpdateLayout { export class UpdateLayout extends CreateOrUpdateLayout {} -export class GetLayoutPagedRequest extends PagedAndSortedResultRequestDto { - filter = ''; - reverse = false; - framework = ''; +export interface GetLayoutPagedRequest extends PagedAndSortedResultRequestDto { + filter?: string; + reverse?: boolean; + framework?: string; } diff --git a/apps/vue/src/api/platform/model/menuModel.ts b/apps/vue/src/api/platform/model/menuModel.ts index 43874d700..396a133c7 100644 --- a/apps/vue/src/api/platform/model/menuModel.ts +++ b/apps/vue/src/api/platform/model/menuModel.ts @@ -1,9 +1,3 @@ -import { - ISortedResultRequest, - ListResultDto, - PagedAndSortedResultRequestDto, - PagedResultDto, -} from '../../model/baseModel'; import { Route } from './basicModel'; export class CreateOrUpdateMenu { @@ -24,20 +18,20 @@ export class CreateMenu extends CreateOrUpdateMenu { export class UpdateMenu extends CreateOrUpdateMenu {} -export class GetAllMenuRequest implements ISortedResultRequest { - filter = ''; - sorting = ''; +export interface GetAllMenuRequest extends SortedResultRequest { + filter?: string; + sorting?: string; parentId?: string; layoutId?: string; - framework = ''; + framework?: string; } -export class GetMenuPagedRequest extends PagedAndSortedResultRequestDto { - filter = ''; - reverse = false; +export interface GetMenuPagedRequest extends PagedAndSortedResultRequestDto { + filter?: string; + reverse?: boolean; layoutId?: string; parentId?: string; - framework = ''; + framework?: string; } export class Menu extends Route { @@ -51,9 +45,9 @@ export class Menu extends Route { children = new Array(); } -export class MenuListResult extends ListResultDto {} +export interface MenuListResult extends ListResultDto {} -export class MenuPagedResult extends PagedResultDto {} +export interface MenuPagedResult extends PagedResultDto {} export class RoleMenu { roleName!: string; diff --git a/apps/vue/src/api/platform/user-favorites-menu/model/index.ts b/apps/vue/src/api/platform/user-favorites-menu/model/index.ts index 5173e035c..78208365e 100644 --- a/apps/vue/src/api/platform/user-favorites-menu/model/index.ts +++ b/apps/vue/src/api/platform/user-favorites-menu/model/index.ts @@ -1,6 +1,4 @@ -import { AuditedEntityDto, EntityDto, IHasConcurrencyStamp } from '/@/api/model/baseModel'; - -export interface UserFavoriteMenuDto extends AuditedEntityDto, EntityDto { +export interface UserFavoriteMenuDto extends AuditedEntityDto { menuId: string; userId: string; aliasName?: string; diff --git a/apps/vue/src/api/sys/menu.ts b/apps/vue/src/api/sys/menu.ts index 31a29be0c..8b52d14ee 100644 --- a/apps/vue/src/api/sys/menu.ts +++ b/apps/vue/src/api/sys/menu.ts @@ -1,6 +1,5 @@ import { defAbpHttp } from '/@/utils/http/abp'; import { RouteItem } from './model/menuModel'; -import { ListResultDto } from '../model/baseModel'; /** * @description: Get user menu based on id diff --git a/apps/vue/src/api/task-management/backgroundJobAction.ts b/apps/vue/src/api/task-management/backgroundJobAction.ts index eee7dee6e..6d2cd306b 100644 --- a/apps/vue/src/api/task-management/backgroundJobAction.ts +++ b/apps/vue/src/api/task-management/backgroundJobAction.ts @@ -7,7 +7,6 @@ import { BackgroundJobActionGetDefinitionsInput } from './model/backgroundJobActionModel'; import { format } from '/@/utils/strings'; -import { ListResultDto } from '../model/baseModel'; enum Api { AddAction = '/api/task-management/background-jobs/actions/{jobId}', diff --git a/apps/vue/src/api/task-management/backgroundJobInfo.ts b/apps/vue/src/api/task-management/backgroundJobInfo.ts index 41f46f7f4..11f006a16 100644 --- a/apps/vue/src/api/task-management/backgroundJobInfo.ts +++ b/apps/vue/src/api/task-management/backgroundJobInfo.ts @@ -7,7 +7,6 @@ import { BackgroundJobInfoGetListInput, } from './model/backgroundJobInfoModel'; import { format } from '/@/utils/strings'; -import { ListResultDto, PagedResultDto } from '../model/baseModel'; import { DefineParamter, DynamicQueryable } from '/@/components/Table/src/types/advancedSearch'; enum Api { diff --git a/apps/vue/src/api/task-management/backgroundJobLog.ts b/apps/vue/src/api/task-management/backgroundJobLog.ts index 816530283..675ff3aea 100644 --- a/apps/vue/src/api/task-management/backgroundJobLog.ts +++ b/apps/vue/src/api/task-management/backgroundJobLog.ts @@ -4,7 +4,6 @@ import { BackgroundJobLogGetListInput, } from './model/backgroundJobLogModel'; import { format } from '/@/utils/strings'; -import { PagedResultDto } from '../model/baseModel'; enum Api { GetById = '/api/task-management/background-jobs/logs/{id}', diff --git a/apps/vue/src/api/task-management/model/backgroundJobInfoModel.ts b/apps/vue/src/api/task-management/model/backgroundJobInfoModel.ts index c6b398a88..4a2b95ac0 100644 --- a/apps/vue/src/api/task-management/model/backgroundJobInfoModel.ts +++ b/apps/vue/src/api/task-management/model/backgroundJobInfoModel.ts @@ -1,5 +1,3 @@ -import { ExtensibleAuditedEntity, IHasConcurrencyStamp, PagedAndSortedResultRequestDto } from "../../model/baseModel"; - export enum JobStatus { None = -1, Completed = 0, @@ -43,7 +41,7 @@ export interface BackgroundJobDefinition { paramters: BackgroundJobParamter[]; } -export interface BackgroundJobInfo extends ExtensibleAuditedEntity, IHasConcurrencyStamp { +export interface BackgroundJobInfo extends ExtensibleAuditedEntityDto, IHasConcurrencyStamp { isEnabled: boolean; name: string; group: string; diff --git a/apps/vue/src/api/task-management/model/backgroundJobLogModel.ts b/apps/vue/src/api/task-management/model/backgroundJobLogModel.ts index d1e8377bd..37fd8ff69 100644 --- a/apps/vue/src/api/task-management/model/backgroundJobLogModel.ts +++ b/apps/vue/src/api/task-management/model/backgroundJobLogModel.ts @@ -1,5 +1,3 @@ -import { PagedAndSortedResultRequestDto } from '/@/api/model/baseModel'; - export interface BackgroundJobLog { id: number; jobName: string; diff --git a/apps/vue/src/api/text-templating/templates/index.ts b/apps/vue/src/api/text-templating/templates/index.ts index 89e5c5c0a..c4e1a0065 100644 --- a/apps/vue/src/api/text-templating/templates/index.ts +++ b/apps/vue/src/api/text-templating/templates/index.ts @@ -1,5 +1,4 @@ import { defAbpHttp } from '/@/utils/http/abp'; -import { PagedResultDto } from '../../model/baseModel'; import { TextTemplateDefinition, TextTemplateContent, diff --git a/apps/vue/src/api/text-templating/templates/model/index.ts b/apps/vue/src/api/text-templating/templates/model/index.ts index fa935f89f..87b512f4d 100644 --- a/apps/vue/src/api/text-templating/templates/model/index.ts +++ b/apps/vue/src/api/text-templating/templates/model/index.ts @@ -1,5 +1,3 @@ -import { PagedAndSortedResultRequestDto } from "/@/api/model/baseModel"; - export interface TextTemplateDefinition { name: string; displayName: string; diff --git a/apps/vue/src/api/webhooks/model/sendAttemptsModel.ts b/apps/vue/src/api/webhooks/model/sendAttemptsModel.ts index cb791380d..43c62d3e2 100644 --- a/apps/vue/src/api/webhooks/model/sendAttemptsModel.ts +++ b/apps/vue/src/api/webhooks/model/sendAttemptsModel.ts @@ -1,4 +1,3 @@ -import { PagedAndSortedResultRequestDto } from '../../model/baseModel'; import { HttpStatusCode } from '/@/enums/httpEnum'; export interface WebhookEvent { diff --git a/apps/vue/src/api/webhooks/model/subscriptionsModel.ts b/apps/vue/src/api/webhooks/model/subscriptionsModel.ts index beff0f293..5b9590429 100644 --- a/apps/vue/src/api/webhooks/model/subscriptionsModel.ts +++ b/apps/vue/src/api/webhooks/model/subscriptionsModel.ts @@ -1,13 +1,10 @@ -import { CreationAuditedEntityDto, PagedAndSortedResultRequestDto } from '../../model/baseModel'; - -export interface WebhookSubscription extends CreationAuditedEntityDto { - id: string; +export interface WebhookSubscription extends CreationAuditedEntityDto { tenantId?: string; webhookUri: string; secret: string; isActive: boolean; webhooks: string[]; - headers: { [key: string]: string }; + headers: Dictionary; } export interface WebhookSubscriptionCreateOrUpdate { @@ -15,7 +12,7 @@ export interface WebhookSubscriptionCreateOrUpdate { secret: string; isActive: boolean; webhooks: string[]; - headers: { [key: string]: string }; + headers: Dictionary; } export type CreateWebhookSubscription = WebhookSubscriptionCreateOrUpdate; diff --git a/apps/vue/src/api/webhooks/send-attempts.ts b/apps/vue/src/api/webhooks/send-attempts.ts index dadfc25e9..7afcc4518 100644 --- a/apps/vue/src/api/webhooks/send-attempts.ts +++ b/apps/vue/src/api/webhooks/send-attempts.ts @@ -1,5 +1,4 @@ import { defAbpHttp } from '/@/utils/http/abp'; -import { PagedResultDto } from '../model/baseModel'; import { WebhookSendAttempt, WebhookSendAttemptGetListInput } from './model/sendAttemptsModel'; const remoteServiceName = 'WebhooksManagement'; diff --git a/apps/vue/src/api/webhooks/subscriptions.ts b/apps/vue/src/api/webhooks/subscriptions.ts index 10e7dd13b..3bc6ffe94 100644 --- a/apps/vue/src/api/webhooks/subscriptions.ts +++ b/apps/vue/src/api/webhooks/subscriptions.ts @@ -6,7 +6,6 @@ import { UpdateWebhookSubscription, WebhookSubscriptionGetListInput, } from './model/subscriptionsModel'; -import { ListResultDto, PagedResultDto } from '../model/baseModel'; const remoteServiceName = 'WebhooksManagement'; const controllerName = 'WebhookSubscription'; diff --git a/apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoDetail.vue b/apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoDetail.vue index 5e46fcd45..d6601a4f5 100644 --- a/apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoDetail.vue +++ b/apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoDetail.vue @@ -5,56 +5,68 @@ {{ L('BackgroundJobDetail') }} - - - - - - - - + + + + + + + + + + + + + + + + + + +