Move objectID into model

source/Context/Popups.ts

@@ -1,7 +1,7 @@
 import { ReactNode, createElement } from "react";
 import { Emitter } from "@Model/Emitter";
 import { Localization } from "@Component/Localization/Localization";
-import { IAnyObject } from "@Model/Renderer";
+import { IAnyObject } from "@Model/Model";
 
 enum ResizeDragDirection {
     top = 1,

source/GLRender/BasicRenderer.ts

@@ -1,4 +1,5 @@
-import { AbstractRenderer, IRendererParam, IAnyObject } from "@Model/Renderer";
+import { AbstractRenderer, IRendererParam } from "@Model/Renderer";
+import { IAnyObject } from "@Model/Model";
 import { EventType } from "@Model/Emitter";
 import { GLCanvas, GLCanvasOption } from "./GLCanvas";
 import { GLContext } from "./GLContext";

source/GLRender/ClassicRenderer.ts

@@ -1,4 +1,5 @@
-import { ObjectID, ObjectData, ICommonParam } from "@Model/Renderer";
+import { ObjectData, ICommonParam } from "@Model/Renderer";
+import { ObjectID } from "@Model/Model";
 import { BasicRenderer } from "./BasicRenderer";
 import { BasicsShader } from "./BasicShader";
 import { Axis } from "./Axis";

source/Input/AttrInput/AttrInput.tsx

@@ -1,7 +1,7 @@
 import { Component, ReactNode } from "react";
 import { Icon } from "@fluentui/react";
 import { AllI18nKeys } from "@Component/Localization/Localization";
-import { ObjectID } from "@Model/Renderer";
+import { ObjectID } from "@Model/Model";
 import { TextField, ITextFieldProps } from "@Input/TextField/TextField";
 import "./AttrInput.scss";
 

source/Input/Parameter/Parameter.tsx

@@ -1,7 +1,7 @@
 import { Component, Fragment, ReactNode } from "react";
 import { useSettingWithEvent, IMixinSettingProps, Language } from "@Context/Setting";
 import { AttrInput } from "@Input/AttrInput/AttrInput";
-import { ObjectID } from "@Model/Renderer";
+import { ObjectID } from "@Model/Model";
 import { TogglesInput } from "@Input/TogglesInput/TogglesInput";
 import { ObjectPicker } from "@Input/ObjectPicker/ObjectPicker";
 import { AllI18nKeys, I18N } from "@Component/Localization/Localization";

source/Model/CtrlObject.ts

@@ -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";
 
 /**
  * 可控对象

source/Model/Individual.ts

@@ -1,5 +1,5 @@
 import type { Group } from "@Model/Group";
-import { ObjectID } from "@Model/Renderer";
+import { ObjectID } from "@Model/Model";
 
 /**
  * 群中的个体类型

source/Model/Label.ts

@@ -1,5 +1,4 @@
-import type { Model } from "@Model/Model";
+import type { Model, ObjectID } from "@Model/Model";
-import { ObjectID } from "@Model/Renderer";
 
 /**
  * 数据标签

source/Model/Model.ts

@@ -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
 }

source/Model/Renderer.ts

@@ -1,9 +1,5 @@
 import { Emitter, EventType } from "@Model/Emitter";
-
+import { IAnyObject, ObjectID } from "@Model/Model"; 
-/**
- * 任意类型对象
- */
-type IAnyObject = Record<string, any>;
 
 /**
  * 渲染器参数
@@ -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,
+    AbstractRenderer, ICommonParam, IRendererParam, 
-    ICommonParam, IRendererParam, 
     ObjectData, IRendererConstructor 
 };

source/Panel/GroupDetails/GroupDetails.tsx

@@ -4,7 +4,7 @@ import { useStatusWithEvent, IMixinStatusProps } from "@Context/Status";
 import { useSetting, IMixinSettingProps } from "@Context/Setting";
 import { ComboInput, IDisplayItem } from "@Input/ComboInput/ComboInput";
 import { Message } from "@Input/Message/Message";
-import { ObjectID } from "@Model/Renderer";
+import { ObjectID } from "@Model/Model";
 import { ColorInput } from "@Input/ColorInput/ColorInput";
 import { TogglesInput } from "@Input/TogglesInput/TogglesInput";
 import { LabelPicker } from "@Input/LabelPicker/LabelPicker";

source/Panel/ObjectList/ObjectCommand.tsx

@@ -2,7 +2,7 @@ import { Component, ReactNode } from "react";
 import { BackgroundLevel, FontLevel, Theme } from "@Component/Theme/Theme";
 import { useStatus, IMixinStatusProps } from "@Context/Status";
 import { ConfirmPopup } from "@Component/ConfirmPopup/ConfirmPopup";
-import { ObjectID } from "@Model/Renderer";
+import { ObjectID } from "@Model/Model";
 import { Icon } from "@fluentui/react";
 import "./ObjectList.scss";
 

source/Panel/ObjectList/ObjectList.tsx

@@ -3,7 +3,7 @@ import { useStatusWithEvent, IMixinStatusProps } from "@Context/Status";
 import { useSetting, IMixinSettingProps } from "@Context/Setting";
 import { Localization } from "@Component/Localization/Localization";
 import { DetailsList } from "@Component/DetailsList/DetailsList";
-import { ObjectID } from "@Model/Renderer";
+import { ObjectID } from "@Model/Model";
 import { Icon } from "@fluentui/react";
 import "./ObjectList.scss";
 

source/Panel/RangeDetails/RangeDetails.tsx

@@ -3,7 +3,7 @@ import { useStatusWithEvent, IMixinStatusProps } from "@Context/Status";
 import { AttrInput } from "@Input/AttrInput/AttrInput";
 import { Message } from "@Input/Message/Message";
 import { Range } from "@Model/Range";
-import { ObjectID } from "@Model/Renderer";
+import { ObjectID } from "@Model/Model";
 import { ColorInput } from "@Input/ColorInput/ColorInput";
 import { TogglesInput } from "@Input/TogglesInput/TogglesInput";
 import { LabelPicker } from "@Input/LabelPicker/LabelPicker";