瀏覽代碼

修正目录

bhikkhu-kosalla-china 4 年之前
父節點
當前提交
100f6214fd
共有 3 個文件被更改,包括 12 次插入8 次删除
  1. 10 8
      app/article/my_collect.js
  2. 1 0
      app/studio/js/dictionary.js
  3. 1 0
      app/studio/js/editor.js

+ 10 - 8
app/article/my_collect.js

@@ -211,26 +211,28 @@ function tocGetTreeData(articles,active=""){
 		if(active==element.article){
 			newNode["extraClasses"]="active";
 		}
+
 		if(newNode.level>iCurrLevel){
+			//新的层级比较大,为上一个的子目录
 			treeParents.push(lastInsNode);					
 			lastInsNode.children = new Array();
 			lastInsNode.children.push(newNode);
 			currParentNode = lastInsNode;
 		}
 		else if(newNode.level==iCurrLevel){
+			//目录层级相同,为平级
 			currParentNode = treeParents[treeParents.length-1];
 			treeParents[treeParents.length-1].children.push(newNode);
 		}
 		else{
-			// 小于
-			try{
-				do {
-					treeParents.pop();
-				} while (treeParents[treeParents.length-1].level>=newNode.level);
-			}catch(e){
-				console.log("toc index:"+index,articles[index]);
-			}
+			// 小于 挂在上一个层级
 
+			while(treeParents.length>1){
+				treeParents.pop();
+				if(treeParents[treeParents.length-1].level<newNode.level){
+					break;
+				}
+			}
 			
 			currParentNode = treeParents[treeParents.length-1];
 			treeParents[treeParents.length-1].children.push(newNode);

+ 1 - 0
app/studio/js/dictionary.js

@@ -1254,6 +1254,7 @@ function menu_file_tools_empty(opt){
 			setNodeText(xDocWords[iword],"org","?");
 			setNodeText(xDocWords[iword],"om","?");
 			setNodeText(xDocWords[iword],"case","?");
+			setNodeText(xDocWords[iword],"parent","?");
 			setNodeText(xDocWords[iword],"bmc","");
 			setNodeText(xDocWords[iword],"bmt","");
 			setNodeText(xDocWords[iword],"note","");

+ 1 - 0
app/studio/js/editor.js

@@ -1823,6 +1823,7 @@ function menu_file_tools_empty(opt) {
 			setNodeText(xDocWords[iword], "org", "?");
 			setNodeText(xDocWords[iword], "om", "?");
 			setNodeText(xDocWords[iword], "case", "?");
+			setNodeText(xDocWords[iword], "parent","?");
 			setNodeText(xDocWords[iword], "bmc", "");
 			setNodeText(xDocWords[iword], "bmt", "");
 			setNodeText(xDocWords[iword], "note", "");