fl-web-component 1.2.4 → 1.2.5

package/dist/fl-web-component.css

@@ -1 +1 @@
-@charset "UTF-8";#fl-model[data-v-581c5bb4],#konva-container[data-v-1eba8e28]{width:100%;height:100%;cursor:pointer}#konva-container[data-v-1eba8e28]{z-index:3;overflow:hidden}span[data-v-f547d5c6]{font-weight:bolder}.text[data-v-f547d5c6]{margin-top:20px}.line[data-v-f547d5c6]{border-bottom:1px solid #dcdfe6;margin:20px 0}.center[data-v-f547d5c6]{display:flex;flex-direction:column;align-items:center}.center .cen span[data-v-f547d5c6],.center .top span[data-v-f547d5c6]{color:"#53a8ff";display:inline-block;width:30px;height:30px;text-align:center;line-height:30px;border:1px solid;padding:5px;margin-bottom:10px;background-color:#e9f3ff}.center .cen span[data-v-f547d5c6]{margin:10px}.button[data-v-f547d5c6]{display:flex;justify-content:end;margin-top:20px}@font-face{font-family:iconfont;src:url(//at.alicdn.com/t/font_3226805_qqvo3ag3r8.woff2?t=1646635700216) format("woff2"),url(//at.alicdn.com/t/font_3226805_qqvo3ag3r8.woff?t=1646635700216) format("woff"),url(//at.alicdn.com/t/font_3226805_qqvo3ag3r8.ttf?t=1646635700216) format("truetype")}.iconfont[data-v-f547d5c6]{font-family:iconfont!important;font-size:50px;font-style:normal;color:"#53a8ff";-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-shubiao[data-v-f547d5c6]:before{content:""}#svg-tigger[data-v-0ec35ee4]{cursor:pointer;height:100%;width:100%}
+@charset "UTF-8";#fl-model[data-v-0134be08],#konva-container[data-v-1eba8e28]{width:100%;height:100%;cursor:pointer}#konva-container[data-v-1eba8e28]{z-index:3;overflow:hidden}span[data-v-f547d5c6]{font-weight:bolder}.text[data-v-f547d5c6]{margin-top:20px}.line[data-v-f547d5c6]{border-bottom:1px solid #dcdfe6;margin:20px 0}.center[data-v-f547d5c6]{display:flex;flex-direction:column;align-items:center}.center .cen span[data-v-f547d5c6],.center .top span[data-v-f547d5c6]{color:"#53a8ff";display:inline-block;width:30px;height:30px;text-align:center;line-height:30px;border:1px solid;padding:5px;margin-bottom:10px;background-color:#e9f3ff}.center .cen span[data-v-f547d5c6]{margin:10px}.button[data-v-f547d5c6]{display:flex;justify-content:end;margin-top:20px}@font-face{font-family:iconfont;src:url(//at.alicdn.com/t/font_3226805_qqvo3ag3r8.woff2?t=1646635700216) format("woff2"),url(//at.alicdn.com/t/font_3226805_qqvo3ag3r8.woff?t=1646635700216) format("woff"),url(//at.alicdn.com/t/font_3226805_qqvo3ag3r8.ttf?t=1646635700216) format("truetype")}.iconfont[data-v-f547d5c6]{font-family:iconfont!important;font-size:50px;font-style:normal;color:"#53a8ff";-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-shubiao[data-v-f547d5c6]:before{content:""}#svg-tigger[data-v-0ec35ee4]{cursor:pointer;height:100%;width:100%}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fl-web-component",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "scripts": {
     "tip1": "仅调试本组件不涉及业务组件,请执行dev",
     "dev": "vue-cli-service serve",

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

@@ -168,7 +168,7 @@
         renderer.autoClearStencil = false;
       },
       initScene() {
-        modelGroup = new this.THREE.Group();
+        // modelGroup = new this.THREE.Group();
         scene = new this.THREE.Scene();
       },
       initCamera() {
@@ -216,6 +216,7 @@
         }
         const { instances, drawObjs } = parseData(data);
         if (instances.length > 0) {
+          modelGroup = new this.THREE.Group();
           modelGroup = handleInstancedMeshModel(
             instances,
             drawObjs,
@@ -669,26 +670,39 @@
       // 删除场景中所有的实体
       removeAll() {
         if (scene) {
-          scene.traverse(item => {
-            item.material && item.material.dispose();
-            item.geometry && item.geometry.dispose();
-            if (item instanceof this.THREE.Mesh) {
+          this.removeTraverse()
+        }
+      },
+      removeTraverse() {
+        let length = modelGroup.children.length
+        if (length > 0) {
+          let list = modelGroup.children[0]
+          list.traverse(item => {
+            if (item.isMesh) {
+              item.material.dispose();
+              item.geometry.dispose();
               item.clear();
+              modelGroup.remove(item);
             }
-            scene.remove(item);
           });
-          scene.clear();
+          modelGroup.remove(list);
+          this.removeTraverse();
+        } else {
+          // 在这里清除一些标记之类的
+          scene.traverse(item => {
+            scene.remove(item)
+          })
+          scene.remove(modelGroup);
+          renderer.clear();
+          modelGroup = null
         }
+
       },
       // 销毁场景 释放内存
       destroyScene() {
         cancelAnimationFrame(animateId);
         if (scene) {
-          scene.traverse(child => {
-            child.material && child.material.dispose();
-            child.geometry && child.geometry.dispose();
-            child = null;
-          });
+          this.removeTraverse();
           scene.clear();
           scene = null;
         }