feat: 裁剪组裁剪跟随选择组移动
This commit is contained in:
@@ -258,10 +258,7 @@ export class ToolManager {
|
||||
const shiftKey = event.shiftKey;
|
||||
|
||||
// 当处于输入状态时不触发快捷键
|
||||
if (
|
||||
event.target.tagName === "INPUT" ||
|
||||
event.target.tagName === "TEXTAREA"
|
||||
) {
|
||||
if (event.target.tagName === "INPUT" || event.target.tagName === "TEXTAREA") {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -286,10 +283,7 @@ export class ToolManager {
|
||||
}
|
||||
|
||||
// 在红绿图模式下检查工具可用性
|
||||
if (
|
||||
this.isRedGreenMode &&
|
||||
!this.isToolAvailableInRedGreenMode(toolId)
|
||||
) {
|
||||
if (this.isRedGreenMode && !this.isToolAvailableInRedGreenMode(toolId)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -564,9 +558,7 @@ export class ToolManager {
|
||||
|
||||
// 通知选区管理器切换到矩形套索工具
|
||||
if (this.canvasManager && this.canvasManager.selectionManager) {
|
||||
this.canvasManager.selectionManager.setCurrentTool(
|
||||
OperationType.LASSO_RECTANGLE
|
||||
);
|
||||
this.canvasManager.selectionManager.setCurrentTool(OperationType.LASSO_RECTANGLE);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -581,9 +573,7 @@ export class ToolManager {
|
||||
|
||||
// 通知选区管理器切换到椭圆套索工具
|
||||
if (this.canvasManager && this.canvasManager.selectionManager) {
|
||||
this.canvasManager.selectionManager.setCurrentTool(
|
||||
OperationType.LASSO_ELLIPSE
|
||||
);
|
||||
this.canvasManager.selectionManager.setCurrentTool(OperationType.LASSO_ELLIPSE);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -598,9 +588,7 @@ export class ToolManager {
|
||||
|
||||
// 通知选区管理器切换到椭圆套索工具
|
||||
if (this.canvasManager && this.canvasManager.selectionManager) {
|
||||
this.canvasManager.selectionManager.setCurrentTool(
|
||||
OperationType.AREA_CUSTOM
|
||||
);
|
||||
this.canvasManager.selectionManager.setCurrentTool(OperationType.AREA_CUSTOM);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -618,9 +606,7 @@ export class ToolManager {
|
||||
console.log("矩形选区工具已激活");
|
||||
|
||||
if (this.canvasManager && this.canvasManager.selectionManager) {
|
||||
this.canvasManager.selectionManager.setCurrentTool(
|
||||
OperationType.AREA_RECTANGLE
|
||||
);
|
||||
this.canvasManager.selectionManager.setCurrentTool(OperationType.AREA_RECTANGLE);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -677,10 +663,7 @@ export class ToolManager {
|
||||
if (layer) {
|
||||
if (layer.isBackground || layer.type === "background") {
|
||||
panelDetail.targetObject = layer.fabricObject;
|
||||
} else if (
|
||||
layer.fabricObjects &&
|
||||
layer.fabricObjects.length > 0
|
||||
) {
|
||||
} else if (layer.fabricObjects && layer.fabricObjects.length > 0) {
|
||||
panelDetail.targetObject = layer.fabricObjects[0];
|
||||
}
|
||||
|
||||
@@ -906,9 +889,7 @@ export class ToolManager {
|
||||
});
|
||||
|
||||
// 准备液化操作,获取原始图像数据
|
||||
const prepareResult = await liquifyManager.prepareForLiquify(
|
||||
targetObject
|
||||
);
|
||||
const prepareResult = await liquifyManager.prepareForLiquify(targetObject);
|
||||
|
||||
// 创建和初始化命令
|
||||
const initCommand = new InitLiquifyToolCommand({
|
||||
@@ -1110,9 +1091,7 @@ export class ToolManager {
|
||||
const target = e.target;
|
||||
if (
|
||||
target &&
|
||||
(target.type === "text" ||
|
||||
target.type === "i-text" ||
|
||||
target.type === "textbox")
|
||||
(target.type === "text" || target.type === "i-text" || target.type === "textbox")
|
||||
) {
|
||||
// 获取对应的图层
|
||||
const layer = this.layerManager.getLayerById(target.layerId);
|
||||
@@ -1380,11 +1359,7 @@ export class ToolManager {
|
||||
}
|
||||
|
||||
// 从画布笔刷获取
|
||||
if (
|
||||
this.canvas &&
|
||||
this.canvas.freeDrawingBrush &&
|
||||
this.canvas.freeDrawingBrush.width
|
||||
) {
|
||||
if (this.canvas && this.canvas.freeDrawingBrush && this.canvas.freeDrawingBrush.width) {
|
||||
return this.canvas.freeDrawingBrush.width;
|
||||
}
|
||||
|
||||
@@ -1409,11 +1384,7 @@ export class ToolManager {
|
||||
}
|
||||
|
||||
// 从画布笔刷获取
|
||||
if (
|
||||
this.canvas &&
|
||||
this.canvas.freeDrawingBrush &&
|
||||
this.canvas.freeDrawingBrush.color
|
||||
) {
|
||||
if (this.canvas && this.canvas.freeDrawingBrush && this.canvas.freeDrawingBrush.color) {
|
||||
return this.canvas.freeDrawingBrush.color;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user