Merge branch 'develop' into 'fix/modify_Jenkinsfile'

# Conflicts:
#   Jenkinsfile

o2web/source/x_component_Minder/MineExplorer.js

@@ -68,7 +68,7 @@ MWF.xApplication.Minder.MineExplorer = new Class({
         var treeSize = this.treeNode.getSize();
         var naviSize = this.app.naviNode.getSize();
 
-        var x = size.x - treeSize.x - naviSize.x;
+        var x = size.x - treeSize.x - naviSize.x - 5;
 
         this.treeNode.setStyle("height", size.y);
 

o2web/source/x_component_Selector/IdentityWidthDuty.js

@@ -169,7 +169,8 @@ MWF.xApplication.Selector.IdentityWidthDuty.ItemCategory = new Class({
         this.iconNode.setStyle("background-image", "url("+"/x_component_Selector/$Selector/"+style+"/icon/companyicon.png)");
     },
     loadSub: function(callback){
-        if (!this.loaded){
+        if (!this.loaded  && !this.loading){
+            this.loading = true;
             if (this.selector.options.units.length){
                 var action = MWF.Actions.get("x_organization_assemble_express");
                 var data = {"name":this.data.name, "unit":""};
@@ -209,6 +210,7 @@ MWF.xApplication.Selector.IdentityWidthDuty.ItemCategory = new Class({
                         if (i>=count){
                             if (!this.loaded) {
                                 this.loaded = true;
+                                this.loading = false;
                                 this.itemLoaded = true;
                                 if (callback) callback();
                             }
@@ -233,6 +235,7 @@ MWF.xApplication.Selector.IdentityWidthDuty.ItemCategory = new Class({
                             if (i>=count){
                                 if (!this.loaded) {
                                     this.loaded = true;
+                                    this.loading = false;
                                     this.itemLoaded = true;
                                     if (callback) callback();
                                 }
@@ -252,6 +255,7 @@ MWF.xApplication.Selector.IdentityWidthDuty.ItemCategory = new Class({
                         }
                     }.bind(this));
                     this.loaded = true;
+                    this.loading = false;
                     if (callback) callback();
                 }.bind(this), null, this.data.name);
             }

o2web/source/x_component_Selector/Person.js

@@ -2104,12 +2104,12 @@ MWF.xApplication.Selector.Person.ItemCategory = new Class({
             }.bind(this));
         }
 
-        var subIdList = this.selector._getChildrenItemIds(this.data);
-        if (subIdList){
-            var count = subIdList.length;
-            this.childrenHeight = count*this.selector.options.itemHeight;
-            this.children.setStyle("height", ""+this.childrenHeight+"px");
-        }
+        // var subIdList = this.selector._getChildrenItemIds(this.data);
+        // if (subIdList){
+        //     var count = subIdList.length;
+        //     this.childrenHeight = count*this.selector.options.itemHeight;
+        //     this.children.setStyle("height", ""+this.childrenHeight+"px");
+        // }
         //if (!this._hasChild()){
         //    this.textNode.setStyle("color", "#333");
         //}
@@ -2211,12 +2211,13 @@ MWF.xApplication.Selector.Person.ItemCategory = new Class({
         }).inject(this.node, "after");
         if (!this.selector.options.expand) this.children.setStyle("display", "none");
 
-        var subIdList = this.selector._getChildrenItemIds(this.data);
-        if (subIdList){
-            var count = subIdList.length;
-            this.childrenHeight = count*this.selector.options.itemHeight;
-            this.children.setStyle("height", ""+this.childrenHeight+"px");
-        }
+        // var subIdList = this.selector._getChildrenItemIds(this.data);
+        // if (subIdList){
+        //     var count = subIdList.length;
+        //     this.childrenHeight = count*this.selector.options.itemHeight;
+        //     this.children.setStyle("height", ""+this.childrenHeight+"px");
+        // }
+
         if (!this._hasChild()){
             this.actionNode.setStyle("background", "transparent");
             this.textNode.setStyle("color", "#777");