Skip to content

fix: 61 bug 组移动后解除组合图形位置不符合预期 #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 10, 2024
Merged

fix: 61 bug 组移动后解除组合图形位置不符合预期 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0b6b39
refactor: 删除无用返回值
JessYan0913 Mar 8, 2024
5772287
update: 更新工具栏文言翻译
JessYan0913 Mar 8, 2024
137236f
fix: [BUG] 组移动后解除组合图形位置不符合预期
JessYan0913 Mar 10, 2024
c785696
update: 计算时考虑父级
JessYan0913 Mar 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions packages/core/src/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,14 +191,10 @@ export class App extends BaseService<EventArgs> {
public _decomposeGroup(group: Konva.Group): KonvaNode[] {
const parent = group.getParent() ?? this.mainLayer;
const resolve = [...group.getChildren()].map((child) => {
const { x, y, scaleX, scaleY, skewX, skewY, rotation } = child.getTransform().decompose();
const { x, y, scaleX, scaleY, rotation } = child.getAbsoluteTransform(parent).copy().decompose();
child.moveTo(parent);
child.x(x);
child.y(y);
child.scaleX(scaleX);
child.scaleY(scaleY);
child.skewX(skewX);
child.skewY(skewY);
child.position({ x, y });
child.scale({ x: scaleX, y: scaleY });
child.rotation(rotation);
return child;
});
Expand Down
1 change: 0 additions & 1 deletion packages/plugin-selector/src/selector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,6 @@ export class Selector {
this.select(...shapesInRubberRect);
this.rubberRect.visible(false);
this.rubberEnable = false;
return; // 橡皮擦模式处理后直接返回
}
};

Expand Down
2 changes: 2 additions & 0 deletions pictode/src/locales/languages/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ export default {
图片: 'Image',
文本: 'Text',
橡皮擦: 'Eraser',
网页: 'Web Page',
箭头: 'Arrow',
网址: 'URL',
描边: 'Stroke',
填充: 'Fill',
Expand Down
2 changes: 2 additions & 0 deletions pictode/src/locales/languages/fr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ export default {
图片: 'Image',
文本: 'Texte',
橡皮擦: 'Gomme',
网页: 'Web Page',
箭头: 'Flèche',
网址: 'URL',
描边: 'Contour',
填充: 'Remplissage',
Expand Down
4 changes: 3 additions & 1 deletion pictode/src/locales/languages/ja.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ export default {
图片: '画像',
文本: 'テキスト',
橡皮擦: '消しゴム',
网址: 'ウェブページ',
网页: 'ウェブページ',
箭头: '矢印',
网址: 'URL',
描边: '輪郭線',
填充: '塗りつぶし',
描边宽度: '輪郭線の太さ',
Expand Down
2 changes: 2 additions & 0 deletions pictode/src/locales/languages/zh-CN.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ export default {
图片: '图片',
文本: '文本',
橡皮擦: '橡皮擦',
网页: '网页',
箭头: '箭头',
网址: '网址',
描边: '描边',
填充: '填充',
Expand Down
2 changes: 2 additions & 0 deletions pictode/src/locales/languages/zh-TW.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ export default {
图片: '圖片',
文本: '文本',
橡皮擦: '橡皮擦',
网页: '網頁',
箭头: '箭頭',
网址: '網址',
描边: '描邊',
填充: '填充',
Expand Down
Loading