From f30c3f233af22409047817793dcbd55b14a5f558 Mon Sep 17 00:00:00 2001
From: YuanFeng <770153798@qq.com>
Date: Sun, 8 Sep 2024 17:48:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=20=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E7=A8=BF=E4=BB=B6=E6=97=B6=E5=9B=BE=E7=89=87=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E6=85=A2=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/DraftDesign/index.vue      | 43 ++++++++++---------
 .../src/components/DraftDesign/utils/Dpi.ts   |  2 +-
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/index.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/index.vue
index 1f6e0fe..eda2701 100644
--- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/index.vue
@@ -59,7 +59,7 @@ import {
   mergeDeepObject, objectHasKey,
 } from "@/components/DraftDesign/utils/FuncUtil";
 
-import {register, getTeleport} from '@antv/x6-vue-shape'
+import {register} from '@antv/x6-vue-shape'
 
 import './icons/style.css'
 
@@ -169,8 +169,6 @@ const regNode = () => {
     })
   }
 }
-const TeleportContainer = defineComponent(getTeleport());
-
 // @ts-nocheck
 const emit = defineEmits(["save"])
 const {t} = useI18n() // 国际化
@@ -699,25 +697,28 @@ const toPngUrl = (callback: (url: string) => void, options?: {
     bottom: number
   }
 }) => {
-  let widthScale = options && options.widthScale ? options.widthScale : 5
-  let heightScale = options && options.heightScale ? options.heightScale : 5
 
-  graph.toPNG((dataUri) => {
-    that.previewUrl = dataUri;
-    callback(that.previewUrl)
-  }, {
-    backgroundColor: that.pageConfig.background.areaColor,
-    width: that.pageConfig.width * (widthScale),
-    height: that.pageConfig.height * (heightScale),
-    padding: {
-      top: 0,
-      left: 0,
-      right: 0,
-      bottom: 0
-    },
-    quality: 1,
-    ...options
-  })
+  setTimeout(()=>{
+    //处理图片等待加载完成
+    let widthScale = options && options.widthScale ? options.widthScale : 5
+    let heightScale = options && options.heightScale ? options.heightScale : 5
+    graph.toPNG((dataUri) => {
+      that.previewUrl = dataUri;
+      callback(that.previewUrl)
+    }, {
+      backgroundColor: that.pageConfig.background.areaColor,
+      width: that.pageConfig.width * (widthScale),
+      height: that.pageConfig.height * (heightScale),
+      padding: {
+        top: 0,
+        left: 0,
+        right: 0,
+        bottom: 0
+      },
+      quality: 1,
+      ...options
+    })
+  },500)
 }
 const setPropList = (propDataInfo) => {
   const keys = Object.keys(propDataInfo)
diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/utils/Dpi.ts b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/utils/Dpi.ts
index 574b99c..670dd14 100644
--- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/utils/Dpi.ts
+++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/utils/Dpi.ts
@@ -38,7 +38,7 @@ export function calcDpiFromSize( screenSize=16,opt = 'd'){
 }
 const tmpImage = {}
 export function convertImageToBase64(url) {
-  return new Promise(async (resolve, reject)=>{
+  return new Promise(async (resolve)=>{
     FileApi.getDomain().then(async (domain) => {
       url =  replaceDomain(domain, url)
       if(tmpImage[url]){