Skip to content

Commit

Permalink
fix: ts interface error
Browse files Browse the repository at this point in the history
  • Loading branch information
Justin-lu committed Mar 23, 2023
1 parent 203568e commit b848045
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 14 deletions.
4 changes: 2 additions & 2 deletions packages/designer/src/designer/detecting.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { makeObservable, obx, IEventBus, createModuleEventBus } from '@alilc/lowcode-editor-core';
import { IPublicModelDetecting } from '@alilc/lowcode-types';
import { IDocumentModel } from '../document/document-model';
import { INode } from '../document/node/node';
import type { INode } from '../document/node/node';

const DETECTING_CHANGE_EVENT = 'detectingChange';
export interface IDetecting extends Omit< IPublicModelDetecting<INode>,
export interface IDetecting extends Omit<IPublicModelDetecting<INode>,
'capture' |
'release' |
'leave'
Expand Down
17 changes: 9 additions & 8 deletions packages/designer/src/document/document-model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
IPublicTypeOnChangeOptions,
IPublicTypeDisposable,
} from '@alilc/lowcode-types';
import {
import type {
IDropLocation,
} from '@alilc/lowcode-designer';
import {
Expand All @@ -39,7 +39,8 @@ import { IProject } from '../project';
import { ISimulatorHost } from '../simulator';
import { IComponentMeta } from '../component-meta';
import { IDesigner, IHistory } from '../designer';
import { insertChildren, insertChild, IRootNode, INode } from './node/node';
import { insertChildren, insertChild, IRootNode } from './node/node';
import type { INode } from './node/node';
import { Selection, ISelection } from './selection';
import { History } from './history';
import { IModalNodesManager, ModalNodesManager, Node } from './node';
Expand All @@ -49,11 +50,11 @@ export type GetDataType<T, NodeType> = T extends undefined
? NodeType extends {
schema: infer R;
}
? R
: any
? R
: any
: T;

export interface IDocumentModel extends Omit< IPublicModelDocumentModel<
export interface IDocumentModel extends Omit<IPublicModelDocumentModel<
ISelection,
IHistory,
INode,
Expand Down Expand Up @@ -656,9 +657,9 @@ export class DocumentModel implements IDocumentModel {
}

checkNesting(
dropTarget: INode,
dragObject: IPublicTypeDragNodeObject | IPublicTypeNodeSchema | INode | IPublicTypeDragNodeDataObject,
): boolean {
dropTarget: INode,
dragObject: IPublicTypeDragNodeObject | IPublicTypeNodeSchema | INode | IPublicTypeDragNodeDataObject,
): boolean {
let items: Array<INode | IPublicTypeNodeSchema>;
if (isDragNodeDataObject(dragObject)) {
items = Array.isArray(dragObject.data) ? dragObject.data : [dragObject.data];
Expand Down
5 changes: 3 additions & 2 deletions packages/designer/src/document/node/node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ import { IDocumentModel } from '../document-model';
import { NodeChildren, INodeChildren } from './node-children';
import { IProp, Prop } from './props/prop';
import { IComponentMeta } from '../../component-meta';
import { ExclusiveGroup, IExclusiveGroup, isExclusiveGroup } from './exclusive-group';
import { ExclusiveGroup, isExclusiveGroup } from './exclusive-group';
import type { IExclusiveGroup } from './exclusive-group';
import { includeSlot, removeSlot } from '../../utils/slot';
import { foreachReverse } from '../../utils/tree';
import { NodeRemoveOptions, EDITOR_EVENT } from '../../types';
Expand Down Expand Up @@ -1095,7 +1096,7 @@ export class Node<Schema extends IPublicTypeNodeSchema = IPublicTypeNodeSchema>
condition(this) !== false :
condition !== false;
})
.map((action: IPublicTypeComponentAction) => action.name) || [];
.map((action: IPublicTypeComponentAction) => action.name) || [];

return availableActions.indexOf(actionName) >= 0;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/shell/src/model/condition-group.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IExclusiveGroup } from '@alilc/lowcode-designer';
import type { IExclusiveGroup } from '@alilc/lowcode-designer';
import { IPublicModelExclusiveGroup, IPublicModelNode } from '@alilc/lowcode-types';
import { conditionGroupSymbol, nodeSymbol } from '../symbols';
import { Node } from './node';
Expand Down Expand Up @@ -39,4 +39,4 @@ export class ConditionGroup implements IPublicModelExclusiveGroup {
shellConditionGroup[conditionGroupSymbol] = shellConditionGroup;
return shellConditionGroup;
}
}
}

0 comments on commit b848045

Please sign in to comment.