@operato/scene-visualizer 1.2.15 → 1.2.17

package/logs/connections-2023-03-12-00.log

@@ -0,0 +1,35 @@
+2023-03-12T00:17:38+09:00 info: Initializing ConnectionManager...
+2023-03-12T00:17:38+09:00 info: Connector 'echo-back-server' started to ready
+2023-03-12T00:17:38+09:00 info: Connector 'echo-back' started to ready
+2023-03-12T00:17:38+09:00 info: Connector 'http-connector' started to ready
+2023-03-12T00:17:38+09:00 info: Connector 'graphql-connector' started to ready
+2023-03-12T00:17:38+09:00 info: Connector 'sqlite-connector' started to ready
+2023-03-12T00:17:38+09:00 info: Connector 'postgresql-connector' started to ready
+2023-03-12T00:17:38+09:00 info: Connector 'mqtt-connector' started to ready
+2023-03-12T00:17:38+09:00 info: Connector 'mssql-connector' started to ready
+2023-03-12T00:17:38+09:00 info: Connector 'oracle-connector' started to ready
+2023-03-12T00:17:38+09:00 info: Connector 'mysql-connector' started to ready
+2023-03-12T00:17:38+09:00 info: Connector 'socket-server' started to ready
+2023-03-12T00:17:38+09:00 info: echo-back-servers are ready
+2023-03-12T00:17:38+09:00 info: echo-back connections are ready
+2023-03-12T00:17:38+09:00 info: http-connector connections are ready
+2023-03-12T00:17:38+09:00 info: graphql-connector connections are ready
+2023-03-12T00:17:38+09:00 info: sqlite-connector connections are ready
+2023-03-12T00:17:38+09:00 info: postgresql-connector connections are ready
+2023-03-12T00:17:38+09:00 info: mqtt-connector connections are ready
+2023-03-12T00:17:38+09:00 info: mssql-connector connections are ready
+2023-03-12T00:17:38+09:00 info: oracle-connector connections are ready
+2023-03-12T00:17:38+09:00 info: mysql-connector connections are ready
+2023-03-12T00:17:38+09:00 info: socket servers are ready
+2023-03-12T00:17:38+09:00 info: All connector for 'echo-back-server' ready
+2023-03-12T00:17:38+09:00 info: All connector for 'echo-back' ready
+2023-03-12T00:17:38+09:00 info: All connector for 'http-connector' ready
+2023-03-12T00:17:38+09:00 info: All connector for 'graphql-connector' ready
+2023-03-12T00:17:38+09:00 info: All connector for 'sqlite-connector' ready
+2023-03-12T00:17:38+09:00 info: All connector for 'postgresql-connector' ready
+2023-03-12T00:17:38+09:00 info: All connector for 'mqtt-connector' ready
+2023-03-12T00:17:38+09:00 info: All connector for 'mssql-connector' ready
+2023-03-12T00:17:38+09:00 info: All connector for 'oracle-connector' ready
+2023-03-12T00:17:38+09:00 info: All connector for 'mysql-connector' ready
+2023-03-12T00:17:38+09:00 info: All connector for 'socket-server' ready
+2023-03-12T00:17:38+09:00 info: ConnectionManager initialization done:

package/package.json

@@ -2,7 +2,7 @@
   "name": "@operato/scene-visualizer",
   "description": "visualizer component for operato-scene",
   "author": "heartyoh",
-  "version": "1.2.15",
+  "version": "1.2.17",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "things-scene": true,
@@ -61,5 +61,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "ed4e6506e972485e11286f305aadb6ba3a8cb929"
+  "gitHead": "32c2556aee9cba6b549bf2d5156dc22cc8dfd550"
 }

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

@@ -217,61 +217,57 @@ export class Visualizer extends ThreeContainer {
   }
 
   onchangeData(): void {
-    var locationField = this.getState('locationField') || 'location'
-    var data = this.data
+    if (typeof this.data !== 'object') {
+      return
+    }
 
-    if (data) {
-      if (data instanceof Array) {
-        /**
-         *  Array type data
-         *  (e.g. data: [{
-         *    'loc' : 'location1',
-         *    'description': 'description1'
-         *  },
-         *  ...
-         *  ])
-         */
-
-        data = data.reduce((acc, value, i, arr) => {
-          var val = JSON.parse(JSON.stringify(value))
-          var id = locationField
-
-          if (!val[id]) {
-            // Rack 데이터가 아니면
-            id = 'id'
-          }
+    var data = this.data
+    var locationField = this.getState('locationField') || 'location'
 
-          if (acc[value[id]]) {
-            if (!acc[value[id]]['items']) {
-              var clone = JSON.parse(JSON.stringify(acc[value[id]]))
-              acc[value[id]] = { items: [] }
-              acc[value[id]]['items'].push(clone)
-            }
-          } else {
-            acc[value[id]] = { items: [] }
-          }
+    if (data instanceof Array) {
+      /**
+       *  Array type data
+       *  (e.g. data: [{
+       *    'location' : 'A0101-01',
+       *    'description': 'description1',
+       *    ...
+       *  }, {
+       *    ...
+       *  }])
+       */
 
-          acc[value[id]]['items'].push(val)
+      data = data.reduce((acc, value, i, arr) => {
+        var location = value[locationField]
 
+        if (!location) {
           return acc
-        }, {})
-      }
+        }
 
-      /**
-       *  Object type data
-       *  (e.g. data: {
-       *    'location1': {description: 'description'},
-       *    ...
-       *  })
-       */
-      for (var key in data) {
-        let id = key
-        if (data.hasOwnProperty(id)) {
-          let d = data[id]
-          let object = this.getObject(id)
-          if (object) {
-            ;(object as Stock).onchangeStockData(d)
-          }
+        // 하나의 로케이션에 여러 레코드 정보가 올 수 있으므로, 하나이 로케이션의 스탁정보를 items 배열에 담는다.
+        if (acc[location]) {
+          acc[location]['items'].push(value)
+        } else {
+          acc[location] = { items: [value] }
+        }
+
+        return acc
+      }, {})
+    }
+
+    /**
+     *  Object type data
+     *  (e.g. data: {
+     *    'A0101-01': { items: [{ location: 'A0101-01', qty: 10, description: 'description', ... }, {...}] },
+     *    ...
+     *  })
+     */
+    for (var key in data) {
+      let id = key
+      if (data.hasOwnProperty(id)) {
+        let d = data[id]
+        let object = this.getObject(id)
+        if (object) {
+          ;(object as Stock).onchangeStockData(d)
         }
       }
     }
@@ -299,10 +295,13 @@ export class Visualizer extends ThreeContainer {
       var realObject = object?.userData.context
 
       if (realObject) {
-        if (ref && (realObject as any).onmouseup) {
+        if (ref && realObject instanceof Stock) {
           ;(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'
             })
           })