@abi-software/scaffoldvuer 0.1.52-beta.3 → 0.1.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/scaffoldvuer",
-  "version": "0.1.52-beta.3",
+  "version": "0.1.52",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -22,9 +22,9 @@
     "*.js"
   ],
   "dependencies": {
-    "@abi-software/svg-sprite": "^0.1.14",
+    "@abi-software/svg-sprite": "^0.1.15",
     "axios": "^0.21.2",
-    "core-js": "^3.3.2",
+    "core-js": "^3.22.5",
     "current-script-polyfill": "^1.0.0",
     "element-ui": "^2.13.0",
     "google-spreadsheet": "^3.1.15",
@@ -33,7 +33,7 @@
     "vue": "^2.6.10",
     "vue-drag-resize": "^1.3.2",
     "vue-router": "^3.5.1",
-    "zincjs": "^1.0.0-alpha-3"
+    "zincjs": "^1.0.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.0.0",

package/src/components/ScaffoldTooltip.vue

@@ -102,6 +102,15 @@ export default {
       }
     }
   }
+
+  &.el-popper[x-placement^="bottom"] {
+    .popper__arrow {
+      border-bottom-color: $app-primary-color !important;
+      &:after {
+        border-bottom-color: #fff !important;
+      }
+    }
+  }
 }
 
 .tooltipContainer {

package/src/components/ScaffoldVuer.vue

@@ -672,21 +672,28 @@ export default {
       cameracontrol.stopAutoTumble();
       this.isTransitioning = false;
     },
+    findObjectsWithGroupName: function(name) {
+      let objects = [];
+      if (name && name != "" && this.$module.scene) {
+        objects = this.$module.scene.findObjectsWithGroupName(name);
+      }
+      return objects;
+    },
     /**
      * Focus on named region
      */
     viewRegion: function(name) {
-      if (name && name != "" && this.$module.scene) {
-        let objects = this.$module.scene.findObjectsWithGroupName(name);
-        let box = this.$module.scene.getBoundingBoxOfZincObjects(objects);
-        if (box) {
-          if (this.$module.isSyncControl()) {
-            this.$module.setSyncControlZoomToBox(box);
-          } else {
-            this.$module.scene.viewAllWithBoundingBox(box);
-          }
+      let objects = this.findObjectsWithGroupName(name);
+      let box = this.$module.scene.getBoundingBoxOfZincObjects(objects);
+      if (box) {
+        if (this.$module.isSyncControl()) {
+          this.$module.setSyncControlZoomToBox(box);
+        } else {
+          this.$module.scene.viewAllWithBoundingBox(box);
         }
+        return true;
       }
+      return false;
     },
     setFocusedRegion: function(name) {
       if (name) {
@@ -753,6 +760,7 @@ export default {
         this.$emit("scaffold-selected", event.identifiers);
       } else if (event.eventType == 2) {
         this.tData.visible = false;
+        const offsets = this.$refs.scaffoldContainer.getBoundingClientRect();
         if (event.identifiers[0]) {
           let id = event.identifiers[0].data.id
             ? event.identifiers[0].data.id
@@ -760,8 +768,8 @@ export default {
           if (event.identifiers[0].coords) {
             this.tData.visible = true;
             this.tData.label = id;
-            this.tData.x = event.identifiers[0].coords.x;
-            this.tData.y =event.identifiers[0].coords.y;
+            this.tData.x = event.identifiers[0].coords.x - offsets.left;
+            this.tData.y = event.identifiers[0].coords.y - offsets.top;
           }
           if (this.$refs.treeControl) {
             let region = event.identifiers[0].data.region;
@@ -775,8 +783,9 @@ export default {
       } else if (event.eventType == 3)  { //MOVE
         if (event.identifiers[0]) {
           if (event.identifiers[0].coords) {
-            this.tData.x = event.identifiers[0].coords.x;
-            this.tData.y = event.identifiers[0].coords.y;
+            const offsets = this.$refs.scaffoldContainer.getBoundingClientRect();
+            this.tData.x = event.identifiers[0].coords.x - offsets.left;
+            this.tData.y = event.identifiers[0].coords.y - offsets.top;
           }
         }
       }

package/src/scripts/RendererModule.js

@@ -47,7 +47,8 @@ RendererModule.prototype.getIntersectedObject = function(intersects) {
 				if (intersects[i].object &&
             intersects[i].object.userData && 
             intersects[i].object.userData.isZincObject && 
-            (intersects[i].object.name || 
+            ((intersects[i].object.name && 
+              intersects[i].object.name !== "_Unnamed") ||
             intersects[i].object.userData.isMarker))
 					return intersects[i];
 			}

package/vue.config.js

@@ -3,7 +3,7 @@ const nodeExternals = require('webpack-node-externals');
 module.exports = {
   configureWebpack: config => {
     if(process.env.NODE_ENV === 'production') {
-      config.externals =  [ nodeExternals() ];
+      config.externals =  [ nodeExternals({allowlist: [/^element-ui/]}) ];
     }
   },
   chainWebpack: config => {