fl-web-component 1.0.8 → 1.0.9

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "fl-web-component",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint \"{src,packages}/**/*.{vue,js}\" --fix",
     "prettier": "prettier --write  \"packages/**/*.{js,css,less,scss,vue,html}\"",
     "watch": "npm run lint && vue-cli-service build --watch --mode production --target lib --name fl-web-component ./src/main.js",
-    "build": "npm run lint && vue-cli-service build --target lib --name fl-web-component ./src/main.js"
+    "build": "npm run lint && vue-cli-service build --target lib --name fl-web-component ./src/main.js",
+    "publish": "npm run build && npm publish"
   },
   "files": [
     "dist",

package/packages/components/com-graphics/index.vue

@@ -79,6 +79,7 @@ var roamConfig = {
     },
     data() {
       return {
+        arrowImg: require('@/assets/arrow-right.png'),
       };
     },
     created() {
@@ -584,7 +585,7 @@ var roamConfig = {
           curve = new this.THREE.CatmullRomCurve3(route, false, 'catmullrom', 0);
           const geometry = new this.THREE.TubeGeometry(curve, 5000, 0.5, 4);
           //加载纹理
-          lineTexture = new this.THREE.TextureLoader().load('/static/arrow/arrow-right.png');
+          lineTexture = new this.THREE.TextureLoader().load(this.arrowImg);
           lineTexture.wrapS = this.THREE.RepeatWrapping;
           lineTexture.wrapT = this.THREE.RepeatWrapping;
           lineTexture.repeat.set(20, 1); //水平重复20次

package/src/utils/instance-parser.js

@@ -31,72 +31,64 @@ function handleInstancedMeshModel(instances, drawObjs, type, scene, customColor,
   for (let i = 0; i < instances.length; i++) {
     formatInstancedMap(instances[i], drawObjs);
   }
-  console.log('drawObjMapInstance', drawObjMapInstance)
   // 第二阶段：遍历所有实例进行处理
   for (let i = 0; i < instances.length; i++) {
     let targetGroup, instancedMeshIndex, drawObjectName;
-    // for (let drawObjectId in drawObjMapInstance) {
-    //   const drawObj = drawObjMapInstance[drawObjectId];
-    //   drawObj.MapInstance.forEach((instance, index) => {
-    //     if (instance.instanceId == instances[i].instanceId) {
-    //       instancedMeshIndex = index;
-    //       drawObjectName = drawObjectId;
-    //     }
-    //   });
-    // }
-
     const drawObjInstance = drawObjMapInstance[instances[i].drawObject];
-    drawObjInstance.MapInstance.forEach((instance, index) => {
-      if (instance.instanceId == instances[i].instanceId) {
-        instancedMeshIndex = index;
-        drawObjectName = instances[i].drawObject;
-      }
-    });
-    if (drawObjectName) {
-      targetGroup = scene.getObjectByName(drawObjectName);
-    }
-
-    if (!targetGroup) {
-      const drawObj = drawObjMapInstance[instances[i].drawObject];
-      const group = new THREE.Group();
-      group.name = instances[i].drawObject;
-      group.userData.isInstancedMeshGroup = true;
-
-      const instanceCount = drawObj.MapInstance.length;
-      drawObj.MapMesh?.forEach(mesh => {
-        const model = drawModel(mesh, group.name, instanceCount, customColor);
-        if (!model) {
-          return;
-        }
-        let meshName = ''
-        for (const key in meshNameConfig) {
-          model.userData[key] = meshNameConfig[key]
-          meshName += ':' + meshNameConfig[key]
+    if (drawObjInstance.MapMesh.length > 0) {
+      drawObjInstance.MapInstance.forEach((instance, index) => {
+        if (instance.instanceId == instances[i].instanceId) {
+          instancedMeshIndex = index;
+          drawObjectName = instances[i].drawObject;
         }
-        drawObj.MapInstance.forEach((instance, index) => {
-          if (instance.instanceId == instances[i].instanceId) {
-            model.userData.instanceIndex = index;
-            model.name = meshName !== '' ? (instances[i].instanceId + meshName) : instances[i].instanceId;
-            const matrixVal = instance.matrix?.val;
-            if (matrixVal) {
-              const m4 = new THREE.Matrix4();
-              // m4.setPosition(new THREE.Vector3(9999999, 9999999, 9999999)); // TODO 临时隐藏方案
-              m4.elements = instance.matrix.val;
-              model.setMatrixAt(index, m4);
-            }
-            // 需要先设置全部实例颜色，否则后续设置颜色无效
-            const { color } = mesh.prop;
-            const meshColor = customColor
-              ? new THREE.Color(customColor)
-              : new THREE.Color(`rgb(${color[0]}, ${color[1]}, ${color[2]})`);
-            model.setColorAt(index, meshColor);
+      });
+      if (drawObjectName) {
+        targetGroup = scene.getObjectByName(drawObjectName);
+      }
+  
+      if (!targetGroup) {
+        const drawObj = drawObjMapInstance[instances[i].drawObject];
+        const group = new THREE.Group();
+        group.name = instances[i].drawObject;
+        group.userData.isInstancedMeshGroup = true;
+  
+        const instanceCount = drawObj.MapInstance.length;
+        drawObj.MapMesh?.forEach(mesh => {
+          const model = drawModel(mesh, group.name, instanceCount, customColor);
+          if (!model) {
+            return;
           }
+          let meshName = ''
+          for (const key in meshNameConfig) {
+            model.userData[key] = meshNameConfig[key]
+            meshName += ':' + meshNameConfig[key]
+          }
+          drawObj.MapInstance.forEach((instance, index) => {
+            if (instance.instanceId == instances[i].instanceId) {
+              model.userData.instanceIndex = index;
+              model.name = meshName !== '' ? (instances[i].instanceId + meshName) : instances[i].instanceId;
+              const matrixVal = instance.matrix?.val;
+              if (matrixVal) {
+                const m4 = new THREE.Matrix4();
+                // m4.setPosition(new THREE.Vector3(9999999, 9999999, 9999999)); // TODO 临时隐藏方案
+                m4.elements = instance.matrix.val;
+                model.setMatrixAt(index, m4);
+              }
+              // 需要先设置全部实例颜色，否则后续设置颜色无效
+              const { color } = mesh.prop;
+              const meshColor = customColor
+                ? new THREE.Color(customColor)
+                : new THREE.Color(`rgb(${color[0]}, ${color[1]}, ${color[2]})`);
+              model.setColorAt(index, meshColor);
+            }
+          });
+          // model.instanceColor.needsUpdate = true;
+          group.add(model);
         });
-        // model.instanceColor.needsUpdate = true;
-        group.add(model);
-      });
-      modelGroup.add(group);
+        modelGroup.add(group);
+      }
     }
+
   }
   console.log('modelGroup', modelGroup)
   return modelGroup;