tangning 9 godzin temu
rodzic
commit
0c89479c5d

+ 3 - 2
src/view/case/photos/canvas-photo-editor.js

@@ -976,7 +976,7 @@ export class CanvasPhotoEditor {
           ...imgItem,
           ...pagePhotos.item[itemIndex],
         }
-        console.log('this.dragPageData', imgItem)
+        console.log('this.s', imgItem)
         this.renderSinglePhoto(ctx, pageX, itemY, layout, pagePhotos.item[itemIndex])
       })
     })
@@ -1012,7 +1012,6 @@ export class CanvasPhotoEditor {
    */
   renderSinglePhoto(ctx, pageX, itemY, layout, photo = {}) {
     // if (!photo) return
-    console.log('this.dragPageData', ctx, pageX, itemY, layout, photo)
 
     let img = this.imgCache.get(photo.id)
     if (!img && photo && photo.url) {
@@ -1058,6 +1057,7 @@ export class CanvasPhotoEditor {
     // 4. 恢复上下文(裁剪失效)
     // 图片未加载完成则跳过
     const jxx = pageX + layout.x;
+    console.log('this.dragPageData', img, photo)
     if (!img || !img.complete || img.width === 0 || img.height === 0) {//无图
 
     } else {
@@ -1187,6 +1187,7 @@ export class CanvasPhotoEditor {
       newPages.forEach((ele, index) => {
         if(index == this.selectedPageIndex){
           ele.list[this.selectedPageItem.index] = null
+          ele.item[this.selectedPageItem.index] = null
           // ele.list.splice(this.selectedPageItem.index, 1)
         }
       })

+ 9 - 1
src/view/case/photos/index.vue

@@ -262,21 +262,25 @@ const pages = ref([
     list: [],
     layoutMode: layoutMode.value, //排版模式
     coordinate: [], //坐标信息
+    item: [], //坐标信息
   },
   {
     list: [],
     layoutMode: layoutMode.value, //排版模式
     coordinate: [], //坐标信息
+    item: [], //坐标信息
   },
   {
     list: [],
     layoutMode: layoutMode.value, //排版模式
     coordinate: [], //坐标信息
+    item: [], //坐标信息
   },
   {
     list: [],
     layoutMode: layoutMode.value, //排版模式
     coordinate: [], //坐标信息
+    item: [], //坐标信息
   },
 ]);
 const scale = ref(1.0);
@@ -600,9 +604,13 @@ const handleDrop = async (e) => {
   while (newPages[pageIndex].list.length <= itemIndex) {
     newPages[pageIndex].list.push("");
   }
+  if(newPages[pageIndex].item.length < itemIndex) {
+    newPages[pageIndex].item.push(draggedPhoto.value);
+  }
   // 放入照片ID
   newPages[pageIndex].list[itemIndex] = draggedPhoto.value.id;
-  console.log("handleDrop", position, newPages[pageIndex]);
+  newPages[pageIndex].item[itemIndex] = draggedPhoto.value;
+  console.log("handleDrop", position, newPages[pageIndex], draggedPhoto.value);
 
   // 同步数据
   pages.value = newPages;