joylink/graphic-pixi
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge branch 'master' of https://git.code.tencent.com/jl-framework/graphic-pixi

Browse Source
This commit is contained in:
walker 2023-09-22 10:59:49 +08:00
commit 023c84c4cc
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jlgraphic/app/JlDrawApp.ts
View File

@ -523,8 +523,12 @@ export class JlDrawApp extends GraphicApp implements IDrawApp {
*/
bindFormData(form: GraphicData): void {
this.formData = form;
if (this.selectedGraphics.length == 1) {
this.formData.copyFrom(this.selectedGraphics[0].saveData());
if (this.formData && this.selectedGraphics.length == 1) {
if (this.formData.graphicType == this.selectedGraphics[0].type) {
this.formData.copyFrom(this.selectedGraphics[0].saveData());
} else {
this.formData = undefined;
}
}
}

10
src/jlgraphic/plugins/InteractionPlugin.ts
View File

@ -4,11 +4,7 @@ import {
FederatedPointerEvent,
Point,
} from 'pixi.js';
import {
IGraphicApp,
IGraphicAppConfig,
IGraphicScene,
} from '../app/JlGraphicApp';
import { IGraphicAppConfig, IGraphicScene } from '../app/JlGraphicApp';
import { JlGraphic } from '../core/JlGraphic';
export enum InteractionPluginType {
@ -417,10 +413,10 @@ export abstract class GraphicInteractionPlugin<G extends JlGraphic>
implements InteractionPlugin
{
readonly _type = InteractionPluginType.Graphic;
app: IGraphicApp;
app: IGraphicScene;
name: string; // 唯一标识
_pause: boolean;
constructor(name: string, app: IGraphicApp) {
constructor(name: string, app: IGraphicScene) {
this.app = app;
this.name = name;
this._pause = true;