From a71174f55fc21b7805e70442bb442d71f91fd246 Mon Sep 17 00:00:00 2001
From: echo <lzq.zheng@qq.com>
Date: Fri, 22 Dec 2017 13:11:33 +0800
Subject: [PATCH 1/3] fix gui layout

---
 drawMapGUI.html | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/drawMapGUI.html b/drawMapGUI.html
index cf4e9356..d1bf237f 100644
--- a/drawMapGUI.html
+++ b/drawMapGUI.html
@@ -8,6 +8,9 @@
         font-family:Roboto,Helvetica,Arial,sans-serif;
         background-color: #F5F5F5;
       }
+      ::-webkit-scrollbar {
+          width: 5px;
+      }
       .main {
         max-width: 100%;
         min-height: 500px;
@@ -43,6 +46,7 @@
         margin-left: 22px;
         margin-top: 21px;
         line-height: 20px;
+        font: 400 13.3333px Arial;
       }
       #editTip{
         position: absolute;
@@ -314,11 +318,10 @@
     <div id="right">
       <div id="iconLib">
         <canvas class='gameCanvas' id='data' width='416' height='416' style='z-index:0'></canvas>
+        <div id="selectBox">
+            <div id='dataSelection' v-show="isSelected" v-cloak></div>
+        </div>
       </div>
-      <div id="selectBox">
-        <div id='dataSelection' v-show="isSelected"></div>
-      </div>
-      
     </div>
   </div>
 
@@ -326,8 +329,8 @@
 <script>main={'instance':{}}</script>
 <script src='libs/icons.js'></script>
 <script src='libs/maps.js'></script>
-<script src='_server/vendor/vue.min.js'></script>
-<!-- <script src="https://unpkg.com/vue"></script> -->
+<!-- <script src='_server/vendor/vue.min.js'></script> -->
+<script src="https://unpkg.com/vue"></script>
 <script>
   main.instance.icons.init();//不知道为什么,需要手动init,明明maps是正常的
   icons=main.instance.icons.getIcons();
@@ -664,7 +667,6 @@
 
   function locToPos(loc) {
     pos = { 'x': ~~(loc.x / loc.size), 'y': ~~(loc.y / loc.size) }
-    console.log(pos)
     return pos;
   }
 
@@ -806,8 +808,8 @@
         
         selectBox.isSelected = true;
         // console.log(pos,core.material.images[pos.images].height)
-        dataSelection.style.left = (iconLib.offsetLeft+pos.x*32) +'px';
-        dataSelection.style.top = (iconLib.offsetTop + pos.y*32) +'px';
+        dataSelection.style.left = pos.x*32 +'px';
+        dataSelection.style.top = pos.y*32 +'px';
         info={'images':pos.images,'y':pos.y};
         for (var ii=0;ii<ids.length;ii++){
           if(pos.images==ids[ii].images && pos.y==ids[ii].y)
@@ -886,8 +888,15 @@
 
 <script type="text/javascript">
   document.body.onmousedown = function(e){
-    selectBox.isSelected = false;
-    info = {};
+    var flag = true;
+    dataSelection.onmousedown = function(e){
+      flag = false;
+    }
+    if(flag){
+      selectBox.isSelected = false;
+      info = {};
+    }
+    
   }
 
   var exportM = new Vue({
@@ -944,7 +953,7 @@
     watch: {
       mapArr: function () {
         var that = this;
-        if(that.formatArr()){
+        if(that.mapArr !='' && that.formatArr()){
           that.error = 0;
           clearTimeout(that.formatTimer);
           setTimeout(function(){
@@ -957,10 +966,9 @@
         }else{
           that.error = 1;
         }
-        
       },
       error: function(){
-        
+        console.log(editArea.mapArr);
       }
     },
     methods: {
@@ -1049,7 +1057,9 @@
         for(var ii=0;ii<fullX + 1 + fullY * (fullX + 1);ii++)map[ii]=0;
         ec = eventLayer.getContext('2d');
         ec.clearRect(0, 0, 416, 416);
+        clearTimeout(editArea.formatTimer);
         pout.value = '';
+        editArea.mapArr = '';
         tip.whichShow = 4;
         editArea.error = 0;
       }

From f1e1725e9f2c64f46ac8fb860f6b5ee95412dfac Mon Sep 17 00:00:00 2001
From: echo <lzq.zheng@qq.com>
Date: Fri, 22 Dec 2017 13:17:45 +0800
Subject: [PATCH 2/3] use local jslib

---
 drawMapGUI.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drawMapGUI.html b/drawMapGUI.html
index d1bf237f..60e7b5b2 100644
--- a/drawMapGUI.html
+++ b/drawMapGUI.html
@@ -329,8 +329,8 @@
 <script>main={'instance':{}}</script>
 <script src='libs/icons.js'></script>
 <script src='libs/maps.js'></script>
-<!-- <script src='_server/vendor/vue.min.js'></script> -->
-<script src="https://unpkg.com/vue"></script>
+<script src='_server/vendor/vue.min.js'></script>
+<!-- <script src="https://unpkg.com/vue"></script> -->
 <script>
   main.instance.icons.init();//不知道为什么,需要手动init,明明maps是正常的
   icons=main.instance.icons.getIcons();

From 9b33c7ee493339d53973918dcbd0408b4af2d44d Mon Sep 17 00:00:00 2001
From: echo <lzq.zheng@qq.com>
Date: Fri, 22 Dec 2017 13:33:11 +0800
Subject: [PATCH 3/3] undo something

---
 drawMapGUI.html | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/drawMapGUI.html b/drawMapGUI.html
index 60e7b5b2..d110da46 100644
--- a/drawMapGUI.html
+++ b/drawMapGUI.html
@@ -887,16 +887,12 @@
 </script>
 
 <script type="text/javascript">
+
   document.body.onmousedown = function(e){
-    var flag = true;
-    dataSelection.onmousedown = function(e){
-      flag = false;
-    }
-    if(flag){
-      selectBox.isSelected = false;
-      info = {};
-    }
-    
+    selectBox.isSelected = false;
+    info = {};
+    canSelectAg = false;
+
   }
 
   var exportM = new Vue({