fl-web-component 1.3.3 → 1.3.5

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.
@@ -1 +1 @@
1
- @charset "UTF-8";#fl-model[data-v-e9c014d6]{width:100%;height:100%;cursor:pointer}[data-v-e9c014d6] .tips-label{width:60px;color:#000;font:12px Helvetica;margin-top:-3em;padding:5px;text-align:center;vertical-align:middle;background-color:khaki}[data-v-e9c014d6] .measure-label{max-width:100px;margin-top:-1em;border:10px;border-radius:5px;padding:3px 10px;cursor:pointer;color:#009bea;background-color:#f4f4f4;box-shadow:0 1px 3px 1px rgba(0,0,0,.25)}[data-v-e9c014d6] .circle-tag{width:10px;height:10px;margin-top:5px;border-radius:50%;background-color:#ff5000}[data-v-e9c014d6] .measure-label-font{word-break:break-all}[data-v-e9c014d6] .mark-label-img{padding-top:5px;width:20px;height:20px}#konva-container[data-v-95b325ba]{z-index:3;width:100%;height:100%;cursor:pointer;overflow:hidden}span[data-v-f547d5c6]{font-weight:bolder}.text[data-v-f547d5c6]{margin-top:20px}.line[data-v-f547d5c6]{border-bottom:1px solid #dcdfe6;margin:20px 0}.center[data-v-f547d5c6]{display:flex;flex-direction:column;align-items:center}.center .cen span[data-v-f547d5c6],.center .top span[data-v-f547d5c6]{color:"#53a8ff";display:inline-block;width:30px;height:30px;text-align:center;line-height:30px;border:1px solid;padding:5px;margin-bottom:10px;background-color:#e9f3ff}.center .cen span[data-v-f547d5c6]{margin:10px}.button[data-v-f547d5c6]{display:flex;justify-content:end;margin-top:20px}@font-face{font-family:iconfont;src:url(//at.alicdn.com/t/font_3226805_qqvo3ag3r8.woff2?t=1646635700216) format("woff2"),url(//at.alicdn.com/t/font_3226805_qqvo3ag3r8.woff?t=1646635700216) format("woff"),url(//at.alicdn.com/t/font_3226805_qqvo3ag3r8.ttf?t=1646635700216) format("truetype")}.iconfont[data-v-f547d5c6]{font-family:iconfont!important;font-size:50px;font-style:normal;color:"#53a8ff";-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-shubiao[data-v-f547d5c6]:before{content:""}#svg-tigger[data-v-0ec35ee4]{cursor:pointer;height:100%;width:100%}
1
+ @charset "UTF-8";#fl-model[data-v-e9c014d6]{width:100%;height:100%;cursor:pointer}[data-v-e9c014d6] .tips-label{width:60px;color:#000;font:12px Helvetica;margin-top:-3em;padding:5px;text-align:center;vertical-align:middle;background-color:khaki}[data-v-e9c014d6] .measure-label{max-width:100px;margin-top:-1em;border:10px;border-radius:5px;padding:3px 10px;cursor:pointer;color:#009bea;background-color:#f4f4f4;box-shadow:0 1px 3px 1px rgba(0,0,0,.25)}[data-v-e9c014d6] .circle-tag{width:10px;height:10px;margin-top:5px;border-radius:50%;background-color:#ff5000}[data-v-e9c014d6] .measure-label-font{word-break:break-all}[data-v-e9c014d6] .mark-label-img{padding-top:5px;width:20px;height:20px}#konva-container[data-v-32dc6e8c]{z-index:3;width:100%;height:100%;cursor:pointer;overflow:hidden}span[data-v-f547d5c6]{font-weight:bolder}.text[data-v-f547d5c6]{margin-top:20px}.line[data-v-f547d5c6]{border-bottom:1px solid #dcdfe6;margin:20px 0}.center[data-v-f547d5c6]{display:flex;flex-direction:column;align-items:center}.center .cen span[data-v-f547d5c6],.center .top span[data-v-f547d5c6]{color:"#53a8ff";display:inline-block;width:30px;height:30px;text-align:center;line-height:30px;border:1px solid;padding:5px;margin-bottom:10px;background-color:#e9f3ff}.center .cen span[data-v-f547d5c6]{margin:10px}.button[data-v-f547d5c6]{display:flex;justify-content:end;margin-top:20px}@font-face{font-family:iconfont;src:url(//at.alicdn.com/t/font_3226805_qqvo3ag3r8.woff2?t=1646635700216) format("woff2"),url(//at.alicdn.com/t/font_3226805_qqvo3ag3r8.woff?t=1646635700216) format("woff"),url(//at.alicdn.com/t/font_3226805_qqvo3ag3r8.ttf?t=1646635700216) format("truetype")}.iconfont[data-v-f547d5c6]{font-family:iconfont!important;font-size:50px;font-style:normal;color:"#53a8ff";-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-shubiao[data-v-f547d5c6]:before{content:""}#svg-tigger[data-v-0ec35ee4]{cursor:pointer;height:100%;width:100%}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fl-web-component",
3
- "version": "1.3.3",
3
+ "version": "1.3.5",
4
4
  "scripts": {
5
5
  "tip1": "仅调试本组件不涉及业务组件,请执行dev",
6
6
  "dev": "vue-cli-service serve",
@@ -42,6 +42,14 @@ var preTarget = [];
42
42
  import { formatEntity, handleFn, centering } from './components/entityFormatting';
43
43
  var konvaStage = null,
44
44
  konvaLayer = null;
45
+ var activedSvgPan = {
46
+ x: 0,
47
+ y: 0,
48
+ zoom: {
49
+ x: 1,
50
+ y: 1,
51
+ },
52
+ };
45
53
  export default {
46
54
  name: 'Fl2dcanvas',
47
55
  components: {},
@@ -277,6 +285,11 @@ var preTarget = [];
277
285
  // });
278
286
  konvaStage.setX(x);
279
287
  konvaStage.setY(y); // 750
288
+
289
+ activedSvgPan.zoom.x = scale;
290
+ activedSvgPan.zoom.y = scale;
291
+ activedSvgPan.x = x;
292
+ activedSvgPan.y = y;
280
293
  setTimeout(() => {
281
294
  this.$emit('loaded')
282
295
  }, 100)
@@ -284,11 +297,11 @@ var preTarget = [];
284
297
  toPdf(name) {
285
298
  // get data URL with default settings
286
299
  konvaStage.scale({
287
- x:2,
288
- y:2
289
- })
290
- konvaStage.setX(0);
291
- konvaStage.setY(750);
300
+ x: activedSvgPan.zoom.x,
301
+ y: activedSvgPan.zoom.y,
302
+ });
303
+ konvaStage.setX(activedSvgPan.x);
304
+ konvaStage.setY(activedSvgPan.y);
292
305
  // open in new window
293
306
  konvaLayer.getCanvas().setPixelRatio(1);
294
307
  const jpegURL = konvaStage.toDataURL({
@@ -69,6 +69,7 @@ function parseData(input) {
69
69
  italic: material?.italic,
70
70
  linepacing: 1, // 默认值
71
71
  linewidth: material?.linewidth !== undefined ? material?.linewidth : 1, // 默认值
72
+ visible: material?.visible === false ? false : true
72
73
  };
73
74
 
74
75
  const identity = new THREE.Matrix4().identity();
@@ -421,6 +421,9 @@ function draw3Dmodel(geom, instanceName, instanceCount, nColor, nOpacity) {
421
421
  };
422
422
  }
423
423
  mesh = new THREE.InstancedMesh(geometry, material, instanceCount);
424
+
425
+ const { visible } = prop;
426
+ mesh.visible = visible;
424
427
  mesh.userData.drawObjectId = instanceName;
425
428
  mesh.userData.is3D = geom.type == GEOM_TYPES.geom_3d || geom.type == GEOM_TYPES.geom_3d_obj;
426
429