Move objectID into model

This commit is contained in:
2022-04-09 12:21:08 +08:00
parent 3026c463bd
commit 8ced3d82f3
14 changed files with 30 additions and 26 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
import { LabelObject } from "@Model/Label"
import type { Model } from "@Model/Model";
import type { ObjectID } from "@Model/Renderer";
import type { ObjectID } from "@Model/Model";
/**
* 可控对象
+1 -1
View File
@@ -1,5 +1,5 @@
import type { Group } from "@Model/Group";
import { ObjectID } from "@Model/Renderer";
import { ObjectID } from "@Model/Model";
/**
* 群中的个体类型
+1 -2
View File
@@ -1,5 +1,4 @@
import type { Model } from "@Model/Model";
import { ObjectID } from "@Model/Renderer";
import type { Model, ObjectID } from "@Model/Model";
/**
* 数据标签
+13 -2
View File
@@ -5,9 +5,19 @@ import { IParamValue } from "@Model/Parameter";
import { Individual } from "@Model/Individual";
import { CtrlObject } from "@Model/CtrlObject";
import { Emitter, EventType, EventMixin } from "@Model/Emitter";
import { ObjectID, AbstractRenderer } from "@Model/Renderer";
import { AbstractRenderer } from "@Model/Renderer";
import { Behavior, IAnyBehavior, IAnyBehaviorRecorder } from "@Model/Behavior";
/**
* 对象标识符
*/
type ObjectID = string;
/**
* 任意类型对象
*/
type IAnyObject = Record<string, any>;
type ModelEvent = {
labelChange: Label[];
objectChange: CtrlObject[];
@@ -376,5 +386,6 @@ export {
EventMixin,
Model,
CtrlObject,
ObjectID
ObjectID,
IAnyObject
}
+3 -11
View File
@@ -1,9 +1,5 @@
import { Emitter, EventType } from "@Model/Emitter";
/**
* 任意类型对象
*/
type IAnyObject = Record<string, any>;
import { IAnyObject, ObjectID } from "@Model/Model";
/**
* 渲染器参数
@@ -32,10 +28,7 @@ interface ICommonParam {
color?: ObjectData;
}
/**
* 对象标识符
*/
type ObjectID = string;
/**
* 接收的数据类型
@@ -125,7 +118,6 @@ abstract class AbstractRenderer<
export default AbstractRenderer;
export {
AbstractRenderer, ObjectID, IAnyObject,
ICommonParam, IRendererParam,
AbstractRenderer, ICommonParam, IRendererParam,
ObjectData, IRendererConstructor
};