From 42f013d24e393d322d80cc2dab216b686c63df11 Mon Sep 17 00:00:00 2001 From: chenshenhai Date: Sat, 24 Jul 2021 09:38:21 +0800 Subject: [PATCH] refactor: renmae selectElementUUID --- docs/todo/core.md | 6 ++++-- packages/core/examples/features/lib/element.js | 2 +- packages/core/src/index.ts | 8 ++++---- packages/idraw/examples/lib/element.js | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/todo/core.md b/docs/todo/core.md index f769bcd..345fa55 100644 --- a/docs/todo/core.md +++ b/docs/todo/core.md @@ -1,10 +1,12 @@ # @idraw/core -* [x] License text in JS result -* [x] Options default data +* [] Change idraw.selectElementByUUID to idraw.selectElementByIndex +* [] Change idraw.selectElement use uuid arg * [] Support gradient color * [] Listen keyboard action * [] Keep all num two decimals +* [x] License text in JS result +* [x] Options default data * [x] BUG: Select area calculate elements error * [x] Move elements that in selected-area * [x] Area select diff --git a/packages/core/examples/features/lib/element.js b/packages/core/examples/features/lib/element.js index cc8085f..39bd4c9 100644 --- a/packages/core/examples/features/lib/element.js +++ b/packages/core/examples/features/lib/element.js @@ -37,7 +37,7 @@ function listenElements(core) { const el = e.path[0]; if (el.hasAttribute('data-elem-name')) { const uuid = el.getAttribute('data-elem-name'); - core.selectElementByUUID(uuid); + core.selectElement(uuid); } else if (el.hasAttribute('data-elem-btn-up')) { const uuid = el.getAttribute('data-elem-btn-up'); core.moveUpElement(uuid); diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index b174977..35e259e 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -99,7 +99,7 @@ class Core { this.draw(); } - selectElement(index: number, opts?: { useMode?: boolean }): void { + selectElementByIndex(index: number, opts?: { useMode?: boolean }): void { if (this[_onlyRender] === true) return; if (this[_data].elements[index]) { const uuid = this[_data].elements[index].uuid; @@ -114,11 +114,11 @@ class Core { } } - selectElementByUUID(uuid: string, opts?: { useMode?: boolean }): void { + selectElement(uuid: string, opts?: { useMode?: boolean }): void { if (this[_onlyRender] === true) return; const index = this[_helper].getElementIndexByUUID(uuid); if (typeof index === 'number' && index >= 0) { - this.selectElement(index, opts); + this.selectElementByIndex(index, opts); } } @@ -278,7 +278,7 @@ class Core { const [index, uuid] = this[_element].isPointInElement(point, this[_data]); if (index >= 0) { // Controll Element - this.selectElement(index, { useMode: true }); + this.selectElementByIndex(index, { useMode: true }); if (typeof uuid === 'string' && this[_coreEvent].has('screenSelectElement')) { this[_coreEvent].trigger( 'screenSelectElement', diff --git a/packages/idraw/examples/lib/element.js b/packages/idraw/examples/lib/element.js index 9e4f232..11aa0c9 100644 --- a/packages/idraw/examples/lib/element.js +++ b/packages/idraw/examples/lib/element.js @@ -36,7 +36,7 @@ function listenElements(idraw) { const el = e.path[0]; if (el.hasAttribute('data-elem-name')) { const uuid = el.getAttribute('data-elem-name'); - idraw.selectElementByUUID(uuid); + idraw.selectElement(uuid); } else if (el.hasAttribute('data-elem-btn-up')) { const uuid = el.getAttribute('data-elem-btn-up'); idraw.moveUpElement(uuid);