|
@@ -119,6 +119,7 @@ export class CanvasPhotoEditor {
|
|
|
// --- 数据 getter/setter ---
|
|
// --- 数据 getter/setter ---
|
|
|
get selectedPageItem() { return this._selectedPageItem }
|
|
get selectedPageItem() { return this._selectedPageItem }
|
|
|
set selectedPageItem(newItem) {
|
|
set selectedPageItem(newItem) {
|
|
|
|
|
+ console.log('selectedPageItem', newItem)
|
|
|
this._selectedPageItem = { ...newItem }
|
|
this._selectedPageItem = { ...newItem }
|
|
|
this.updata({
|
|
this.updata({
|
|
|
selectedPageItem: this._selectedPageItem,
|
|
selectedPageItem: this._selectedPageItem,
|
|
@@ -1206,14 +1207,14 @@ export class CanvasPhotoEditor {
|
|
|
newPages.splice(PageIndex + 1, 0, newPageItem)
|
|
newPages.splice(PageIndex + 1, 0, newPageItem)
|
|
|
}
|
|
}
|
|
|
if (direction == 'double' && list.length != 2) {
|
|
if (direction == 'double' && list.length != 2) {
|
|
|
- newPages = this.autoFill(newPages, PageIndex)
|
|
|
|
|
|
|
+ newPages = this.autoFill(newPages, PageIndex, direction)
|
|
|
}
|
|
}
|
|
|
if (!direction) this.selectedPageIndex++
|
|
if (!direction) this.selectedPageIndex++
|
|
|
this.pages = newPages
|
|
this.pages = newPages
|
|
|
this.saveHistory()
|
|
this.saveHistory()
|
|
|
return this.pages
|
|
return this.pages
|
|
|
}
|
|
}
|
|
|
- autoFill(newPages, PageIndex){
|
|
|
|
|
|
|
+ autoFill(newPages, PageIndex, direction){
|
|
|
let newPageList = {
|
|
let newPageList = {
|
|
|
list: [],
|
|
list: [],
|
|
|
item: []
|
|
item: []
|
|
@@ -1266,17 +1267,16 @@ export class CanvasPhotoEditor {
|
|
|
if (this.selectedPageItem.index == -1) {//删除整页
|
|
if (this.selectedPageItem.index == -1) {//删除整页
|
|
|
const check = await this.checkIndexing();
|
|
const check = await this.checkIndexing();
|
|
|
newPages.splice(this.selectedPageIndex, 1)
|
|
newPages.splice(this.selectedPageIndex, 1)
|
|
|
- this.selectedPageItem.pageIndex = -1
|
|
|
|
|
- this.selectedPageIndex = -1
|
|
|
|
|
} else {//删除单个图片
|
|
} else {//删除单个图片
|
|
|
newPages[this.selectedPageIndex].list[this.selectedPageItem.index] = null
|
|
newPages[this.selectedPageIndex].list[this.selectedPageItem.index] = null
|
|
|
newPages[this.selectedPageIndex].item[this.selectedPageItem.index] = null
|
|
newPages[this.selectedPageIndex].item[this.selectedPageItem.index] = null
|
|
|
newPages = this.autoFill(newPages, this.selectedPageIndex)
|
|
newPages = this.autoFill(newPages, this.selectedPageIndex)
|
|
|
- this.selectedPageItem.pageIndex = -1
|
|
|
|
|
}
|
|
}
|
|
|
// this.saveHistory()
|
|
// this.saveHistory()
|
|
|
|
|
+ this.selectedPageIndex = -1
|
|
|
this.pages = newPages
|
|
this.pages = newPages
|
|
|
- this.selectedPageIndex = Math.min(this.selectedPageIndex, this.pages.length - 1)
|
|
|
|
|
|
|
+ this.selectedPageItem.pageIndex = -1
|
|
|
|
|
+ // this.selectedPageIndex = Math.min(this.selectedPageIndex, this.pages.length - 1)
|
|
|
if (this.selectedPageItem.index == -1) {
|
|
if (this.selectedPageItem.index == -1) {
|
|
|
// this.resetPosition()
|
|
// this.resetPosition()
|
|
|
}
|
|
}
|