@operato/scene-visualizer 1.2.14 → 1.2.16

package/src/rack-table.ts

@@ -285,28 +285,15 @@ export class RackTable3d extends RealObjectGroup {
   }
 
   createRacks() {
-    var { rotation = 0, shelfPattern, shelfLocations, shelves = 1 } = this.component.state
+    var { rotation = 0, shelfLocations, shelves = 1 } = this.component.state
 
     this.object3d.rotation.y = -rotation
-
-    if (shelfPattern) {
-      var shelfLocIds = []
-      for (var i = 0; i < shelves; i++) {
-        var locId = this.makeShelfString(shelfPattern, i + 1, shelves)
-        shelfLocIds.push(locId)
-      }
-
-      shelfLocations = shelfLocIds.join(',')
-    }
-
-    // FIXME
-    // delete this.model.shelfPattern
-
     ;(this.component as RackTable).components.forEach((cell: Component) => {
       let { shelfLocations: shelfLoc = shelfLocations, isEmpty } = cell.state
 
-      var rackLocationIds = ((shelfLoc as string) || '').split(/\s*,\s*/).filter(l => !!l)
-      if (!isEmpty || rackLocationIds?.length == shelves) {
+      if (!isEmpty) {
+        cell.setState('shelfLocations', shelfLoc)
+
         var rack = new Rack(cell)
         rack.update()
         this.object3d.add(rack.object3d)
@@ -1257,10 +1244,6 @@ export class RackTable extends ContainerAbstract {
       )
     }
 
-    if ('shelfLocations' in after) {
-      delete this.model.shelfPattern
-    }
-
     this.invalidate()
   }
 

package/src/stock.ts

@@ -154,6 +154,10 @@ export class Stock extends RealObject<THREE.Mesh> {
   }
 
   onchangeStockData(data: any) {
+    this.object3d.userData = {
+      ...this.object3d.userData,
+      data
+    }
     var visualizer = this.visualizer
 
     if (!(visualizer && visualizer && visualizer!.legendTarget && visualizer!.legendTarget.get('status'))) return
@@ -226,27 +230,23 @@ export class Stock extends RealObject<THREE.Mesh> {
   onmouseup(e: MouseEvent, visualizer: Visualizer, callback: (arg: { data: any; location: string }) => void) {
     if (!this.object3d.visible) return
 
-    if (!this.object3d.userData || Object.keys(this.object3d.userData).length === 0)
+    if (!this.object3d.userData || !this.object3d.userData.data)
       this.object3d.userData = {
         ...this.object3d.userData,
-        loc: this.object3d.name,
-        items: [
-          {
-            loc: this.object3d.name
-          }
-        ]
+        data: {
+          loc: this.object3d.name,
+          items: [
+            {
+              loc: this.object3d.name
+            }
+          ]
+        }
       }
 
     if (callback && typeof callback == 'function') {
-      var data = Object.assign(
-        {
-          color: '#' + (this.object3d.material as any).color?.getHexString()
-        },
-        this.object3d.userData
-      )
       callback({
-        data: {},
-        location: 'right-top'
+        ...this.object3d.userData.data,
+        color: '#' + (this.object3d.material as any).color?.getHexString()
       })
     }
   }

package/src/three-container.ts

@@ -392,7 +392,6 @@ export class ThreeContainer extends Container implements ThreeDimensionalContain
     div.style.position = 'absolute'
     div.style.top = '0'
     div.style.pointerEvents = 'none'
-    div.setAttribute('aaaabbbb', '1')
 
     if (this.app.isViewMode) {
       // disableAllUserEvents(div)

package/src/visualizer.ts

@@ -241,6 +241,7 @@ export class Visualizer extends ThreeContainer {
             id = 'id'
           }
 
+          // 하나의 로케이션에 여러 레코드 정보가 올 수 있으므로, 하나이 로케이션의 스탁정보를 items 배열에 담는다.
           if (acc[value[id]]) {
             if (!acc[value[id]]['items']) {
               var clone = JSON.parse(JSON.stringify(acc[value[id]]))
@@ -260,7 +261,7 @@ export class Visualizer extends ThreeContainer {
       /**
        *  Object type data
        *  (e.g. data: {
-       *    'location1': {description: 'description'},
+       *    'location1': { items: [{ qty: 10, description: 'description', ... }, ...] },
        *    ...
        *  })
        */
@@ -302,7 +303,10 @@ export class Visualizer extends ThreeContainer {
         if (ref && (realObject as any).onmouseup) {
           ;(realObject as any).onmouseup(e, this, (data: any) => {
             ScenePopup.show(this, ref, {
-              ...data,
+              data,
+              modal: false,
+              closable: true,
+              output: false,
               location: this.state.popupPosition || 'right-top'
             })
           })
@@ -311,6 +315,7 @@ export class Visualizer extends ThreeContainer {
         ;(realObject as any)._focused = true
         ;(realObject as any)._focusedAt = performance.now()
         this._lastFocused = realObject
+        realObject.component?.trigger('click', e)
       } else {
         ScenePopup.hide(this.root)
       }