Skip to content

Commit 8537eff

Browse files
JackLianliujuping
JackLian
authored and
liujuping
committed
fix: fix lint issues in shell
1 parent c1299e3 commit 8537eff

38 files changed

Lines changed: 429 additions & 262 deletions

‎docs/docs/api/model/detecting.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ hover 节点变化事件
7777
* set callback which will be called when hovering object changed.
7878
* @since v1.1.0
7979
*/
80-
onDetectingChange(fn: (node: IPublicModelNode) => void): IPublicTypeDisposable;
80+
onDetectingChange(fn: (node: IPublicModelNode | null) => void): IPublicTypeDisposable;
8181
```
8282

8383
相关类型：

‎packages/designer/src/designer/active-tracker.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
} from '@alilc/lowcode-types';
77
import { isNode } from '@alilc/lowcode-utils';
88

9-
export interface IActiveTracker extends IPublicModelActiveTracker {
9+
export interface IActiveTracker extends Omit< IPublicModelActiveTracker, 'track' > {
1010
track(originalTarget: IPublicTypeActiveTarget | INode): void;
1111
}
1212

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

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,16 @@ import {
1717
IPublicTypeLocationData,
1818
IPublicEnumTransformStage,
1919
IPublicModelDragon,
20-
IPublicModelActiveTracker,
2120
IPublicModelDropLocation,
2221
} from '@alilc/lowcode-types';
2322
import { megreAssets, IPublicTypeAssetsJson, isNodeSchema, isDragNodeObject, isDragNodeDataObject, isLocationChildrenDetail, Logger } from '@alilc/lowcode-utils';
2423
import { Project } from '../project';
2524
import { Node, DocumentModel, insertChildren, INode } from '../document';
26-
import { ComponentMeta } from '../component-meta';
25+
import { ComponentMeta, IComponentMeta } from '../component-meta';
2726
import { INodeSelector, Component } from '../simulator';
2827
import { Scroller } from './scroller';
29-
import { Dragon, ILocateEvent } from './dragon';
30-
import { ActiveTracker } from './active-tracker';
28+
import { Dragon, IDragon, ILocateEvent } from './dragon';
29+
import { ActiveTracker, IActiveTracker } from './active-tracker';
3130
import { Detecting } from './detecting';
3231
import { DropLocation } from './location';
3332
import { OffsetObserver, createOffsetObserver } from './offset-observer';
@@ -56,24 +55,49 @@ export interface DesignerProps {
5655
onMount?: (designer: Designer) => void;
5756
onDragstart?: (e: ILocateEvent) => void;
5857
onDrag?: (e: ILocateEvent) => void;
59-
onDragend?: (e: { dragObject: IPublicModelDragObject; copy: boolean }, loc?: DropLocation) => void;
58+
onDragend?: (
59+
e: { dragObject: IPublicModelDragObject; copy: boolean },
60+
loc?: DropLocation,
61+
) => void;
6062
}
6163

6264
export interface IDesigner {
65+
6366
get dragon(): IPublicModelDragon;
64-
get activeTracker(): IPublicModelActiveTracker;
67+
68+
get activeTracker(): IActiveTracker;
69+
70+
get componentActions(): ComponentActions;
71+
72+
get editor(): IPublicModelEditor;
73+
6574
createScroller(scrollable: IPublicModelScrollable): IPublicModelScroller;
6675

6776
/**
6877
* 创建插入位置，考虑放到 dragon 中
6978
*/
7079
createLocation(locationData: IPublicTypeLocationData): IPublicModelDropLocation;
80+
81+
get componentsMap(): { [key: string]: IPublicTypeNpmInfo | Component };
82+
83+
loadIncrementalAssets(incrementalAssets: IPublicTypeAssetsJson): Promise<void>;
84+
85+
getComponentMeta(
86+
componentName: string,
87+
generateMetadata?: () => IPublicTypeComponentMetadata | null,
88+
): IComponentMeta;
89+
90+
createComponentMeta(data: IPublicTypeComponentMetadata): IComponentMeta | null;
91+
92+
getComponentMetasMap(): Map<string, IComponentMeta>;
93+
94+
addPropsReducer(reducer: IPublicTypePropsTransducer, stage: IPublicEnumTransformStage): void;
7195
}
7296

7397
export class Designer implements IDesigner {
74-
public dragon: Dragon;
98+
dragon: IDragon;
7599

76-
public viewName: string | undefined;
100+
viewName: string | undefined;
77101

78102
readonly componentActions = new ComponentActions();
79103

@@ -99,7 +123,7 @@ export class Designer implements IDesigner {
99123

100124
private oobxList: OffsetObserver[] = [];
101125

102-
@obx.ref private _componentMetasMap = new Map<string, ComponentMeta>();
126+
@obx.ref private _componentMetasMap = new Map<string, IComponentMeta>();
103127

104128
@obx.ref private _simulatorComponent?: ComponentType<any>;
105129

@@ -483,7 +507,7 @@ export class Designer implements IDesigner {
483507
metas.forEach((data) => this.createComponentMeta(data));
484508
}
485509

486-
createComponentMeta(data: IPublicTypeComponentMetadata): ComponentMeta | null {
510+
createComponentMeta(data: IPublicTypeComponentMetadata): IComponentMeta | null {
487511
const key = data.componentName;
488512
if (!key) {
489513
return null;
@@ -515,7 +539,7 @@ export class Designer implements IDesigner {
515539
getComponentMeta(
516540
componentName: string,
517541
generateMetadata?: () => IPublicTypeComponentMetadata | null,
518-
) {
542+
): IComponentMeta {
519543
if (this._componentMetasMap.has(componentName)) {
520544
return this._componentMetasMap.get(componentName)!;
521545
}

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
import { makeObservable, obx, IEventBus, createModuleEventBus } from '@alilc/lowcode-editor-core';
2-
import { IPublicModelDetecting, IPublicModelNode, IPublicModelDocumentModel } from '@alilc/lowcode-types';
2+
import { IPublicModelDetecting } from '@alilc/lowcode-types';
3+
import { IDocumentModel } from '../document/document-model';
4+
import { INode } from '../document/node/node';
35

46
const DETECTING_CHANGE_EVENT = 'detectingChange';
57
export interface IDetecting extends Omit< IPublicModelDetecting, 'capture' | 'release' | 'leave' > {
68

7-
capture(node: IPublicModelNode | null): void;
9+
capture(node: INode | null): void;
810

9-
release(node: IPublicModelNode | null): void;
11+
release(node: INode | null): void;
1012

11-
leave(document: IPublicModelDocumentModel | undefined): void;
13+
leave(document: IDocumentModel | undefined): void;
14+
15+
get current(): INode | null;
1216
}
1317

1418
export class Detecting implements IDetecting {
@@ -31,7 +35,7 @@ export class Detecting implements IDetecting {
3135

3236
@obx.ref xRayMode = false;
3337

34-
@obx.ref private _current: IPublicModelNode | null = null;
38+
@obx.ref private _current: INode | null = null;
3539

3640
private emitter: IEventBus = createModuleEventBus('Detecting');
3741

@@ -43,27 +47,27 @@ export class Detecting implements IDetecting {
4347
return this._current;
4448
}
4549

46-
capture(node: IPublicModelNode | null) {
50+
capture(node: INode | null) {
4751
if (this._current !== node) {
4852
this._current = node;
4953
this.emitter.emit(DETECTING_CHANGE_EVENT, this.current);
5054
}
5155
}
5256

53-
release(node: IPublicModelNode | null) {
57+
release(node: INode | null) {
5458
if (this._current === node) {
5559
this._current = null;
5660
this.emitter.emit(DETECTING_CHANGE_EVENT, this.current);
5761
}
5862
}
5963

60-
leave(document: IPublicModelDocumentModel | undefined) {
64+
leave(document: IDocumentModel | undefined) {
6165
if (this.current && this.current.document === document) {
6266
this._current = null;
6367
}
6468
}
6569

66-
onDetectingChange(fn: (node: IPublicModelNode) => void) {
70+
onDetectingChange(fn: (node: INode) => void) {
6771
this.emitter.on(DETECTING_CHANGE_EVENT, fn);
6872
return () => {
6973
this.emitter.off(DETECTING_CHANGE_EVENT, fn);

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

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,18 @@ import {
99
IPublicTypeDragNodeDataObject,
1010
IPublicModelDocumentModel,
1111
IPublicModelHistory,
12-
IPublicModelModalNodesManager,
1312
IPublicModelNode,
14-
IPublicApiProject,
15-
IPublicModelDropLocation,
1613
IPublicEnumTransformStage,
1714
IPublicTypeOnChangeOptions,
1815
} from '@alilc/lowcode-types';
19-
import { Project } from '../project';
16+
import { IProject, Project } from '../project';
2017
import { ISimulatorHost } from '../simulator';
2118
import { ComponentMeta } from '../component-meta';
22-
import { IDropLocation, Designer } from '../designer';
19+
import { IDropLocation, Designer, IHistory } from '../designer';
2320
import { Node, insertChildren, insertChild, isNode, RootNode, INode } from './node/node';
2421
import { Selection, ISelection } from './selection';
2522
import { History } from './history';
26-
import { ModalNodesManager } from './node';
23+
import { IModalNodesManager, ModalNodesManager } from './node';
2724
import { uniqueId, isPlainObject, compatStage, isJSExpression, isDOMText, isNodeSchema, isDragNodeObject, isDragNodeDataObject } from '@alilc/lowcode-utils';
2825
import { EDITOR_EVENT } from '../types';
2926

@@ -44,17 +41,31 @@ export interface IDocumentModel extends Omit< IPublicModelDocumentModel, 'select
4441
*/
4542
readonly selection: ISelection;
4643

44+
readonly project: IProject;
45+
46+
/**
47+
* 模态节点管理
48+
*/
49+
readonly modalNodesManager: IModalNodesManager;
50+
4751
/**
4852
* 根据 id 获取节点
4953
*/
5054
getNode(id: string): INode | null;
55+
56+
getHistory(): IHistory;
57+
58+
get focusNode(): INode | null;
59+
60+
get rootNode(): INode | null;
61+
5162
}
5263

5364
export class DocumentModel implements IDocumentModel {
5465
/**
5566
* 根节点 类型有：Page/Component/Block
5667
*/
57-
rootNode: RootNode | null;
68+
rootNode: INode | null;
5869

5970
/**
6071
* 文档编号
@@ -74,11 +85,11 @@ export class DocumentModel implements IDocumentModel {
7485
/**
7586
* 模态节点管理
7687
*/
77-
readonly modalNodesManager: IPublicModelModalNodesManager;
88+
readonly modalNodesManager: IModalNodesManager;
7889

7990
private _nodesMap = new Map<string, IPublicModelNode>();
8091

81-
readonly project: IPublicApiProject;
92+
readonly project: IProject;
8293

8394
readonly designer: Designer;
8495

@@ -114,7 +125,7 @@ export class DocumentModel implements IDocumentModel {
114125
this.rootNode?.getExtraProp('fileName', true)?.setValue(fileName);
115126
}
116127

117-
get focusNode() {
128+
get focusNode(): INode {
118129
if (this._drillDownNode) {
119130
return this._drillDownNode;
120131
}
@@ -147,7 +158,7 @@ export class DocumentModel implements IDocumentModel {
147158

148159
@obx.ref private _dropLocation: IDropLocation | null = null;
149160

150-
set dropLocation(loc: IPublicModelDropLocation | null) {
161+
set dropLocation(loc: IDropLocation | null) {
151162
this._dropLocation = loc;
152163
// pub event
153164
this.designer.editor.eventBus.emit(
@@ -626,7 +637,7 @@ export class DocumentModel implements IDocumentModel {
626637
return data;
627638
}
628639

629-
getHistory(): History {
640+
getHistory(): IHistory {
630641
return this.history;
631642
}
632643

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ export class History<T = IPublicTypeNodeSchema> implements IHistory {
193193
return this.onStateChange(func);
194194
}
195195

196-
onStateChange(func: () => any) {
196+
onStateChange(func: () => any): () => void {
197197
this.emitter.on('statechange', func);
198198
return () => {
199199
this.emitter.removeListener('statechange', func);
@@ -208,7 +208,8 @@ export class History<T = IPublicTypeNodeSchema> implements IHistory {
208208
onChangeCursor(func: () => any): () => void {
209209
return this.onCursor(func);
210210
}
211-
onCursor(func: () => any) {
211+
212+
onCursor(func: () => any): () => void {
212213
this.emitter.on('cursor', func);
213214
return () => {
214215
this.emitter.removeListener('cursor', func);

0 commit comments

Comments
 (0)