From 97202fe976e3efdca693ee61280959d0821a4e27 Mon Sep 17 00:00:00 2001
From: MrKBear <mrkbear@qq.com>
Date: Wed, 9 Mar 2022 11:54:31 +0800
Subject: [PATCH] Change object id type

---
 source/Model/Model.ts                      | 10 +++++-----
 source/Model/Renderer.ts                   |  2 +-
 source/Panel/RangeDetails/RangeDetails.tsx |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/Model/Model.ts b/source/Model/Model.ts
index cda7ccb..3448165 100644
--- a/source/Model/Model.ts
+++ b/source/Model/Model.ts
@@ -28,8 +28,8 @@ class Model extends Emitter<ModelEvent> {
      * 下一个需要分配的 ID
      */
     private idIndex: number = 1;
-    public get nextId(): number {
-        return this.idIndex ++;
+    public nextId(label: string = "U"): string {
+        return `${label}-${this.idIndex ++}`;
     }
 
     /**
@@ -55,7 +55,7 @@ class Model extends Emitter<ModelEvent> {
      */
     public addLabel(name: string): Label {
         console.log(`Model: Creat label with id ${this.idIndex}`);
-        let label = new Label(this, this.nextId, name);
+        let label = new Label(this, this.nextId("L"), name);
         this.labelPool.push(label);
         this.emit("labelAdd", label);
         this.emit("labelChange", this.labelPool);
@@ -95,7 +95,7 @@ class Model extends Emitter<ModelEvent> {
      */
     public addGroup(): Group {
         console.log(`Model: Creat group with id ${this.idIndex}`);
-        let group = new Group(this, this.nextId);
+        let group = new Group(this, this.nextId("G"));
         this.objectPool.push(group);
         this.emit("groupAdd", group);
         this.emit("objectAdd", group);
@@ -108,7 +108,7 @@ class Model extends Emitter<ModelEvent> {
      */
     public addRange(): Range {
         console.log(`Model: Creat range with id ${this.idIndex}`);
-        let range = new Range(this, this.nextId);
+        let range = new Range(this, this.nextId("R"));
         this.objectPool.push(range);
         this.emit("rangeAdd", range);
         this.emit("objectAdd", range);
diff --git a/source/Model/Renderer.ts b/source/Model/Renderer.ts
index d9714f1..2c9ee64 100644
--- a/source/Model/Renderer.ts
+++ b/source/Model/Renderer.ts
@@ -35,7 +35,7 @@ interface ICommonParam {
 /**
  * 对象标识符
  */
-type ObjectID = Symbol | string | number;
+type ObjectID = string;
 
 /**
  * 接收的数据类型
diff --git a/source/Panel/RangeDetails/RangeDetails.tsx b/source/Panel/RangeDetails/RangeDetails.tsx
index d8c5362..101a440 100644
--- a/source/Panel/RangeDetails/RangeDetails.tsx
+++ b/source/Panel/RangeDetails/RangeDetails.tsx
@@ -113,7 +113,7 @@ class RangeDetails extends Component<IMixinStatusProps> {
             if (this.props.status.focusObject.size > 1) {
                 return <ErrorMessage i18nKey="Common.Attr.Key.Error.Multiple"/>;
             }
-            let id: ObjectID = 0;
+            let id: ObjectID = "";
             this.props.status.focusObject.forEach((cid => id = cid));
             
             let range = this.props.status!.model.getObjectById(id);