- 修复编辑文件名时候点及其他文件时候造成的死循环

- 优化获取的编程数据异常时生成目录树死循环问题

- 修复编辑文件名时候点及其他文件时候造成的死循环
- 优化获取的编程数据异常时生成目录树死循环问题
商艳涛
1 parent e78674ef
Showing 1 changed file with 75 additions and 62 deletions
src/js/gb.js
@@ -37,12 +37,12 @@ $(function() {
     var playUrl;
     var playData;
     var playTreePathData = {"tree": []};
-
+    var isPlayDataError = false;
     var playFoo = {
         showPLayError: function(){
             utils.errorVisit.template = $('<div id="tips" class="tips">' + 
                                             '<div class="tips-inner">' + 
-                                                '访问参数出错，请联系管理人员。' +
+                                                '访问参数出错，请联系管理人员。<br />并告知错误链接地址：<br /><span style="color: red;">' + window.location.href + '</span>' +
                                             '</div>' + 
                                         '</div>');
             utils.errorVisit.show();
@@ -51,57 +51,67 @@ $(function() {
             var playTreeFolder = [], 
                 playTreeFile = [];
             var n = 0, 
-                m = 0
+                m = 0,
                 l = 0;
-            playData.programmingFileList.length = 10;
-            for (var i =  0; i < playData.programmingFileList.length; i++) {
-                var temArr = playData.programmingFileList[i].path.split('/');
-                if(playTreeFolder.length > 0){
-                    for (var j = 0; j < playTreeFolder.length; j++) {
-                        if(playTreeFolder[j]){
-                            if(playTreeFolder[j].name != temArr[0]){
-                                playTreeFolder[n] = {"name": temArr[0], "open": true, "isParent": true, "collapse": false };
-                            }else{
-                                // console.log('playTreeFolder[j] else');
+            var datalist = arr;
+            datalist.length = 10;
+            for (var i =  0; i < datalist.length; i++) {
+                var temArr = datalist[i].path.split('/');
+                if(temArr[0] != "undefined" && temArr[1] != "undefined"){
+                    if(playTreeFolder.length > 0){
+                        for (var j = 0; j < playTreeFolder.length; j++) {
+                            if(playTreeFolder[j]){
+                                if(playTreeFolder[j].name != temArr[0]){
+                                    playTreeFolder[n] = {"name": temArr[0], "open": true, "isParent": true, "collapse": false };
+                                }else{
+                                    // console.log('playTreeFolder[j] else');
+                                }
                             }
                         }
+                    }else{
+                        playTreeFolder[n] = {"name": temArr[0], "open": true, "isParent": true, "collapse": false };
+                        n++;
                     }
-                }else{
-                    playTreeFolder[n] = {"name": temArr[0], "open": true, "isParent": true, "collapse": false };
-                    n++;
-                }
-
-                if(playTreeFile.length > 0){
-                    for (var j = 0; j < playTreeFile.length; j++) {
-                        if(playTreeFile[j]){
-                            if(playTreeFile[j].name != temArr[1]){
-                                playTreeFile[m] = {'pName': temArr[0], "name": temArr[1], "type": "java" };
-                            }else{
-                                playTreeFile[m] = {'pName': temArr[0], "name": temArr[1], "type": "java" };
-                                m++;
+
+                    if(playTreeFile.length > 0){
+                        for (var j = 0; j < playTreeFile.length; j++) {
+                            if(playTreeFile[j]){
+                                if(playTreeFile[j].name != temArr[1]){
+                                    playTreeFile[m] = {'pName': temArr[0], "name": temArr[1], "type": "java" };
+                                }else{
+                                    playTreeFile[m] = {'pName': temArr[0], "name": temArr[1], "type": "java" };
+                                    m++;
+                                }
                             }
                         }
-                    }
+                    }else{
+                        playTreeFile[m] = {'pName': temArr[0], "name": temArr[1], "type": "java" };
+                        m++;
+                    }    
                 }else{
-                    playTreeFile[m] = {'pName': temArr[0], "name": temArr[1], "type": "java" };
-                    m++;
+                    isPlayDataError = true;
+                    return false;
                 }
             }
-            for (var i = 0; i < playTreeFolder.length; i++) {
-                playTreeFolder[i].pId = 0;
-                playTreeFolder[i].id = i+1;
-                playTreePathData['tree'].push(playTreeFolder[i]);
-            }
-            for (var i = 0; i < playTreeFile.length; i++) {
-                for (var j = 0; j < playTreeFolder.length; j++) {
-                    if(playTreeFile[i].pName == playTreeFolder[j].name){
-                        playTreeFile[i].id = (playTreeFolder[j].id.toString() + i.toString()) * 1;
-                        playTreeFile[i].pId = playTreeFolder[j].id;
-                        playTreePathData.tree.push(playTreeFile[i]);
+            if(!isPlayDataError){
+                for (var i = 0; i < playTreeFolder.length; i++) {
+                    playTreeFolder[i].pId = 0;
+                    playTreeFolder[i].id = i+1;
+                    playTreePathData['tree'].push(playTreeFolder[i]);
+                }
+                for (var i = 0; i < playTreeFile.length; i++) {
+                    for (var j = 0; j < playTreeFolder.length; j++) {
+                        if(playTreeFile[i].pName == playTreeFolder[j].name){
+                            playTreeFile[i].id = (playTreeFolder[j].id.toString() + i.toString()) * 1;
+                            playTreeFile[i].pId = playTreeFolder[j].id;
+                            playTreePathData.tree.push(playTreeFile[i]);
+                        }
                     }
                 }
+                return playTreePathData.tree;
+            }else{
+                return false;
             }
-            return playTreePathData.tree;
         }
     }
@@ -155,6 +165,7 @@ $(function() {
             return false;
         },
         beforeEditName: function (treeId, treeNode) {
+            // console.info('beforeEditName');
             treeObj.selectNode(treeNode);
             setTimeout(function() {
                 // if (confirm("进入节点 -- " + treeNode.name + " 的编辑状态吗？")) {
@@ -167,26 +178,26 @@ $(function() {
         },
         renameAlert: function (str, treeNode){
             setTimeout(function() {
-                // treeObj.cancelEditName(newName);
+                // var zTree = $.fn.zTree.getZTreeObj("folder");
+                treeObj.cancelEditName();
                 alert(str);
             }, 0);
-            // 优化体验再次进入编辑状态
-            setTimeout(function() {
-                treeObj.selectNode(treeNode);
-                treeObj.editName(treeNode);
-            }, 0);
+            // 这样写有bug 造成 编辑框死去焦点 获取焦点 死循环
+            // 优化体验再次进入编辑状态  
+            // setTimeout(function() {
+                // treeObj.selectNode(treeNode);
+                // treeObj.editName(treeNode);
+            // }, 0);
         },
         beforeRename: function (treeId, treeNode, newName, isCancel) {
             var _this = this;
             // console.info('beforeRename');
-            // console.info(treeNode);
             if (newName.length == 0) {
                 treeFoo.renameAlert("文件名名称不能为空.", treeNode);
                 return false;
             }else if(newName != treeNode.name){
                 for (var i = 0; i < treeLinkEditor.length; i++) {
-
                     // 判断是否重名
                     if(treeLinkEditor[i].file === newName){
                         treeFoo.renameAlert("文件名“" + newName + "”已被占用，请选取其他名称。", treeNode);
@@ -194,14 +205,16 @@ $(function() {
                     }else if(/.java$/.test(newName) && newName.split('.').length > 2){
                         treeFoo.renameAlert("文件名“" + newName + "”有误，请选取其他名称。", treeNode);
                         return false;
-                    }else if(!/.java$/.test(newName)){
-                        treeFoo.renameAlert("文件后缀名“" + newName + "”有误，请选取其他名称。", treeNode);
+                    }else if(!newName.split('.')[0]){
+                        treeFoo.renameAlert("文件名“" + newName + "”有误，请选取其他名称。", treeNode);
                         return false;
                     }else if(/[0-9]/.test(newName.substr(0,1))){
                         treeFoo.renameAlert("文件“" + newName + "”有误，首字母不能是数字，请选取其他名称。", treeNode);
                         return false;
+                    }else if(!/.java$/.test(newName)){
+                        treeFoo.renameAlert("文件后缀名“" + newName + "”有误，请选取其他名称。", treeNode);
+                        return false;
                     }else{
-                        console.log('else');
                         // 更新 treeLinkEditor 存值
                         if(treeLinkEditor[i].file === treeNode.name){
                             var _temName = treeLinkEditor[i].name;
@@ -217,7 +230,6 @@ $(function() {
                             treeLinkEditor[i].CodeMirrorReplayId = treeLinkEditor[i].replay + 'CodeMirror';
                             mainPath = treeLinkEditor[i].filePath;
-
                             // 更新DOM相关
                             $('#'+ _temName +'RecordWrap').attr({
                                 id: _name +'RecordWrap'
@@ -244,8 +256,6 @@ $(function() {
                         }
                     }
                 }
-            }else{
-                isCancel = true;
             }
             return true;
         },
@@ -522,22 +532,25 @@ $(function() {
                     if(playData.programmingFileList){
                         treeData = playFoo.programFileListToTreeJson(playData.programmingFileList);
+                        console.log('数据是否异常：');
+                        console.log(!treeData);
+                        if(treeData){
+                            treeData    = playTreePathData.tree;
+                            treeObj     = $.fn.zTree.init($("#folder"), ZTREE.config, treeData);
-                        console.log(treeData);
-
-                        treeData    = playTreePathData.tree;
-                        treeObj     = $.fn.zTree.init($("#folder"), ZTREE.config, treeData);
+                            GBCodePlayBack.recordinit(treeData);
-                        GBCodePlayBack.recordinit(treeData);
+                            $('#app').show();
+                        }else{
+                            playFoo.showPLayError();
+                        }
                     }
-                    $('#app').show();
                 }else{
                     playFoo.showPLayError();
                 }
             },
             error: function() {
                 playFoo.showPLayError();
-                alert('错误')
             }
         });
         // if(!_codeReplayId || !_userId || !_role || !_chapterId){