Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

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
+  }
 });
 
 // 引用和状态
@@ -727,9 +734,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() {
@@ -1194,6 +1211,14 @@ defineExpose({
       style="display: none"
       @change="handleImageUpload"
     />
+    <SelectImages 
+    ref="selectImages"
+    full-data
+    radio
+    @select="handleImageSelect"
+    :api="Https.httpUrls.queryLibraryPage"
+    isLibrary
+    />
   </div>
 </template>