diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 7442356..89371af 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -108,11 +108,11 @@ export default class Core { board: this._board, element: this._elementHandler, config: this._config, - drawFeekback: this.__draw.bind(this), + drawFeekback: this.$draw.bind(this), getDataFeekback: () => this._data, selectElementByIndex: this.selectElementByIndex.bind(this), emitChangeScreen: this._emitChangeScreen.bind(this), - emitChangeData: this.__emitChangeData.bind(this) + emitChangeData: this.$emitChangeData.bind(this) }); this._engine.init(); @@ -134,7 +134,7 @@ export default class Core { } } - __draw(opts?: { resourceChangeUUIDs?: string[] }): void { + $draw(opts?: { resourceChangeUUIDs?: string[] }): void { this._engine.updateHelperConfig({ width: this._opts.width, height: this._opts.height, @@ -226,26 +226,26 @@ export default class Core { resetSize(opts: BoardSizeOptions) { this._opts = { ...this._opts, ...opts }; this._board.resetSize(opts); - this.__draw(); + this.$draw(); } scale(ratio: number): ScreenContext { const screen = this._board.scale(ratio); - this.__draw(); + this.$draw(); this._emitChangeScreen(); return screen; } scrollLeft(left: number): ScreenContext { const screen = this._board.scrollX(0 - left); - this.__draw(); + this.$draw(); this._emitChangeScreen(); return screen; } scrollTop(top: number): ScreenContext { const screen = this._board.scrollY(0 - top); - this.__draw(); + this.$draw(); this._emitChangeScreen(); return screen; } @@ -267,14 +267,14 @@ export default class Core { const resourceChangeUUIDs = diffElementResourceChangeList(this._data, data); this._data = this._elementHandler.initData(deepClone(parseData(data))); if (opts && opts.triggerChangeEvent === true) { - this.__emitChangeData(); + this.$emitChangeData(); } - this.__draw({ resourceChangeUUIDs }); + this.$draw({ resourceChangeUUIDs }); } clearOperation() { this._tempData.clear(); - this.__draw(); + this.$draw(); } on( @@ -303,25 +303,25 @@ export default class Core { return this._board.pointContextToScreen(p); } - __getBoardContext(): IDrawContext { + $getBoardContext(): IDrawContext { return this._board.getContext(); } - __getDisplayContext2D(): CanvasRenderingContext2D { + $getDisplayContext2D(): CanvasRenderingContext2D { return this._board.getDisplayContext2D(); } - __getOriginContext2D(): CanvasRenderingContext2D { + $getOriginContext2D(): CanvasRenderingContext2D { return this._board.getOriginContext2D(); } - __emitChangeData() { + $emitChangeData() { if (this._coreEvent.has('changeData')) { this._coreEvent.trigger('changeData', deepClone(this._data)); } } - __getElementHandler() { + $getElementHandler() { return this._elementHandler; } } diff --git a/packages/core/src/mixins/element.ts b/packages/core/src/mixins/element.ts index c149634..4621851 100644 --- a/packages/core/src/mixins/element.ts +++ b/packages/core/src/mixins/element.ts @@ -65,8 +65,8 @@ export function updateElement( break; } } - core.__emitChangeData(); - core.__draw({ resourceChangeUUIDs }); + core.$emitChangeData(); + core.$draw({ resourceChangeUUIDs }); } export function selectElementByIndex(core: Core, index: number): void { @@ -77,7 +77,7 @@ export function selectElementByIndex(core: Core, index: number): void { core.getEngine().temp.set('selectedUUID', uuid); core.getEngine().temp.set('selectedUUIDList', []); } - core.__draw(); + core.$draw(); } } @@ -97,7 +97,7 @@ export function cancelElementByIndex(core: Core, index: number): void { core.getEngine().temp.set('selectedUUID', null); core.getEngine().temp.set('selectedUUIDList', []); } - core.__draw(); + core.$draw(); } } @@ -119,8 +119,8 @@ export function moveUpElement(core: Core, uuid: string): void { core.getData().elements[index] = core.getData().elements[index + 1]; core.getData().elements[index + 1] = temp; } - core.__emitChangeData(); - core.__draw(); + core.$emitChangeData(); + core.$draw(); } export function moveDownElement(core: Core, uuid: string): void { @@ -134,8 +134,8 @@ export function moveDownElement(core: Core, uuid: string): void { core.getData().elements[index] = core.getData().elements[index - 1]; core.getData().elements[index - 1] = temp; } - core.__emitChangeData(); - core.__draw(); + core.$emitChangeData(); + core.$draw(); } export function addElement( @@ -145,19 +145,17 @@ export function addElement( const _elem = deepClone(elem); _elem.uuid = createUUID(); core.getData().elements.push(_elem); - core.__emitChangeData(); - core.__draw(); + core.$emitChangeData(); + core.$draw(); return _elem.uuid; } export function deleteElement(core: Core, uuid: string) { - const index = core - .__getElementHandler() - .getElementIndex(core.getData(), uuid); + const index = core.$getElementHandler().getElementIndex(core.getData(), uuid); if (index >= 0) { core.getData().elements.splice(index, 1); - core.__emitChangeData(); - core.__draw(); + core.$emitChangeData(); + core.$draw(); } } @@ -182,8 +180,8 @@ export function insertElementBeforeIndex( _elem.uuid = createUUID(); if (index >= 0) { core.getData().elements.splice(index, 0, _elem); - core.__emitChangeData(); - core.__draw(); + core.$emitChangeData(); + core.$draw(); return _elem.uuid; } return null; @@ -210,8 +208,8 @@ export function insertElementAfterIndex( _elem.uuid = createUUID(); if (index >= 0) { core.getData().elements.splice(index + 1, 0, _elem); - core.__emitChangeData(); - core.__draw(); + core.$emitChangeData(); + core.$draw(); return _elem.uuid; } return null; diff --git a/packages/idraw/src/mixins/file.ts b/packages/idraw/src/mixins/file.ts index 1d2055c..b748f2d 100644 --- a/packages/idraw/src/mixins/file.ts +++ b/packages/idraw/src/mixins/file.ts @@ -15,7 +15,7 @@ export async function exportDataURL( function listenRenderFrameComplete() { idraw.off('drawFrameComplete', listenRenderFrameComplete); idraw.getTempData().set('isDownloading', false); - const ctx = idraw.__getOriginContext2D(); + const ctx = idraw.$getOriginContext2D(); const canvas = ctx.canvas; dataURL = canvas.toDataURL(type, quality); resolve(dataURL); @@ -34,7 +34,7 @@ export function toDataURL( type: 'image/png' | 'image/jpeg', quality?: number ): string { - const ctx = idraw.__getOriginContext2D(); + const ctx = idraw.$getOriginContext2D(); const canvas = ctx.canvas; const dataURL: string = canvas.toDataURL(type, quality); return dataURL;