From 3c662921f7fded0fc4be48d7b0856e8ee0a63f72 Mon Sep 17 00:00:00 2001
From: huanghao1412 <huanghao1412@163.com>
Date: Mon, 4 Mar 2024 10:17:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=A7=E5=B1=8F=E4=BC=98=E5=8C=96403?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E4=BB=A5=E5=8F=8AconData=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EngineeringConfig/configData.vue             | 16 ++++++++--------
 .../CustomComponents/EngineeringConfig/index.vue |  3 ++-
 src/views/chart/hooks/useSync.hook.ts            |  6 ++++++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/configData.vue b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/configData.vue
index 6d15ac5d..1fc16bf7 100644
--- a/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/configData.vue
+++ b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/configData.vue
@@ -1,7 +1,7 @@
 <template>
   <n-space vertical>
     <setting-item-box name="组态ID" :alone="true">
-      <n-input-number v-model:value="mapId" size="small" placeholder="请输入组态ID"/>
+      <n-input-number :value="props.customData.mapId" @update:value="setMapId" size="small" placeholder="请输入组态ID"/>
     </setting-item-box>
   </n-space>
 </template>
@@ -14,17 +14,17 @@ import { SettingItemBox } from '@/components/Pages/ChartItemSetting'
 
 const props = defineProps(['customData', 'request'])
 
-let mapId: Ref<null | number> = ref(null)
-mapId.value = props.customData.mapId as (null | number)
+// let mapId: Ref<null | number> = ref(null)
+// mapId.value = props.customData.mapId as (null | number)
 const setMapId = debounce((v: null | number) => {
   props.customData.mapId = v
 }, 500)
 
-watch(() => {
-  return mapId.value
-}, (v: null | number) => {
-  setMapId(v)
-})
+// watch(() => {
+//   return mapId.value
+// }, (v: null | number) => {
+//   setMapId(v)
+// })
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/index.vue b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/index.vue
index b3819a02..dccb7d1e 100644
--- a/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/index.vue
+++ b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/index.vue
@@ -47,7 +47,8 @@ const handleMsg = (event: any) => {
   if (event.origin === origin) {
     // 处理来自子级页面的消息
     let obj = event.data
-    if(obj.type === 'changeRoute') {
+    if(obj.page !== 'engineering') return
+    if(obj.type === 'changeTopmostRoute') {
       postMessageToParent({
         type: 'changeRouterV1',
         url: obj.path
diff --git a/src/views/chart/hooks/useSync.hook.ts b/src/views/chart/hooks/useSync.hook.ts
index e1aa2195..1db3b3e4 100644
--- a/src/views/chart/hooks/useSync.hook.ts
+++ b/src/views/chart/hooks/useSync.hook.ts
@@ -126,7 +126,13 @@ export const useSync = () => {
       const intComponent = (target: CreateComponentType) => {
         if (!window['$vue'].component(target.chartConfig.chartKey)) {
           window['$vue'].component(target.chartConfig.chartKey, fetchChartComponent(target.chartConfig))
+          // window['$vue'].component(target.chartConfig.conKey, fetchConfigComponent(target.chartConfig))
+          // window['$vue'].component(target.chartConfig.conDataKey, fetchConfigDataComponent(target.chartConfig))
+        }
+        if (!window['$vue'].component(target.chartConfig.conKey)) {
           window['$vue'].component(target.chartConfig.conKey, fetchConfigComponent(target.chartConfig))
+        }
+        if (!window['$vue'].component(target.chartConfig.conDataKey)) {
           window['$vue'].component(target.chartConfig.conDataKey, fetchConfigDataComponent(target.chartConfig))
         }
       }