From a7debf165e24e6200d7c986555f31c721792af38 Mon Sep 17 00:00:00 2001
From: walker <shengxuqiang@joylink.club>
Date: Thu, 6 Jul 2023 11:21:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9websocket=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=A4=84=E7=90=86=E6=9F=A5=E8=AF=A2=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jlgraphic/app/JlGraphicApp.ts  |  5 ++++-
 src/jlgraphic/core/GraphicStore.ts | 16 ++++++++++++++++
 src/layouts/DrawLayout.vue         |  4 ++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/jlgraphic/app/JlGraphicApp.ts b/src/jlgraphic/app/JlGraphicApp.ts
index c2b0af8..e073582 100644
--- a/src/jlgraphic/app/JlGraphicApp.ts
+++ b/src/jlgraphic/app/JlGraphicApp.ts
@@ -528,7 +528,10 @@ export class GraphicApp extends EventEmitter<GraphicAppEvents> {
    */
   handleGraphicStates(graphicStates: GraphicState[]) {
     graphicStates.forEach((state) => {
-      const list = this.queryStore.queryByIdOrCode(state.code);
+      const list = this.queryStore.queryByIdOrCodeAndType(
+        state.code,
+        state.graphicType
+      );
       if (list.length == 0) {
         const template = this.getGraphicTemplatesByType(state.graphicType);
         const g = template.new();
diff --git a/src/jlgraphic/core/GraphicStore.ts b/src/jlgraphic/core/GraphicStore.ts
index 979bd20..23e8889 100644
--- a/src/jlgraphic/core/GraphicStore.ts
+++ b/src/jlgraphic/core/GraphicStore.ts
@@ -37,6 +37,12 @@ export interface GraphicQueryStore {
    * @param v
    */
   queryByIdOrCode(v: string): JlGraphic[];
+  /**
+   * 根据id或code及类型查询图形
+   * @param v
+   * @param type
+   */
+  queryByIdOrCodeAndType(v: string, type: string): JlGraphic[];
   /**
    * 根据code和类型获取图形
    * @param code
@@ -69,6 +75,7 @@ export class GraphicStore implements GraphicQueryStore {
     this.store = new Map<string, JlGraphic>();
     this.relationManage = new RelationManage(app);
   }
+
   /**
    * 获取所有图形对象
    */
@@ -125,6 +132,15 @@ export class GraphicStore implements GraphicQueryStore {
     });
     return list;
   }
+  queryByIdOrCodeAndType(s: string, type: string): JlGraphic[] {
+    const list: JlGraphic[] = [];
+    this.store.forEach((g) => {
+      if (g.isIdOrCode(s) && g.type === type) {
+        list.push(g);
+      }
+    });
+    return list;
+  }
   queryByCodeAndType<T extends JlGraphic>(
     code: string,
     type: string
diff --git a/src/layouts/DrawLayout.vue b/src/layouts/DrawLayout.vue
index a7f642f..fa1c35a 100644
--- a/src/layouts/DrawLayout.vue
+++ b/src/layouts/DrawLayout.vue
@@ -120,6 +120,7 @@
 </template>
 
 <script setup lang="ts">
+import { Base64 } from 'js-base64';
 import { useQuasar } from 'quasar';
 import DrawProperties from 'src/components/draw-app/DrawProperties.vue';
 import { getDrawApp, loadDrawDatas } from 'src/examples/app';
@@ -157,6 +158,9 @@ function toggleFullscreen(e: unknown): void {
 
 onMounted(() => {
   console.log('绘制应用layout mounted');
+
+  const basic = Base64.decode('Zm9vOmJhcg==');
+  console.log(basic);
   const dom = document.getElementById('draw-app-container');
   if (dom) {
     const drawApp = drawStore.initDrawApp(dom);