Merge branch 'master' of http://47.122.114.111:9999/zhuzhequan/electron-printer

package.json

@@ -2,7 +2,7 @@
   "name": "JomallProductionAssistant",
   "name": "JomallProductionAssistant",
   "productName": "JomallProductionAssistant",
   "productName": "JomallProductionAssistant",
   "description": "",
   "description": "",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "private": true,
   "private": true,
   "scripts": {
   "scripts": {
     "serve": "vue-cli-service serve",
     "serve": "vue-cli-service serve",
@@ -29,7 +29,7 @@
     "electron-updater": "^6.2.1",
     "electron-updater": "^6.2.1",
     "element-ui": "^2.13.0",
     "element-ui": "^2.13.0",
     "express": "^4.17.1",
     "express": "^4.17.1",
-    "fabric": "^5.2.4",
+    "fabric": "^6.7.0",
     "html2canvas": "^1.4.1",
     "html2canvas": "^1.4.1",
     "lodash-id": "^0.14.0",
     "lodash-id": "^0.14.0",
     "log4js": "^6.9.1",
     "log4js": "^6.9.1",

src/views/design/main/index.vue

@@ -652,7 +652,6 @@ export default {
         that.$nextTick(async () => {
         that.$nextTick(async () => {
           let w = bw / 2;
           let w = bw / 2;
           let h = bh / 2;
           let h = bh / 2;
-
           let width_px, height_px, rate, x, y;
           let width_px, height_px, rate, x, y;
           if (size && !files[i].isCut) {
           if (size && !files[i].isCut) {
             width_px = that.WHproportion * mmToPx(size.width);
             width_px = that.WHproportion * mmToPx(size.width);
@@ -1053,12 +1052,7 @@ export default {
           });
           });
           break;
           break;
         case "sendFile":
         case "sendFile":
-          console.log("sendFile");
-          if (size) {
-            this.hasSize = true;
-          } else {
-            this.hasSize = false;
-          }
+          this.hasSize = !!size;
           this.detail.designImageSize = size;
           this.detail.designImageSize = size;
           console.log(this.detail, "this.detail");
           console.log(this.detail, "this.detail");
           this.imgList = [];
           this.imgList = [];