Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
a90be2f7
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,发现更多精彩内容 >>
提交
a90be2f7
编写于
10月 14, 2020
作者:
NoSubject
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'wrdp' into 'develop'
Wrdp See merge request o2oa/o2oa!1813
上级
e531b853
f2cb0e72
变更
19
隐藏空白更改
内联
并排
Showing
19 changed file
with
91 addition
and
7 deletion
+91
-7
o2web/source/x_component_Homepage/FileContent.js
o2web/source/x_component_Homepage/FileContent.js
+3
-2
o2web/source/x_component_Org/$Explorer.js
o2web/source/x_component_Org/$Explorer.js
+2
-2
o2web/source/x_component_Selector/Person.js
o2web/source/x_component_Selector/Person.js
+2
-1
o2web/source/x_component_cms_FormDesigner/Module/Authorfield/authorfield.html
...nent_cms_FormDesigner/Module/Authorfield/authorfield.html
+7
-0
o2web/source/x_component_cms_FormDesigner/Module/Personfield/personfield.html
...nent_cms_FormDesigner/Module/Personfield/personfield.html
+7
-0
o2web/source/x_component_cms_FormDesigner/Module/Readerfield/readerfield.html
...nent_cms_FormDesigner/Module/Readerfield/readerfield.html
+7
-0
o2web/source/x_component_cms_Xform/Readerfield.js
o2web/source/x_component_cms_Xform/Readerfield.js
+3
-1
o2web/source/x_component_portal_PageDesigner/Module/Org/org.html
...ource/x_component_portal_PageDesigner/Module/Org/org.html
+7
-0
o2web/source/x_component_process_FormDesigner/Module/Org/org.html
...urce/x_component_process_FormDesigner/Module/Org/org.html
+7
-0
o2web/source/x_component_process_FormDesigner/Module/Orgfield/orgfield.html
...ponent_process_FormDesigner/Module/Orgfield/orgfield.html
+7
-0
o2web/source/x_component_process_FormDesigner/Module/Personfield/personfield.html
..._process_FormDesigner/Module/Personfield/personfield.html
+7
-0
o2web/source/x_component_process_Xform/Attachment.js
o2web/source/x_component_process_Xform/Attachment.js
+6
-0
o2web/source/x_component_process_Xform/Org.js
o2web/source/x_component_process_Xform/Org.js
+1
-0
o2web/source/x_component_process_Xform/Orgfield.js
o2web/source/x_component_process_Xform/Orgfield.js
+1
-0
o2web/source/x_component_process_Xform/Personfield.js
o2web/source/x_component_process_Xform/Personfield.js
+1
-0
o2web/source/x_desktop/js/initalScriptSubstitute.js
o2web/source/x_desktop/js/initalScriptSubstitute.js
+2
-0
o2web/source/x_desktop/js/initalServiceScriptSubstitute.js
o2web/source/x_desktop/js/initalServiceScriptSubstitute.js
+3
-0
o2web/source/x_desktop/js/initialScriptText.js
o2web/source/x_desktop/js/initialScriptText.js
+10
-1
o2web/source/x_desktop/js/initialServiceScriptText.js
o2web/source/x_desktop/js/initialServiceScriptText.js
+8
-0
未找到文件。
o2web/source/x_component_Homepage/FileContent.js
浏览文件 @
a90be2f7
...
...
@@ -127,8 +127,9 @@ MWF.xApplication.Homepage.FileContent.File = new Class({
//this.itemContentNode.addClass("o2_homepage_task_area_content_empty").addClass("icon_notask");
this
.
content
.
noItemNode
=
new
Element
(
"
div.o2_homepage_file_area_content_empty_node
"
,
{
"
text
"
:
this
.
app
.
lp
.
noFile
}).
inject
(
this
.
container
);
this
.
content
.
noItemNode
.
addEvent
(
"
click
"
,
function
(
e
){
layout
.
openApplication
(
e
,
"
File
"
);
});
// layout.openApplication(e, "File");
this
.
content
.
openFile
(
e
);
}.
bind
(
this
));
var
m
=
(
this
.
content
.
contentHeight
-
this
.
content
.
noItemNode
.
getSize
().
y
)
/
2
;
this
.
content
.
noItemNode
.
setStyle
(
"
margin-top
"
,
""
+
m
+
"
px
"
);
this
.
content
.
isLoading
=
false
;
...
...
o2web/source/x_component_Org/$Explorer.js
浏览文件 @
a90be2f7
...
...
@@ -440,8 +440,8 @@ MWF.xApplication.Org.$Explorer = new Class({
}
this
.
deleteElementsNode
.
position
({
relativeTo
:
(
item
)
?
item
.
node
:
this
.
toolbarNode
,
position
:
"
centerBottom
"
,
edge
:
"
centerTop
"
position
:
"
topRight
"
,
edge
:
"
topLeft
"
});
}
else
{
if
(
this
.
deleteElementsNode
){
...
...
o2web/source/x_component_Selector/Person.js
浏览文件 @
a90be2f7
...
...
@@ -1471,7 +1471,8 @@ MWF.xApplication.Selector.Person = new Class({
if
(
!
category
.
subItems
[
0
].
isSelected
)
category
.
subItems
[
0
].
clickItem
();
}
}
else
if
(
category
.
subCategorys
.
length
===
1
){
if
(
!
category
.
subCategorys
[
0
].
_hasChild
||
!
category
.
subCategorys
[
0
].
_hasChild
()
){
//category.subCategorys[0].isItem &&
if
(
category
.
subItems
&&
category
.
subItems
.
length
>
0
){
}
else
if
(
!
category
.
subCategorys
[
0
].
_hasChild
||
!
category
.
subCategorys
[
0
].
_hasChild
()
){
//category.subCategorys[0].isItem &&
if
(
!
category
.
subItems
[
0
].
isSelected
)
category
.
subItems
[
0
].
clickItem
();
}
else
{
checkCategory
(
category
.
subCategorys
[
0
]
)
...
...
o2web/source/x_component_cms_FormDesigner/Module/Authorfield/authorfield.html
浏览文件 @
a90be2f7
...
...
@@ -27,6 +27,13 @@
<input
type=
"radio"
name=
"isReadonly"
value=
"false"
text
{(!$.
isReadonly
)?'
checked
'
:
''}
/>
否
</td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
显示卡片:
</td>
<td
class=
"editTableValue"
>
<input
type=
"radio"
name=
"showCard"
value=
"yes"
text
{($.
showCard
!='
no
')?'
checked
'
:
''}
/>
是
<input
type=
"radio"
name=
"showCard"
value=
"no"
text
{($
.showCard=
='no')?'checked':''}/
>
否
</td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
值类型:
</td>
<td
class=
"editTableValue"
>
...
...
o2web/source/x_component_cms_FormDesigner/Module/Personfield/personfield.html
浏览文件 @
a90be2f7
...
...
@@ -27,6 +27,13 @@
<input
type=
"radio"
name=
"isReadonly"
value=
"false"
text
{(!$.
isReadonly
)?'
checked
'
:
''}
/>
否
</td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
显示卡片:
</td>
<td
class=
"editTableValue"
>
<input
type=
"radio"
name=
"showCard"
value=
"yes"
text
{($.
showCard
!='
no
')?'
checked
'
:
''}
/>
是
<input
type=
"radio"
name=
"showCard"
value=
"no"
text
{($
.showCard=
='no')?'checked':''}/
>
否
</td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
允许输入:
</td>
<td
class=
"editTableValue"
>
...
...
o2web/source/x_component_cms_FormDesigner/Module/Readerfield/readerfield.html
浏览文件 @
a90be2f7
...
...
@@ -27,6 +27,13 @@
<input
type=
"radio"
name=
"isReadonly"
value=
"false"
text
{(!$.
isReadonly
)?'
checked
'
:
''}
/>
否
</td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
显示卡片:
</td>
<td
class=
"editTableValue"
>
<input
type=
"radio"
name=
"showCard"
value=
"yes"
text
{($.
showCard
!='
no
')?'
checked
'
:
''}
/>
是
<input
type=
"radio"
name=
"showCard"
value=
"no"
text
{($
.showCard=
='no')?'checked':''}/
>
否
</td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
值类型:
</td>
<td
class=
"editTableValue"
>
...
...
o2web/source/x_component_cms_Xform/Readerfield.js
浏览文件 @
a90be2f7
...
...
@@ -466,7 +466,9 @@ MWF.xApplication.cms.Xform.Readerfield = MWF.CMSReaderfield = new Class({
}
},
loadOrgWidget
:
function
(
value
,
node
){
var
options
=
{
"
style
"
:
"
xform
"
,
"
canRemove
"
:
!
this
.
readonly
,
"
onRemove
"
:
this
.
removeItem
};
var
disableInfor
=
layout
.
mobile
?
true
:
false
;
if
(
this
.
json
.
showCard
===
"
no
"
)
disableInfor
=
true
;
var
options
=
{
"
style
"
:
"
xform
"
,
"
canRemove
"
:
!
this
.
readonly
,
"
onRemove
"
:
this
.
removeItem
,
"
disableInfor
"
:
disableInfor
};
value
.
each
(
function
(
data
){
if
(
data
.
distinguishedName
){
var
flag
=
data
.
distinguishedName
.
substr
(
data
.
distinguishedName
.
length
-
1
,
1
);
...
...
o2web/source/x_component_portal_PageDesigner/Module/Org/org.html
浏览文件 @
a90be2f7
...
...
@@ -27,6 +27,13 @@
<input
type=
"radio"
name=
"isReadonly"
value=
"false"
text
{(!$.
isReadonly
)?'
checked
'
:
''}
/>
否
</td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
显示卡片:
</td>
<td
class=
"editTableValue"
>
<input
type=
"radio"
name=
"showCard"
value=
"yes"
text
{($.
showCard
!='
no
')?'
checked
'
:
''}
/>
是
<input
type=
"radio"
name=
"showCard"
value=
"no"
text
{($
.showCard=
='no')?'checked':''}/
>
否
</td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
允许输入:
</td>
<td
class=
"editTableValue"
>
...
...
o2web/source/x_component_process_FormDesigner/Module/Org/org.html
浏览文件 @
a90be2f7
...
...
@@ -27,6 +27,13 @@
<input
type=
"radio"
name=
"isReadonly"
value=
"false"
text
{(!$.
isReadonly
)?'
checked
'
:
''}
/>
否
</td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
显示卡片:
</td>
<td
class=
"editTableValue"
>
<input
type=
"radio"
name=
"showCard"
value=
"yes"
text
{($.
showCard
!='
no
')?'
checked
'
:
''}
/>
是
<input
type=
"radio"
name=
"showCard"
value=
"no"
text
{($
.showCard=
='no')?'checked':''}/
>
否
</td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
允许输入:
</td>
<td
class=
"editTableValue"
>
...
...
o2web/source/x_component_process_FormDesigner/Module/Orgfield/orgfield.html
浏览文件 @
a90be2f7
...
...
@@ -27,6 +27,13 @@
<input
type=
"radio"
name=
"isReadonly"
value=
"false"
text
{(!$.
isReadonly
)?'
checked
'
:
''}
/>
否
</td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
显示卡片:
</td>
<td
class=
"editTableValue"
>
<input
type=
"radio"
name=
"showCard"
value=
"yes"
text
{($.
showCard
!='
no
')?'
checked
'
:
''}
/>
是
<input
type=
"radio"
name=
"showCard"
value=
"no"
text
{($
.showCard=
='no')?'checked':''}/
>
否
</td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
允许输入:
</td>
<td
class=
"editTableValue"
>
...
...
o2web/source/x_component_process_FormDesigner/Module/Personfield/personfield.html
浏览文件 @
a90be2f7
...
...
@@ -27,6 +27,13 @@
<input
type=
"radio"
name=
"isReadonly"
value=
"false"
text
{(!$.
isReadonly
)?'
checked
'
:
''}
/>
否
</td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
显示卡片:
</td>
<td
class=
"editTableValue"
>
<input
type=
"radio"
name=
"showCard"
value=
"yes"
text
{($.
showCard
!='
no
')?'
checked
'
:
''}
/>
是
<input
type=
"radio"
name=
"showCard"
value=
"no"
text
{($
.showCard=
='no')?'checked':''}/
>
否
</td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
允许输入:
</td>
<td
class=
"editTableValue"
>
...
...
o2web/source/x_component_process_Xform/Attachment.js
浏览文件 @
a90be2f7
...
...
@@ -701,6 +701,7 @@ MWF.xApplication.process.Xform.AttachmentController = new Class({
}
},
setAttachmentConfig
:
function
(
readInput
,
editInput
,
controllerInput
)
{
debugger
;
if
(
this
.
selectedAttachments
.
length
)
{
var
readList
=
readInput
.
retrieve
(
"
data-value
"
);
var
editList
=
editInput
.
retrieve
(
"
data-value
"
);
...
...
@@ -741,6 +742,7 @@ MWF.xApplication.process.Xform.AttachmentController = new Class({
});
}
var
loadedCount
=
0
;
this
.
selectedAttachments
.
each
(
function
(
att
)
{
att
.
data
.
readUnitList
=
readUnitList
;
att
.
data
.
readIdentityList
=
readIdentityList
;
...
...
@@ -765,6 +767,10 @@ MWF.xApplication.process.Xform.AttachmentController = new Class({
attachment
.
configAction
.
setStyle
(
"
display
"
,
"
none
"
);
}
}
loadedCount
++
;
if
(
loadedCount
===
this
.
selectedAttachments
.
length
){
this
.
checkActions
();
}
}.
bind
(
this
))
}.
bind
(
this
));
}.
bind
(
this
));
...
...
o2web/source/x_component_process_Xform/Org.js
浏览文件 @
a90be2f7
...
...
@@ -951,6 +951,7 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg = new Class({
},
loadOrgWidget
:
function
(
value
,
node
){
var
disableInfor
=
layout
.
mobile
?
true
:
false
;
if
(
this
.
json
.
showCard
===
"
no
"
)
disableInfor
=
true
;
var
height
=
node
.
getStyle
(
"
height
"
).
toInt
();
if
(
node
.
getStyle
(
"
overflow
"
)
===
"
visible
"
&&
!
height
)
node
.
setStyle
(
"
overflow
"
,
"
hidden
"
);
if
(
value
&&
value
.
length
){
...
...
o2web/source/x_component_process_Xform/Orgfield.js
浏览文件 @
a90be2f7
...
...
@@ -470,6 +470,7 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield = new Class({
},
loadOrgWidget
:
function
(
value
,
node
){
var
disableInfor
=
layout
.
mobile
?
true
:
false
;
if
(
this
.
json
.
showCard
===
"
no
"
)
disableInfor
=
true
;
var
options
=
{
"
style
"
:
"
xform
"
,
"
canRemove
"
:
false
,
"
onRemove
"
:
this
.
removeItem
,
"
disableInfor
"
:
disableInfor
};
value
.
each
(
function
(
data
){
if
(
data
.
distinguishedName
){
...
...
o2web/source/x_component_process_Xform/Personfield.js
浏览文件 @
a90be2f7
...
...
@@ -882,6 +882,7 @@ MWF.xApplication.process.Xform.Personfield = MWF.APPPersonfield = new Class({
},
loadOrgWidget
:
function
(
value
,
node
){
var
disableInfor
=
layout
.
mobile
?
true
:
false
;
if
(
this
.
json
.
showCard
===
"
no
"
)
disableInfor
=
true
;
var
height
=
node
.
getStyle
(
"
height
"
).
toInt
();
if
(
node
.
getStyle
(
"
overflow
"
)
===
"
visible
"
&&
!
height
)
node
.
setStyle
(
"
overflow
"
,
"
hidden
"
);
if
(
value
&&
value
.
length
){
...
...
o2web/source/x_desktop/js/initalScriptSubstitute.js
浏览文件 @
a90be2f7
...
...
@@ -824,6 +824,8 @@ var _Actions = {
};
bind
.
Actions
=
_Actions
;
print
=
function
(
str
,
type
){}
bind
.
print
=
print
;
bind
.
library
=
library
;
bind
.
data
=
this
.
data
;
...
...
o2web/source/x_desktop/js/initalServiceScriptSubstitute.js
浏览文件 @
a90be2f7
...
...
@@ -900,6 +900,9 @@ var _org = {
}
};
print
=
function
(
str
,
type
){}
bind
.
print
=
print
;
bind
.
org
=
_org
;
bind
.
library
=
library
;
bind
.
define
=
_define
;
...
...
o2web/source/x_desktop/js/initialScriptText.js
浏览文件 @
a90be2f7
...
...
@@ -815,6 +815,15 @@ var _Actions = {
bind
.
Actions
=
_Actions
;
var
oPrint
=
print
;
print
=
function
(
str
,
type
){
var
d
=
new
Date
();
var
t
=
(
type
||
"
PRINT
"
).
toUpperCase
();
var
l
=
"
[Script]
"
;
oPrint
(
d
.
format
(
"
db
"
)
+
"
.
"
+
d
.
getMilliseconds
()
+
"
"
+
t
+
"
"
+
l
+
"
"
+
str
);
}
bind
.
print
=
print
;
bind
.
library
=
library
;
bind
.
data
=
this
.
data
;
bind
.
workContext
=
wrapWorkContext
;
...
...
@@ -911,4 +920,4 @@ bind.request = {
return
null
}
}
}
\ No newline at end of file
}
o2web/source/x_desktop/js/initialServiceScriptText.js
浏览文件 @
a90be2f7
...
...
@@ -3259,6 +3259,14 @@ var _org = {
}
};
var
oPrint
=
print
;
print
=
function
(
str
,
type
){
var
d
=
new
Date
();
var
t
=
(
type
||
"
PRINT
"
).
toUpperCase
();
var
l
=
"
[ServiceScript]
"
;
oPrint
(
d
.
format
(
"
db
"
)
+
"
.
"
+
d
.
getMilliseconds
()
+
"
"
+
t
+
"
"
+
l
+
"
"
+
str
);
}
bind
.
print
=
print
;
bind
.
org
=
_org
;
bind
.
library
=
library
;
bind
.
define
=
_define
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录