fl-web-component 2.1.1-beta.1 → 2.1.1-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -13827,13 +13827,6 @@ function isVNode(node) {
13827
13827
 
13828
13828
  /***/ }),
13829
13829
 
13830
- /***/ "4326":
13831
- /***/ (function(module, exports, __webpack_require__) {
13832
-
13833
- // extracted by mini-css-extract-plugin
13834
-
13835
- /***/ }),
13836
-
13837
13830
  /***/ "4546":
13838
13831
  /***/ (function(module, exports, __webpack_require__) {
13839
13832
 
@@ -14043,6 +14036,17 @@ Factory_1.Factory.addGetterSetter(Node_1.Node, 'hue', 0, (0, Validators_1.getNum
14043
14036
  Factory_1.Factory.addGetterSetter(Node_1.Node, 'saturation', 0, (0, Validators_1.getNumberValidator)(), Factory_1.Factory.afterSetFilter);
14044
14037
  Factory_1.Factory.addGetterSetter(Node_1.Node, 'value', 0, (0, Validators_1.getNumberValidator)(), Factory_1.Factory.afterSetFilter);
14045
14038
 
14039
+ /***/ }),
14040
+
14041
+ /***/ "469d":
14042
+ /***/ (function(module, __webpack_exports__, __webpack_require__) {
14043
+
14044
+ "use strict";
14045
+ /* 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_0f76e7f4_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("f323");
14046
+ /* 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_0f76e7f4_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_0f76e7f4_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
14047
+ /* unused harmony reexport * */
14048
+
14049
+
14046
14050
  /***/ }),
14047
14051
 
14048
14052
  /***/ "4726":
@@ -56514,7 +56518,7 @@ module.exports = document && document.documentElement;
56514
56518
  /***/ "9224":
56515
56519
  /***/ (function(module) {
56516
56520
 
56517
- module.exports = JSON.parse("{\"name\":\"fl-web-component\",\"version\":\"2.1.1-beta.1\",\"scripts\":{\"postinstall\":\"patch-package\",\"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:prod\",\"watch\":\"vue-cli-service build --watch --mode development --target lib --name fl-web-component --formats commonjs ./src/main.js\",\"watch:prod\":\"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/\",\"publish:beta:base\":\"npm run build && npm publish --tag beta --registry https://registry.npmjs.org/\",\"==\":\"=============================================================\",\"tip3\":\"发版注意: 【测试版执行publish:beta】【修改bug执行publish:fix】【新增功能执行publish:feat】【新特性执行publish:perf】\",\"publish:beta\":\"npm version prerelease --preid=beta && npm run publish:beta:base\",\"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\"],\"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\",\"fflate\":\"^0.8.2\",\"html2canvas\":\"^1.4.1\",\"jspdf\":\"^3.0.1\",\"konva\":\"^9.3.12\",\"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/plugin-proposal-nullish-coalescing-operator\":\"^7.18.6\",\"@babel/plugin-proposal-optional-chaining\":\"^7.21.0\",\"@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-config-prettier\":\"^6.15.0\",\"eslint-plugin-prettier\":\"^3.4.1\",\"eslint-plugin-vue\":\"^6.2.2\",\"patch-package\":\"^6.4.7\",\"prettier\":\"^2.8.8\",\"sass\":\"1.32.13\",\"sass-loader\":\"10.1.1\",\"vue-template-compiler\":\"^2.6.11\",\"worker-loader\":\"^3.0.8\"},\"browserslist\":[\"> 1%\",\"last 2 versions\"]}");
56521
+ module.exports = JSON.parse("{\"name\":\"fl-web-component\",\"version\":\"2.1.1-beta.2\",\"scripts\":{\"postinstall\":\"patch-package\",\"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:prod\",\"watch\":\"vue-cli-service build --watch --mode development --target lib --name fl-web-component --formats commonjs ./src/main.js\",\"watch:prod\":\"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/\",\"publish:beta:base\":\"npm run build && npm publish --tag beta --registry https://registry.npmjs.org/\",\"==\":\"=============================================================\",\"tip3\":\"发版注意: 【测试版执行publish:beta】【修改bug执行publish:fix】【新增功能执行publish:feat】【新特性执行publish:perf】\",\"publish:beta\":\"npm version prerelease --preid=beta && npm run publish:beta:base\",\"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\"],\"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\",\"fflate\":\"^0.8.2\",\"html2canvas\":\"^1.4.1\",\"jspdf\":\"^3.0.1\",\"konva\":\"^9.3.12\",\"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/plugin-proposal-nullish-coalescing-operator\":\"^7.18.6\",\"@babel/plugin-proposal-optional-chaining\":\"^7.21.0\",\"@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-config-prettier\":\"^6.15.0\",\"eslint-plugin-prettier\":\"^3.4.1\",\"eslint-plugin-vue\":\"^6.2.2\",\"patch-package\":\"^6.4.7\",\"prettier\":\"^2.8.8\",\"sass\":\"1.32.13\",\"sass-loader\":\"10.1.1\",\"vue-template-compiler\":\"^2.6.11\",\"worker-loader\":\"^3.0.8\"},\"browserslist\":[\"> 1%\",\"last 2 versions\"]}");
56518
56522
 
56519
56523
  /***/ }),
56520
56524
 
@@ -59332,17 +59336,6 @@ var isDefined = exports.isDefined = function isDefined(val) {
59332
59336
 
59333
59337
  module.exports = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAACGUlEQVR4AeSUPU4CURSFgRW4A7FwAUYLC4yY2DNUFhZApLPRxMKOsAPsSYAVACuQCdqZ2NiYmIiFPQsw4Hfe/GTeMINkEirJO3N/3n333PsuM4Xcln//gMBxnHJwi+jFQJeM2/LFkXpFHC5Xq9VPDtSQj9j1fD4v2UIXetpD74E6euJKJSBZazgc7o1Go8ZyuRxgX/h2m0znwGVPepu9FnbiWiGgGlM5SeeREzvY3xH7naQfsiGZsffDucROLAKCdMenfqVVJRBI0gFN6YJ0Yp6kC9j7oAFpzc8ht4FFgEcD/UJmWnQyix+0CKii71dRZ7CleHCardhKpXLH2TI5LBKLIJLgimqOIvZaldh6oVC4RPbjgRaB7o+gCVWcgE48OM0mtslMDtgvKgcyXBYBXg0ZkX1Bln5FbE50j1QxBTeb0hDbZQ6vxLvAWvEOzCbX9AzRizE2e7xxZkLoLrCWRUAlZQWOx+N77jT8n1snEgw613tyy9afM9D9ZZ4DXRchUw64vGV14G+6juPotZ96Ibkc91vC1w1s6SCcEbo+gj2617cpCDPSIpAHkj5ooJtvDTK3WCyOqe5QuuDru9J9zHQGaA6+yxMrBJ7bPF0qN5XxEl1T3YhK1ZkqfSBiLlsx6AOQuFIJqKZPUnXSZuD6bKv9Nv4GUJfGZu8Me6XygC2VQAEcVOvh0GTLHyBuB/6oXEsQDcyqb53gFwAA//9V8fpjAAAABklEQVQDAOkWA0BYT6hNAAAAAElFTkSuQmCC"
59334
59338
 
59335
- /***/ }),
59336
-
59337
- /***/ "affa":
59338
- /***/ (function(module, __webpack_exports__, __webpack_require__) {
59339
-
59340
- "use strict";
59341
- /* 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_e2de7752_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("4326");
59342
- /* 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_e2de7752_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_e2de7752_prod_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
59343
- /* unused harmony reexport * */
59344
-
59345
-
59346
59339
  /***/ }),
59347
59340
 
59348
59341
  /***/ "b2fd":
@@ -76353,6 +76346,13 @@ exports.default = {
76353
76346
 
76354
76347
  /***/ }),
76355
76348
 
76349
+ /***/ "f323":
76350
+ /***/ (function(module, exports, __webpack_require__) {
76351
+
76352
+ // extracted by mini-css-extract-plugin
76353
+
76354
+ /***/ }),
76355
+
76356
76356
  /***/ "f35c":
76357
76357
  /***/ (function(module, exports, __webpack_require__) {
76358
76358
 
@@ -78634,7 +78634,7 @@ if (typeof window !== 'undefined') {
78634
78634
  // Indicate to webpack that this file can be concatenated
78635
78635
  /* harmony default export */ var setPublicPath = (null);
78636
78636
 
78637
- // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"b074442e-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=d40d4870&scoped=true
78637
+ // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"205eac74-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=d40d4870&scoped=true
78638
78638
  var com_graphicsvue_type_template_id_d40d4870_scoped_true_render = function render() {
78639
78639
  var _vm = this,
78640
78640
  _c = _vm._self._c;
@@ -111647,8 +111647,8 @@ function composeInstanceMatrix(instance, mesh, geometry) {
111647
111647
  return resultMatrix;
111648
111648
  }
111649
111649
 
111650
- /**
111651
- * 重置处理状态,用于新的批量加载会话
111650
+ /**
111651
+ * 重置处理状态,用于新的批量加载会话
111652
111652
  */
111653
111653
  function resetProcessingState() {
111654
111654
  drawObjMapInstance = {};
@@ -128530,8 +128530,8 @@ var component = normalizeComponent(
128530
128530
  )
128531
128531
 
128532
128532
  /* harmony default export */ var com_graphics = (component.exports);
128533
- // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"b074442e-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=e2de7752&scoped=true
128534
- var com_flcanvasvue_type_template_id_e2de7752_scoped_true_render = function render() {
128533
+ // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"205eac74-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=0f76e7f4&scoped=true
128534
+ var com_flcanvasvue_type_template_id_0f76e7f4_scoped_true_render = function render() {
128535
128535
  var _vm = this,
128536
128536
  _c = _vm._self._c;
128537
128537
  return _c('div', {
@@ -128544,9 +128544,9 @@ var com_flcanvasvue_type_template_id_e2de7752_scoped_true_render = function rend
128544
128544
  }
128545
128545
  });
128546
128546
  };
128547
- var com_flcanvasvue_type_template_id_e2de7752_scoped_true_staticRenderFns = [];
128547
+ var com_flcanvasvue_type_template_id_0f76e7f4_scoped_true_staticRenderFns = [];
128548
128548
 
128549
- // CONCATENATED MODULE: ./packages/components/com-flcanvas/index.vue?vue&type=template&id=e2de7752&scoped=true
128549
+ // CONCATENATED MODULE: ./packages/components/com-flcanvas/index.vue?vue&type=template&id=0f76e7f4&scoped=true
128550
128550
 
128551
128551
  // EXTERNAL MODULE: ./node_modules/konva/lib/index.js
128552
128552
  var lib = __webpack_require__("362d");
@@ -133788,10 +133788,11 @@ function drawArc(recordDxf, entity, group, key, configParams) {
133788
133788
  name: key.replace(/\s*/g, ''),
133789
133789
  entityId: key,
133790
133790
  stroke: hex,
133791
- customColor: configParams ? configParams.color : '',
133791
+ customColor: configParams ? configParams.color : hex,
133792
133792
  strokeWidth: width,
133793
133793
  visible: configParams ? configParams.visible : true,
133794
- oldstrokeLength: width
133794
+ oldstrokeLength: width,
133795
+ isGroup: false
133795
133796
  });
133796
133797
  // if(group.attrs.isBlock){
133797
133798
  // let scale=group.scale();
@@ -133834,10 +133835,11 @@ function drawEllpse(recordDxf, entity, group, key, configParams) {
133834
133835
  name: key.replace(/\s*/g, ''),
133835
133836
  entityId: key,
133836
133837
  stroke: configParams ? configParams.color : '#000',
133837
- customColor: configParams ? configParams.color : '',
133838
+ customColor: configParams ? configParams.color : '#000',
133838
133839
  strokeWidth: width,
133839
133840
  visible: configParams ? configParams.visible : true,
133840
- oldstrokeLength: width
133841
+ oldstrokeLength: width,
133842
+ isGroup: false
133841
133843
  });
133842
133844
  // let line = new Konva.Line({
133843
133845
  // name: key.replace(/\s*/g, ""),
@@ -133875,7 +133877,7 @@ function drawLine(recordDxf, entity, group, key, configParams) {
133875
133877
  entityId: key,
133876
133878
  isGroup: false,
133877
133879
  stroke: hex,
133878
- customColor: configParams ? configParams.color : '',
133880
+ customColor: configParams ? configParams.color : hex,
133879
133881
  strokeWidth: width,
133880
133882
  visible: configParams ? configParams.visible : true,
133881
133883
  oldstrokeLength: width
@@ -133923,13 +133925,14 @@ function entityFormatting_drawText(recordDxf, entity, group, key, configParams)
133923
133925
  align: 'left',
133924
133926
  verticalAlign: 'top',
133925
133927
  fill: hex,
133926
- customColor: configParams ? configParams.color : '',
133928
+ customColor: configParams ? configParams.color : hex,
133927
133929
  name: key.replace(/\s*/g, ''),
133928
133930
  entityId: key,
133929
133931
  fontFamily: 'SimSun',
133930
133932
  visible: configParams ? configParams.visible : true,
133931
133933
  stroke: hex,
133932
- strokeWidth: 0.1
133934
+ strokeWidth: 0.1,
133935
+ shapeType: 'text'
133933
133936
  });
133934
133937
  if (entity.xScale) {
133935
133938
  dim.scaleX(entity.xScale);
@@ -133982,7 +133985,8 @@ function entityFormatting_drawText(recordDxf, entity, group, key, configParams)
133982
133985
  name: key.replace(/\s*/g, ''),
133983
133986
  entityId: key,
133984
133987
  visible: configParams ? configParams.visible : true,
133985
- customColor: configParams ? configParams.color : ''
133988
+ customColor: configParams ? configParams.color : '',
133989
+ isGroup: true
133986
133990
  });
133987
133991
  g.add(dim);
133988
133992
  group.push({
@@ -134019,9 +134023,10 @@ function drawLwLine(recordDxf, entity, group, key, configParams) {
134019
134023
  points: list,
134020
134024
  closed: closed,
134021
134025
  name: key.replace(/\s*/g, ''),
134026
+ isGroup: false,
134022
134027
  entityId: key,
134023
134028
  stroke: hex,
134024
- customColor: configParams ? configParams.color : '',
134029
+ customColor: configParams ? configParams.color : hex,
134025
134030
  strokeWidth: width,
134026
134031
  visible: configParams ? configParams.visible : true,
134027
134032
  oldstrokeLength: width
@@ -134057,7 +134062,7 @@ function drawSpline(recordDxf, entity, group, key, configParams) {
134057
134062
  entityId: key,
134058
134063
  isGroup: false,
134059
134064
  stroke: configParams ? configParams : '#000',
134060
- customColor: configParams ? configParams.color : '',
134065
+ customColor: configParams ? configParams.color : '#000',
134061
134066
  strokeWidth: width,
134062
134067
  visible: configParams ? configParams.visible : true,
134063
134068
  oldstrokeLength: width
@@ -135208,7 +135213,7 @@ function downloadPDF(base64, fileName) {
135208
135213
  name: key.replace(/\s*/g, ''),
135209
135214
  entityId: key,
135210
135215
  stroke: group[0].stroke,
135211
- customColor: _configParams ? _configParams.color : '',
135216
+ customColor: _configParams ? _configParams.color : group[0].stroke,
135212
135217
  //visible: configParams ? configParams.visible :true,
135213
135218
  sceneFunc: function sceneFunc(context, shape) {
135214
135219
  context.beginPath();
@@ -135263,7 +135268,8 @@ function downloadPDF(base64, fileName) {
135263
135268
  }
135264
135269
  // context.closePath();
135265
135270
  context.fillStrokeShape(shape);
135266
- }
135271
+ },
135272
+ shapeType: 'shape'
135267
135273
  });
135268
135274
  if (_this3.konvaLayer) _this3.konvaLayer.add(customShape);
135269
135275
  }
@@ -135523,15 +135529,49 @@ function downloadPDF(base64, fileName) {
135523
135529
  this.konvaLayer = null;
135524
135530
  this.konvaStage = null;
135525
135531
  },
135526
- beforeDestroy: function beforeDestroy() {
135527
- this.clearCache();
135532
+ // 更改图纸的色系 区分明暗两种 darkness 暗色系 bright 明亮
135533
+ setColorScheme: function setColorScheme(colorType) {
135534
+ var _this5 = this;
135535
+ // const backgroundColor = colorType === "darkness" ? "#000" : "transparent";
135536
+ var color = colorType === "darkness" ? "#fff" : "#000";
135537
+ // konvaStage.container().style.background = backgroundColor;
135538
+ this.konvaLayer.children.forEach(function (item) {
135539
+ _this5.traverseLayer(item, color);
135540
+ });
135541
+ },
135542
+ traverseLayer: function traverseLayer(obj, color) {
135543
+ var _this6 = this;
135544
+ if (!obj.attrs.isGroup) {
135545
+ if (color === '#fff') {
135546
+ var setColor = obj.attrs.customColor === '#000' || obj.attrs.customColor === '#000000' || obj.attrs.customColor === 'rgb(0, 0, 0)' || obj.attrs.customColor === 'rgba(0, 0, 0, 1)' ? color : obj.attrs.customColor;
135547
+ if (obj.attrs.shapeType === 'hatch' || obj.attrs.shapeType === 'text') {
135548
+ obj.setFill(setColor);
135549
+ }
135550
+ obj.setStroke(setColor);
135551
+ obj.attrs.oldCustomColor = obj.attrs.customColor;
135552
+ obj.attrs.customColor = setColor;
135553
+ } else {
135554
+ obj.attrs.customColor = obj.attrs.oldCustomColor;
135555
+ if (obj.attrs.shapeType === 'hatch' || obj.attrs.shapeType === 'text') {
135556
+ obj.setFill(obj.attrs.customColor);
135557
+ }
135558
+ obj.setStroke(obj.attrs.customColor);
135559
+ }
135560
+ } else {
135561
+ obj.children.forEach(function (item) {
135562
+ _this6.traverseLayer(item, color);
135563
+ });
135564
+ }
135528
135565
  }
135566
+ },
135567
+ beforeDestroy: function beforeDestroy() {
135568
+ this.clearCache();
135529
135569
  }
135530
135570
  });
135531
135571
  // CONCATENATED MODULE: ./packages/components/com-flcanvas/index.vue?vue&type=script&lang=js
135532
135572
  /* harmony default export */ var components_com_flcanvasvue_type_script_lang_js = (com_flcanvasvue_type_script_lang_js);
135533
- // EXTERNAL MODULE: ./packages/components/com-flcanvas/index.vue?vue&type=style&index=0&id=e2de7752&prod&lang=scss&scoped=true
135534
- var com_flcanvasvue_type_style_index_0_id_e2de7752_prod_lang_scss_scoped_true = __webpack_require__("affa");
135573
+ // EXTERNAL MODULE: ./packages/components/com-flcanvas/index.vue?vue&type=style&index=0&id=0f76e7f4&prod&lang=scss&scoped=true
135574
+ var com_flcanvasvue_type_style_index_0_id_0f76e7f4_prod_lang_scss_scoped_true = __webpack_require__("469d");
135535
135575
 
135536
135576
  // CONCATENATED MODULE: ./packages/components/com-flcanvas/index.vue
135537
135577
 
@@ -135544,17 +135584,17 @@ var com_flcanvasvue_type_style_index_0_id_e2de7752_prod_lang_scss_scoped_true =
135544
135584
 
135545
135585
  var com_flcanvas_component = normalizeComponent(
135546
135586
  components_com_flcanvasvue_type_script_lang_js,
135547
- com_flcanvasvue_type_template_id_e2de7752_scoped_true_render,
135548
- com_flcanvasvue_type_template_id_e2de7752_scoped_true_staticRenderFns,
135587
+ com_flcanvasvue_type_template_id_0f76e7f4_scoped_true_render,
135588
+ com_flcanvasvue_type_template_id_0f76e7f4_scoped_true_staticRenderFns,
135549
135589
  false,
135550
135590
  null,
135551
- "e2de7752",
135591
+ "0f76e7f4",
135552
135592
  null
135553
135593
 
135554
135594
  )
135555
135595
 
135556
135596
  /* harmony default export */ var com_flcanvas = (com_flcanvas_component.exports);
135557
- // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"b074442e-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
135597
+ // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"205eac74-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
135558
135598
  var per_controlvue_type_template_id_f547d5c6_scoped_true_render = function render() {
135559
135599
  var _vm = this,
135560
135600
  _c = _vm._self._c;
@@ -135662,7 +135702,7 @@ var per_control_component = normalizeComponent(
135662
135702
  )
135663
135703
 
135664
135704
  /* harmony default export */ var per_control = (per_control_component.exports);
135665
- // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"b074442e-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=2572c0e2&scoped=true
135705
+ // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"205eac74-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=2572c0e2&scoped=true
135666
135706
  var pidvue_type_template_id_2572c0e2_scoped_true_render = function render() {
135667
135707
  var _vm = this,
135668
135708
  _c = _vm._self._c;
@@ -135709,7 +135749,7 @@ var browserify_default = /*#__PURE__*/__webpack_require__.n(browserify);
135709
135749
  var html2canvas = __webpack_require__("c0e9");
135710
135750
  var html2canvas_default = /*#__PURE__*/__webpack_require__.n(html2canvas);
135711
135751
 
135712
- // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"b074442e-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/component/ann-tool.vue?vue&type=template&id=4b17bce0&scoped=true
135752
+ // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"205eac74-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/component/ann-tool.vue?vue&type=template&id=4b17bce0&scoped=true
135713
135753
  var ann_toolvue_type_template_id_4b17bce0_scoped_true_render = function render() {
135714
135754
  var _vm = this,
135715
135755
  _c = _vm._self._c;