Skip to content

Commit fc964ec

Browse files
Justin-luliujuping
Justin-lu
authored and
liujuping
committed
fix: ts interface error
1 parent 33289ba commit fc964ec

File tree

14 files changed

+53
-41
lines changed

14 files changed

+53
-41
lines changed

‎packages/designer/src/designer/detecting.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { makeObservable, obx, IEventBus, createModuleEventBus } from '@alilc/lowcode-editor-core';
22
import { IPublicModelDetecting } from '@alilc/lowcode-types';
3-
import { IDocumentModel } from '../document/document-model';
4-
import { INode } from '../document/node/node';
3+
import type { IDocumentModel } from '../document/document-model';
4+
import type { INode } from '../document/node/node';
55

66
const DETECTING_CHANGE_EVENT = 'detectingChange';
7-
export interface IDetecting extends Omit< IPublicModelDetecting<INode>,
7+
export interface IDetecting extends Omit<IPublicModelDetecting<INode>,
88
'capture' |
99
'release' |
1010
'leave'

‎packages/designer/src/designer/location.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { IDocumentModel, INode } from '../document';
1+
import type { IDocumentModel, INode } from '../document';
22
import { ILocateEvent } from './dragon';
33
import {
44
IPublicModelDropLocation,
@@ -98,7 +98,7 @@ function isDocument(elem: any): elem is Document {
9898
export function getWindow(elem: Element | Document): Window {
9999
return (isDocument(elem) ? elem : elem.ownerDocument!).defaultView!;
100100
}
101-
export interface IDropLocation extends Omit< IPublicModelDropLocation, 'target' | 'clone' > {
101+
export interface IDropLocation extends Omit<IPublicModelDropLocation, 'target' | 'clone'> {
102102

103103
readonly source: string;
104104

‎packages/designer/src/designer/setting/setting-field.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ import {
66
IPublicTypeFieldExtraProps,
77
IPublicTypeFieldConfig,
88
IPublicTypeCustomView,
9-
IPublicTypeSetValueOptions,
109
IPublicTypeDisposable,
1110
IPublicModelSettingField,
1211
IBaseModelSettingField,
1312
} from '@alilc/lowcode-types';
13+
import type {
14+
IPublicTypeSetValueOptions,
15+
} from '@alilc/lowcode-types';
1416
import { Transducer } from './utils';
1517
import { ISettingPropEntry, SettingPropEntry } from './setting-prop-entry';
1618
import { computed, obx, makeObservable, action, untracked, intl } from '@alilc/lowcode-editor-core';
@@ -31,10 +33,10 @@ function getSettingFieldCollectorKey(parent: ISettingTopEntry | ISettingField, c
3133
}
3234

3335
export interface ISettingField extends ISettingPropEntry, Omit<IBaseModelSettingField<
34-
ISettingTopEntry,
35-
ISettingField,
36-
IComponentMeta,
37-
INode
36+
ISettingTopEntry,
37+
ISettingField,
38+
IComponentMeta,
39+
INode
3840
>, 'setValue' | 'key' | 'node'> {
3941
get items(): Array<ISettingField | IPublicTypeCustomView>;
4042

‎packages/designer/src/designer/setting/setting-prop-entry.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { GlobalEvent, IPublicApiSetters, IPublicModelEditor, IPublicModelSetting
33
import { uniqueId, isJSExpression } from '@alilc/lowcode-utils';
44
import { ISettingEntry } from './setting-entry-type';
55
import { INode } from '../../document';
6-
import { IComponentMeta } from '../../component-meta';
6+
import type { IComponentMeta } from '../../component-meta';
77
import { IDesigner } from '../designer';
88
import { ISettingTopEntry } from './setting-top-entry';
99
import { ISettingField, isSettingField } from './setting-field';

‎packages/designer/src/designer/setting/setting-top-entry.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { computed, IEventBus, createModuleEventBus } from '@alilc/lowcode-editor
44
import { ISettingEntry } from './setting-entry-type';
55
import { ISettingField, SettingField } from './setting-field';
66
import { INode } from '../../document';
7-
import { IComponentMeta } from '../../component-meta';
7+
import type { IComponentMeta } from '../../component-meta';
88
import { IDesigner } from '../designer';
99
import { Setters } from '@alilc/lowcode-shell';
1010

‎packages/designer/src/document/document-model.ts‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {
1111
import {
1212
IPublicTypeNodeData,
1313
IPublicTypeNodeSchema,
14-
IPublicTypeRootSchema,
1514
IPublicTypePageSchema,
1615
IPublicTypeComponentsMap,
1716
IPublicTypeDragNodeObject,
@@ -21,7 +20,10 @@ import {
2120
IPublicTypeOnChangeOptions,
2221
IPublicTypeDisposable,
2322
} from '@alilc/lowcode-types';
24-
import {
23+
import type {
24+
IPublicTypeRootSchema,
25+
} from '@alilc/lowcode-types';
26+
import type {
2527
IDropLocation,
2628
} from '@alilc/lowcode-designer';
2729
import {
@@ -37,9 +39,10 @@ import {
3739
} from '@alilc/lowcode-utils';
3840
import { IProject } from '../project';
3941
import { ISimulatorHost } from '../simulator';
40-
import { IComponentMeta } from '../component-meta';
42+
import type { IComponentMeta } from '../component-meta';
4143
import { IDesigner, IHistory } from '../designer';
42-
import { insertChildren, insertChild, IRootNode, INode } from './node/node';
44+
import { insertChildren, insertChild, IRootNode } from './node/node';
45+
import type { INode } from './node/node';
4346
import { Selection, ISelection } from './selection';
4447
import { History } from './history';
4548
import { IModalNodesManager, ModalNodesManager, Node } from './node';
@@ -49,11 +52,11 @@ export type GetDataType<T, NodeType> = T extends undefined
4952
? NodeType extends {
5053
schema: infer R;
5154
}
52-
? R
53-
: any
55+
? R
56+
: any
5457
: T;
5558

56-
export interface IDocumentModel extends Omit< IPublicModelDocumentModel<
59+
export interface IDocumentModel extends Omit<IPublicModelDocumentModel<
5760
ISelection,
5861
IHistory,
5962
INode,
@@ -656,9 +659,9 @@ export class DocumentModel implements IDocumentModel {
656659
}
657660

658661
checkNesting(
659-
dropTarget: INode,
660-
dragObject: IPublicTypeDragNodeObject | IPublicTypeNodeSchema | INode | IPublicTypeDragNodeDataObject,
661-
): boolean {
662+
dropTarget: INode,
663+
dragObject: IPublicTypeDragNodeObject | IPublicTypeNodeSchema | INode | IPublicTypeDragNodeDataObject,
664+
): boolean {
662665
let items: Array<INode | IPublicTypeNodeSchema>;
663666
if (isDragNodeDataObject(dragObject)) {
664667
items = Array.isArray(dragObject.data) ? dragObject.data : [dragObject.data];

‎packages/designer/src/document/node/exclusive-group.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { obx, computed, makeObservable } from '@alilc/lowcode-editor-core';
22
import { uniqueId } from '@alilc/lowcode-utils';
33
import { IPublicTypeTitleContent, IPublicModelExclusiveGroup } from '@alilc/lowcode-types';
4-
import { INode } from './node';
4+
import type { INode } from './node';
55
import { intl } from '../../locale';
66

77
export interface IExclusiveGroup extends IPublicModelExclusiveGroup<INode> {

‎packages/designer/src/document/node/node.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ import {
2121
import { compatStage, isDOMText, isJSExpression, isNode, isNodeSchema } from '@alilc/lowcode-utils';
2222
import { ISettingTopEntry } from '@alilc/lowcode-designer';
2323
import { Props, getConvertedExtraKey, IProps } from './props/props';
24-
import { IDocumentModel } from '../document-model';
24+
import type { IDocumentModel } from '../document-model';
2525
import { NodeChildren, INodeChildren } from './node-children';
2626
import { IProp, Prop } from './props/prop';
27-
import { IComponentMeta } from '../../component-meta';
28-
import { ExclusiveGroup, IExclusiveGroup, isExclusiveGroup } from './exclusive-group';
27+
import type { IComponentMeta } from '../../component-meta';
28+
import { ExclusiveGroup, isExclusiveGroup } from './exclusive-group';
29+
import type { IExclusiveGroup } from './exclusive-group';
2930
import { includeSlot, removeSlot } from '../../utils/slot';
3031
import { foreachReverse } from '../../utils/tree';
3132
import { NodeRemoveOptions, EDITOR_EVENT } from '../../types';
@@ -1095,7 +1096,7 @@ export class Node<Schema extends IPublicTypeNodeSchema = IPublicTypeNodeSchema>
10951096
condition(this) !== false :
10961097
condition !== false;
10971098
})
1098-
.map((action: IPublicTypeComponentAction) => action.name) || [];
1099+
.map((action: IPublicTypeComponentAction) => action.name) || [];
10991100

11001101
return availableActions.indexOf(actionName) >= 0;
11011102
}

‎packages/designer/src/document/node/props/prop.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { untracked, computed, obx, engineConfig, action, makeObservable, mobx, runInAction } from '@alilc/lowcode-editor-core';
2-
import { IPublicTypeCompositeValue, GlobalEvent, IPublicTypeJSSlot, IPublicTypeSlotSchema, IPublicEnumTransformStage, IPublicModelProp } from '@alilc/lowcode-types';
2+
import { GlobalEvent, IPublicEnumTransformStage } from '@alilc/lowcode-types';
3+
import type { IPublicTypeCompositeValue, IPublicTypeJSSlot, IPublicTypeSlotSchema, IPublicModelProp } from '@alilc/lowcode-types';
34
import { uniqueId, isPlainObject, hasOwnProperty, compatStage, isJSExpression, isJSSlot, isNodeSchema } from '@alilc/lowcode-utils';
45
import { valueToSource } from './value-to-source';
56
import { IProps, IPropParent } from './props';
@@ -13,7 +14,7 @@ export type UNSET = typeof UNSET;
1314

1415
export interface IProp extends Omit<IPublicModelProp<
1516
INode
16-
>, 'exportSchema' | 'node' > {
17+
>, 'exportSchema' | 'node'> {
1718

1819
readonly props: IProps;
1920

‎packages/designer/src/document/node/props/props.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { computed, makeObservable, obx, action } from '@alilc/lowcode-editor-core';
2-
import { IPublicTypePropsMap, IPublicTypePropsList, IPublicTypeCompositeValue, IPublicEnumTransformStage, IBaseModelProps } from '@alilc/lowcode-types';
2+
import { IPublicTypePropsList, IPublicTypeCompositeValue, IPublicEnumTransformStage, IBaseModelProps } from '@alilc/lowcode-types';
3+
import type { IPublicTypePropsMap } from '@alilc/lowcode-types';
34
import { uniqueId, compatStage } from '@alilc/lowcode-utils';
45
import { Prop, IProp, UNSET } from './prop';
56
import { INode } from '../node';

0 commit comments

Comments
 (0)