|
|
@@ -953,17 +953,20 @@ export class CanvasPhotoEditor {
|
|
|
ctx.fillStyle = '#ffffff'
|
|
|
ctx.fillRect(pageX + layout.x, itemY, layout.width, layout.height)
|
|
|
// coordinate.push({x: pageX + layout.x, y: itemY, width: layout.width, height:layout.height})
|
|
|
- ctx.strokeStyle = photoId?'#fff':'#e5e7eb'
|
|
|
+ ctx.strokeStyle = '#fff'
|
|
|
ctx.lineWidth = 1 / this.scale
|
|
|
ctx.strokeRect(pageX + layout.x, itemY, layout.width, layout.height)
|
|
|
// 设置填充颜色
|
|
|
+ ctx.strokeStyle = '#e5e7eb'
|
|
|
ctx.fillStyle = photoId?'#fff':'#D9D9D9'; // 黄色
|
|
|
// 绘制填充矩形
|
|
|
ctx.fillRect(pageX + layout.x, itemY, layout.width, layout.height);
|
|
|
// 说明文字占位框
|
|
|
if (this._selectedPageItem && this._selectedPageItem.pageIndex === pageIndex && this._selectedPageItem.index === itemIndex) {
|
|
|
|
|
|
- ctx.strokeStyle = this.selectedPageColor
|
|
|
+ ctx.fillStyle = 'red'; // 黄色
|
|
|
+ ctx.strokeStyle = 'red'; // 黄色
|
|
|
+ // ctx.strokeStyle = this.selectedPageColor
|
|
|
ctx.lineWidth = 2 / this.scale
|
|
|
ctx.strokeRect(pageX + layout.x - 1, itemY - 1, layout.width + 2, layout.height + 2)
|
|
|
ctx.strokeStyle = '#e5e7eb'
|
|
|
@@ -1595,9 +1598,9 @@ export class CanvasPhotoEditor {
|
|
|
);
|
|
|
|
|
|
// 虚线框
|
|
|
- ctx.setLineDash([1, 1]);
|
|
|
- ctx.strokeRect(coord.x, coord.y + coord.height + this.imgMargin, coord.width, this.titleHieght);
|
|
|
- ctx.setLineDash([]);
|
|
|
+ // ctx.setLineDash([1, 1]);
|
|
|
+ // ctx.strokeRect(coord.x, coord.y + coord.height + this.imgMargin, coord.width, this.titleHieght);
|
|
|
+ // ctx.setLineDash([]);
|
|
|
}
|
|
|
});
|
|
|
// 页码
|
|
|
@@ -1759,9 +1762,9 @@ export class CanvasPhotoEditor {
|
|
|
coord.width - 20, 24, 2, "14pt 宋体"
|
|
|
);
|
|
|
|
|
|
- ctx.setLineDash([1, 1]);
|
|
|
- ctx.strokeRect(coord.x, coord.y + coord.height + this.imgMargin, coord.width, this.titleHieght);
|
|
|
- ctx.setLineDash([]);
|
|
|
+ // ctx.setLineDash([1, 1]);
|
|
|
+ // ctx.strokeRect(coord.x, coord.y + coord.height + this.imgMargin, coord.width, this.titleHieght);
|
|
|
+ // ctx.setLineDash([]);
|
|
|
}
|
|
|
});
|
|
|
// 页码
|