人员选择增加状态

o2web/source/x_component_Selector/IdentityWidthDutyCategoryByUnit.js

@@ -92,6 +92,7 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit = new Class({
     _loadSelectItems : function( identityList ){
         //this.listAllIdentityInUnitObject( identityList );
         var unitTree = this.listNestedUnitByIdentity( identityList );
+        this.uniqueIdentity( unitTree );
         if( this.options.dutyUnitLevelBy === "duty" ){
             this.level1Container = [];
             if( this.options.units && this.options.units.length ){
@@ -113,10 +114,10 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit = new Class({
         this.sortUnit( unitTree.unitList );
         for( var i=0; i< unitTree.unitList.length; i++ ){
             var unit = unitTree.unitList[i];
-            if( !this.isExcluded( unit ) ) {
+            // if( !this.isExcluded( unit ) ) {
                 var category = this._newItemCategory("ItemCategory",unit, this, this.itemAreaNode);
                 this.subCategorys.push(category);
-            }
+            // }
         }
     },
     sortUnit : function( unitList ){
@@ -146,7 +147,7 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit = new Class({
         for( var i=0; i< unitTree.unitList.length; i++ ){
             var unit = unitTree.unitList[i];
             if( this.isUnitContain( unit ) ){
-                if( !this.isExcluded( unit ) ) {
+                // if( !this.isExcluded( unit ) ) {
                     var container = this.itemAreaNode;
                     if( this.level1Container && this.level1Container.length ){
                         var index = this.getIndexFromUnitOption( unit );
@@ -154,7 +155,7 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit = new Class({
                     }
                     var category = this._newItemCategory("ItemCategory",unit, this, container );
                     this.subCategorys.push(category);
-                }
+                // }
             }else{
                 this._loadSelectItemsByDutyUnit( unit );
             }
@@ -234,11 +235,15 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit = new Class({
     },
     _listNestedUnitByIdentity : function( identityList ){
         debugger;
+        var checkStatus = true; //this.options.checkStatus;
         //identityList = Array.unique(identityList);
         var key = this.options.dutyUnitLevelBy === "duty" ? "matchUnitLevelName" : "unitLevelName";
         //根据unitLevelName整合成组织树
         var unitTree = {};
         for( var i=0; i<identityList.length; i++ ){
+            var flag = true;
+            if( this.isExcluded( identityList[i] ) )continue;
+
             var levelNames = identityList[i][key];
             //if( !levelNames && key === "matchUnitLevelName" )levelNames = identityList[i].unitLevelName;
             var unitLevelNameList = levelNames.split("/");
@@ -248,6 +253,11 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit = new Class({
                 nameList.push( unitLevelNameList[j] );
                 var name = nameList.join("/");
 
+                if( this.isExcluded( this.allUnitObject[name] || {} ) ){
+                    flag = false;
+                    break;
+                }
+
                 if( !tree.unitList )tree.unitList = [];
                 var found = false;
                 for( var k=0; k<tree.unitList.length; k++ ){
@@ -258,19 +268,63 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit = new Class({
                     }
                 }
                 if( !found ){
-                    var obj = {};
+                    // var obj = {};
+                    var obj = this.allUnitObject[name] || {};
+                    obj.matchLevelName = name;
                     tree.unitList.push( obj );
                     tree = obj;
                 }
-                if( !tree.distinguishedName ){
-                    tree = Object.merge( tree, this.allUnitObject[name] );
-                }
+                // if( !tree.distinguishedName ){
+                //     tree = Object.merge( tree, this.allUnitObject[name] );
+                // }
                 if( !tree.identityList )tree.identityList = [];
+
             }
-            tree.identityList.push( identityList[i] );
+            if(flag)tree.identityList.push( identityList[i] );
         }
         return unitTree;
     },
+    uniqueIdentity : function( tree ){
+        var map = {};
+        var isExist = function ( d ) {
+            if(( d.distinguishedName && map[ d.distinguishedName ] ) ||
+                ( d.levelName && map[ d.levelName ] ) ||
+                ( d.id && map[ d.id ] ) ||
+                ( d.unique && map[ d.unique ] )){
+                return true;
+            }else{
+                map[ typeOf( d ) === "string" ? d : ( d.distinguishedName || d.id || d.unique || d.employee || d.levelName) ] = true;
+                return false;
+            }
+        };
+
+        var identityList = [];
+        if( tree.identityList ){
+            for( var i=0; i<tree.identityList.length; i++ ){
+                if( !isExist( tree.identityList[i] ) )identityList.push( tree.identityList[i] );
+            }
+        }
+        tree.identityList = identityList;
+
+        if( this.options.checkStatus ){
+            var names = (tree.matchLevelName || tree.levelName || "").split("/");
+            var nameList = [];
+            for( var i=0; i<names.length; i++ ){
+                nameList.push( names[i] );
+                var name = nameList.join("/");
+                var obj = this.allUnitObject[name];
+                if( obj ){
+                    obj.subNestedIdentityCount = ( obj.subNestedIdentityCount || 0 ) + identityList.length;
+                }
+            }
+        }
+
+        if( tree.unitList ){
+            for( var i=0; i<tree.unitList.length; i++ ){
+                this.uniqueIdentity( tree.unitList[i] );
+            }
+        }
+    },
     //listNestedUnitByIdentity : function( identityList ){
     //    debugger;
     //    this.unitArray = [];
@@ -362,6 +416,10 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit.ItemSelected = new Cla
 
 MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit.ItemCategory = new Class({
     Extends: MWF.xApplication.Selector.IdentityWidthDuty.ItemCategory,
+    getSelectedCount : function(){
+        if( typeOf( this.selectedCount ) === "number" )return this.selectedCount;
+
+    },
     isExisted : function( d ){
         if( !d )return true;
         if( !this.createdItemObject )this.createdItemObject = {};
@@ -388,19 +446,18 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit.ItemCategory = new Cla
     loadSub: function(callback){
         if (!this.loaded){
             if( this.data.identityList && this.data.identityList.length>0 ){
-                debugger;
                 this.data.identityList.sort( function(a, b){
                     //this.selector.getUnitOrderNumber( a.unitLevelName )
                     return (a.orderNumber || 9999999) - (b.orderNumber || 9999999);
                 });
                 this.data.identityList.each( function( identity ){
-                    if( !this.selector.isExcluded( identity ) ) {
-                        if( !this.isExisted( identity ) ){
+                    // if( !this.selector.isExcluded( identity ) ) {
+                    //     if( !this.isExisted( identity ) ){
                             var item = this.selector._newItem(identity, this.selector, this.children, this.level + 1, this);
                             this.selector.items.push(item);
                             if(this.subItems)this.subItems.push( item );
-                        }
-                    }
+                        // }
+                    // }
                 }.bind(this))
             }
 
@@ -409,11 +466,11 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit.ItemCategory = new Cla
                     return (a.orderNumber || 9999999) - (b.orderNumber || 9999999);
                 });
                 this.data.unitList.each( function( subData ){
-                    if( !this.selector.isExcluded( subData ) ) {
+                    // if( !this.selector.isExcluded( subData ) ) {
                         var category = this.selector._newItemCategory("ItemCategory", subData, this.selector, this.children, this.level + 1, this);
                         this.subCategorys.push( category );
                         category.loadSub()
-                    }
+                    // }
                 }.bind(this));
             }
 
@@ -425,19 +482,6 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit.ItemCategory = new Cla
     },
     loadCategoryChildren: function(callback){
         if (!this.categoryLoaded){
-            //if( this.data.unitList && this.data.unitList.length ){
-            //    this.data.unitList.sort( function(a, b){
-            //        return (a.orderNumber || 9999999) - (b.orderNumber || 9999999);
-            //    });
-            //    this.data.unitList.each( function( subData ){
-            //        if( !this.selector.isExcluded( subData ) ) {
-            //            var category = this.selector._newItemCategory("ItemCategory", subData, this.selector, this.children, this.level + 1, this);
-            //            this.subCategorys.push( category );
-            //            category.loadCategoryChildren()
-            //        }
-            //    }.bind(this));
-            //}
-
             this.loadSub();
 
             this.categoryLoaded = true;
@@ -455,13 +499,13 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit.ItemCategory = new Cla
                     return (a.orderNumber || 9999999) - (b.orderNumber || 9999999);
                 });
                 this.data.identityList.each( function( identity ){
-                    if( !this.selector.isExcluded( identity ) ) {
-                        if( !this.isExisted( identity ) ){
+                    // if( !this.selector.isExcluded( identity ) ) {
+                    //     if( !this.isExisted( identity ) ){
                             var item = this.selector._newItem(identity, this.selector, this.children, this.level + 1, this);
                             this.selector.items.push(item);
                             if(this.subItems)this.subItems.push( item );
-                        }
-                    }
+                        // }
+                    // }
                 }.bind(this))
             }
             this.itemLoaded = true;

o2web/source/x_component_Selector/Person.js

@@ -36,6 +36,9 @@ MWF.xApplication.Selector.Person = new Class({
         "flatCategory" : false, //扁平化展现分类,
         "selectType" : "person",
 
+        "checkStatus" : true,
+        "showSelectedCount" : false,
+
         "itemHeight" : 29,
         "identityItemWidth" : 0, //选项宽度，如果不为0，设置为float:left,
 
@@ -391,6 +394,27 @@ MWF.xApplication.Selector.Person = new Class({
         this.setEvent();
     },
 
+    getUnitIdentityCount : function(){
+
+    },
+    getUnitSelecteIndentityCount : function( unitLevelName ){ //根据组织获取已选身份数
+        var count;
+        this.selectedItems.each( function (item) {
+            if( item.data.unitLevelName.indexOf( unitLevelName ) === 0 )count++;
+        }.bind(this));
+        return count;
+    },
+    getGroupNestCount : function(){
+        // o2.Actions.load("x_organization_assemble_express").
+    },
+    getGroupSelecteIndentityCount : function( groupName ){ //根据组织获取已选身份数
+        var count;
+        this.selectedItems.each( function (item) {
+            if( item.data.unitLevelName.indexOf( unitLevelName ) === 0 )count++;
+        }.bind(this));
+        return count;
+    },
+
     setEvent: function(){
         if (this.titleActionNode){
             this.titleActionNode.addEvent("click", function(){