From 70413ca5fb46d2122a95db1a01ec70c94cf022ce Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 20 Aug 2021 18:29:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E9=80=89=E6=8B=A9=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E4=B8=8B=E7=BA=A7=E9=83=A8=E9=97=A8=E4=BD=BF=E7=94=A8?= =?UTF-8?q?express=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- o2web/source/x_component_Selector/Identity.js | 84 +++++++++++++------ 1 file changed, 60 insertions(+), 24 deletions(-) diff --git a/o2web/source/x_component_Selector/Identity.js b/o2web/source/x_component_Selector/Identity.js index b7ff281ee9..497d2ecf15 100644 --- a/o2web/source/x_component_Selector/Identity.js +++ b/o2web/source/x_component_Selector/Identity.js @@ -1042,18 +1042,36 @@ MWF.xApplication.Selector.Identity.ItemCategory = new Class({ var loadSubUnit = function () { if( this.selector.options.expandSubEnable && !this.categoryLoaded ){ - this.selector.orgAction.listSubUnitDirect(function(json){ - json.data.each(function(subData){ - if( !this.selector.isExcluded( subData ) ) { - if( subData && this.data.parentLevelName)subData.parentLevelName = this.data.parentLevelName +"/" + subData.name; - var category = this.selector._newItemCategory("ItemUnitCategory", subData, this.selector, this.children, this.level + 1, this); - this.subCategorys.push( category ); - this.subCategoryMap[subData.parentLevelName || subData.levelName] = category; - } - }.bind(this)); - this.loaded = true; - if (callback) callback( true ); - }.bind(this), null, this.data.distinguishedName); + o2.Actions.load("x_organization_assemble_express").UnitAction.listWithUnitSubDirectObject({ + unitList: [this.data.distinguishedName], + countSubDirectUnit: true, + countSubDirectIdentity: true + }, + function(json){ + json.data.each(function(subData){ + if( !this.selector.isExcluded( subData ) ) { + if( subData && this.data.parentLevelName)subData.parentLevelName = this.data.parentLevelName +"/" + subData.name; + var category = this.selector._newItemCategory("ItemUnitCategory", subData, this.selector, this.children, this.level + 1, this); + this.subCategorys.push( category ); + this.subCategoryMap[subData.parentLevelName || subData.levelName] = category; + } + }.bind(this)); + this.loaded = true; + if (callback) callback( true ); + }.bind(this) + ); + // this.selector.orgAction.listSubUnitDirect(function(json){ + // json.data.each(function(subData){ + // if( !this.selector.isExcluded( subData ) ) { + // if( subData && this.data.parentLevelName)subData.parentLevelName = this.data.parentLevelName +"/" + subData.name; + // var category = this.selector._newItemCategory("ItemUnitCategory", subData, this.selector, this.children, this.level + 1, this); + // this.subCategorys.push( category ); + // this.subCategoryMap[subData.parentLevelName || subData.levelName] = category; + // } + // }.bind(this)); + // this.loaded = true; + // if (callback) callback( true ); + // }.bind(this), null, this.data.distinguishedName); }else{ this.loaded = true; if (callback) callback( true ); @@ -1133,18 +1151,36 @@ MWF.xApplication.Selector.Identity.ItemCategory = new Class({ loadCategoryChildren: function(callback){ if (!this.categoryLoaded){ if( this.selector.options.expandSubEnable ){ - this.selector.orgAction.listSubUnitDirect(function(json){ - json.data.each(function(subData){ - if( !this.selector.isExcluded( subData ) ) { - if( subData && this.data.parentLevelName)subData.parentLevelName = this.data.parentLevelName +"/" + subData.name; - var category = this.selector._newItemCategory("ItemUnitCategory", subData, this.selector, this.children, this.level + 1, this); - this.subCategorys.push( category ); - this.subCategoryMap[subData.parentLevelName || subData.levelName] = category; - } - }.bind(this)); - this.categoryLoaded = true; - if (callback) callback(); - }.bind(this), null, this.data.distinguishedName); + o2.Actions.load("x_organization_assemble_express").UnitAction.listWithUnitSubDirectObject({ + unitList: [this.data.distinguishedName], + countSubDirectUnit: true, + countSubDirectIdentity: true + }, + function(json){ + json.data.each(function(subData){ + if( !this.selector.isExcluded( subData ) ) { + if( subData && this.data.parentLevelName)subData.parentLevelName = this.data.parentLevelName +"/" + subData.name; + var category = this.selector._newItemCategory("ItemUnitCategory", subData, this.selector, this.children, this.level + 1, this); + this.subCategorys.push( category ); + this.subCategoryMap[subData.parentLevelName || subData.levelName] = category; + } + }.bind(this)); + this.categoryLoaded = true; + if (callback) callback(); + }.bind(this) + ); + // this.selector.orgAction.listSubUnitDirect(function(json){ + // json.data.each(function(subData){ + // if( !this.selector.isExcluded( subData ) ) { + // if( subData && this.data.parentLevelName)subData.parentLevelName = this.data.parentLevelName +"/" + subData.name; + // var category = this.selector._newItemCategory("ItemUnitCategory", subData, this.selector, this.children, this.level + 1, this); + // this.subCategorys.push( category ); + // this.subCategoryMap[subData.parentLevelName || subData.levelName] = category; + // } + // }.bind(this)); + // this.categoryLoaded = true; + // if (callback) callback(); + // }.bind(this), null, this.data.distinguishedName); }else{ if (callback) callback(); } -- GitLab