From 7b49f61cc8940bb51b57510962f8e36b7a5a2bf2 Mon Sep 17 00:00:00 2001
From: zhangyh <zhangyahui@haier.com>
Date: Wed, 24 Sep 2025 17:18:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20library-=E6=9C=8D=E8=A3=85-=E7=94=BB?=
 =?UTF-8?q?=E5=B8=83=E6=B7=BB=E5=8A=A0=E4=BB=8Elibrary=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                             |  2 ++
 src/component/Canvas/CanvasEditor/index.vue | 27 ++++++++++++++++++++-
 src/component/modules/generalMiniCanvas.vue |  1 +
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/components.d.ts b/components.d.ts
index 1796a907..27d9abac 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -18,6 +18,7 @@ declare module 'vue' {
     AMenu: typeof import('ant-design-vue/es')['Menu']
     AMenuItem: typeof import('ant-design-vue/es')['MenuItem']
     AModal: typeof import('ant-design-vue/es')['Modal']
+    APagination: typeof import('ant-design-vue/es')['Pagination']
     APopover: typeof import('ant-design-vue/es')['Popover']
     ARangePicker: typeof import('ant-design-vue/es')['RangePicker']
     ASelect: typeof import('ant-design-vue/es')['Select']
@@ -27,6 +28,7 @@ declare module 'vue' {
     ASwitch: typeof import('ant-design-vue/es')['Switch']
     ATable: typeof import('ant-design-vue/es')['Table']
     AUpload: typeof import('ant-design-vue/es')['Upload']
+    ElCascader: typeof import('element-plus/es')['ElCascader']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
   }
diff --git a/src/component/Canvas/CanvasEditor/index.vue b/src/component/Canvas/CanvasEditor/index.vue
index 503e83dd..8893b257 100644
--- a/src/component/Canvas/CanvasEditor/index.vue
+++ b/src/component/Canvas/CanvasEditor/index.vue
@@ -21,6 +21,9 @@ import { RedGreenModeManager } from "./managers/RedGreenModeManager";
 import texturePresetManager from "./managers/brushes/TexturePresetManager";
 import { BrushStore } from "./store/BrushStore";
 import cuowuImg from '@/assets/images/homePage/cuowu.svg'
+import { Https } from "@/tool/https";
+import SelectImages from '@/component/common/SelectImages.vue'
+import { UrlToFile } from '@/tool/util'
 
 
 // import { MinimapManager } from "./managers/minimap/MinimapManager";
@@ -102,6 +105,10 @@ const props = defineProps({
     type: Boolean,
     default: false, // 是否显示固定图层
   },
+  isGeneral: { // 从generalMiniCanvas来的
+    type: Boolean,
+    default:false
+  }
 });
 
 // 引用和状态
@@ -706,9 +713,19 @@ function handleImageUpload(event) {
     });
 }
 
+const selectImages = ref(null);
+const handleImageSelect = (data) => {
+  UrlToFile(data.url,data.name).then((file)=>{
+    handleImageUpload({ target: { files: [file] } })
+  })
+}
 function triggerLibrary() {
   console.log('打开收藏')
-  emit("trigger-library");
+  if (props.isGeneral) { 
+    selectImages.value.init()
+  } else {
+    emit("trigger-library");
+  }
 }
 
 function handleAddText() {
@@ -1171,6 +1188,14 @@ defineExpose({
       style="display: none"
       @change="handleImageUpload"
     />
+    <SelectImages 
+    ref="selectImages"
+    full-data
+    radio
+    @select="handleImageSelect"
+    :api="Https.httpUrls.queryLibraryPage"
+    isLibrary
+    />
   </div>
 </template>
 
diff --git a/src/component/modules/generalMiniCanvas.vue b/src/component/modules/generalMiniCanvas.vue
index e9463578..12a36713 100644
--- a/src/component/modules/generalMiniCanvas.vue
+++ b/src/component/modules/generalMiniCanvas.vue
@@ -4,6 +4,7 @@
 			<editCanvas v-if="canvasLoad" :config="canvasConfig" 
 				@canvasInit="canvasInit"
 				@changeCanvas="changeCanvas"
+				is-general
 				ref="editCanvas"></editCanvas>
 		</div>
 		<div class="btn">