diff --git a/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts index 82c995f3cb..f56af00b42 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts @@ -1,6 +1,5 @@ import { LinkedList } from '@abp/utils'; import { InjectFlags, InjectionToken, InjectOptions, Type } from '@angular/core'; -import { O } from 'ts-toolbelt'; export abstract class ActionList> extends LinkedList {} @@ -22,10 +21,13 @@ export abstract class ActionData { } } -export type ReadonlyActionData = O.Merge< - O.Readonly, 'data' | 'record'>>, - { record: R } ->; +// export type ReadonlyActionData = O.Merge< +// Readonly, 'data' | 'record'>>, +// { record: R } +// >; + +export type ReadonlyActionData = Readonly, 'data'>>; + export abstract class Action { constructor( public readonly permission: string, diff --git a/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts index 549e6aa43d..7b1e2b7949 100644 --- a/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts +++ b/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts @@ -1,6 +1,5 @@ import { LinkedList } from '@abp/utils'; import { InjectFlags, InjectionToken, InjectOptions, Type } from '@angular/core'; -import { O } from 'ts-toolbelt'; import { ePropType } from '../enums/props.enum'; import { FormPropTooltip } from './form-props'; @@ -24,10 +23,8 @@ export abstract class PropData { } } -export type ReadonlyPropData = O.Merge< - O.Readonly, 'data' | 'record'>>, - { record: R } ->; +export type ReadonlyPropData = Readonly, 'data'>>; + export abstract class Prop { constructor( public readonly type: ePropType,