From c26ff78fe51000bc1d084185fd94cb406592ebb9 Mon Sep 17 00:00:00 2001 From: 0JARVIS0 <709406687@qq.com> Date: Tue, 20 Oct 2020 19:36:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20used=E6=97=B6=E7=A6=81=E6=AD=A2dancepale?= =?UTF-8?q?tte=E4=B8=8Eaction?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- painter.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/painter.js b/painter.js index c2da727..f24fa86 100644 --- a/painter.js +++ b/painter.js @@ -46,7 +46,7 @@ Component({ dancePalette: { type: Object, observer: function (newVal, oldVal) { - if (!this.isEmpty(newVal)) { + if (!this.isEmpty(newVal) && !this.properties.use2D) { this.initDancePalette(newVal); } }, @@ -72,7 +72,7 @@ Component({ action: { type: Object, observer: function (newVal, oldVal) { - if (newVal && !this.isEmpty(newVal)) { + if (newVal && !this.isEmpty(newVal) && !this.properties.use2D) { this.doAction(newVal, (callbackInfo) => { this.movingCache = callbackInfo }, false, true) @@ -232,6 +232,9 @@ Component({ }, doAction(action, callback, isMoving, overwrite) { + if (this.properties.use2D) { + return; + } let newVal = null if (action) { newVal = action.view @@ -622,6 +625,9 @@ Component({ }, initDancePalette() { + if (this.properties.use2D) { + return; + } this.isDisabled = true; this.initScreenK(); this.downloadImages(this.properties.dancePalette).then(async (palette) => {