From b60718aa625751a3b6bdccc2e6aae5cda7ff360f Mon Sep 17 00:00:00 2001
From: BTMuli <BT-Muli@outlook.com>
Date: Fri, 17 Nov 2023 22:26:29 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20=E4=BC=98=E5=8C=96=20share?=
 =?UTF-8?q?=20=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/home/t-calendar.vue |  2 +-
 src/pages/User/Characters.vue      |  3 +--
 src/pages/User/Record.vue          |  3 +--
 src/utils/TGShare.ts               | 10 ++++------
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/components/home/t-calendar.vue b/src/components/home/t-calendar.vue
index 7e510828..e4739977 100644
--- a/src/components/home/t-calendar.vue
+++ b/src/components/home/t-calendar.vue
@@ -41,7 +41,7 @@
           :label="switchType === 'avatar' ? '角色' : '武器'"
           @change="switchType = switchType === 'avatar' ? 'weapon' : 'avatar'"
         />
-        <v-btn class="calendar-title-btn" @click="share">
+        <v-btn class="calendar-title-btn" @click="share" data-html2canvas-ignore>
           <template #prepend>
             <v-icon>mdi-share-variant</v-icon>
           </template>
diff --git a/src/pages/User/Characters.vue b/src/pages/User/Characters.vue
index 9ea475d2..be55fc45 100644
--- a/src/pages/User/Characters.vue
+++ b/src/pages/User/Characters.vue
@@ -8,7 +8,7 @@
         </span>
         <span v-else> 暂无数据 </span>
       </div>
-      <div class="uc-top-btns">
+      <div class="uc-top-btns" data-html2canvas-ignore>
         <v-btn class="uc-top-btn" @click="refreshRoles()">
           <template #prepend>
             <v-icon>mdi-refresh</v-icon>
@@ -182,7 +182,6 @@ function selectRole(role: TGApp.Sqlite.Character.UserRole): void {
 <style lang="css" scoped>
 .uc-box {
   display: flex;
-  width: 100%;
   flex-direction: column;
   padding: 10px;
   border: 1px solid var(--common-shadow-2);
diff --git a/src/pages/User/Record.vue b/src/pages/User/Record.vue
index 9a27f8c0..c96765dd 100644
--- a/src/pages/User/Record.vue
+++ b/src/pages/User/Record.vue
@@ -6,7 +6,7 @@
         <span v-if="!isEmpty">{{ getTitle() }} 更新于 {{ recordData.updated }}</span>
         <span v-else>原神战绩【暂无数据】</span>
       </div>
-      <div class="ur-top-btns">
+      <div class="ur-top-btns" data-html2canvas-ignore>
         <v-btn class="ur-top-btn" @click="refresh()">
           <template #prepend>
             <v-icon>mdi-refresh</v-icon>
@@ -118,7 +118,6 @@ async function shareRecord(): Promise<void> {
 <style lang="css" scoped>
 .ur-box {
   display: flex;
-  width: 100%;
   flex-direction: column;
   padding: 10px;
   border-radius: 5px;
diff --git a/src/utils/TGShare.ts b/src/utils/TGShare.ts
index dbfe0081..7e936331 100644
--- a/src/utils/TGShare.ts
+++ b/src/utils/TGShare.ts
@@ -79,18 +79,16 @@ function getShareImgBgColor(): string {
  * @param {string} fileName - 文件名
  * @param {HTMLElement} element - 元素
  * @param {number} scale - 缩放比例
- * @param {number} offset - 偏移量
  * @returns {Promise<void>} 无返回值
  */
 export async function generateShareImg(
   fileName: string,
   element: HTMLElement,
   scale: number = 1.2,
-  offset: number = 30,
 ): Promise<void> {
   const canvas = document.createElement("canvas");
-  const width = element.clientWidth + offset;
-  const height = element.clientHeight + offset;
+  const width = element.clientWidth + 30;
+  const height = element.clientHeight + 30;
   canvas.width = width * scale;
   canvas.height = height * scale;
   const opts = {
@@ -101,8 +99,8 @@ export async function generateShareImg(
     height,
     useCORS: true,
     canvas,
-    x: (-offset / 2) * scale,
-    y: (-offset / 2) * scale,
+    x: -10,
+    y: -15,
     dpi: 350,
   };
   const canvasData = await html2canvas(element, opts);