fl-web-component 1.0.10 → 1.0.12

package/dist/fl-web-component.css

@@ -1 +1 @@
-@charset "UTF-8";#fl-model[data-v-6e37e043],#konva-container[data-v-83d38700]{width:100%;height:100%;cursor:pointer}#konva-container[data-v-83d38700]{z-index:3;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:""}
+@charset "UTF-8";#fl-model[data-v-6e37e043],#konva-container[data-v-300b3063]{width:100%;height:100%;cursor:pointer}#konva-container[data-v-300b3063]{z-index:3;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:""}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "fl-web-component",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint \"{src,packages}/**/*.{vue,js}\" --fix",
     "prettier": "prettier --write  \"packages/**/*.{js,css,less,scss,vue,html}\"",
-    "watch": "npm run lint && vue-cli-service build --watch --mode production --target lib --name fl-web-component ./src/main.js",
-    "build": "npm run lint && vue-cli-service build --target lib --name fl-web-component ./src/main.js",
+    "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": "npm run build && npm publish"
   },
   "files": [
@@ -18,7 +19,7 @@
   "main": "dist/fl-web-component.common.js",
   "dependencies": {
     "camera-controls": "^2.9.0",
-    "core-js": "^3.6.5",
+    "core-js": "^3.42.0",
     "dxf-parser": "^1.1.2",
     "element-ui": "2.15.14",
     "html2canvas": "^1.4.1",
@@ -26,28 +27,15 @@
     "konva": "^9.3.14",
     "lodash": "^4.17.21",
     "meshline": "^3.3.1",
+    "regenerator-runtime": "^0.14.1",
     "three": "^0.176.0",
     "three.path": "^1.0.1",
     "vue": "^2.6.11"
   },
   "devDependencies": {
     "@babel/core": "^7.12.16",
-    "@babel/plugin-proposal-class-properties": "^7.0.0",
-    "@babel/plugin-proposal-decorators": "^7.0.0",
-    "@babel/plugin-proposal-export-namespace-from": "^7.0.0",
-    "@babel/plugin-proposal-function-sent": "^7.0.0",
-    "@babel/plugin-proposal-json-strings": "^7.0.0",
-    "@babel/plugin-proposal-numeric-separator": "^7.0.0",
-    "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
-    "@babel/plugin-proposal-optional-chaining": "^7.17.12",
-    "@babel/plugin-proposal-throw-expressions": "^7.0.0",
-    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
-    "@babel/plugin-syntax-import-meta": "^7.0.0",
-    "@babel/plugin-syntax-jsx": "^7.17.12",
-    "@babel/plugin-transform-object-rest-spread": "^7.25.9",
-    "@babel/plugin-transform-runtime": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
-    "@babel/runtime-corejs2": "^7.18.3",
+    "@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",

package/packages/components/com-flcanvas/index.vue

@@ -4,6 +4,26 @@
 </template>
 
 <script>
+    function base64ToBlob(base64) {
+        const byteCharacters = atob(base64);
+        const byteArrays = [];
+
+        for (let offset = 0; offset < byteCharacters.length; offset += 512) {
+            const slice = byteCharacters.slice(offset, offset + 512);
+            const byteNumbers = new Array(slice.length);
+            for (let i = 0; i < slice.length; i++) {
+                byteNumbers[i] = slice.charCodeAt(i);
+            }
+            const byteArray = new Uint8Array(byteNumbers);
+            byteArrays.push(byteArray);
+        }
+        return new Blob(byteArrays, { type: 'application/pdf' });
+    }
+
+
+    function createObjectURL(blob) {
+        return URL.createObjectURL(blob);
+    }
 
 
 
@@ -100,11 +120,21 @@
 
         methods: {
             loadDxf(data){
+
+                console.log("ok");
+
                 const parser = new DxfParser();
                 let dxf = parser.parse(data);
                 let entities = formatEntity(dxf.entities);
+
+                console.log(entities);
+
                 let layers = dxf.tables.layer.layers;
                 //加载图纸
+
+                console.log("layers");
+                console.log(layers);
+
                 for (let key in layers) {
                     if (entities[key]) {
                         let group = [];
@@ -142,12 +172,25 @@
                                         let y1=entity.y1;
                                         let x2=entity.x2;
                                         let y2=entity.y2;
-                                        context.moveTo(x1, -parseFloat(y1));
-                                        context.lineTo(x2, -parseFloat(y2));
+
+
+                                        if(x1!=undefined&&y1!=undefined&&x2!=undefined&&y2!=undefined) {
+
+
+                                            context.moveTo(x1, -parseFloat(y1));
+                                            context.lineTo(x2, -parseFloat(y2));
+                                        }
                                     }
                                     if(entity.type === "polyline"){
+                                        let flag=false;
+
+
+
                                         let points=entity.points;
                                         let closed = entity.closed;
+
+
+
                                         for(let j = 0; j < points.length; j++){
                                             let index = j % 2;
                                             if(index === 0){
@@ -183,10 +226,11 @@
                     scale = Number((boundingRect.width / boundingRect.height).toFixed(1));
                     scale = scale < 2 ? 2 : scale
                 }
+                /*
                 konvaStage.scale({
-                    x: scale,
-                    y: scale,
-                })
+                  x: scale,
+                  y: scale,
+                })*/
                 const boundingScale = konvaLayer.getClientRect();
                 //平移视口
                 const x =
@@ -195,14 +239,19 @@
                 const y =
                     this.$refs.svgDraw.clientHeight / 2 -
                     (Math.ceil(boundingScale.height) / 2 + boundingScale.y);
-                konvaStage.setX(x);
-                konvaStage.setY(y);
+
+                konvaStage.scale({
+                    x:2,
+                    y:2
+                })
+                //  konvaStage.setX(x);
+                konvaStage.setY(750);
 
 
 
 
             },
-            toPdf(){
+            toPdf(name){
                 // get data URL with default settings
 
                 // open in new window
@@ -228,7 +277,7 @@
                     konvaStage.height()
                 );
 
-                pdf.save('canvas.pdf');
+                pdf.save(name+".pdf");
                 // var imgData = canvas.toDataURL('image/png');
                 //doc.text("Hello world!", 10, 10);
                 //doc.save("a4.pdf");

package/src/main.js

@@ -2,6 +2,7 @@ import FlModel from '../packages/components/com-graphics/index.vue';
 import Fl2dcanvas from '../packages/components/com-flcanvas/index.vue';
 import FLPerControl from '../packages/components/com-graphics/per-control.vue';
 import * as THREE from 'three';
+
 const components = [
     FlModel,
     Fl2dcanvas,

package/dist/demo.html

@@ -1,10 +0,0 @@
-<meta charset="utf-8">
-<title>fl-web-component demo</title>
-<script src="./fl-web-component.umd.js"></script>
-
-<link rel="stylesheet" href="./fl-web-component.css">
-
-
-<script>
-console.log(fl-web-component)
-</script>