fix: bug

css/lzb.css

@@ -222,7 +222,7 @@ ul li {
 }
 
 .toolRight div.content>ul>li>*:first-child {
-    margin: 3px 0 13px 0;
+    margin: 3px 0 5px 0 !important;
 }
 
 .itemMargin {
@@ -365,7 +365,7 @@ ul.MenuOptions li.chosen {
 }
 
 .toolRight div.content ul>li>* {
-    margin: 6px 0 12px 0;
+    margin: 7px 0 12px 0;
     line-height: 32px;
     height: 100%;
 }
@@ -378,6 +378,10 @@ ul.MenuOptions li.chosen {
     border: none;
     cursor: pointer;
 }
+.buttons.tail button, .buttons.bigger button{
+    height:34px;
+    font-size: 14px;
+}
 
 .toolRight .addSpot button, .toolRight .addTour button {
     /* position: fixed;
@@ -761,7 +765,7 @@ ul.MenuOptions li.chosen {
     right: 0px;
     top: 2px;
     content: ""attr(data-size)"";
-    color: #7b7b7b;
+    color: #7b7b7b; font-size: 14px;
 }
 
 .toolRight .itemTitle {
@@ -769,7 +773,14 @@ ul.MenuOptions li.chosen {
     display: flex;
     line-height: 16px;
     position: relative;
+    
+}
+
+.toolRight .itemTitle:not(:first-child) {
+    margin: 25px 0 2px 0 !important;
 }
+
+
 .toolRight .secondFontSize{
     font-size: 15px;
     line-height: 14px;
@@ -781,7 +792,7 @@ ul.MenuOptions li.chosen {
 .toolRight li[name="content"]>ul>li {
     background: #212121;
     padding: 8px 5px 8px 10px;
-    margin: 14px 0;
+    margin: 18px 0;
     border-radius: 2px;
 }
 
@@ -807,7 +818,7 @@ ul.MenuOptions li.chosen {
 
 .innerBtn {
     border-radius: 17px;
-    height: 34px;
+    height: 30px;
     line-height: 34px;
     background-color: rgba(0, 0, 0, 0.3);
     border-color: rgba(0, 0, 0, 0.3);
@@ -1084,6 +1095,11 @@ ul.MenuOptions li.chosen {
     background-size: 107%;
     background-position: -5px center;
 }
+.toolRight .roomLabels  [name="list"] .icon{
+    background-image: url(../images/hotlist.png);
+    background-size: 45%;
+}
+
 
  
 .toolRight .secondary .content {
@@ -1100,6 +1116,7 @@ ul.MenuOptions li.chosen {
 .buttons {
     display: flex;
     justify-content: center;
+    margin: 5px 0;
 }
 
 .toolRight .secondary .itemTitle.head a.close {
@@ -1177,7 +1194,7 @@ ul.MenuOptions li.chosen {
 .toolRight .secondary .buttons.tail {
     height: 65px;
     width: 100%;
-    padding: 15px 10px;
+    padding: 9px 10px;
     border-top: 1px solid #5d5d5d !important;
 }
 
@@ -1188,7 +1205,7 @@ ul.MenuOptions li.chosen {
 }
 
 .buttons button:nth-child(2) {
-    /* margin-left: 10px; */
+    margin-left: 10px;
 }
 
 
@@ -1228,7 +1245,10 @@ ul.MenuOptions li.chosen {
 }
 .toolRight  .itemTitle button, .toolRight .remark  button{
     padding:0 20px;
-    height: 30px;
+    height: 28px;
+    margin-top: -3px;
+    font-size:14px;
+    
 } 
 
 .toolRight .upload input {
@@ -1391,7 +1411,7 @@ ul.MenuOptions li.chosen {
     background: rgba(0, 0, 0, 0.6);
     top: 0;
     left: 0;
-    z-index: 101;
+    z-index: 10001;
 }
 
 .square-move {

css/main.css

@@ -563,7 +563,7 @@ hr {
 
 .tooltip {
     position: absolute;
-    z-index: 1070;
+    z-index: 5070;
     display: block;
     visibility: visible;
     font-size: 12px;
@@ -985,7 +985,7 @@ hr {
     left: 0;
     display: table;
     background-color: rgba(0, 0, 0, .75);
-    z-index: 101;
+    z-index: 10001;
     font-weight: lighter;
     -webkit-transition: all 250ms ease-in-out;
     transition: all 250ms ease-in-out;
@@ -2509,7 +2509,7 @@ body, html {
 #gui-spinner {
     display: block;
     position: absolute;
-    z-index: 100;
+    z-index: 10000;
     top: 50%;
     left: 50%;
     width: 40px;
@@ -2850,7 +2850,7 @@ ul{
     display: flex;
     flex-direction: column;
     transition: right 0.4s, width 0.5s;
-    z-index: 100;
+    z-index: 10000;
 }
 
 
@@ -3093,7 +3093,7 @@ ul{
 
 #terms-modal {
     position: absolute;
-    z-index: 100;
+    z-index: 10000;
     left: 10%;
     top: 10%;
     bottom: 10%;
@@ -3122,7 +3122,7 @@ ul{
 
 @media only screen and (max-width: 487px), (max-height:487px) {
     #terms-modal {
-        z-index: 100;
+        z-index: 10000;
         left: 0;
         top: 0;
         bottom: 0;
@@ -3411,7 +3411,7 @@ a.hasHover:hover, a:active {
 
 .pinTop.left {
     left: 50%;
-    z-index: 99;
+    z-index: 9900;
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -3420,14 +3420,14 @@ a.hasHover:hover, a:active {
 
 .pinTop.right {
     right: 10px;
-    z-index: 50
+    z-index: 500
 }
 
 .pinBottom-container {
     bottom: 0px;
     width: 100%;
     transition: all .5s;
-    z-index: 3;
+    z-index: 30000;
     position: absolute;
 }
 
@@ -3469,12 +3469,12 @@ a.hasHover:hover, a:active {
     float: right;
     right: 0;
     text-shadow: 0 0 1px rgba(0, 0, 0, .6);
-    z-index: 50;
+    z-index: 50000;
     bottom: 10px;
 }
 
 .pinBottom.left {
-    z-index: 50;
+    z-index: 50000;
     background: rgba(0, 0, 0, 0.2);
     border-radius: 10px;
     left: 10px;
@@ -3976,7 +3976,7 @@ a.hasHover:hover, a:active {
     transition-property: bottom, opacity;
     transition-duration: .5s;
     opacity: 1;
-    z-index: 3;
+    z-index: 10000;
     position: absolute;
 }
 

css/oldVer/main0.css

@@ -30,7 +30,7 @@ iframe{
 
 
 #popup {
-	z-index: 20;
+ 
 	text-align: center;
 	padding: 0;
 	position: relative;
@@ -38,7 +38,7 @@ iframe{
 	height: 100%;
 	/* margin: 80px auto; */
 	display: none;
-	z-index: 101;
+	z-index: 10001;
 	background:  rgba(0,0,0,0.6);
 }
 .popup-content{

edit.html

@@ -923,7 +923,7 @@
                 <div class="hotpoint content hide">
                     <ul>
                         <li class="addBtn"> 
-                            <div class="buttons">
+                            <div class="buttons bigger">
                                 <button class="innerBtn" data-type="shine">添加热点</button>
                                 <button class="innerBtn" data-type="photo">添加展览</button>
                             </div> 
@@ -1107,6 +1107,11 @@
                                             <span>简介</span>
                                         </div>
                                         <textarea placeholder="简介" class="editText" maxlength="2000"></textarea>
+                                        <div class="buttons" name='addSign' style='margin-top:-13px'>
+                                            <button class="innerBtn cancel" name='space'>加空格</button>
+                                            <button class="innerBtn cancel" name='return'>加换行</button>
+                                        </div> 
+                                    
                                     </li>
                                     <li name="photo"> 
                                         <div class="itemTitle secondFontSize" data-size="<9M">
@@ -1253,7 +1258,7 @@
                                     </ul>
                                     <ul>
                                         <li name='boxDepthPanel'> 
-                                            <div class="itemTitle">
+                                            <div class="itemTitle secondFontSize">
                                                 <span data-lang="">厚度</span>
                                             </div>
                                             <div id="boxDepth"></div>
@@ -1385,8 +1390,12 @@
                                 <span>简介内容</span>
                             </div>
 
-                            <textarea placeholder="大场景的简介" id="info-summary" class="editText"
-                               maxlength="1000"  ></textarea>
+                            <textarea placeholder="大场景的简介" id="info-summary" class="editText" maxlength="1000"  ></textarea>
+
+                            <div class="buttons" name='addSign' for='info-summary' style='margin-top:-2px'>
+                                <button class="innerBtn cancel" name='space'>加空格</button>
+                                <button class="innerBtn cancel" name='return'>换行</button>
+                            </div> 
 
                             <div class="itemTitle" data-size="300" id="project-intro2">
                                 <span>分享文字</span>
@@ -1557,7 +1566,7 @@
                 <div class="snapTour content hide">
                     <ul> 
                         <li class="addTour">
-                            <div class="buttons begin">
+                            <div class="buttons begin bigger">
                                 <button class="innerBtn">添加导览</button>
                                 <button class="innerBtn">添加片段</button>
                             </div>
@@ -1789,25 +1798,30 @@
                 <div class="roomLabels content hide">
                     <ul > 
                         <li class="addBtn"> 
-                            <div class="buttons">
+                            <div class="buttons bigger">
                                 <button class="innerBtn" data-type="shine">添加标签</button> 
                             </div>   
                         </li>
-                        <li name='prop' class = 'hide'>
-                            <ul > 
-                                <li name='title'>
-                                    <div class="itemTitle" data-size="30">
-                                        <span>标题</span>
-                                    </div>
-                                    <input spellcheck="false" class="right input" type="text" minlength="1" maxlength="30" placeholder="输入文字">
-                                </li>
-                                <li name='delete'>
-                                    <div class="buttons">
-                                        <button class="innerBtn cancel" >删除</button> 
-                                    </div>   
-                                </li>
+                        <li name='list'> 
+                            <ul>
+                                <li name='prop' class = 'hide'>
+                                    <ul> 
+                                        <li name='title'>
+                                            <!-- <div class="itemTitle" data-size="30">
+                                                <span>标题</span>
+                                            </div> -->
+                                            <input spellcheck="false" class="right input" type="text" minlength="1" maxlength="30" placeholder="输入标题 <30字">
+                                        </li>
+                                        <!-- <li name='delete'>
+                                            <div class="buttons">
+                                                <button class="innerBtn cancel" >删除</button> 
+                                            </div>   
+                                        </li> -->
+                                    </ul> 
+                                </li> 
                             </ul> 
-                        </li> 
+                        </li>
+                        
                     </ul>
                 </div>
                 

eforclient.html

@@ -119,6 +119,7 @@
                     <div class="webgl-inside">
                         <div class="content">
                             <div id="hot"> </div>
+                            <div id="otherLabels"> </div>
                             <div class='widgets-doll-labels'> </div> 
                             
                             
@@ -922,7 +923,7 @@
                 <div class="hotpoint content hide">
                     <ul>
                         <li class="addBtn"> 
-                            <div class="buttons">
+                            <div class="buttons bigger">
                                 <button class="innerBtn" data-type="shine">添加热点</button>
                                 <button class="innerBtn" data-type="photo">添加展览</button>
                             </div> 
@@ -1093,7 +1094,7 @@
                                             当前漫游点独立调整
                                         </label>
                                         <label class="remark">若在不同点位出现错位，请开启此开关，独立调整在特定点位的位移。</label>
-                                    
+                                        <label class="remark hide" name='dis' style='color: #888; margin-top: 10px'>与相机水平距离</label>
                                     </ul>
                                 </li>
                                 <li name='content'>
@@ -1106,6 +1107,11 @@
                                             <span>简介</span>
                                         </div>
                                         <textarea placeholder="简介" class="editText" maxlength="2000"></textarea>
+                                        <div class="buttons" name='addSign' style='margin-top:-13px'>
+                                            <button class="innerBtn cancel" name='space'>加空格</button>
+                                            <button class="innerBtn cancel" name='return'>加换行</button>
+                                        </div> 
+                                    
                                     </li>
                                     <li name="photo"> 
                                         <div class="itemTitle secondFontSize" data-size="<9M">
@@ -1252,7 +1258,7 @@
                                     </ul>
                                     <ul>
                                         <li name='boxDepthPanel'> 
-                                            <div class="itemTitle">
+                                            <div class="itemTitle secondFontSize">
                                                 <span data-lang="">厚度</span>
                                             </div>
                                             <div id="boxDepth"></div>
@@ -1384,8 +1390,12 @@
                                 <span>简介内容</span>
                             </div>
 
-                            <textarea placeholder="大场景的简介" id="info-summary" class="editText"
-                               maxlength="1000"  ></textarea>
+                            <textarea placeholder="大场景的简介" id="info-summary" class="editText" maxlength="1000"  ></textarea>
+
+                            <div class="buttons" name='addSign' for='info-summary' style='margin-top:-2px'>
+                                <button class="innerBtn cancel" name='space'>加空格</button>
+                                <button class="innerBtn cancel" name='return'>换行</button>
+                            </div> 
 
                             <div class="itemTitle" data-size="300" id="project-intro2">
                                 <span>分享文字</span>
@@ -1556,7 +1566,7 @@
                 <div class="snapTour content hide">
                     <ul> 
                         <li class="addTour">
-                            <div class="buttons begin">
+                            <div class="buttons begin bigger">
                                 <button class="innerBtn">添加导览</button>
                                 <button class="innerBtn">添加片段</button>
                             </div>
@@ -1788,25 +1798,30 @@
                 <div class="roomLabels content hide">
                     <ul > 
                         <li class="addBtn"> 
-                            <div class="buttons">
+                            <div class="buttons bigger">
                                 <button class="innerBtn" data-type="shine">添加标签</button> 
                             </div>   
                         </li>
-                        <li name='prop' class = 'hide'>
-                            <ul > 
-                                <li name='title'>
-                                    <div class="itemTitle" data-size="30">
-                                        <span>标题</span>
-                                    </div>
-                                    <input spellcheck="false" class="right input" type="text" minlength="1" maxlength="30" placeholder="输入文字">
-                                </li>
-                                <li name='delete'>
-                                    <div class="buttons">
-                                        <button class="innerBtn cancel" >删除</button> 
-                                    </div>   
-                                </li>
+                        <li name='list'> 
+                            <ul>
+                                <li name='prop' class = 'hide'>
+                                    <ul> 
+                                        <li name='title'>
+                                            <!-- <div class="itemTitle" data-size="30">
+                                                <span>标题</span>
+                                            </div> -->
+                                            <input spellcheck="false" class="right input" type="text" minlength="1" maxlength="30" placeholder="输入标题 <30字">
+                                        </li>
+                                        <!-- <li name='delete'>
+                                            <div class="buttons">
+                                                <button class="innerBtn cancel" >删除</button> 
+                                            </div>   
+                                        </li> -->
+                                    </ul> 
+                                </li> 
                             </ul> 
-                        </li> 
+                        </li>
+                        
                     </ul>
                 </div>
                 
@@ -1851,14 +1866,12 @@
 
     <script>
        
-    
         var ceshi = ''
         var token = ''
      
     
         window.isEdit = true
 
-
     </script>
 
     <script src="js/lib/jquery-2.1.1.min.js" class="build keep"></script>

js/Hot.js

@@ -1406,11 +1406,14 @@ window.initHot = function(model){
         } */
         
         
-        requestDownload(type,callback) { 
+        requestDownload(type, callback) { 
             var plane = this.plane;
              
             if(type == 'photo'){
-                if(this.photoHasRequestLoad || this.texType != 'photo')return;
+                if(this.photoHasRequestLoad || this.texType != 'photo'){
+                    callback && callback()
+                    return;
+                }
                 //console.log('overlay beginDownload : ' + this.sid)
                 
                  
@@ -1419,7 +1422,7 @@ window.initHot = function(model){
                     if(!tex.image ){
                         return  //只是单纯用了相同src的tex，但image仍未加载完
                     }
-                    if(!this._loadDones)return
+                    //if(!this._loadDones)return
                     dealMap(tex)
                     
                     setTimeout(Hot.loadNext, 50) 
@@ -1553,10 +1556,11 @@ window.initHot = function(model){
         let count = Hot.maxLoadingCount - loadings.length
         Hot.loadQueue.slice(0, count).forEach(e=>{
             loadings.push(e) 
-            //console.log(e)
+            //console.log('requestDownload', e.hot.info.texSrc)
             e.hot.requestDownload(e.type, ()=>{
                 var i = loadings.indexOf(e)
-                loadings.splice(i,1)
+                //console.log('requestDownload index', i)
+                i > -1 && loadings.splice(i,1)
             })
         })
         Hot.loadQueue.splice(0, count) 

js/edit.js

@@ -136,10 +136,11 @@ EditTools.prototype.init = function() {
         setDraggable({ul:$('#hotpointDetail [name="photo"] .list')[0],  dragItemClassName:['mediaItem'] })
     
     
-        //热点列表拖拽
-         
+        //热点列表拖拽 
         setDraggable({ul:$('.toolRight .spotList')[0],  dragItemClassName:['listItem']})
         
+        //roomLabel列表拖拽 
+        setDraggable({ul:$('.toolRight .roomLabels [name="list"]>ul')[0],  dragItemClassName:['listItem']})
     }
     
     
@@ -271,6 +272,18 @@ EditTools.prototype.active = function() {
         ev.stopPropagation();
     })
 
+ 
+    //加空格和回车字符
+    $(".buttons[name='addSign'] button").on('click',function(e){ 
+        let forAttr = $(this).parent().attr('for') 
+        let textarea = forAttr ? $('#'+forAttr) : $(this).parent().parent().find('textarea')
+        let sign = $(this).attr('name') == 'space' ? '&nbsp;' : '<br>'
+        var v = textarea.val();
+        textarea.val(v + sign) 
+    })
+    
+
+        
 }
 //保存按钮
 EditTools.prototype.initSaveAll = function() {
@@ -400,7 +413,8 @@ class EditLabel{
     }
     
     init(){
-        player.model.roomLabels.forEach(e=>this.addLebelEvent(e))
+        let reverse = player.model.roomLabels.slice(0).reverse()
+        reverse.forEach(e=>this.addLebelCallback(e))
         
         
         $('.toolRight .roomLabels .addBtn button').on('click',()=>{//准备添加
@@ -410,13 +424,13 @@ class EditLabel{
             this.setAddState(true) 
         })  
         $('.toolRight .roomLabels [name="title"] input').on('input',(e)=>{//标题
-            this.editingLabel.setTitle(e.target.value)
+            this.editingLabel.setTitle(e.target.value) 
+            this.editingLabel.$li.find('.title').text(e.target.value)
         })
-        $('.toolRight .roomLabels [name="delete"] button').on('click',(e)=>{//删除
-            
+        /* $('.toolRight .roomLabels [name="delete"] button').on('click',(e)=>{//删除 
             this.deleteLabel(this.editingLabel)
-            this.setEditLabel(false,this.editingLabel)
-        })
+            this.setEditLabel(false,this.editingLabel)            
+        }) */
         
         
         
@@ -426,18 +440,11 @@ class EditLabel{
                 position.y += 0.5
                 //var floorIndex = player.model.allFloorsVisible ? null : player.model.currentFloor.floorIndex
                 var floorIndex = intersect.object.parent.parent.floorIndex 
-                var label = new RoomLabel({position, title:'' ,  floorIndex/* , modes:[]   */
-                    /* ,clickFun:()=>{
-                        if(this.editing){
-                            this.setEditLabel(true,label)
-                        }  
-                    }   */
-                })
+                var label = new RoomLabel({position, title:'' ,  floorIndex  })
                 player.model.roomLabels.push(label)
-                this.setAddState(false)
+                this.setAddState(false) 
+                this.addLebelCallback(label)
                 this.setEditLabel(true, label) //开始编辑
-                this.addLebelEvent(label)
-                
                     
                     
                 this.adding = false
@@ -445,6 +452,32 @@ class EditLabel{
                 consume(true)
             }
         })
+        
+        
+        
+        
+        
+        //点击列表弹出按钮
+        $('.toolRight .roomLabels [name="list"]>ul').on("click", (e)=>{
+            var target = $(e.target); 
+            let li = searchParent(e.target, { className: 'listItem' }, 7);
+            if(!li)return;
+            
+            let label = li.label
+              
+          
+            if (target.hasClass("del")) {
+                e.stopPropagation();
+                target.siblings(".DelConfirm").addClass("active"); 
+            } else {
+                if (target.hasClass("DelConfirm")) {
+                    e.stopPropagation();
+                    this.deleteLabel(label);
+                }else{  
+                    this.setEditLabel(true, label) //开始编辑
+                }
+            }
+        });
     } 
     
     deleteLabel(label){
@@ -452,18 +485,35 @@ class EditLabel{
         index > -1 && player.model.roomLabels.splice(index,1) 
         
         label.dispose()
+        
+        label.$li.remove()
+        
+        if(this.editingLabel == label){
+            this.setEditLabel(false,this.editingLabel)
+        }
     }
     
+    addLebelCallback(label){
+        this.addLebelEvent(label)
+        this.addToList(label)
+    }
     
-    
+    addToList(label){
+        var $li = $("<li class='listItem' draggable='true'><div class='icon'></div><div class=title >" + label.title + "</div><div class=DelConfirm title='删除'>确定删除</div><div class=del></div></li>");
+        $li[0].label = label  
+        label.$li = $li;
+        
+        $('.toolRight .roomLabels [name="list"]>ul').prepend($li)
+        
+    }
     setAddState(state){
         state ? CursorDeal.add('addLabel') : CursorDeal.remove('addLabel')
         this.adding = state 
     }
     
     setEditLabel(state, label){
-        let pannel = $('.toolRight  li[name="prop"]') 
-             
+        let pannel = $('.toolRight .roomLabels li[name="prop"]') 
+         
         if(state){  
             if(this.editingLabel){
                 this.setEditLabel(false, this.editingLabel)
@@ -472,6 +522,7 @@ class EditLabel{
             pannel.removeClass('hide')
             pannel.find('[name="title"] input').val(label.title)
             label.setEditSelect(true)
+            pannel.insertAfter(label.$li)     
             this.editingLabel = label 
         }else{
             label.elem.removeClass('selected')
@@ -485,17 +536,18 @@ class EditLabel{
         //拖拽 
         let dragElemShift = {}
         let dragging = false
-        const startDrag = (evt) => { 
+        const startDrag = (evt) => {
+            if(!this.editing )return
             dragging = true
             $('#player').on("mousemove", drag); 
-            
-            if(player.mode != 'floorplan'){ //换算到elem的底部
+            label.elem.find('a').css('pointer-events','none')
+            /* if(player.mode != 'floorplan'){ //换算到elem的底部
                 let lebelWidth = label.elem.children(0).width() 
                 let lebelHeight = label.elem.children(0).height() * (68+24) / 24 ;//
-                dragElemShift = {x: -evt.offsetX + lebelWidth/2, y: 100   /* -evt.offsetY + lebelHeight  */} //y向不准确，因为原本添加时提高了0.5，而0.5对应的像素需要根据视角，那就算了吧
+                dragElemShift = {x: -evt.offsetX + lebelWidth/2, y: 100  } //y向不准确，因为原本添加时提高了0.5，而0.5对应的像素需要根据视角，那就算了吧
             }else{
                 dragElemShift = {x:0,y:0}
-            }
+            } */
             
             CursorDeal.add('moveLabel')
         };
@@ -504,7 +556,7 @@ class EditLabel{
             dragging = false
 
             $('#player').off("mousemove", drag);
-            
+            label.elem.find('a').css('pointer-events','')
             CursorDeal.remove('moveLabel')
         };
 
@@ -514,7 +566,7 @@ class EditLabel{
                 evt.preventDefault(); 
                 let mouse = new THREE.Vector3()   
                 let meshes = player.model.allFloorsVisible ? player.model.colliders : player.model.currentFloor.collider.children
-                math.convertScreenPositionToNDC(evt.offsetX+dragElemShift.x, evt.offsetY+dragElemShift.y, mouse);
+                math.convertScreenPositionToNDC(evt.offsetX/* +dragElemShift.x */, evt.offsetY/* +dragElemShift.y */, mouse);
                 var intersect = convertTool.getMouseIntersect(player.camera, meshes, mouse)
                 if(intersect){
                     let position = intersect.point.clone()
@@ -551,16 +603,19 @@ class EditLabel{
         this.editing = false
         this.editingLabel && this.setEditLabel(false, this.editingLabel)
         player.roomLebelClickUnabled = false
+        this.setAddState(false)
     }
     
-    getSavingInfo(){
-        var info = player.model.roomLabels.map(e=>{
+    getSavingInfo(){ 
+        var info = Array.from($('.toolRight .roomLabels [name="list"] .listItem')).map((li,index)=>{
+            let label = li.label
             return {
-                title : e.title,
-                position : toPrecision(e.position.toArray(), 4),
-                floorIndex: e.floorIndex
-            }
-        })
+                //order: index,
+                title : label.title,
+                position : toPrecision(label.position.toArray(), 4),
+                floorIndex: label.floorIndex
+            } 
+        }) 
         console.log(info)
         return info