fl-web-component 1.3.17 → 1.3.18

package/README.md

@@ -46,6 +46,10 @@ Vue.use(FlWebComponent)
 欢迎贡献代码和问题反馈。
 
 ## 更新日志
+- 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

@@ -22291,7 +22291,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.18\",\"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\"]}");
 
 /***/ }),
 
@@ -29274,7 +29274,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":"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
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"01ad9958-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() {
   var _vm = this,
     _c = _vm._self._c;
@@ -62799,7 +62799,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":"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":"01ad9958-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 +65119,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 +65317,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 +65342,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 +65411,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 +65429,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 +65458,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 +65480,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 +65529,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 +65554,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 +66496,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":"01ad9958-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 +66604,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":"01ad9958-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;