Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
b94c1f39
o2oa
项目概览
fuyue82
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
0
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,发现更多精彩内容 >>
提交
b94c1f39
编写于
3月 21, 2020
作者:
NoSubject
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'develop' into 'fix/modify_Jenkinsfile'
# Conflicts: # Jenkinsfile
上级
8f037a43
3ca0557d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
14 deletion
+19
-14
o2web/source/x_component_Minder/MineExplorer.js
o2web/source/x_component_Minder/MineExplorer.js
+1
-1
o2web/source/x_component_Selector/IdentityWidthDuty.js
o2web/source/x_component_Selector/IdentityWidthDuty.js
+5
-1
o2web/source/x_component_Selector/Person.js
o2web/source/x_component_Selector/Person.js
+13
-12
未找到文件。
o2web/source/x_component_Minder/MineExplorer.js
浏览文件 @
b94c1f39
...
...
@@ -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
浏览文件 @
b94c1f39
...
...
@@ -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
浏览文件 @
b94c1f39
...
...
@@ -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
"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录