Merge remote-tracking branch 'origin/jx-test' into jx-test

src/modules/gstore/GstorePropertySetter.ts

@@ -12,6 +12,10 @@ const propertySetter: PropertySetter = {
       {
         dataPath: 'dt.strokeWidth', label: '边线宽度', input: 'InputNumber',
         inputProps: {}
+      },
+      {
+        dataPath: 'originId', label: 'originId', input: 'InputNumber',
+        inputProps: {}
       }
     ]
   }

src/modules/gstore/GstoreRenderer.ts

@@ -131,6 +131,15 @@ export default class GstoreRenderer extends BaseRenderer {
       const wrap1 = this.wallManager.create(item.id + '_' + i, {})
       wrap1.setMatrix4(tempMatrix)
     })
+
+    // 创建一个 id 标签
+    this.tempViewport.labelManager.createOrUpdateMeshLabel(object, '' + item.id, {
+      name: Constract.WAY_ID_LABEL,
+      useHtmlLabel: false,
+      fontSize: 0.2,
+      color: '#000000',
+      offset: new THREE.Vector3(0, 0, 0)
+    })
   }
 
   dispose() {

src/modules/rack/RackPropertySetter.ts

@@ -58,6 +58,10 @@ const propertySetter: PropertySetter = {
              *   }
              * }
              */
+          {
+            dataPath: 'originId', label: 'originId', input: 'InputNumber',
+            inputProps: {}
+          }
         ],
     },
 };

src/modules/rack/RackRenderer.ts

@@ -40,6 +40,15 @@ export default class RackRenderer extends BaseRenderer {
       THREE.MathUtils.degToRad(item.tf[1][1]),
       THREE.MathUtils.degToRad(item.tf[1][2])
     )
+
+    // 创建一个 id 标签
+    this.tempViewport.labelManager.createOrUpdateMeshLabel(point, '' + item.id, {
+      name: Constract.WAY_ID_LABEL,
+      useHtmlLabel: false,
+      fontSize: 0.2,
+      color: '#000000',
+      offset: new THREE.Vector3(point.position.x, 0, point.position.z)
+    })
   }
 
   createLine(start: ItemJson, end: ItemJson, type: LinkType, option?: RendererCudOption) {

src/modules/way/WayPropertySetter.ts

@@ -12,7 +12,11 @@ const propertySetter: PropertySetter = {
       {
         dataPath: 'logicY', label: 'LogicY', input: 'InputNumber',
         inputProps: {}
-      }
+      },
+      {
+        dataPath: 'originId', label: 'originId', input: 'InputNumber',
+        inputProps: {}
+      },
     ]
   }
 }

src/utils/AmrMapConvert.ts

@@ -261,7 +261,7 @@ export function AmrMapConvert(from: any): Array<ItemJson> {
   let maxX = NaN, maxY = NaN, minX = NaN, minY = NaN
   for (const amrNode of from.businessMap[0].mapData) {
     amrIdMap.set(amrNode.id, amrNode)
-    const lccId = amrNode.logicX + '_' + amrNode.logicY
+    const lccId = _.toString(amrNode.id) // amrNode.logicX + '_' + amrNode.logicY
     // if (lccId === '105_105') {
     //   debugger
     // }
@@ -308,7 +308,8 @@ export function AmrMapConvert(from: any): Array<ItemJson> {
     }
 
     if (insertNode) {
-      insertNode.originId = amrNode.id
+      // insertNode.originId = amrNode.id
+      // insertNode.name = _.toString(amrNode.id)
       insertNode.tf[0][0] = new Decimal(amrNode.x).div(d100).toNumber()
       insertNode.tf[0][2] = new Decimal(amrNode.y).div(d100).toNumber()
       insertNode.logicX = amrNode.logicX
@@ -345,8 +346,8 @@ export function AmrMapConvert(from: any): Array<ItemJson> {
         continue
       }
 
-      const startLccId = startNode.logicX + '_' + startNode.logicY
-      const endLccId = endNode.logicX + '_' + endNode.logicY
+      const startLccId = _.toString(dg.startSite) // startNode.logicX + '_' + startNode.logicY
+      const endLccId = _.toString(dg.endSite)  // endNode.logicX + '_' + endNode.logicY
       if (!lccMap.get(startLccId) || !lccMap.get(endLccId)) {
         console.warn('未找到起点或终点 LCC 节点', startLccId, endLccId)
         continue