fl-web-component 1.2.8 → 1.2.10

package/README.md

@@ -46,8 +46,14 @@ Vue.use(FlWebComponent)
 欢迎贡献代码和问题反馈。
 
 ## 更新日志
+- 1.2.10 2025-06-23
+1. 修改文字渲染逻辑
+- 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
 1. 修复removeAll方法不生效问题
 - 1.2.5 2025-06-17

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

@@ -29241,7 +29241,7 @@ 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":"7c526cf7-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
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"44287e30-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;
@@ -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
@@ -59478,6 +59479,14 @@ function handleInstancedMeshModel(modelGroup, instances, drawObjs, type, scene,
                 // m4.setPosition(new THREE.Vector3(9999999, 9999999, 9999999)); // TODO 临时隐藏方案
                 meshMatrix.elements = item.matrix.val;
                 geomMatrix.elements = mesh.matrix.val;
+                var points = mesh.points;
+                if (isTextType(mesh.type)) {
+                  var positionMatrix = new Matrix4();
+                  var alignMatrix = new Matrix4();
+                  positionMatrix.identity().makeTranslation(points[0], points[1], points[2]);
+                  alignMatrix.identity().makeTranslation(-(mesh.prop.fontsize / 2.5), -(mesh.prop.fontsize / 2.5), 0);
+                  geomMatrix.multiply(positionMatrix).multiply(alignMatrix);
+                }
                 m4.multiplyMatrices(meshMatrix, geomMatrix);
                 model.setMatrixAt(index, m4);
                 var copyMatrix = new Matrix4().copy(m4);
@@ -59566,7 +59575,7 @@ function instance_parser_drawModel(geom, instanceName, instanceCount, nColor, nO
   if (geom.type == GEOM_TYPES.geom_2d || geom.type == GEOM_TYPES.geom_2d_others) {
     model = draw2Dmodel(geom, instanceName, instanceCount); // TODO 该类型调试中
     // 处理二维文本类型
-  } else if (geom.type == GEOM_TYPES.geom_2d_text || geom.type == GEOM_TYPES.geom_2d_mtext || geom.type == GEOM_TYPES.geom_3d_text || geom.type == GEOM_TYPES.geom_3d_mtext) {
+  } else if (isTextType(geom.type)) {
     model = drawText(geom, instanceName, instanceCount);
     // 处理各种曲线类型（圆形、圆弧、椭圆、椭圆弧）
   } else if (geom.type == GEOM_TYPES.geom_2d_circle || geom.type == GEOM_TYPES.geom_2d_arc || geom.type == GEOM_TYPES.geom_2d_ellipse || geom.type == GEOM_TYPES.geom_2d_ellipseArc) {
@@ -59578,6 +59587,15 @@ function instance_parser_drawModel(geom, instanceName, instanceCount, nColor, nO
   return model;
 }
 
+/**
+ * 判断几何类型是否为文本类型
+ * @param {number} type - 几何类型枚举值，参考GEOM_TYPES中的定义
+ * @returns {boolean} 是否为文本类型（2D/3D 单行或多行文本）
+ */
+function isTextType(type) {
+  return type == GEOM_TYPES.geom_2d_text || type == GEOM_TYPES.geom_2d_mtext || type == GEOM_TYPES.geom_3d_text || type == GEOM_TYPES.geom_3d_mtext;
+}
+
 /**
  * 绘制曲线
  *
@@ -59637,7 +59655,8 @@ function draw3Dmodel(geom, instanceName, instanceCount, nColor, nOpacity) {
     customMaterial = geom.material,
     triangles = geom.triangles,
     points = geom.points,
-    normals = geom.normals;
+    normals = geom.normals,
+    prop = geom.prop;
   // 使用自定义几何体或创建新的缓冲几何体
   var geometry = customGeometry || new BufferGeometry();
 
@@ -59657,7 +59676,7 @@ function draw3Dmodel(geom, instanceName, instanceCount, nColor, nOpacity) {
     var normal = new Float32Array(normals);
     geometry.setAttribute('normal', new BufferAttribute(normal, 3));
   }
-  var color = geom.prop.color;
+  var color = prop.color;
   var material, mesh, colors, opacity;
   if (Array.isArray(color) && color.length) {
     colors = color;
@@ -59799,10 +59818,10 @@ function drawText(geom, instanceName, instanceCount) {
   }, instanceName, instanceCount);
 
   // 创建平移矩阵并应用
-
-  var matrix = new Matrix4();
-  matrix.identity().makeTranslation(points[0], points[1], points[2]);
-  mesh.applyMatrix4(matrix);
+  // const matrix = new THREE.Matrix4();
+  // matrix.identity().makeTranslation(points[0], points[1], points[2]);
+  // mesh.applyMatrix4(matrix);
+  // points && mesh.position.set(points[0], points[1], points[2]);
 
   // if (stageId == STAGE_MODEL_TYPE.PID) {
   //   mesh.translateX(-(fontsize / 2));
@@ -59814,8 +59833,9 @@ function drawText(geom, instanceName, instanceCount) {
   //   mesh.rotateY(rotate);
   // }
   // mesh.rotateX(-Math.PI / 2);
-  mesh.translateX(-(fontsize / 2.5));
-  mesh.translateY(-(fontsize / 2.5));
+  // mesh.translateX(-(fontsize / 2.5));
+  // mesh.translateY(-(fontsize / 2.5));
+
   mesh.userData.instanceName = instanceName;
   return mesh;
 }
@@ -62480,7 +62500,7 @@ var component = normalizeComponent(
 )
 
 /* harmony default export */ var com_graphics = (component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7c526cf7-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":"44287e30-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;
@@ -65679,7 +65699,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":"7c526cf7-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":"44287e30-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;
@@ -65787,7 +65807,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":"7c526cf7-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":"44287e30-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;