Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
b5139ca6
o2oa
项目概览
ghsby
/
o2oa
落后 Fork 源项目 2880 个版本
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b5139ca6
编写于
12月 01, 2020
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
选择身份可能重复加载的问题
上级
0844c47b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
35 addition
and
24 deletion
+35
-24
o2web/source/x_component_Selector/Identity.js
o2web/source/x_component_Selector/Identity.js
+19
-11
o2web/source/x_component_Selector/IdentityWidthDutyCategoryByUnit.js
...e/x_component_Selector/IdentityWidthDutyCategoryByUnit.js
+16
-13
未找到文件。
o2web/source/x_component_Selector/Identity.js
浏览文件 @
b5139ca6
...
...
@@ -968,16 +968,8 @@ MWF.xApplication.Selector.Identity.ItemCategory = new Class({
// }
// }else{
this
.
selector
.
orgAction
.
listIdentityWithUnit
(
function
(
idJson
){
idJson
.
data
.
each
(
function
(
idSubData
){
if
(
!
this
.
selector
.
isExcluded
(
idSubData
)
)
{
var
item
=
this
.
selector
.
_newItem
(
idSubData
,
this
.
selector
,
this
.
children
,
this
.
level
+
1
,
this
);
this
.
selector
.
items
.
push
(
item
);
if
(
this
.
subItems
)
this
.
subItems
.
push
(
item
);
}
}.
bind
(
this
));
if
(
this
.
selector
.
options
.
expandSubEnable
){
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
)
)
{
...
...
@@ -992,7 +984,23 @@ MWF.xApplication.Selector.Identity.ItemCategory = new Class({
this
.
loaded
=
true
;
if
(
callback
)
callback
(
true
);
}
}.
bind
(
this
),
null
,
this
.
data
.
distinguishedName
);
}.
bind
(
this
);
if
(
!
this
.
itemLoaded
){
this
.
selector
.
orgAction
.
listIdentityWithUnit
(
function
(
idJson
){
idJson
.
data
.
each
(
function
(
idSubData
){
if
(
!
this
.
selector
.
isExcluded
(
idSubData
)
)
{
var
item
=
this
.
selector
.
_newItem
(
idSubData
,
this
.
selector
,
this
.
children
,
this
.
level
+
1
,
this
);
this
.
selector
.
items
.
push
(
item
);
if
(
this
.
subItems
)
this
.
subItems
.
push
(
item
);
}
}.
bind
(
this
));
loadSubUnit
();
}.
bind
(
this
),
null
,
this
.
data
.
distinguishedName
);
}
else
{
loadSubUnit
();
}
// }
}
else
{
if
(
callback
)
callback
(
);
...
...
o2web/source/x_component_Selector/IdentityWidthDutyCategoryByUnit.js
浏览文件 @
b5139ca6
...
...
@@ -568,19 +568,22 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit.ItemCategory = new Cla
this
.
itemLoaded
=
true
;
}
if
(
this
.
data
.
unitList
&&
this
.
data
.
unitList
.
length
)
{
this
.
data
.
unitList
.
sort
(
function
(
a
,
b
)
{
if
(
a
.
orderNumber
===
0
)
a
.
orderNumber
=
-
1
;
if
(
b
.
orderNumber
===
0
)
b
.
orderNumber
=
-
1
;
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
.
loadSub
()
// }
}.
bind
(
this
));
if
(
!
this
.
categoryLoaded
){
if
(
this
.
data
.
unitList
&&
this
.
data
.
unitList
.
length
)
{
this
.
data
.
unitList
.
sort
(
function
(
a
,
b
)
{
if
(
a
.
orderNumber
===
0
)
a
.
orderNumber
=
-
1
;
if
(
b
.
orderNumber
===
0
)
b
.
orderNumber
=
-
1
;
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
.
loadSub
()
// }
}.
bind
(
this
));
}
this
.
categoryLoaded
=
true
;
}
this
.
loaded
=
true
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录