|
@@ -250,7 +250,7 @@ export class SelectCtrl extends ModuleControl<EditorModule> {
|
|
|
this._state = MODE_SCALE_WIDTH;
|
|
|
if (
|
|
|
this.store.selected.length == 1 &&
|
|
|
- this.store.currComp.compKey == "Text"
|
|
|
+ (this.selected[0].comp.compKey == "Text" || this.selected[0].comp.compKey == "Group")
|
|
|
) {
|
|
|
//拖拽的是文本
|
|
|
const scaleFlags = [
|
|
@@ -617,6 +617,16 @@ export class SelectCtrl extends ModuleControl<EditorModule> {
|
|
|
this.transferStyle.matrix = matrix;
|
|
|
this.transferStyle.matrixInvert = matrixInvert;
|
|
|
this.transferStyle.showOrthScale = this.selected.length == 1;
|
|
|
+
|
|
|
+ if (this.selected.length == 1) {
|
|
|
+ const comp = this.selected[0].comp
|
|
|
+ if (comp.compKey == "Group") {
|
|
|
+ this.transferStyle.showOrthScale = false;
|
|
|
+ }
|
|
|
+ if (comp.layout.locked) {
|
|
|
+ this.transferStyle.showGizmo = false;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
selectId(id: string) {
|
|
@@ -863,8 +873,12 @@ export class SelectCtrl extends ModuleControl<EditorModule> {
|
|
|
let dirOrth = ["scaleright", "scaleleft", "scalebottom", "scaletop"];
|
|
|
|
|
|
const rect = this.store.currStreamCard.$el.getBoundingClientRect();
|
|
|
- let StartX = event.clientX - rect.left;
|
|
|
- let StartY = event.clientY - rect.top;
|
|
|
+
|
|
|
+ const maget = this.assistMagnet as AssistMagnetCtrl;
|
|
|
+ maget.test(event);
|
|
|
+
|
|
|
+ let StartX = maget.clientX - rect.left;
|
|
|
+ let StartY = maget.clientY - rect.top;
|
|
|
const objContainer = this.objContainer as ObjsContainer;
|
|
|
|
|
|
//获取当前屏幕坐标和选框中心点坐标,计算旋转值
|