合并

src/renderer/src/views/components/bottomSide/bottomSide.vue

@@ -1,13 +1,8 @@
 <template>
   <div class="bottomMenuBox zIndex9">
     <div class="animate__animated bottomMenu">
-      <div
+      <div class="bottom_box" v-for="(item, i) of bottomMenuList" :key="i" :title="t('bottomMenu.' + item.sourceType)"
-        class="bottom_box"
+        @click="addMarker(item)">
-        v-for="(item, i) of bottomMenuList"
-        :key="i"
-        :title="t('bottomMenu.' + item.sourceType)"
-        @click="addMarker(item)"
-      >
         <svg-icon :name="item.sourceType" :size="20" color="rgba(0, 255, 255, 1)"></svg-icon>
         <div class="span">
           {{ t('bottomMenu.' + item.sourceType) }}
@@ -23,6 +18,8 @@ import { useI18n } from 'vue-i18n'
 import { inject } from 'vue'
 import { TreeApi } from '@/api/tree'
 import { initMapData } from '../tree/initMapData'
+import { useTreeNode } from '../tree/hooks/treeNode'
+const { cusAddNodes } = useTreeNode()
 const { t } = useI18n()
 const eventBus: any = inject('bus')
 
@@ -84,6 +81,7 @@ const bottomMenuList = ref([
           id: id,
           sourceName: name,
           sourceType: 'point',
+          // isShow: 1,
           parentId:
             selectedNodes && selectedNodes[selectedNodes.length - 1]
               ? selectedNodes[selectedNodes.length - 1].id
@@ -92,6 +90,7 @@ const bottomMenuList = ref([
           params: options
         }
         TreeApi.addOtherSource(params)
+        cusAddNodes(window.treeObj, params.parentId, [params])
       })
     }
   },
@@ -120,6 +119,7 @@ const bottomMenuList = ref([
           id: id,
           sourceName: name,
           sourceType: 'line',
+          // isShow: 1,
           parentId:
             selectedNodes && selectedNodes[selectedNodes.length - 1]
               ? selectedNodes[selectedNodes.length - 1].id
@@ -128,6 +128,7 @@ const bottomMenuList = ref([
           params: options
         }
         TreeApi.addOtherSource(params)
+        cusAddNodes(window.treeObj, params.parentId, [params])
       })
     }
   },
@@ -154,6 +155,7 @@ const bottomMenuList = ref([
           id: id,
           sourceName: name,
           sourceType: 'curve',
+          // isShow: 1,
           parentId:
             selectedNodes && selectedNodes[selectedNodes.length - 1]
               ? selectedNodes[selectedNodes.length - 1].id
@@ -162,6 +164,7 @@ const bottomMenuList = ref([
           params: options
         }
         TreeApi.addOtherSource(params)
+        cusAddNodes(window.treeObj, params.parentId, [params])
       })
     }
   },
@@ -194,6 +197,7 @@ const bottomMenuList = ref([
           id: id,
           sourceName: name,
           sourceType: 'panel',
+          // isShow: 1,
           parentId:
             selectedNodes && selectedNodes[selectedNodes.length - 1]
               ? selectedNodes[selectedNodes.length - 1].id
@@ -202,8 +206,8 @@ const bottomMenuList = ref([
           params: options
         }
         console.log(params)
-        // eventBus.emit("openDialog", 'panel');
         TreeApi.addOtherSource(params)
+        cusAddNodes(window.treeObj, params.parentId, [params])
       })
     }
   },
@@ -215,8 +219,7 @@ const bottomMenuList = ref([
     fun: () => {
       let Draw = new YJ.Draw.DrawCircle(window.earth)
       Draw.start(async (a, opt) => {
-        // let id = new YJ.Tools().randomString()
+        let id = new YJ.Tools().randomString()
-        let id = 'aaa'
         let name = '圆'
         let options: any = await initMapData('circle', {
           id: id,
@@ -224,18 +227,24 @@ const bottomMenuList = ref([
           center: opt.center, radius: opt.radius
         })
 
+        delete options.host
+
+        console.log('options', options)
+
         let selectedNodes = window.treeObj.getSelectedNodes()
         let params = {
-          "id": id,
+          id: id,
-          "sourceName": name,
+          sourceName: name,
-          "sourceType": "circle",
+          sourceType: "circle",
-          "parentId": (selectedNodes && selectedNodes[selectedNodes.length - 1]) ? selectedNodes[selectedNodes.length - 1].id : undefined,
+          // isShow: 1,
+          parentId: (selectedNodes && selectedNodes[selectedNodes.length - 1]) ? selectedNodes[selectedNodes.length - 1].id : undefined,
           // "treeIndex": 0,
-          "params": options
+          params: options
         }
-        console.log(params)
+
         // eventBus.emit("openDialog", 'circle');
-        TreeApi.addOtherSource(params)
+        // TreeApi.addOtherSource(params)
+        cusAddNodes(window.treeObj, params.parentId, [params])
       })
     }
   },
@@ -268,6 +277,7 @@ const bottomMenuList = ref([
           id: id,
           sourceName: name,
           sourceType: 'rectangle',
+          // isShow: 1,
           parentId:
             selectedNodes && selectedNodes[selectedNodes.length - 1]
               ? selectedNodes[selectedNodes.length - 1].id
@@ -278,6 +288,7 @@ const bottomMenuList = ref([
         console.log(params)
         // eventBus.emit("openDialog", 'panel');
         TreeApi.addOtherSource(params)
+        cusAddNodes(window.treeObj, params.parentId, [params])
       })
     }
   },
@@ -312,6 +323,7 @@ const bottomMenuList = ref([
           id: id,
           sourceName: name,
           sourceType: 'rendezvous',
+          // isShow: 1,
           parentId:
             selectedNodes && selectedNodes[selectedNodes.length - 1]
               ? selectedNodes[selectedNodes.length - 1].id
@@ -322,6 +334,7 @@ const bottomMenuList = ref([
         console.log(params)
         // eventBus.emit("openDialog", 'panel');
         TreeApi.addOtherSource(params)
+        cusAddNodes(window.treeObj, params.parentId, [params])
       })
     }
   },
@@ -356,6 +369,7 @@ const bottomMenuList = ref([
           id: id,
           sourceName: name,
           sourceType: 'attackArrow',
+          // isShow: 1,
           parentId:
             selectedNodes && selectedNodes[selectedNodes.length - 1]
               ? selectedNodes[selectedNodes.length - 1].id
@@ -366,6 +380,7 @@ const bottomMenuList = ref([
         console.log(params)
         // eventBus.emit("openDialog", 'panel');
         TreeApi.addOtherSource(params)
+        cusAddNodes(window.treeObj, params.parentId, [params])
       })
     }
   },
@@ -401,6 +416,7 @@ const bottomMenuList = ref([
           id: id,
           sourceName: name,
           sourceType: 'pincerArrow',
+          // isShow: 1,
           parentId:
             selectedNodes && selectedNodes[selectedNodes.length - 1]
               ? selectedNodes[selectedNodes.length - 1].id
@@ -410,6 +426,7 @@ const bottomMenuList = ref([
         }
         // eventBus.emit("openDialog", 'panel');
         TreeApi.addOtherSource(params)
+        cusAddNodes(window.treeObj, params.parentId, [params])
       })
     }
   }