1

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

@@ -232,7 +232,7 @@ export class CanvasPhotoEditor {
     if (!this.show && pageIndex > -1 && this.setImgTitle.titleIndex > -1 && this.pages[pageIndex].list && this.pages[pageIndex].list[this.setImgTitle.titleIndex]) {//点击标题进行修改标题名称
       let item = this.pages[pageIndex].item[this.setImgTitle.titleIndex]
       if (!item.id) return
-      return ElMessageBox.prompt("", "修改名称", {
+      return ElMessageBox.prompt("", "修改说明", {
         confirmButtonText: "确定",
         customClass: "promptClass",
         cancelButtonText: "取消",
@@ -244,7 +244,7 @@ export class CanvasPhotoEditor {
           }
           return true;
         },
-        inputErrorMessage: "请输入名称",
+        inputErrorMessage: "请输入说明",
       })
         .then(async ({ value }) => {
           this.pages[pageIndex].item[this.setImgTitle.titleIndex] = {
@@ -1233,11 +1233,12 @@ export class CanvasPhotoEditor {
           newPageList.item.push(...itemInfo.item)
         }
       })
+      console.log(newPageList, 'newPageList', PageIndex, direction)
 
-      newPages[PageIndex].list[1] = newPageList.list[0]
-      newPages[PageIndex].item[1] = newPageList.item[0]
+      newPages[PageIndex].list[direction == 'double'?1:this.selectedPageItem.index] = newPageList.list[0]
+      newPages[PageIndex].item[direction == 'double'?1:this.selectedPageItem.index] = newPageList.item[0]
       let numberId = 1
-      for (var i = PageIndex + 1; i < newPages.length; i++) {
+      for (var i =PageIndex + 1; i < newPages.length; i++) {
         let newPageslist = [newPageList.list[numberId]]
         let newPagesitem = [newPageList.item[numberId]]
         numberId++
@@ -1271,11 +1272,10 @@ export class CanvasPhotoEditor {
       const check = await this.checkIndexing();
       newPages[this.selectedPageIndex].list[this.selectedPageItem.index] = null
       newPages[this.selectedPageIndex].item[this.selectedPageItem.index] = null
-      newPages = this.autoFill(newPages, this.selectedPageIndex)
+      newPages = this.autoFill(newPages, this.selectedPageIndex, newPages[this.selectedPageIndex].layoutMode)
     }
     // this.saveHistory()
-    this.selectedPageIndex = -1
-    this.pages = newPages
+    this.selectedPageIndex = -1    this.pages = newPages
     this.selectedPageItem.pageIndex = -1
     // this.selectedPageIndex = Math.min(this.selectedPageIndex, this.pages.length - 1)
     if (this.selectedPageItem.index == -1) {

src/view/case/photos/index.vue

@@ -557,7 +557,7 @@ const handleLayoutChange = async (value) => {
   }
 };
 const autoLayouts = async () => {
-  const check = await editor.value.checkIndexing();
+  // const check = await editor.value.checkIndexing();
   selectedPhotosbf.value = selectedPhotos.value;
   autoLayout();
 };
@@ -577,8 +577,10 @@ const autoLayout = () => {
   // editor.value.drawAllPages()
 };
 const handleAddType = async (type) => {
+  if(selectedPageIndex.value == pages.value.length-1){
+    return insertBlankPage(type);
+  }
   const check = await editor.value.checkIndexing();
-  console.log("handleAddType", type, check);
   insertBlankPage(type);
 };
 // 插入空白页