From de0dd57a0442e188cb7aab37f7c0dbc1f4f4c53b Mon Sep 17 00:00:00 2001
From: "ben.qin" <ben.qin@avepoint.com>
Date: Thu, 21 Apr 2022 17:25:25 +0800
Subject: [PATCH] Optmize archive function type

---
 source/Model/CtrlObject.ts |  6 +++---
 source/Model/Range.ts      | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/Model/CtrlObject.ts b/source/Model/CtrlObject.ts
index 4a041a8..8769222 100644
--- a/source/Model/CtrlObject.ts
+++ b/source/Model/CtrlObject.ts
@@ -17,7 +17,7 @@ interface IArchiveCtrlObject {
 /**
  * 可控对象
  */
-class CtrlObject extends LabelObject {
+class CtrlObject<A extends IAnyObject = IAnyObject> extends LabelObject {
 
     /**
      * 显示名称
@@ -109,7 +109,7 @@ class CtrlObject extends LabelObject {
         return this.deleteFlag;
     }
 
-    public toArchive<T>(): IArchiveCtrlObject & T {
+    public toArchive(): IArchiveCtrlObject & A {
         return {
             displayName: this.displayName,
             color: this.color.concat([]),
@@ -121,7 +121,7 @@ class CtrlObject extends LabelObject {
         } as any;
     }
 
-    public fromArchive<T>(archive: IArchiveCtrlObject & T, paster?: IArchiveParseFn): void {
+    public fromArchive(archive: IArchiveCtrlObject & A, paster?: IArchiveParseFn): void {
         this.displayName = archive.displayName;
         this.color = archive.color.concat([]);
         this.display = !!archive.display;
diff --git a/source/Model/Range.ts b/source/Model/Range.ts
index 7a9df4c..7b4a507 100644
--- a/source/Model/Range.ts
+++ b/source/Model/Range.ts
@@ -10,7 +10,7 @@ interface IArchiveRange {
 /**
  * 范围
  */
-class Range extends CtrlObject {
+class Range extends CtrlObject<IArchiveRange> {
 
     /**
      * 坐标
@@ -31,7 +31,7 @@ class Range extends CtrlObject {
         }
     }
 
-    public override toArchive<T>(): IArchiveCtrlObject & T {
+    public override toArchive(): IArchiveCtrlObject & IArchiveRange {
         return {
             ...super.toArchive(),
             position: this.position.concat([]),
@@ -39,10 +39,10 @@ class Range extends CtrlObject {
         };
     }
 
-    public override fromArchive<T>(archive: IArchiveCtrlObject & T, paster?: IArchiveParseFn): void {
+    public override fromArchive(archive: IArchiveCtrlObject & IArchiveRange, paster?: IArchiveParseFn): void {
         super.fromArchive(archive, paster);
-        this.position = (archive as any).position.concat([]),
-        this.radius = (archive as any).radius.concat([])
+        this.position = archive.position.concat([]),
+        this.radius = archive.radius.concat([])
     }
 
 }