fl-web-component 1.1.7 → 1.1.8

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

@@ -436,19 +436,20 @@
       },
       // 恢复模型原来的状态
       updateWholeProperty() {
-        if (scene) {
-          scene.traverse(obj => {
-            if (obj instanceof this.THREE.Mesh) {
-              // 恢复颜色
-              obj.setColorAt(obj.userData.instanceIndex, obj.material.userData.nColor)
-              obj.instanceColor.needsUpdate = true
-              // 修改可见性
-              const restoreMatrix = new this.THREE.Matrix4().copy(obj.userData.copyMatrix);
-              obj.setMatrixAt(index, restoreMatrix);
-              obj.instanceMatrix.needsUpdate = true;
-            }
-          });
-        }
+        throw(new Error('该方法已暂停使用，请使用restore方法。'))
+        // if (scene) {
+        //   scene.traverse(obj => {
+        //     if (obj instanceof this.THREE.Mesh) {
+        //       // 恢复颜色
+        //       obj.setColorAt(obj.userData.instanceIndex, obj.material.userData.nColor)
+        //       obj.instanceColor.needsUpdate = true
+        //       // 修改可见性
+        //       const restoreMatrix = new this.THREE.Matrix4().copy(obj.userData.copyMatrix);
+        //       obj.setMatrixAt(index, restoreMatrix);
+        //       obj.instanceMatrix.needsUpdate = true;
+        //     }
+        //   });
+        // }
       },
       // 清除上一次的属性修改操作 为了方便业务平台参数跟updateProperty方法的参数一样
       resetProperty(list) {
@@ -1280,7 +1281,7 @@
         });
       },
       //  添加自定义模型, 暂时只支持glb、gltf格式
-      addCustomModel(name, position, url, scale, immediately = false, callback) {
+      addCustomModel(name, position, url, scale = 1, immediately = false, callback) {
         const loader = new GLTFLoader()
         let locationModel = null;
         loader.load(url, (gltf) => {

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

@@ -39,7 +39,8 @@
         this.onWindowResize;
       });
       svgEmbed.addEventListener('load', () => {
-        console.log(svgPanZoom)
+        preTargetCon.splice(0)
+        preTargetStyle.splice(0)
         svgTigger = svgPanZoom('#svg-tigger', {
           viewportSelector: '.svg-pan-zoom_viewport',
           panEnabled: true,
@@ -109,7 +110,7 @@
       /*
       参数：svgIds: [], 需要高亮的id的集合， flag: true / false, 是否要定位目标元素, color: '', 高亮的颜色
     */
-      highLight(svgIds, flag, color) {
+      highLight(svgIds, flag = false, color) {
         console.log(svgIds)
         if (svgIds === null || svgIds === undefined) {
           throw new Error('svgIds should be an array');

package/src/utils/instance-parser.js

@@ -99,6 +99,7 @@ function handleInstancedMeshModel(instances, drawObjs, type, scene, customColor,
 
   }
   console.log('modelGroup', modelGroup)
+  console.log('drawObjMapInstance', drawObjMapInstance)
   return modelGroup;
   // timeRender();
   // console.log('scene', scene)