fl-web-component 1.2.7 → 1.2.9

package/README.md

@@ -46,6 +46,10 @@ Vue.use(FlWebComponent)
 欢迎贡献代码和问题反馈。
 
 ## 更新日志
+- 1.2.9 2025-06-19
+1. fix: matrix 容错
+- 1.2.8 2025-06-19
+1. 修改removeAll清除时drawObjMapInstance都清空
 - 1.2.7 2025-06-19
 1. 修复removeAll方法不生效问题
 - 1.2.6 2025-06-18

package/dist/fl-web-component.common.js

@@ -2643,6 +2643,13 @@ Factory_1.Factory.addGetterSetter(TextPath, 'kerningFunc', undefined);
 
 /***/ }),
 
+/***/ "2d03":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
+/***/ }),
+
 /***/ "2fb2":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -2685,6 +2692,17 @@ exports.FastLayer = FastLayer;
 FastLayer.prototype.nodeType = 'FastLayer';
 (0, Global_1._registerNode)(FastLayer);
 
+/***/ }),
+
+/***/ "3341":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_9d23b864_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("2d03");
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_9d23b864_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_9d23b864_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "3583":
@@ -22245,17 +22263,6 @@ Factory_1.Factory.addGetterSetter(Node_1.Node, 'green', 0, function (val) {
 });
 Factory_1.Factory.addGetterSetter(Node_1.Node, 'blue', 0, Validators_1.RGBComponent, Factory_1.Factory.afterSetFilter);
 
-/***/ }),
-
-/***/ "9111":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_9c3a6c50_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("a031");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_9c3a6c50_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_9c3a6c50_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "926b":
@@ -23370,13 +23377,6 @@ exports.Util = {
 
 /***/ }),
 
-/***/ "a031":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-
 /***/ "a34e":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -29241,8 +29241,8 @@ if (typeof window !== 'undefined') {
 // Indicate to webpack that this file can be concatenated
 /* harmony default export */ var setPublicPath = (null);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b0e1558-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/com-graphics/index.vue?vue&type=template&id=9c3a6c50&scoped=true
-var com_graphicsvue_type_template_id_9c3a6c50_scoped_true_render = function render() {
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"b052779e-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/com-graphics/index.vue?vue&type=template&id=9d23b864&scoped=true
+var com_graphicsvue_type_template_id_9d23b864_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -29253,7 +29253,7 @@ var com_graphicsvue_type_template_id_9c3a6c50_scoped_true_render = function rend
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/components/com-graphics/index.vue?vue&type=template&id=9c3a6c50&scoped=true
+// CONCATENATED MODULE: ./packages/components/com-graphics/index.vue?vue&type=template&id=9d23b864&scoped=true
 
 // CONCATENATED MODULE: ./node_modules/camera-controls/dist/camera-controls.module.js
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
@@ -57174,7 +57174,7 @@ function parseData(input) {
         return g.id === primitive.prmid;
       });
       if (primitiveData) {
-        var _input$material;
+        var _input$material, _primitive$matrix;
         var material = (_input$material = input.material) === null || _input$material === void 0 ? void 0 : _input$material.find(function (m) {
           return m.id === primitiveData.material;
         });
@@ -57187,9 +57187,10 @@ function parseData(input) {
           // 默认值
           linewidth: (material === null || material === void 0 ? void 0 : material.linewidth) !== undefined ? material === null || material === void 0 ? void 0 : material.linewidth : 1 // 默认值
         };
+        var identity = new Matrix4().identity();
         geomList.push({
           matrix: {
-            val: primitive.matrix
+            val: (_primitive$matrix = primitive.matrix) !== null && _primitive$matrix !== void 0 && _primitive$matrix.length ? primitive.matrix : identity.elements
           },
           prmid: primitive.prmid,
           geomId: primitiveData.id,
@@ -57197,7 +57198,7 @@ function parseData(input) {
           text: primitiveData.geomText,
           points: primitiveData.position,
           normals: primitiveData.normal,
-          triangles: primitiveData.indices,
+          triangles: primitiveData.indices || [],
           max: primitiveData.max,
           min: primitiveData.min,
           prop: prop
@@ -59417,9 +59418,10 @@ var drawObjMapInstance = {};
  * @param {Object} instance - 实例对象，包含绘制对象ID和实例ID等数据
  * @param {Array} drawObjs - 绘制对象数组，包含几何数据
  */
-function handleInstancedMeshModel(instances, drawObjs, type, scene, customColor, meshNameConfig, customOpacity) {
+function handleInstancedMeshModel(modelGroup, instances, drawObjs, type, scene, customColor, meshNameConfig, customOpacity) {
+  drawObjMapInstance = {};
   // 第一阶段：构建实例映射表
-  var modelGroup = new Group();
+  // let modelGroup = new THREE.Group();
   for (var i = 0; i < instances.length; i++) {
     formatInstancedMap(instances[i], drawObjs);
   }
@@ -61178,7 +61180,7 @@ var guiParams = {
         instances = _parseData.instances,
         drawObjs = _parseData.drawObjs;
       if (instances.length > 0) {
-        com_graphicsvue_type_script_lang_js_modelGroup = handleInstancedMeshModel(instances, drawObjs, '', com_graphicsvue_type_script_lang_js_scene, color, meshNameConfig);
+        handleInstancedMeshModel(com_graphicsvue_type_script_lang_js_modelGroup, instances, drawObjs, '', com_graphicsvue_type_script_lang_js_scene, color, meshNameConfig);
         var modelBox3 = new this.THREE.Box3();
         modelBox3.expandByObject(com_graphicsvue_type_script_lang_js_modelGroup);
         var modelWorldPs = new this.THREE.Vector3().addVectors(modelBox3.max, modelBox3.min).multiplyScalar(0.5);
@@ -61217,6 +61219,7 @@ var guiParams = {
         });
         // cameraControls.fitToSphere(scene, true); // TODO 待处理，先用 setModelCenter 进行定位
         this.setModelCenter(com_graphicsvue_type_script_lang_js_modelGroup);
+        console.log(com_graphicsvue_type_script_lang_js_modelGroup);
         this.$emit('modelLoaded');
         // cameraControls.saveState();
       }
@@ -61618,12 +61621,11 @@ var guiParams = {
         this.removeTraverse();
       } else {
         // 在这里清除一些标记之类的
+        com_graphicsvue_type_script_lang_js_modelGroup.clear();
         com_graphicsvue_type_script_lang_js_scene.remove(com_graphicsvue_type_script_lang_js_modelGroup);
         com_graphicsvue_type_script_lang_js_renderer.clear();
         com_graphicsvue_type_script_lang_js_modelGroup = null;
         com_graphicsvue_type_script_lang_js_modelGroup = new this.THREE.Group();
-        this.initCamera();
-        this.initControl();
       }
     },
     // 销毁场景 释放内存
@@ -62357,8 +62359,8 @@ var guiParams = {
 });
 // CONCATENATED MODULE: ./packages/components/com-graphics/index.vue?vue&type=script&lang=js
  /* harmony default export */ var components_com_graphicsvue_type_script_lang_js = (com_graphicsvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./packages/components/com-graphics/index.vue?vue&type=style&index=0&id=9c3a6c50&prod&lang=scss&scoped=true
-var com_graphicsvue_type_style_index_0_id_9c3a6c50_prod_lang_scss_scoped_true = __webpack_require__("9111");
+// EXTERNAL MODULE: ./packages/components/com-graphics/index.vue?vue&type=style&index=0&id=9d23b864&prod&lang=scss&scoped=true
+var com_graphicsvue_type_style_index_0_id_9d23b864_prod_lang_scss_scoped_true = __webpack_require__("3341");
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
 /* globals __VUE_SSR_CONTEXT__ */
@@ -62469,17 +62471,17 @@ function normalizeComponent(
 
 var component = normalizeComponent(
   components_com_graphicsvue_type_script_lang_js,
-  com_graphicsvue_type_template_id_9c3a6c50_scoped_true_render,
+  com_graphicsvue_type_template_id_9d23b864_scoped_true_render,
   staticRenderFns,
   false,
   null,
-  "9c3a6c50",
+  "9d23b864",
   null
   
 )
 
 /* harmony default export */ var com_graphics = (component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b0e1558-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/com-flcanvas/index.vue?vue&type=template&id=1eba8e28&scoped=true
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"b052779e-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/com-flcanvas/index.vue?vue&type=template&id=1eba8e28&scoped=true
 var com_flcanvasvue_type_template_id_1eba8e28_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -65678,7 +65680,7 @@ var com_flcanvas_component = normalizeComponent(
 )
 
 /* harmony default export */ var com_flcanvas = (com_flcanvas_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b0e1558-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/com-graphics/per-control.vue?vue&type=template&id=f547d5c6&scoped=true
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"b052779e-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/com-graphics/per-control.vue?vue&type=template&id=f547d5c6&scoped=true
 var per_controlvue_type_template_id_f547d5c6_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -65786,7 +65788,7 @@ var per_control_component = normalizeComponent(
 )
 
 /* harmony default export */ var per_control = (per_control_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b0e1558-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/com-graphics/pid.vue?vue&type=template&id=0ec35ee4&scoped=true
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"b052779e-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/com-graphics/pid.vue?vue&type=template&id=0ec35ee4&scoped=true
 var pidvue_type_template_id_0ec35ee4_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;