fl-web-component 1.3.17 → 1.3.19

package/README.md

@@ -46,6 +46,12 @@ Vue.use(FlWebComponent)
 欢迎贡献代码和问题反馈。
 
 ## 更新日志
+- 1.3.19 2025-10-31
+1. 修复多引用问题
+- 1.3.18 2025-10-30
+1. 修复pidbug
+- 1.3.17 2025-09-28
+1. 修复pidbug
 - 1.3.16 2025-09-18
 1. 相机设置自动调整
 2. 处理多渲染实例的问题

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

@@ -1194,13 +1194,6 @@ Factory_1.Factory.addGetterSetter(Layer, 'hitGraphEnabled', true, (0, Validators
 
 /***/ }),
 
-/***/ "101a":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-
 /***/ "122f":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -5885,12 +5878,12 @@ Factory_1.Factory.addGetterSetter(Text, 'textDecoration', '');
 
 /***/ }),
 
-/***/ "596c":
+/***/ "5b29":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_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_1_id_c496e868_prod_lang_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("101a");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_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_1_id_c496e868_prod_lang_css__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_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_1_id_c496e868_prod_lang_css__WEBPACK_IMPORTED_MODULE_0__);
+/* 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_1bdd1986_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("b34b");
+/* 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_1bdd1986_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_1bdd1986_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -9110,6 +9103,24 @@ module.exports = JSON.parse("{\"glyphs\":{\"0\":{\"x_min\":73,\"x_max\":715,\"ha
 
 /***/ }),
 
+/***/ "8298":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_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_1_id_1bdd1986_prod_lang_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("8364");
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_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_1_id_1bdd1986_prod_lang_css__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_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_1_id_1bdd1986_prod_lang_css__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
+/***/ }),
+
+/***/ "8364":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
+/***/ }),
+
 /***/ "85b7":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -22291,7 +22302,7 @@ Factory_1.Factory.addGetterSetter(Node_1.Node, 'blue', 0, Validators_1.RGBCompon
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"name\":\"fl-web-component\",\"version\":\"1.3.17\",\"scripts\":{\"tip1\":\"仅调试本组件不涉及业务组件,请执行dev\",\"dev\":\"vue-cli-service serve\",\"lint\":\"eslint \\\"{src,packages}/**/*.{vue,js}\\\" --fix\",\"prettier\":\"prettier --write  \\\"packages/**/*.{js,css,less,scss,vue,html}\\\"\",\"=\":\"=============================================================\",\"tip2\":\"同时调试本组件与业务组件,请执行watch\",\"watch\":\"vue-cli-service build --watch --mode production --target lib --name fl-web-component --formats commonjs ./src/main.js\",\"build\":\"npm run lint && vue-cli-service build --target lib --name fl-web-component --formats commonjs ./src/main.js\",\"build:test\":\"vue-cli-service build --target lib --name fl-web-component --formats commonjs ./src/main.js\",\"publish:base\":\"npm run build && npm publish --registry https://registry.npmjs.org/\",\"==\":\"=============================================================\",\"tip3\":\"发版注意: 【修改bug执行publish:fix】【新增功能执行publish:feat】【新特性执行publish:perf】\",\"publish:fix\":\"npm version patch && npm run publish:base\",\"publish:feat\":\"npm version minor && npm run publish:base\",\"publish:perf\":\"npm version major && npm run publish:base\"},\"files\":[\"dist\",\"packages\",\"src\",\"patches\"],\"main\":\"dist/fl-web-component.common.js\",\"dependencies\":{\"camera-controls\":\"2.9.0\",\"core-js\":\"^3.42.0\",\"dxf-parser\":\"^1.1.2\",\"element-ui\":\"2.15.14\",\"html2canvas\":\"^1.4.1\",\"jspdf\":\"^3.0.1\",\"konva\":\"^9.3.14\",\"lodash\":\"^4.17.21\",\"meshline\":\"^3.3.1\",\"regenerator-runtime\":\"^0.14.1\",\"svg-pan-zoom\":\"^3.6.2\",\"three\":\"^0.176.0\",\"three.path\":\"^1.0.1\",\"vue\":\"^2.6.11\"},\"devDependencies\":{\"@babel/core\":\"^7.12.16\",\"@babel/preset-env\":\"^7.0.0\",\"@babel/runtime-corejs3\":\"^7.27.1\",\"@vue/cli-plugin-babel\":\"~4.4.0\",\"@vue/cli-plugin-eslint\":\"~4.4.0\",\"@vue/cli-service\":\"~4.4.0\",\"babel-eslint\":\"^10.1.0\",\"babel-loader\":\"^8.0.0\",\"copy-webpack-plugin\":\"^4.0.1\",\"eslint\":\"^6.7.2\",\"eslint-plugin-vue\":\"^6.2.2\",\"patch-package\":\"^6.4.7\",\"sass\":\"1.32.13\",\"sass-loader\":\"10.1.1\",\"vue-template-compiler\":\"^2.6.11\"},\"eslintConfig\":{\"root\":true,\"env\":{\"node\":true},\"extends\":[\"plugin:vue/essential\",\"eslint:recommended\"],\"parserOptions\":{\"parser\":\"babel-eslint\"},\"rules\":{}},\"browserslist\":[\"> 1%\",\"last 2 versions\",\"not dead\"]}");
+module.exports = JSON.parse("{\"name\":\"fl-web-component\",\"version\":\"1.3.19\",\"scripts\":{\"tip1\":\"仅调试本组件不涉及业务组件,请执行dev\",\"dev\":\"vue-cli-service serve\",\"lint\":\"eslint \\\"{src,packages}/**/*.{vue,js}\\\" --fix\",\"prettier\":\"prettier --write  \\\"packages/**/*.{js,css,less,scss,vue,html}\\\"\",\"=\":\"=============================================================\",\"tip2\":\"同时调试本组件与业务组件,请执行watch\",\"watch\":\"vue-cli-service build --watch --mode production --target lib --name fl-web-component --formats commonjs ./src/main.js\",\"build\":\"npm run lint && vue-cli-service build --target lib --name fl-web-component --formats commonjs ./src/main.js\",\"build:test\":\"vue-cli-service build --target lib --name fl-web-component --formats commonjs ./src/main.js\",\"publish:base\":\"npm run build && npm publish --registry https://registry.npmjs.org/\",\"==\":\"=============================================================\",\"tip3\":\"发版注意: 【修改bug执行publish:fix】【新增功能执行publish:feat】【新特性执行publish:perf】\",\"publish:fix\":\"npm version patch && npm run publish:base\",\"publish:feat\":\"npm version minor && npm run publish:base\",\"publish:perf\":\"npm version major && npm run publish:base\"},\"files\":[\"dist\",\"packages\",\"src\",\"patches\"],\"main\":\"dist/fl-web-component.common.js\",\"dependencies\":{\"camera-controls\":\"2.9.0\",\"core-js\":\"^3.42.0\",\"dxf-parser\":\"^1.1.2\",\"element-ui\":\"2.15.14\",\"html2canvas\":\"^1.4.1\",\"jspdf\":\"^3.0.1\",\"konva\":\"^9.3.14\",\"lodash\":\"^4.17.21\",\"meshline\":\"^3.3.1\",\"regenerator-runtime\":\"^0.14.1\",\"svg-pan-zoom\":\"^3.6.2\",\"three\":\"^0.176.0\",\"three.path\":\"^1.0.1\",\"vue\":\"^2.6.11\"},\"devDependencies\":{\"@babel/core\":\"^7.12.16\",\"@babel/preset-env\":\"^7.0.0\",\"@babel/runtime-corejs3\":\"^7.27.1\",\"@vue/cli-plugin-babel\":\"~4.4.0\",\"@vue/cli-plugin-eslint\":\"~4.4.0\",\"@vue/cli-service\":\"~4.4.0\",\"babel-eslint\":\"^10.1.0\",\"babel-loader\":\"^8.0.0\",\"copy-webpack-plugin\":\"^4.0.1\",\"eslint\":\"^6.7.2\",\"eslint-plugin-vue\":\"^6.2.2\",\"patch-package\":\"^6.4.7\",\"sass\":\"1.32.13\",\"sass-loader\":\"10.1.1\",\"vue-template-compiler\":\"^2.6.11\"},\"eslintConfig\":{\"root\":true,\"env\":{\"node\":true},\"extends\":[\"plugin:vue/essential\",\"eslint:recommended\"],\"parserOptions\":{\"parser\":\"babel-eslint\"},\"rules\":{}},\"browserslist\":[\"> 1%\",\"last 2 versions\",\"not dead\"]}");
 
 /***/ }),
 
@@ -23663,6 +23674,13 @@ Factory_1.Factory.addGetterSetter(Node_1.Node, 'alpha', 1, function (val) {
 
 /***/ }),
 
+/***/ "b34b":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
+/***/ }),
+
 /***/ "b5e0":
 /***/ (function(module, exports) {
 
@@ -28244,17 +28262,6 @@ Animation.animations = [];
 Animation.animIdCounter = 0;
 Animation.animRunning = false;
 
-/***/ }),
-
-/***/ "f046":
-/***/ (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_c496e868_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("f494");
-/* 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_c496e868_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_c496e868_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "f0b4":
@@ -28440,13 +28447,6 @@ Group.prototype.nodeType = 'Group';
 
 /***/ }),
 
-/***/ "f494":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-
 /***/ "f655":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -29274,8 +29274,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":"2ace760a-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=c496e868&scoped=true
-var com_graphicsvue_type_template_id_c496e868_scoped_true_render = function render() {
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"9df9ad46-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=1bdd1986&scoped=true
+var com_graphicsvue_type_template_id_1bdd1986_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -29286,7 +29286,7 @@ var com_graphicsvue_type_template_id_c496e868_scoped_true_render = function rend
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/components/com-graphics/index.vue?vue&type=template&id=c496e868&scoped=true
+// CONCATENATED MODULE: ./packages/components/com-graphics/index.vue?vue&type=template&id=1bdd1986&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)); }
@@ -59580,6 +59580,9 @@ function handleInstancedMeshModel(modelGroup, instances, drawObjs, type, scene,
             model.userData[_key] = meshNameConfig[_key];
             meshName += ':' + meshNameConfig[_key];
           }
+
+          // 初始化实例映射表
+          model.userData.instanceMaps = {};
           // 一次性为该 drawObject 的所有实例设置矩阵与颜色
           drawObj.MapInstance.forEach(function (item, index) {
             var _item$matrix;
@@ -59587,6 +59590,10 @@ function handleInstancedMeshModel(modelGroup, instances, drawObjs, type, scene,
             model.userData.instanceId = item.instanceId;
             model.userData.primId = mesh.prmid;
             model.name = meshName !== '' ? item.instanceId + meshName : item.instanceId;
+            model.userData.instanceMaps[item.instanceId] = {};
+            model.userData.instanceMaps[item.instanceId]['instanceIndex'] = index;
+            model.userData.instanceMaps[item.instanceId]['primId'] = mesh.prmid;
+            model.userData.instanceMaps[item.instanceId]['name'] = model.name;
             var matrixVal = (_item$matrix = item.matrix) === null || _item$matrix === void 0 ? void 0 : _item$matrix.val;
             if (matrixVal) {
               var m4 = new Matrix4();
@@ -59609,6 +59616,7 @@ function handleInstancedMeshModel(modelGroup, instances, drawObjs, type, scene,
               model.setMatrixAt(index, m4);
               var copyMatrix = new Matrix4().copy(m4);
               model.userData.copyMatrix = copyMatrix;
+              model.userData.instanceMaps[item.instanceId]['copyMatrix'] = copyMatrix;
             }
             // 需要先设置全部实例颜色，否则后续设置颜色无效
             var color = mesh.prop.color;
@@ -61519,6 +61527,7 @@ var guiParams = {
             }
           };
           if (intersects.length > 0) {
+            intersects[0].object.userData.currentInstanceIndex = intersects[0].instanceId;
             params = {
               objects: [intersects[0].object],
               mousePosition: {
@@ -61617,30 +61626,33 @@ var guiParams = {
           switch (key) {
             case 'color':
               targetObj.forEach(function (children) {
+                var instanceIndex = children.userData.instanceMaps[ele.name]['instanceIndex'];
                 if (children.isMesh) {
-                  children.setColorAt(children.userData.instanceIndex, new _this2.THREE.Color(ele.attr[key]));
+                  children.setColorAt(instanceIndex, new _this2.THREE.Color(ele.attr[key]));
                   children.instanceColor.needsUpdate = true;
                 }
               });
               break;
             case 'visible':
               targetObj.forEach(function (children) {
-                var index = children.userData.instanceIndex;
+                var instanceIndex = children.userData.instanceMaps[ele.name]['instanceIndex'];
+                var copyMatrix = children.userData.instanceMaps[ele.name]['copyMatrix'];
                 if (ele.attr[key]) {
-                  var restoreMatrix = new _this2.THREE.Matrix4().copy(children.userData.copyMatrix);
-                  children.setMatrixAt(index, restoreMatrix);
+                  var restoreMatrix = new _this2.THREE.Matrix4().copy(copyMatrix);
+                  children.setMatrixAt(instanceIndex, restoreMatrix);
                 } else {
-                  var offsetMatrix = new _this2.THREE.Matrix4().copy(children.userData.copyMatrix).makeTranslation(9999999, 9999999, 9999999);
-                  children.setMatrixAt(index, offsetMatrix);
+                  var offsetMatrix = new _this2.THREE.Matrix4().copy(copyMatrix).makeTranslation(9999999, 9999999, 9999999);
+                  children.setMatrixAt(instanceIndex, offsetMatrix);
                 }
                 children.instanceMatrix.needsUpdate = true;
               });
               break;
             case 'opacity':
+              var instanceIndex = children.userData.instanceMaps[ele.name]['instanceIndex'];
               targetObj.forEach(function (children) {
                 if (children.isMesh) {
                   var opacity = children.geometry.attributes.opacity.array;
-                  opacity[children.userData.instanceIndex] = ele.attr[key];
+                  opacity[instanceIndex] = ele.attr[key];
                   children.geometry.attributes.opacity.needsUpdate = true;
                 }
               });
@@ -61718,14 +61730,25 @@ var guiParams = {
     },
     // 定位到模型
     locateModel: function locateModel(name) {
-      var obj = com_graphicsvue_type_script_lang_js_scene.getObjectByName(name);
+      var _this$getObjectByName;
+      var obj = com_graphicsvue_type_script_lang_js_scene.getObjectByName(name) || ((_this$getObjectByName = this.getObjectByName(name)) === null || _this$getObjectByName === void 0 ? void 0 : _this$getObjectByName[0]);
       if (obj) {
         // cameraControls.fitToSphere(obj.parent, true); // TODO 待处理，先用 setModelCenter 进行定位
         if (obj.isGroup) {
           this.setModelCenter(obj);
         } else if (obj.isMesh) {
-          var center = this.getCenter(obj);
-          var size = this.getSize(obj);
+          var instanceIndex = obj.userData.instanceMaps[name]['instanceIndex'];
+          var tempMatrix = new this.THREE.Matrix4();
+          // const instancePos = new this.THREE.Vector3();
+          obj.getMatrixAt(instanceIndex, tempMatrix);
+          var center = this.getCenter(obj, tempMatrix);
+          // const instanceLocalCenter = center.applyMatrix4(tempMatrix);
+          // center.applyMatrix4(tempMatrix);           // 先应用实例矩阵
+          // obj.localToWorld(center); 
+          // instancePos.setFromMatrixPosition(tempMatrix);        // 提取局部位置
+          // obj.localToWorld(instancePos);                          
+
+          var size = this.getSize(obj, tempMatrix);
           this.locateByCenterBox(center, size);
         }
       }
@@ -61812,7 +61835,9 @@ var guiParams = {
     getObjectByName: function getObjectByName(name) {
       var object = [];
       com_graphicsvue_type_script_lang_js_scene.traverse(function (item) {
-        if (item.name === name) {
+        var _item$userData;
+        if (item.name === name || ((_item$userData = item.userData) === null || _item$userData === void 0 || (_item$userData = _item$userData.instanceMaps) === null || _item$userData === void 0 ? void 0 : _item$userData[name]) !== undefined // 或者找出对应的实例对象
+        ) {
           object.push(item);
         }
       });
@@ -62597,15 +62622,33 @@ var guiParams = {
       scenePass = null;
     },
     // 获取中心点
-    getCenter: function getCenter(obj) {
+    getCenter: function getCenter(instancedMesh, tempMatrix) {
+      // 1. 获取原始几何体的中心（局部坐标，相对于单个 mesh 原点）
+      var geometry = instancedMesh.geometry;
+      if (!geometry.boundingBox) {
+        geometry.computeBoundingBox();
+      }
+      var localCenter = geometry.boundingBox.getCenter(new this.THREE.Vector3());
+
+      // 2. 将中心应用实例的局部变换（tempMatrix）
+      var instanceLocalCenter = localCenter.clone().applyMatrix4(tempMatrix);
+
+      // 3. 转换到世界坐标
+      var worldCenter = instancedMesh.localToWorld(instanceLocalCenter.clone());
+      return worldCenter;
       var center = new this.THREE.Vector3();
+      if (tempMatrix) {
+        obj.applyMatrix4(tempMatrix);
+        obj.updateMatrixWorld();
+      }
       obj.boundingBox.getCenter(center);
       if (obj.userData.is3D) {
         center.applyMatrix4(mat4);
+        obj.updateMatrixWorld();
       }
       return center;
     },
-    getSize: function getSize(obj) {
+    getSize: function getSize(obj, tempMatrix) {
       var size = new this.THREE.Vector3();
       obj.boundingBox.getSize(size);
       if (obj.userData.is3D) {
@@ -62673,11 +62716,11 @@ 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=c496e868&prod&lang=scss&scoped=true
-var com_graphicsvue_type_style_index_0_id_c496e868_prod_lang_scss_scoped_true = __webpack_require__("f046");
+// EXTERNAL MODULE: ./packages/components/com-graphics/index.vue?vue&type=style&index=0&id=1bdd1986&prod&lang=scss&scoped=true
+var com_graphicsvue_type_style_index_0_id_1bdd1986_prod_lang_scss_scoped_true = __webpack_require__("5b29");
 
-// EXTERNAL MODULE: ./packages/components/com-graphics/index.vue?vue&type=style&index=1&id=c496e868&prod&lang=css
-var com_graphicsvue_type_style_index_1_id_c496e868_prod_lang_css = __webpack_require__("596c");
+// EXTERNAL MODULE: ./packages/components/com-graphics/index.vue?vue&type=style&index=1&id=1bdd1986&prod&lang=css
+var com_graphicsvue_type_style_index_1_id_1bdd1986_prod_lang_css = __webpack_require__("8298");
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
 /* globals __VUE_SSR_CONTEXT__ */
@@ -62789,17 +62832,17 @@ function normalizeComponent(
 
 var component = normalizeComponent(
   components_com_graphicsvue_type_script_lang_js,
-  com_graphicsvue_type_template_id_c496e868_scoped_true_render,
+  com_graphicsvue_type_template_id_1bdd1986_scoped_true_render,
   staticRenderFns,
   false,
   null,
-  "c496e868",
+  "1bdd1986",
   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":"2ace760a-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=3507a900&scoped=true
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"9df9ad46-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=3507a900&scoped=true
 var com_flcanvasvue_type_template_id_3507a900_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -65119,6 +65162,34 @@ function entityFormatting_unsupportedIterableToArray(r, a) { if (r) { if ("strin
 function entityFormatting_arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 
 
+
+//rgb转换
+
+function decimalToRGBHex(decimalValue) {
+  // Ensure the input is a valid integer
+  if (!Number.isInteger(decimalValue)) {
+    throw new Error("Input must be an integer.");
+  }
+
+  // Ensure the input is within the valid range for 24-bit colors
+  if (decimalValue < 0 || decimalValue > 0xFFFFFF) {
+    throw new Error("Input must be between 0 and 16777215 (0xFFFFFF).");
+  }
+
+  // Extract the red, green, and blue components
+  var red = decimalValue >> 16 & 0xFF;
+  var green = decimalValue >> 8 & 0xFF;
+  var blue = decimalValue & 0xFF;
+
+  // Convert the RGB components to hexadecimal and format as a string
+  var hex = "#" + red.toString(16).padStart(2, '0') + green.toString(16).padStart(2, '0') + blue.toString(16).padStart(2, '0');
+  return {
+    red: red,
+    green: green,
+    blue: blue,
+    hex: hex.toUpperCase()
+  };
+}
 function handleFn(functionName, recordDxf, entity, group, key, configParams, konvaLayer) {
   console.log(functionName);
   switch (functionName) {
@@ -65289,6 +65360,10 @@ function mtextContentAndFormattingToTextAndStyle(textAndControlChars, entity, co
   };
 }
 function drawArc(recordDxf, entity, group, key, configParams) {
+  var color = entity.color;
+  var rgb = decimalToRGBHex(color);
+  console.log(rgb);
+  var hex = rgb.hex;
   var startAngle, endAngle;
   if (entity.type === "CIRCLE") {
     startAngle = entity.startAngle || 0;
@@ -65310,7 +65385,7 @@ function drawArc(recordDxf, entity, group, key, configParams) {
     points: list,
     name: key.replace(/\s*/g, ""),
     entityId: key,
-    stroke: configParams ? configParams.color : "#000",
+    stroke: hex,
     customColor: configParams ? configParams.color : "",
     strokeWidth: width,
     visible: configParams ? configParams.visible : true,
@@ -65379,6 +65454,10 @@ function drawEllpse(recordDxf, entity, group, key, configParams) {
   // group.add(line);
 }
 function drawLine(recordDxf, entity, group, key, configParams) {
+  var color = entity.color;
+  var rgb = decimalToRGBHex(color);
+  console.log(rgb);
+  var hex = rgb.hex;
   var x1 = entity.vertices[0].x;
   var y1 = entity.vertices[0].y;
   var x2 = entity.vertices[1].x;
@@ -65393,7 +65472,7 @@ function drawLine(recordDxf, entity, group, key, configParams) {
     name: key.replace(/\s*/g, ""),
     entityId: key,
     isGroup: false,
-    stroke: configParams ? configParams.color : "#000",
+    stroke: hex,
     customColor: configParams ? configParams.color : "",
     strokeWidth: width,
     visible: configParams ? configParams.visible : true,
@@ -65422,6 +65501,13 @@ function drawLine(recordDxf, entity, group, key, configParams) {
   // group.add(line);
 }
 function entityFormatting_drawText(recordDxf, entity, group, key, configParams) {
+  var color = entity.color;
+  var rgb = decimalToRGBHex(color);
+  console.log(rgb);
+  var hex = rgb.hex;
+  if (hex == '#FFFFFF') {
+    hex = '#000';
+  }
   var text = entity.text;
   var fontSize = 0;
   if (key == 0) {
@@ -65437,13 +65523,13 @@ function entityFormatting_drawText(recordDxf, entity, group, key, configParams)
     y: -parseFloat(y),
     text: text,
     fontSize: fontSize,
-    fill: configParams ? configParams.color : "#000",
+    fill: hex,
     customColor: configParams ? configParams.color : "",
     name: key.replace(/\s*/g, ""),
     entityId: key,
     fontFamily: "SimSun",
     visible: configParams ? configParams.visible : true,
-    stroke: configParams ? configParams.color : "#000",
+    stroke: hex,
     strokeWidth: 0.1
   });
   if (entity.rotation) {
@@ -65486,6 +65572,13 @@ function drawHatch(recordDxf, entity, group, key, configParams) {
   console.log("hatch");
 }
 function drawLwLine(recordDxf, entity, group, key, configParams) {
+  var color = entity.color;
+  var rgb = decimalToRGBHex(color);
+  console.log(rgb);
+  var hex = rgb.hex;
+  if (hex == '#FFFFFF') {
+    hex = '#000';
+  }
   var closed = entity.shape;
   var list = [];
   for (var i = 0; i < entity.vertices.length; i++) {
@@ -65504,7 +65597,7 @@ function drawLwLine(recordDxf, entity, group, key, configParams) {
     closed: closed,
     name: key.replace(/\s*/g, ""),
     entityId: key,
-    stroke: configParams ? configParams.color : "#000",
+    stroke: hex,
     customColor: configParams ? configParams.color : "",
     strokeWidth: width,
     visible: configParams ? configParams.visible : true,
@@ -66446,7 +66539,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":"2ace760a-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":"9df9ad46-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;
@@ -66554,7 +66647,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":"2ace760a-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":"9df9ad46-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;