From adcaeccc332e4abbeca2c2a52c433d316a9aeade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E9=B9=8F?= <2916022834@qq.com>
Date: Wed, 22 Oct 2025 14:35:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E5=B8=83=E7=BB=84=E5=90=88=E6=92=A4?=
 =?UTF-8?q?=E5=9B=9E=E5=92=8C=E9=87=8D=E5=81=9Abug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CanvasEditor/commands/LayerCommands.js    | 18 ++++----
 src/component/Canvas/canvasExample.vue        | 45 ++++++++++++++++++-
 src/views/HomeView/history.vue                |  4 +-
 3 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/src/component/Canvas/CanvasEditor/commands/LayerCommands.js b/src/component/Canvas/CanvasEditor/commands/LayerCommands.js
index 3275365a..bf3f3220 100644
--- a/src/component/Canvas/CanvasEditor/commands/LayerCommands.js
+++ b/src/component/Canvas/CanvasEditor/commands/LayerCommands.js
@@ -2019,7 +2019,7 @@ export class LayerObjectsToGroupCommand extends Command {
       console.error("图层或Canvas未初始化");
       return null;
     }
-
+	this.activeLayer = this.layerManager.getActiveLayer();
     // 查找图层中是否已有组对象
     const existingGroup = this._findExistingGroup();
     this.existingGroupId = existingGroup?.id || null;
@@ -2073,10 +2073,10 @@ export class LayerObjectsToGroupCommand extends Command {
         }
 
         // 更新交互性
-        this.layerManager?.updateLayersObjectsInteractivity?.(false);
-
-        // 更新缩略图
-        this._updateThumbnail();
+        this.layerManager?.updateLayersObjectsInteractivity?.(false).then(()=>{
+          // 更新缩略图
+          this._updateThumbnail();
+		});
       });
 
       // 标记为非首次执行
@@ -2344,7 +2344,7 @@ export class LayerObjectsToGroupCommand extends Command {
 
           // 将对象添加回画布
           this.canvas.add(obj);
-          restoredObjects.push(obj);
+          restoredObjects.push(obj.toObject("id", "layerId", "layerName"));
 
           console.log(
             `✅ 恢复原始对象 ${obj.id || obj.type} 到位置 (${position.left}, ${
@@ -2543,9 +2543,9 @@ export class LayerObjectsToGroupCommand extends Command {
    * @private
    */
   _updateThumbnail() {
-    // this.canvas?.thumbnailManager?.generateLayerThumbnail?.(
-    //   this.activeLayer.id
-    // );
+    this.canvas?.thumbnailManager?.generateLayerThumbnail?.(
+      this.activeLayer.id
+    );
   }
 
   getInfo() {
diff --git a/src/component/Canvas/canvasExample.vue b/src/component/Canvas/canvasExample.vue
index d67bdd41..e0b82da9 100644
--- a/src/component/Canvas/canvasExample.vue
+++ b/src/component/Canvas/canvasExample.vue
@@ -157,7 +157,30 @@ function canvasProject() {
     console.warn("没有找到保存的画布项目");
   }
 }
-
+const exportJSON = () => {
+  console.log("导出JSON");
+  // 实现导出JSON逻辑
+  const json = canvasEditor.value.getJSON();
+  // 导出JSON文件
+  const blob = new Blob([json], { type: "application/json" });
+  const url = URL.createObjectURL(blob);
+  const a = document.createElement("a");
+  a.href = url;
+  a.download = "canvas_project.json";
+  a.click();
+  URL.revokeObjectURL(url);
+};
+// 复制JSON
+const copyJSON = () => {
+  console.log("复制JSON");
+  // 实现复制JSON逻辑
+  const json = canvasEditor.value.getJSON();
+  // 复制JSON到剪贴板
+  navigator.clipboard.writeText(json);
+};
+const getLayers = ()=>{
+  console.log("==========layers",canvasEditor.value?.layers)
+}
 // 处理自定义工具点击
 const handleCustomToolClick = (tool) => {
   tool.action();
@@ -255,6 +278,26 @@ const isShowLeft = ref(true);
             <span>更</span>
             <div class="tool-tooltip">更换底图</div>
           </div>
+          <div class="custom-tool-btn" @click="saveCanvas">
+            <span>保</span>
+            <div class="tool-tooltip">保存画布</div>
+          </div>
+          <div class="custom-tool-btn" @click="canvasProject">
+            <span>读</span>
+            <div class="tool-tooltip">读取画布</div>
+          </div>
+          <div class="custom-tool-btn" @click="exportJSON">
+            <span>导</span>
+            <div class="tool-tooltip">导出JSON</div>
+          </div>
+          <div class="custom-tool-btn" @click="copyJSON">
+            <span>复</span>
+            <div class="tool-tooltip">复制JSON</div>
+          </div>
+          <div class="custom-tool-btn" @click="getLayers">
+            <span>查</span>
+            <div class="tool-tooltip">查询图层</div>
+          </div>
         </template>
       </CanvasEditor>
     </div>
diff --git a/src/views/HomeView/history.vue b/src/views/HomeView/history.vue
index dfb19a74..a809fe6c 100644
--- a/src/views/HomeView/history.vue
+++ b/src/views/HomeView/history.vue
@@ -271,7 +271,7 @@ export default defineComponent({
 	  const historyTable = this.$refs.historyTable
 	  const height = historyTable.offsetHeight;
 	  const size = Math.trunc((height - 110) / 54);
-	  this.pageSize = size
+	  this.pageSize = size || 1
 	  if(rem){
 	    this.currentPage = 1
 	    this.getHistoryList()
@@ -655,7 +655,7 @@ export default defineComponent({
           :deep(.ant-table-wrapper) {
             height: 100%;
             .ant-spin-nested-loading {
-              &,
+              &,	
               .ant-spin-container {
                 height: 100%;
 				.ant-table{