From 8ebf9b53901f9fbf4d945293b658cc06c5b83449 Mon Sep 17 00:00:00 2001
From: rookie4show <rookie4show@gmail.com>
Date: Thu, 6 Mar 2025 19:00:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Yys.vue | 49 ++++++++++++++++++++++++++++++------------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/components/Yys.vue b/src/components/Yys.vue
index 25c006d..5f9adb5 100644
--- a/src/components/Yys.vue
+++ b/src/components/Yys.vue
@@ -12,6 +12,11 @@
       @closeProperty="closeProperty"
       @updateProperty="updateProperty"
   />
+  <!-- 现有的代码 -->
+  <div style="margin: 20px" data-html2canvas-ignore="true">
+    <!-- 触发截图的按钮 -->
+    <el-button type="primary" @click="prepareCapture">{{ t('prepareCapture') }}</el-button>
+  </div>
 
   <draggable :list="state.groups" item-key="group" style="display: flex; flex-direction: column; width: 100%;"
              handle=".drag-handle">
@@ -49,7 +54,8 @@
               <template #item="{element : position, index:positionIndex}">
                 <div>
                   <el-col>
-                    <el-card :body-style="{ padding: '0px', display: 'flex', 'flex-direction': 'column', 'justify-content': 'center', 'align-items': 'center' }">
+                    <el-card shadow="never"
+                             :body-style="{ display: 'flex', 'flex-direction': 'column', 'justify-content': 'center', 'align-items': 'center' }">
 
                       <div>
                         <!-- Add delete button here -->
@@ -117,11 +123,7 @@
   </draggable>
   <div style="margin: 20px">
 
-    <!-- 现有的代码 -->
-    <div style="margin: 20px" data-html2canvas-ignore="true">
-      <!-- 触发截图的按钮 -->
-      <el-button type="primary" @click="prepareCapture">{{ t('prepareCapture') }}</el-button>
-    </div>
+
 
     <!-- 预览弹窗 -->
     <el-dialog id="preview-container" v-model="state.previewVisible" width="80%" :before-close="handleClose">
@@ -279,6 +281,15 @@ const ignoreElements = (element) => {
 const prepareCapture = async () => {
   state.previewVisible = true; // 显示预览弹窗
 
+  // 创建临时样式
+  const style = document.createElement('style')
+  style.id = 'capture-style'
+  style.textContent = `
+    .ql-container.ql-snow {
+      border: none !important;
+    }
+  `
+  document.head.appendChild(style)
   // 捕获页面元素并生成图片
   try {
     const element = document.querySelector('#main-container'); // 替换为要捕获的元素选择器
@@ -290,17 +301,21 @@ const prepareCapture = async () => {
 
     const canvas = await html2canvas(element, {
           ignoreElements: ignoreElements,
-          height: element.scrollHeight
+          height: element.scrollHeight,
         }
     );
     state.previewImage = canvas.toDataURL();
     if (!state.previewImage) {
       console.error('Failed to generate image data URL.');
       state.previewVisible = false;
+      state.previewVisible = false;
     }
   } catch (error) {
     console.error('Failed to capture screenshot', error);
     state.previewVisible = false;
+  }finally {
+    // 清除临时样式
+    document.getElementById('capture-style')?.remove()
   }
 };
 
@@ -335,24 +350,30 @@ const handleClose = (done) => {
 
 /* 正方形容器 */
 .avatar-wrapper {
-  width: 100px;         /* 正方形边长 */
-  height: 100px;        /* 与宽度相同 */
+  width: 100px; /* 正方形边长 */
+  height: 100px; /* 与宽度相同 */
   position: relative;
-  overflow: hidden;     /* 隐藏超出部分 */
-  border-radius: 50%;   /* 圆形裁剪 */
-  //border: 2px solid #fff; /* 可选：添加边框 */
-  box-shadow: 0 2px 8px rgba(0,0,0,0.1); /* 可选：添加阴影 */
+  overflow: hidden; /* 隐藏超出部分 */
+  border-radius: 50%; /* 圆形裁剪 */
+//border: 2px solid #fff; /* 可选：添加边框 */ //box-shadow: 0 2px 8px rgba(0,0,0,0.1); /* 可选：添加阴影 */
 }
 
 /* 图片样式 */
 .avatar-image {
   width: 100%;
   height: 100%;
-  object-fit: cover;    /* 关键属性：保持比例填充容器 */
+  object-fit: cover; /* 关键属性：保持比例填充容器 */
   object-position: center; /* 居中显示 */
   display: block;
   cursor: pointer;
 }
 
 
+
+
+.el-card {
+  border: 0;
+}
+
+
 </style>