1

src/view/case/photos/canvas-photo-editor.js

@@ -1101,6 +1101,8 @@ export class CanvasPhotoEditor {
   // --- 页面操作 ---
   autoLayout(selectedPhotos=[]) {
     let newList = this.pages.flatMap(item => item.list)
+    console.log('newList', newList)
+
     const layout = this.getItemSize()
     let newPages = []
     const pageX = this.pages.length * (this.pageWidth + this.pageMargin)
@@ -1116,9 +1118,6 @@ export class CanvasPhotoEditor {
       newArr.forEach((photoId, photoIndex) => {
         list.push(photoId)
         console.log('newArr', list,layout, photoId)
-        if(photoIndex+1>this.pages.length && !photoId){
-          return
-        }
         if(list.length == layout.count){
             newPages.push({...currentPage, list: list, })
             list = []
@@ -1134,9 +1133,10 @@ export class CanvasPhotoEditor {
         let itemList = this.padArrayLength(ele.list, ele.layoutMode == 'double'?2:1)
         let eleItem = this.padArrayLength(ele.item, ele.layoutMode == 'double'?2:1)
         if(countId >= selectedPhotos.length) return
+        console.log('newArr', itemList, eleItem, selectedPhotos, countId)
         itemList.map((element,index) => {
           if(!element){
-            itemList.push(selectedPhotos[countId])
+            itemList[index] = selectedPhotos[countId]
             eleItem[index] = this.photos.find(p => p.id === selectedPhotos[countId])
             countId++
           }
@@ -1160,9 +1160,9 @@ export class CanvasPhotoEditor {
       }
     }
         console.log('newArr', newPages)
-    if(newPages.length > 0 && newPages.length < this._pages.length){//需要补位
-      newPages = newPages.concat(Array(this._pages.length - newPages.length).fill({...currentPage, list: layout.count == 2 ? [null, null] : [null]}));
-    }
+    // if(newPages.length > 0 && newPages.length < this._pages.length){//需要补位
+    //   newPages = newPages.concat(Array(this._pages.length - newPages.length).fill({...currentPage, list: layout.count == 2 ? [null, null] : [null]}));
+    // }
     this.pages = newPages
     // newPages.length || selectedPhotos.length ? newPages : this._pages
     this.resetPosition()
@@ -1177,7 +1177,7 @@ export class CanvasPhotoEditor {
     const newPages = [...this.pages]
     if(direction === undefined){
       this.pages = [...newPages, {
-        list: [],
+        list: new Array(layout.count).fill(null),
         layoutMode: this.layoutMode, //页码布局类型
         coordinate: [], //坐标信息
       }]
@@ -1203,7 +1203,6 @@ export class CanvasPhotoEditor {
     const PageIndex = this.selectedPageIndex;
     let list = newPages[PageIndex] && newPages[PageIndex].list?.filter(i => i) || []
     newPages[PageIndex].layoutMode = direction
-    debugger
     if (list.length == 2 && direction != 'double') {//两页改成一页
       newPageItem = {
         coordinate: [newPages[PageIndex].coordinate[1]],

src/view/case/photos/index.vue

@@ -316,7 +316,7 @@ const getImgList = async () => {
   let content = item && item.content && JSON.parse(item?.content);
   // editor.value.drawAllPages(photos.value);
   if (content) {
-    editor.value._layoutMode = content.pages.some(ele =>ele.layoutMode == 'double') ? "double" : "single";
+    // editor.value._layoutMode = content.pages.some(ele =>ele.layoutMode == 'double') ? "double" : "single";
     pages.value = content.pages;
     editor.value.pages = pages.value;
     editor.value.indexingLineList = content.indexingLineList || [];