From b61a9afea8f9b0372cd998a96ac06234d768db83 Mon Sep 17 00:00:00 2001 From: YouWei Zhao Date: Tue, 19 Mar 2019 22:25:14 -0400 Subject: [PATCH] selectBox --- _server/editor.js | 20 ++++++++++---------- _server/editor_blockly.js | 2 +- _server/editor_mode.js | 2 +- _server/editor_multi.js | 2 +- _server/vm.js | 27 +++++++++++++-------------- editor-mobile.html | 2 +- editor.html | 2 +- 7 files changed, 28 insertions(+), 29 deletions(-) diff --git a/_server/editor.js b/_server/editor.js index bd1524f3..96a1ce67 100644 --- a/_server/editor.js +++ b/_server/editor.js @@ -573,7 +573,7 @@ editor.prototype.setSelectBoxFromInfo=function(thisevent){ dataSelection.style.left = pos.x * 32 + 'px'; dataSelection.style.top = pos.y * ysize + 'px'; dataSelection.style.height = ysize - 6 + 'px'; - setTimeout(function(){selectBox.isSelected = true;}); + setTimeout(function(){selectBox.isSelected(true);}); editor.info = JSON.parse(JSON.stringify(thisevent)); tip.infos = JSON.parse(JSON.stringify(thisevent)); editor.pos=pos; @@ -617,7 +617,7 @@ editor.prototype.listen = function () { } if (unselect) { if (clickpath.indexOf('eui') === -1) { - if (selectBox.isSelected) { + if (selectBox.isSelected()) { editor_mode.onmode(''); editor.file.saveFloorFile(function (err) { if (err) { @@ -627,7 +627,7 @@ editor.prototype.listen = function () { ;printf('地图保存成功'); }); } - selectBox.isSelected = false; + selectBox.isSelected(false); editor.info = {}; } } @@ -705,7 +705,7 @@ editor.prototype.listen = function () { editor.showMidMenu(e.clientX,e.clientY); return; } - if (!selectBox.isSelected) { + if (!selectBox.isSelected()) { var loc = eToLoc(e); var pos = locToPos(loc,true); editor_mode.onmode('nextChange'); @@ -730,7 +730,7 @@ editor.prototype.listen = function () { } eui.onmousemove = function (e) { - if (!selectBox.isSelected) { + if (!selectBox.isSelected()) { //tip.whichShow = 1; return; } @@ -761,7 +761,7 @@ editor.prototype.listen = function () { } eui.onmouseup = function (e) { - if (!selectBox.isSelected) { + if (!selectBox.isSelected()) { //tip.whichShow = 1; return; } @@ -892,7 +892,7 @@ editor.prototype.listen = function () { if (e.altKey && [48, 49, 50, 51, 52, 53, 54, 55, 56, 57].indexOf(e.keyCode) !== -1) e.preventDefault(); //Ctrl+z 撤销上一步undo - if (e.keyCode == 90 && e.ctrlKey && editor.preMapData && currDrawData.pos.length && selectBox.isSelected) { + if (e.keyCode == 90 && e.ctrlKey && editor.preMapData && currDrawData.pos.length && selectBox.isSelected()) { editor.map = JSON.parse(JSON.stringify(editor.preMapData.map)); editor.fgmap = JSON.parse(JSON.stringify(editor.preMapData.fgmap)); editor.bgmap = JSON.parse(JSON.stringify(editor.preMapData.bgmap)); @@ -902,7 +902,7 @@ editor.prototype.listen = function () { editor.preMapData = null; } //Ctrl+y 重做一步redo - if (e.keyCode == 89 && e.ctrlKey && reDo && reDo.pos.length && selectBox.isSelected) { + if (e.keyCode == 89 && e.ctrlKey && reDo && reDo.pos.length && selectBox.isSelected()) { editor.preMapData = JSON.parse(JSON.stringify({map:editor.map,fgmap:editor.fgmap,bgmap:editor.bgmap})); for (var j = 0; j < reDo.pos.length; j++) editor.map[reDo.pos[j].y][reDo.pos[j].x] = JSON.parse(JSON.stringify(reDo.info)); @@ -1024,7 +1024,7 @@ editor.prototype.listen = function () { } else if ((pos.y + 1) * ysize > editor.widthsX[spriter][3]) pos.y = ~~(editor.widthsX[spriter][3] / ysize) - 1; - selectBox.isSelected = true; + selectBox.isSelected(true); // console.log(pos,core.material.images[pos.images].height) dataSelection.style.left = pos.x * 32 + 'px'; dataSelection.style.top = pos.y * ysize + 'px'; @@ -1127,7 +1127,7 @@ editor.prototype.listen = function () { chooseThis.onmousedown = function(e){ editor.hideMidMenu(); e.stopPropagation(); - selectBox.isSelected = false; + selectBox.isSelected(false); editor_mode.onmode('nextChange'); editor_mode.onmode('loc'); diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js index 5cc6747a..017805b8 100644 --- a/_server/editor_blockly.js +++ b/_server/editor_blockly.js @@ -512,7 +512,7 @@ function omitedcheckUpdateFunction(event) { var blocklyWidgetDiv = document.getElementsByClassName('blocklyWidgetDiv'); editor_blockly.show = function () { - if (typeof(selectBox) !== typeof(undefined)) selectBox.isSelected = false; + if (typeof(selectBox) !== typeof(undefined)) selectBox.isSelected(false); document.getElementById('left6').style = ''; for (var ii = 0, node; node = blocklyWidgetDiv[ii]; ii++) { node.style.zIndex = 201; diff --git a/_server/editor_mode.js b/_server/editor_mode.js index 009499ad..465e55fc 100644 --- a/_server/editor_mode.js +++ b/_server/editor_mode.js @@ -410,7 +410,7 @@ editor_mode = function (editor) { if (editor_mode[mode]) editor_mode[mode](); document.getElementById('editModeSelect').value = mode; var tips = tip_in_showMode; - if (!selectBox.isSelected) printf('tips: ' + tips[~~(tips.length * Math.random())]); + if (!selectBox.isSelected()) printf('tips: ' + tips[~~(tips.length * Math.random())]); } editor_mode.prototype.loc = function (callback) { diff --git a/_server/editor_multi.js b/_server/editor_multi.js index 705f0ab4..5125c4e3 100644 --- a/_server/editor_multi.js +++ b/_server/editor_multi.js @@ -39,7 +39,7 @@ editor_multi = function () { editor_multi.lintAutocomplete = false; editor_multi.show = function () { - if (typeof(selectBox) !== typeof(undefined)) selectBox.isSelected = false; + if (typeof(selectBox) !== typeof(undefined)) selectBox.isSelected(false); var valueNow = codeEditor.getValue(); //try{eval('function _asdygakufyg_() { return '+valueNow+'\n}');editor_multi.lintAutocomplete=true;}catch(ee){} if (valueNow.slice(0, 8) === 'function') editor_multi.lintAutocomplete = true; diff --git a/_server/vm.js b/_server/vm.js index 8fe05935..5e4fbe21 100644 --- a/_server/vm.js +++ b/_server/vm.js @@ -185,7 +185,7 @@ deleteMap.onclick=function () { else printe('删除成功,请F5刷新编辑器生效'); } printf = function (str_, type) { - selectBox.isSelected = false; + selectBox.isSelected(false); if (!type) { tip.whichShow = 11; } else { @@ -279,18 +279,17 @@ var tip = new Vue({ } } }) - -var selectBox = new Vue({ - el: '#selectBox', - data: { - isSelected: false - }, - watch: { - isSelected: function () { - tip.isSelectedBlock = this.isSelected; - tip.whichShow = 0; - clearTimeout(tip.timer); - } +var selectBox=document.getElementById('selectBox') +var dataSelection=document.getElementById('dataSelection') +selectBox._isSelected=false +selectBox.isSelected=function(value){ + if(value!=null){ + selectBox._isSelected=value; + tip.isSelectedBlock = value; + tip.whichShow = 0; + clearTimeout(tip.timer); + dataSelection.style.display=value?'':'none' } -}) + return selectBox._isSelected +} diff --git a/editor-mobile.html b/editor-mobile.html index e90fe59a..66d38e6f 100644 --- a/editor-mobile.html +++ b/editor-mobile.html @@ -277,7 +277,7 @@
-
+
diff --git a/editor.html b/editor.html index cc870582..0fe2bc80 100644 --- a/editor.html +++ b/editor.html @@ -325,7 +325,7 @@
-
+