Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
10f1ccad
o2oa
项目概览
weixin_42566577
/
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,发现更多精彩内容 >>
提交
10f1ccad
编写于
11月 09, 2022
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
组织管理的组织成员增加排序值编辑功能
上级
09567a60
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
114 addition
and
3 deletion
+114
-3
o2web/source/x_component_Org/$List/default/css.wcss
o2web/source/x_component_Org/$List/default/css.wcss
+33
-0
o2web/source/x_component_Org/UnitExplorer.js
o2web/source/x_component_Org/UnitExplorer.js
+79
-3
o2web/source/x_component_Org/lp/en.js
o2web/source/x_component_Org/lp/en.js
+1
-0
o2web/source/x_component_Org/lp/zh-cn.js
o2web/source/x_component_Org/lp/zh-cn.js
+1
-0
未找到文件。
o2web/source/x_component_Org/$List/default/css.wcss
浏览文件 @
10f1ccad
...
...
@@ -120,5 +120,38 @@
"line-height": "normal",
"color":"#333",
"border-radius":"3px"
},
"okActionNode": {
"background": "url(../x_component_Org/$Explorer/default/icon/mainid.png) 5px center no-repeat",
"background-size": "12px",
"float": "right",
"cursor": "pointer",
"margin-top": "0px",
"margin-left": "5px",
"padding": "3px 5px",
"padding-left": "22px",
"font-size": "12px",
"font-weight": "normal",
"border": "1px solid #666",
"background-color": "#FFF",
"line-height": "normal",
"color":"#333",
"border-radius":"3px"
},
"cancelActionNode": {
// "background": "url(../x_component_Org/$List/default/icon/order.png) 3px center no-repeat",
"float": "right",
"cursor": "pointer",
"margin-top": "0px",
"margin-left": "5px",
"padding": "3px 5px",
// "padding-left": "22px",
"font-size": "12px",
"font-weight": "normal",
"border": "1px solid #666",
"background-color": "#FFF",
"line-height": "normal",
"color":"#333",
"border-radius":"3px"
}
}
\ No newline at end of file
o2web/source/x_component_Org/UnitExplorer.js
浏览文件 @
10f1ccad
...
...
@@ -771,6 +771,12 @@ MWF.xApplication.Org.UnitExplorer.UnitContent = new Class({
},
_listIdentityMembers
:
function
(){
var
_self
=
this
;
if
(
this
.
identityMemberList
){
this
.
identityMemberList
.
clear
();
}
this
.
personMemberContentNode
.
empty
();
this
.
identityMemberList
=
new
MWF
.
xApplication
.
Org
.
List
(
this
.
personMemberContentNode
,
this
,
{
"
action
"
:
_self
.
getIdentityActionPermission
(),
"
canEdit
"
:
false
,
...
...
@@ -794,7 +800,7 @@ MWF.xApplication.Org.UnitExplorer.UnitContent = new Class({
"
get
"
:
function
(){
return
this
.
woPerson
.
mail
}
},
{
"
getHtml
"
:
function
(){
return
"
<div style='width:24px; height:24px; background:url(../x_component_Org/$Explorer/
"
+
return
"
<div style='
float:right;
width:24px; height:24px; background:url(../x_component_Org/$Explorer/
"
+
_self
.
explorer
.
app
.
options
.
style
+
"
/icon/open.png) center center no-repeat'></div>
"
;
},
"
events
"
:
{
...
...
@@ -826,6 +832,11 @@ MWF.xApplication.Org.UnitExplorer.UnitContent = new Class({
this
.
sortAction
.
addEvent
(
"
click
"
,
function
(
e
)
{
_self
.
sortByPinYin
(
e
)
})
this
.
sortByManualAction
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
sortActionNode
,
"
text
"
:
_self
.
explorer
.
app
.
lp
.
sortByManual
}).
inject
(
this
.
actionNode
);
this
.
sortByManualAction
.
addEvent
(
"
click
"
,
function
(
e
)
{
_self
.
sortByManual
(
e
)
})
}
}
});
...
...
@@ -836,13 +847,78 @@ MWF.xApplication.Org.UnitExplorer.UnitContent = new Class({
{
"
style
"
:
""
,
"
text
"
:
this
.
explorer
.
app
.
lp
.
personEmployee
},
{
"
style
"
:
""
,
"
text
"
:
this
.
explorer
.
app
.
lp
.
personMobile
},
{
"
style
"
:
""
,
"
text
"
:
this
.
explorer
.
app
.
lp
.
personMail
},
{
"
style
"
:
"
width: 10px
"
,
"
text
"
:
""
},
{
"
style
"
:
"
width: 10px
"
,
"
text
"
:
""
}
{
"
style
"
:
"
width: 10
0
px
"
,
"
text
"
:
""
},
{
"
style
"
:
"
width: 10
0
px
"
,
"
text
"
:
""
}
]);
this
.
data
.
woSubDirectIdentityList
.
each
(
function
(
id
){
var
item
=
this
.
identityMemberList
.
push
(
id
);
}.
bind
(
this
));
},
sortByManual
:
function
(){
var
_self
=
this
;
if
(
this
.
identityMemberList
)
this
.
identityMemberList
.
clear
();
this
.
identityMemberList
=
null
;
this
.
personMemberContentNode
.
empty
();
this
.
identitySortList
=
new
MWF
.
xApplication
.
Org
.
List
(
this
.
personMemberContentNode
,
this
,
{
"
action
"
:
false
,
"
canEdit
"
:
false
,
"
attr
"
:
[{
"
getHtml
"
:
function
(){
var
src
=
_self
.
explorer
.
actions
.
getPersonIcon
(
this
.
woPerson
.
id
);
return
"
<div style='width:24px; height:24px;''><img style='width:24px; height:24px; border-radius:12px; border: 0' src='
"
+
src
+
"
'/></div>
"
;
},
"
set
"
:
function
(){}
},
{
"
get
"
:
function
(){
return
this
.
woPerson
.
name
}
},
{
"
get
"
:
function
(){
return
this
.
woPerson
.
employee
}
},
{
"
get
"
:
function
(){
return
this
.
woPerson
.
mobile
}
},
{
"
get
"
:
function
(){
return
this
.
woPerson
.
mail
}
},
{
"
getHtml
"
:
function
(){
return
"
<input class='orderNumber' type='number' min=1 value='
"
+
this
.
orderNumber
+
"
'/>
"
;
}
}]
});
this
.
identitySortList
.
loadAction
=
function
(){
this
.
actionAreaNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
actionAreaNode
}).
inject
(
this
.
contentNode
,
"
top
"
);
this
.
actionNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
actionNode
}).
inject
(
this
.
actionAreaNode
);
this
.
sortCancelAction
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
cancelActionNode
,
"
text
"
:
_self
.
explorer
.
app
.
lp
.
cancel
}).
inject
(
this
.
actionNode
);
this
.
sortCancelAction
.
addEvent
(
"
click
"
,
function
(
e
)
{
_self
.
_listIdentityMembers
(
e
)
})
this
.
sortOkAction
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
okActionNode
,
"
text
"
:
_self
.
explorer
.
app
.
lp
.
ok
}).
inject
(
this
.
actionNode
);
this
.
sortOkAction
.
addEvent
(
"
click
"
,
function
(
e
)
{
var
pList
=
[];
_self
.
identitySortList
.
items
.
each
(
function
(
item
){
item
.
data
.
orderNumber
=
item
.
tr
.
tr
.
getElement
(
"
.orderNumber
"
).
get
(
"
value
"
).
toInt
();
var
p
=
o2
.
Actions
.
load
(
"
x_organization_assemble_control
"
).
IdentityAction
.
edit
(
item
.
data
.
id
,
item
.
data
);
pList
.
push
(
p
);
})
Promise
.
all
(
pList
).
then
(
function
()
{
_self
.
data
.
woSubDirectIdentityList
.
sort
(
function
(
a
,
b
){
return
a
.
orderNumber
-
b
.
orderNumber
;
})
_self
.
_listIdentityMembers
(
e
)
})
})
};
this
.
identitySortList
.
load
([
{
"
style
"
:
"
width: 30px
"
,
"
text
"
:
""
},
{
"
style
"
:
"
width: 20%
"
,
"
text
"
:
this
.
explorer
.
app
.
lp
.
personName
},
{
"
style
"
:
""
,
"
text
"
:
this
.
explorer
.
app
.
lp
.
personEmployee
},
{
"
style
"
:
""
,
"
text
"
:
this
.
explorer
.
app
.
lp
.
personMobile
},
{
"
style
"
:
""
,
"
text
"
:
this
.
explorer
.
app
.
lp
.
personMail
},
{
"
style
"
:
""
,
"
text
"
:
this
.
explorer
.
app
.
lp
.
orderNumber
}
]);
this
.
data
.
woSubDirectIdentityList
.
each
(
function
(
id
){
var
item
=
this
.
identitySortList
.
push
(
id
);
}.
bind
(
this
));
},
sortByPinYin
:
function
(
e
){
var
_self
=
this
;
this
.
explorer
.
app
.
confirm
(
"
infor
"
,
e
,
this
.
explorer
.
app
.
lp
.
sortByPinYin
,
{
"
html
"
:
this
.
explorer
.
app
.
lp
.
sortByPinYinConfirmContent
},
300
,
180
,
function
(){
...
...
o2web/source/x_component_Org/lp/en.js
浏览文件 @
10f1ccad
...
...
@@ -24,6 +24,7 @@ MWF.xApplication.Org.LP = {
"
no
"
:
"
No
"
,
"
sortByPinYin
"
:
"
Sort by pinyin
"
,
"
sortByPinYinConfirmContent
"
:
"
This operation will sort the identities in the organization according to pinyin, confirm the operation?
"
,
"
sortByManual
"
:
"
Change the sort number
"
,
"
search
"
:
"
Search
"
,
"
searchText
"
:
"
Input search keyword
"
,
...
...
o2web/source/x_component_Org/lp/zh-cn.js
浏览文件 @
10f1ccad
...
...
@@ -24,6 +24,7 @@ MWF.xApplication.Org.LP = {
"
no
"
:
"
否
"
,
"
sortByPinYin
"
:
"
按拼音排序
"
,
"
sortByPinYinConfirmContent
"
:
"
该操作将使本组织内身份按照拼音排序,确定操作?
"
,
"
sortByManual
"
:
"
修改
"
,
"
search
"
:
"
搜索
"
,
"
searchText
"
:
"
请输入关键字
"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录