Browse Source

remove unnecessary dto structures

pull/757/head
cKey 3 years ago
parent
commit
aac3d0c944
  1. 6
      apps/vue/src/api/abp/model/appModel.ts
  2. 1
      apps/vue/src/api/account/accounts.ts
  3. 2
      apps/vue/src/api/account/model/profilesModel.ts
  4. 1
      apps/vue/src/api/auditing/auditLog.ts
  5. 8
      apps/vue/src/api/auditing/model/auditLogModel.ts
  6. 2
      apps/vue/src/api/caching-management/cache/model/index.ts
  7. 1
      apps/vue/src/api/identity-server/clients.ts
  8. 15
      apps/vue/src/api/identity-server/model/apiResourcesModel.ts
  9. 13
      apps/vue/src/api/identity-server/model/apiScopesModel.ts
  10. 15
      apps/vue/src/api/identity-server/model/clientsModel.ts
  11. 13
      apps/vue/src/api/identity-server/model/identityResourcesModel.ts
  12. 16
      apps/vue/src/api/identity-server/model/persistedGrantsModel.ts
  13. 64
      apps/vue/src/api/identity/model/claimModel.ts
  14. 39
      apps/vue/src/api/identity/model/organizationUnitsModel.ts
  15. 44
      apps/vue/src/api/identity/model/roleModel.ts
  16. 5
      apps/vue/src/api/identity/model/securityLogModel.ts
  17. 2
      apps/vue/src/api/identity/model/userLookupModel.ts
  18. 88
      apps/vue/src/api/identity/model/userModel.ts
  19. 18
      apps/vue/src/api/localization/model/languagesModel.ts
  20. 14
      apps/vue/src/api/localization/model/resourcesModel.ts
  21. 4
      apps/vue/src/api/localization/model/textsModel.ts
  22. 4
      apps/vue/src/api/logging/model/loggingModel.ts
  23. 5
      apps/vue/src/api/messages/model/friendsModel.ts
  24. 2
      apps/vue/src/api/messages/model/groupModel.ts
  25. 11
      apps/vue/src/api/messages/model/messagesModel.ts
  26. 16
      apps/vue/src/api/messages/model/notificationsModel.ts
  27. 6
      apps/vue/src/api/messages/model/subscribesModel.ts
  28. 172
      apps/vue/src/api/model/baseModel.ts
  29. 12
      apps/vue/src/api/multi-tenancy/models/tenantModel.ts
  30. 20
      apps/vue/src/api/oss-management/model/ossModel.ts
  31. 1
      apps/vue/src/api/oss-management/private.ts
  32. 1
      apps/vue/src/api/oss-management/public.ts
  33. 13
      apps/vue/src/api/platform/model/dataModel.ts
  34. 17
      apps/vue/src/api/platform/model/layoutModel.ts
  35. 26
      apps/vue/src/api/platform/model/menuModel.ts
  36. 4
      apps/vue/src/api/platform/user-favorites-menu/model/index.ts
  37. 1
      apps/vue/src/api/sys/menu.ts
  38. 1
      apps/vue/src/api/task-management/backgroundJobAction.ts
  39. 1
      apps/vue/src/api/task-management/backgroundJobInfo.ts
  40. 1
      apps/vue/src/api/task-management/backgroundJobLog.ts
  41. 4
      apps/vue/src/api/task-management/model/backgroundJobInfoModel.ts
  42. 2
      apps/vue/src/api/task-management/model/backgroundJobLogModel.ts
  43. 1
      apps/vue/src/api/text-templating/templates/index.ts
  44. 2
      apps/vue/src/api/text-templating/templates/model/index.ts
  45. 1
      apps/vue/src/api/webhooks/model/sendAttemptsModel.ts
  46. 9
      apps/vue/src/api/webhooks/model/subscriptionsModel.ts
  47. 1
      apps/vue/src/api/webhooks/send-attempts.ts
  48. 1
      apps/vue/src/api/webhooks/subscriptions.ts
  49. 130
      apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoDetail.vue
  50. 45
      apps/vue/src/views/task-management/background-jobs/datas/DescriptionData.ts
  51. 8
      apps/vue/types/abp.d.ts
  52. 6
      apps/vue/types/abp.dto.d.ts

6
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<string>[] } = {};
languagesMap: { [key: string]: NameValue<string>[] } = {};
/** 语言文档映射集合 */
languageFilesMap: { [key: string]: INameValue<string>[] } = {};
languageFilesMap: { [key: string]: NameValue<string>[] } = {};
}
/** 多租户配置 */

1
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 {

2
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;

1
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',

8
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 {

2
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<string, any>;
}
export interface CacheRefreshRequest {

1
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',

15
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<string> {
export interface ApiResource extends ExtensibleAuditedEntityDto<string> {
name: string;
displayName: string;
description: string;
@ -56,8 +51,8 @@ export interface ApiResourceCreate extends ApiResourceCreateOrUpdate {
export type ApiResourceUpdate = ApiResourceCreateOrUpdate;
export class ApiResourcePagedResult extends PagedResultDto<ApiResource> {}
export interface ApiResourcePagedResult extends PagedResultDto<ApiResource> {}
export class GetApiResourcePagedRequest extends PagedAndSortedResultRequestDto {
filter = '';
export interface GetApiResourcePagedRequest extends PagedAndSortedResultRequestDto {
filter?: string;
}

13
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<string> {
export interface ApiScope extends ExtensibleAuditedEntityDto<string> {
enabled: boolean;
name: string;
displayName: string;
@ -38,8 +33,8 @@ export interface ApiScopeCreate extends ApiScopeCreateOrUpdate {
export type ApiScopeUpdate = ApiScopeCreateOrUpdate;
export class ApiScopePagedResult extends PagedResultDto<ApiScope> {}
export interface ApiScopePagedResult extends PagedResultDto<ApiScope> {}
export class GetApiScopePagedRequest extends PagedAndSortedResultRequestDto {
filter = '';
export interface GetApiScopePagedRequest extends PagedAndSortedResultRequestDto {
filter?: string;
}

15
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<string> {
export interface Client extends ExtensibleAuditedEntityDto<string> {
clientId: string;
clientName: string;
description: string;
@ -161,8 +156,8 @@ export interface ClientClone {
CopyIdentityProviderRestriction: boolean;
}
export class ClientPagedResult extends PagedResultDto<Client> {}
export interface ClientPagedResult extends PagedResultDto<Client> {}
export class GetClientPagedRequest extends PagedAndSortedResultRequestDto {
filter = '';
export interface GetClientPagedRequest extends PagedAndSortedResultRequestDto {
filter?: string;
}

13
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<string> {
export interface IdentityResource extends ExtensibleAuditedEntityDto<string> {
name: string;
displayName: string;
description: string;
@ -37,8 +32,8 @@ export type IdentityResourceCreate = IdentityResourceCreateOrUpdate;
export type IdentityResourceUpdate = IdentityResourceCreateOrUpdate;
export class IdentityResourcePagedResult extends PagedResultDto<IdentityResource> {}
export interface IdentityResourcePagedResult extends PagedResultDto<IdentityResource> {}
export class GetIdentityResourcePagedRequest extends PagedAndSortedResultRequestDto {
filter = '';
export interface GetIdentityResourcePagedRequest extends PagedAndSortedResultRequestDto {
filter?: string;
}

16
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<string> {
export interface PersistedGrant extends ExtensibleEntityDto<string> {
key: string;
type: string;
subjectId: string;
@ -17,9 +11,9 @@ export interface PersistedGrant extends ExtensibleEntity<string> {
data: string;
}
export class PersistedGrantPagedResult extends PagedResultDto<PersistedGrant> {}
export interface PersistedGrantPagedResult extends PagedResultDto<PersistedGrant> {}
export class GetPersistedGrantPagedRequest extends PagedAndSortedResultRequestDto {
filter = '';
subjectId = '';
export interface GetPersistedGrantPagedRequest extends PagedAndSortedResultRequestDto {
filter?: string;
subjectId?: string;
}

64
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<string> {
name!: string;
required!: boolean;
isStatic!: boolean;
export interface IdentityClaimType extends ExtensibleEntityDto<string> {
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<IdentityClaimType> {}
export interface IdentityClaimTypeListResult extends ListResultDto<IdentityClaimType> {}
export class IdentityClaimTypePagedResult extends PagedResultDto<IdentityClaimType> {}
export interface IdentityClaimTypePagedResult extends PagedResultDto<IdentityClaimType> {}
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;
}

39
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<string> {
/** 父节点标识 */
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<OrganizationUnit> {}
export interface OrganizationUnitPagedResult extends PagedResultDto<OrganizationUnit> {}
/** 组织结构列表返回结果 */
export class OrganizationUnitListResult extends ListResultDto<OrganizationUnit> {}
export interface OrganizationUnitListResult extends ListResultDto<OrganizationUnit> {}
/** 组织机构创建对象 */
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[];
}

44
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<Role> {}
export interface RoleListResult extends ListResultDto<Role> {}
export class RolePagedResult extends PagedResultDto<Role> {}
export interface RolePagedResult extends PagedResultDto<Role> {}
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<RoleClaim> {}
export interface RoleClaimListResult extends ListResultDto<RoleClaim> {}

5
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 {

2
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;

88
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<string>, 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<User> {}
export interface UserPagedResult extends PagedResultDto<User> {}
export class UserClaim extends IdentityClaim {
id!: string;
export interface UserClaim extends IdentityClaim {
id: string;
}
export class UserClaimListResult extends ListResultDto<UserClaim> {}
export interface UserClaimListResult extends ListResultDto<UserClaim> {}

18
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<string> {
enable: boolean;
cultureName: string;
uiCultureName: string;
@ -22,10 +14,10 @@ export interface LanguageCreateOrUpdate {
flagIcon: string;
}
export class LanguageListResult extends ListResultDto<Language> {}
export interface LanguageListResult extends ListResultDto<Language> {}
export class LanguagePagedResult extends PagedResultDto<Language> {}
export interface LanguagePagedResult extends PagedResultDto<Language> {}
export class GetLanguagePagedRequest extends PagedAndSortedResultRequestDto {
filter = '';
export interface GetLanguagePagedRequest extends PagedAndSortedResultRequestDto {
filter?: string;
}

14
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<Resource> {}
export interface ResourceListResult extends ListResultDto<Resource> {}
export class ResourcePagedResult extends PagedResultDto<Resource> {}
export interface ResourcePagedResult extends PagedResultDto<Resource> {}
export class GetResourcePagedRequest extends PagedAndSortedResultRequestDto {
filter = '';
export interface GetResourcePagedRequest extends PagedAndSortedResultRequestDto {
filter?: string;
}

4
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<TextDifference> {}
export interface TextListResult extends ListResultDto<TextDifference> {}
export interface GetTextByKey {
key: boolean;

4
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<Log> {}
export interface LogPagedResult extends PagedResultDto<Log> {}

5
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 {

2
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;

11
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;
}

16
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<NotificationInfo> {}
export interface NotificationPagedResult extends PagedResultDto<NotificationInfo> {}
export class NotificationGroupListResult extends ListResultDto<NotificationGroup> {}
export interface NotificationGroupListResult extends ListResultDto<NotificationGroup> {}

6
apps/vue/src/api/messages/model/subscribesModel.ts

@ -1,9 +1,3 @@
import {
ListResultDto,
PagedAndSortedResultRequestDto,
PagedResultDto,
} from '../../model/baseModel';
export interface UserSubscreNotification {
name: string;
}

172
apps/vue/src/api/model/baseModel.ts

@ -8,11 +8,6 @@ export interface BasicFetchResult<T> {
total: number;
}
export interface INameValue<T> {
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<TKey> {
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<T> implements ListResultDto<T>, IPagedResult<T> {
items!: T[];
totalCount!: number;
}
/** 列表接口Dto */
export class ListResultDto<T> implements IListResult<T> {
items!: T[];
}
export class ExtensibleObject implements IHasExtraProperties {
extraProperties!: { [key: string]: any };
}
export class ExtensibleEntity<TKey> extends ExtensibleObject {
id!: TKey;
}
export class ExtensibleCreationAuditedEntity<TKey> extends ExtensibleEntity<TKey> {
creationTime!: Date;
creatorId?: string;
}
export class ExtensibleAuditedEntity<TKey> extends ExtensibleCreationAuditedEntity<TKey> {
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<T> {
/** 列表项 */
items: T[];
}
/** 分页请求接口 */
export interface IPagedResult<T> extends IListResult<T> {
/** 最大数据大小 */
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 {
/** 作用域 */

12
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<string> {
/** 租户名称 */
name!: string;
name: string;
}
/** 租户连接字符串 */

20
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 {

1
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',

1
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}',

13
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<Data> {}
export interface DataPagedResult extends PagedResultDto<Data> {}
export class DataListResult extends ListResultDto<Data> {}
export interface DataListResult extends ListResultDto<Data> {}
export class CreateOrUpdateData {
name = '';

17
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<Layout> {}
export interface LayoutListResult extends ListResultDto<Layout> {}
export class LayoutPagedResult extends PagedResultDto<Layout> {}
export interface LayoutPagedResult extends PagedResultDto<Layout> {}
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;
}

26
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<Menu>();
}
export class MenuListResult extends ListResultDto<Menu> {}
export interface MenuListResult extends ListResultDto<Menu> {}
export class MenuPagedResult extends PagedResultDto<Menu> {}
export interface MenuPagedResult extends PagedResultDto<Menu> {}
export class RoleMenu {
roleName!: string;

4
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<string> {
export interface UserFavoriteMenuDto extends AuditedEntityDto<string> {
menuId: string;
userId: string;
aliasName?: string;

1
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

1
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}',

1
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 {

1
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}',

4
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<string>, IHasConcurrencyStamp {
export interface BackgroundJobInfo extends ExtensibleAuditedEntityDto<string>, IHasConcurrencyStamp {
isEnabled: boolean;
name: string;
group: string;

2
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;

1
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,

2
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;

1
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 {

9
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<string> {
tenantId?: string;
webhookUri: string;
secret: string;
isActive: boolean;
webhooks: string[];
headers: { [key: string]: string };
headers: Dictionary<string, string>;
}
export interface WebhookSubscriptionCreateOrUpdate {
@ -15,7 +12,7 @@ export interface WebhookSubscriptionCreateOrUpdate {
secret: string;
isActive: boolean;
webhooks: string[];
headers: { [key: string]: string };
headers: Dictionary<string, string>;
}
export type CreateWebhookSubscription = WebhookSubscriptionCreateOrUpdate;

1
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';

1
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';

130
apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoDetail.vue

@ -5,56 +5,68 @@
{{ L('BackgroundJobDetail') }}
</template>
<Skeleton :loading="jobInfo === undefined">
<Card class="mt-4" :title="L('BasicInfo')">
<Description @register="registerDescription" :data="jobInfo" />
</Card>
<Card class="mt-4" :title="L('BackgroundJobLogs')">
<List
ref="logListElRef"
item-layout="vertical"
size="default"
bordered
:loading="fetchingLog"
:pagination="{
pageSize: fetchLogCount,
total: maxLogCount,
showSizeChanger: true,
onChange: fetchJobLogs,
onShowSizeChange: handleSizeChange,
}"
:data-source="jobLogs"
>
<template #renderItem="{ item }">
<ListItem :key="item.id">
<ListItemMeta :description="item.message">
<template #avatar>
<Icon
v-if="!item.exception"
:size="40"
icon="grommet-icons:status-good"
color="seagreen"
/>
<Icon v-else :size="40" icon="grommet-icons:status-warning" color="orangered" />
</template>
<template #title>
<span>{{ item.runTime }}</span>
</template>
</ListItemMeta>
{{ item.exception ?? item.message }}
</ListItem>
</template>
</List>
</Card>
<Tabs v-model:active-key="tabActiveKey" ref="logTabWrapRef">
<TabPane key="basic" :tab="L('BasicInfo')">
<Card class="mt-4">
<Description @register="registerDescription" :data="jobInfo" />
</Card>
</TabPane>
<TabPane key="paramter" :tab="L('Paramters')">
<Card class="mt-4">
<BasicTable @register="registerTable" :data-source="getArgs" />
</Card>
</TabPane>
<TabPane key="logs" :tab="L('BackgroundJobLogs')">
<Card class="mt-4">
<List
ref="logListElRef"
item-layout="vertical"
size="default"
bordered
:loading="fetchingLog"
:pagination="{
pageSize: fetchLogCount,
total: maxLogCount,
showSizeChanger: true,
onChange: fetchJobLogs,
onShowSizeChange: handleSizeChange,
}"
:data-source="jobLogs"
>
<template #renderItem="{ item }">
<ListItem :key="item.id">
<ListItemMeta :description="item.message">
<template #avatar>
<Icon
v-if="!item.exception"
:size="40"
icon="grommet-icons:status-good"
color="seagreen"
/>
<Icon v-else :size="40" icon="grommet-icons:status-warning" color="orangered" />
</template>
<template #title>
<span>{{ item.runTime }}</span>
</template>
</ListItemMeta>
{{ item.exception ?? item.message }}
</ListItem>
</template>
</List>
</Card>
</TabPane>
</Tabs>
</Skeleton>
</PageWrapper>
</template>
<script lang="ts" setup>
import { onMounted, ref } from 'vue';
import { Card, List, Skeleton } from 'ant-design-vue';
import { computed, onMounted, ref, unref } from 'vue';
import { Card, List, Skeleton, Tabs } from 'ant-design-vue';
import { ArrowLeftOutlined } from '@ant-design/icons-vue';
import { Icon } from '/@/components/Icon';
import { PageWrapper } from '/@/components/Page';
import { BasicTable, useTable } from '/@/components/Table';
import { Description, useDescription } from '/@/components/Description';
import { useRoute, useRouter } from 'vue-router';
import { useLocalization } from '/@/hooks/abp/useLocalization';
@ -67,14 +79,16 @@
const ListItem = List.Item;
const ListItemMeta = List.Item.Meta;
const TabPane = Tabs.TabPane;
const { L } = useLocalization('TaskManagement');
const { L } = useLocalization(['TaskManagement']);
const { back } = useRouter();
const route = useRoute();
const maxLogCount = ref(0);
const fetchLogCount = ref(10);
const fetchingLog = ref(false);
const logListElRef = ref<any>();
const tabActiveKey = ref('basic');
const jobInfo = ref<BackgroundJobInfo>();
const jobLogs = ref<BackgroundJobLog[]>([]);
@ -83,6 +97,36 @@
column: 3,
schema: getDescriptionSchemas(),
});
const [registerTable] = useTable({
rowKey: 'key',
columns: [
{
title: L('DisplayName:Key'),
dataIndex: 'key',
align: 'left',
width: 200,
sorter: true,
},
{
title: L('DisplayName:Value'),
dataIndex: 'value',
align: 'left',
width: 300,
sorter: true,
},
],
pagination: false,
});
const getArgs = computed(() => {
const job = unref(jobInfo);
if (!job || !job.args) return [];
return Object.keys(job.args).map((key) => {
return {
key: key,
value: job.args[key],
};
});
});
onMounted(fetchJob);

45
apps/vue/src/views/task-management/background-jobs/datas/DescriptionData.ts

@ -1,11 +1,32 @@
import { createVNode } from 'vue';
import { Tag, Checkbox } from 'ant-design-vue';
import { DescItem } from "/@/components/Description";
import { useLocalization } from '/@/hooks/abp/useLocalization';
import { JobStatusMap, JobTypeMap, JobPriorityMap } from './typing';
import { JobStatusMap, JobStatusColor, JobTypeMap, JobPriorityMap, JobSourceMap } from './typing';
const { L } = useLocalization('TaskManagement');
const { L } = useLocalization(['TaskManagement']);
export function getDescriptionSchemas() : DescItem[] {
return [
{
label: L('DisplayName:Source'),
field: 'source',
render: (val) => {
return JobSourceMap[val];
},
span: 1.5,
},
{
label: L('DisplayName:IsEnabled'),
field: 'isEnabled',
render: (val) => createVNode(
Checkbox,
{
checked: val,
disabled: true,
}),
span: 1.5,
},
{
label: L('DisplayName:Group'),
field: 'group',
@ -40,22 +61,32 @@ export function getDescriptionSchemas() : DescItem[] {
field: 'description',
span: 2,
},
{
label: L('DisplayName:Cron'),
field: 'cron',
span: 1,
},
{
label: L('DisplayName:LastRunTime'),
field: 'lastRunTime',
span: 1.5,
span: 1,
},
{
label: L('DisplayName:NextRunTime'),
field: 'nextRunTime',
span: 1.5,
span: 1,
},
{
label: L('DisplayName:Status'),
field: 'status',
render: (val) => {
return JobStatusMap[val];
},
render: (val) => createVNode(
Tag,
{
color: JobStatusColor[val]
},
{
default: () => JobStatusMap[val]
}),
span: 1,
},
{

8
apps/vue/types/abp.d.ts

@ -5,6 +5,14 @@ declare interface LocalizableStringInfo {
declare type ExtraPropertyDictionary = Dictionary<string, any>;
declare interface IHasConcurrencyStamp {
concurrencyStamp: string;
}
declare interface IHasExtraProperties {
extraProperties: ExtraPropertyDictionary;
}
declare interface ISelectionStringValueItem {
value: string;
displayText: LocalizableStringInfo;

6
apps/vue/types/abp.dto.d.ts

@ -101,10 +101,14 @@ declare interface PagedResultDto<T> extends ListResultDto<T> {
declare interface ExtensiblePagedResultDto<T> extends PagedResultDto<T>, ExtensibleObject {}
declare interface PagedAndSortedResultRequestDto extends PagedResultRequestDto {
declare interface SortedResultRequest {
sorting?: string;
}
declare interface PagedAndSortedResultRequestDto
extends PagedResultRequestDto,
SortedResultRequest {}
declare interface ExtensiblePagedAndSortedResultRequestDto
extends PagedAndSortedResultRequestDto,
ExtensibleObject {}

Loading…
Cancel
Save