From 750550d9ed9ce94ef0e7e778ef1125b14f01f506 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 25 Feb 2019 16:42:02 +0800
Subject: [PATCH 1/2]  * code task #5302.

---
 module/project/js/tree.js | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/module/project/js/tree.js b/module/project/js/tree.js
index 01ee041733..624379d9c9 100644
--- a/module/project/js/tree.js
+++ b/module/project/js/tree.js
@@ -8,16 +8,22 @@ $(function()
 
     var taskTree = $taskTree.data('zui.tree');
 
-    var hiddenModuleItem = function($moduleItems)
+    var sortItems = function($items)
     {
-        $moduleItems.each(function()
+        var items = $items.toArray();
+        for(i = 0; i < items.length; i++)
         {
-            var $childrenItems = $moduleItems.find('ul > li.item-module:not(.hidden)');
-            hiddenModuleItem($childrenItems);
-
-            var items = $(this).find('ul li:not(.hidden)').length;
-            if(items == 0) $(this).addClass('hidden');
-        });
+            for(j = 0; j < items.length - 1 - i; j++)
+            {
+                if($(items[j + 1]).data('id').toString() > $(items[j]).data('id').toString())
+                {
+                    var tmp = items[j + 1];
+                    items[j + 1] = items[j];
+                    items[j] = tmp;
+                }
+            }
+        }
+        return items;
     }
 
     // 根据列表展开树形列表
@@ -53,7 +59,12 @@ $(function()
                 if(items == 0) $(this).addClass('hidden');
             });
             var $moduleItems = $('#taskTree li.item-module');
-            hiddenModuleItem($moduleItems);
+            moduleItems = sortItems($moduleItems);
+            for(i = 0; i < moduleItems.length; i++)
+            {
+                var items = $(moduleItems[i]).find('ul li:not(.hidden)').length;
+                if(items == 0) $(moduleItems[i]).addClass('hidden');
+            }
             var $productItems = $('#taskTree li.item-product');
             $productItems.each(function()
             {
@@ -69,7 +80,12 @@ $(function()
 
             $('#taskTree li.item-task').addClass('hidden');
             var $moduleItems = $('#taskTree li.item-module');
-            hiddenModuleItem($moduleItems);
+            moduleItems = sortItems($moduleItems);
+            for(i = 0; i < moduleItems.length; i++)
+            {
+                var items = $(moduleItems[i]).find('ul li:not(.hidden)').length;
+                if(items == 0) $(moduleItems[i]).addClass('hidden');
+            }
             var $productItems = $('#taskTree li.item-product');
             $productItems.each(function()
             {

From b9b7fbdceb93e4e887fc7ef2ccd24ae15bbb5dcd Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 25 Feb 2019 17:35:38 +0800
Subject: [PATCH 2/2]  * adjust for doc dropdown-menu max-height.

---
 module/doc/css/common.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/doc/css/common.css b/module/doc/css/common.css
index 340777fbb6..f2edf96574 100644
--- a/module/doc/css/common.css
+++ b/module/doc/css/common.css
@@ -78,3 +78,5 @@ td.c-name a:visited{color: #082999}
 
 #queryBox #groupAndOr {min-width: 65px;}
 #noticeAcl{margin-left:10px;}
+
+#pageNav .dropdown-menu{max-height:250px; overflow-y:auto;}