Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
5879fee0
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,发现更多精彩内容 >>
提交
5879fee0
编写于
7月 02, 2021
作者:
NoSubject
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复token改名涉及到的bug
上级
100fb8f6
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
12 addition
and
7 deletion
+12
-7
o2web/source/o2_core/o2.js
o2web/source/o2_core/o2.js
+2
-1
o2web/source/o2_core/o2/actionWorker.js
o2web/source/o2_core/o2/actionWorker.js
+3
-2
o2web/source/o2_core/o2/widget/JavascriptEditor.js
o2web/source/o2_core/o2/widget/JavascriptEditor.js
+3
-1
o2web/source/o2_core/scriptWorker.js
o2web/source/o2_core/scriptWorker.js
+1
-0
o2web/source/x_component_process_ProcessDesigner/$Process/route.html
...e/x_component_process_ProcessDesigner/$Process/route.html
+2
-2
o2web/source/x_desktop/index.html
o2web/source/x_desktop/index.html
+1
-1
未找到文件。
o2web/source/o2_core/o2.js
浏览文件 @
5879fee0
...
@@ -1555,7 +1555,8 @@ if (window.Promise && !Promise.any){
...
@@ -1555,7 +1555,8 @@ if (window.Promise && !Promise.any){
address
:
o2
.
filterUrl
(
address
),
address
:
o2
.
filterUrl
(
address
),
body
:
data
,
body
:
data
,
debug
:
(
window
.
layout
&&
layout
[
"
debugger
"
]),
debug
:
(
window
.
layout
&&
layout
[
"
debugger
"
]),
token
:
(
window
.
layout
&&
layout
.
session
&&
layout
.
session
.
user
)
?
layout
.
session
.
user
.
token
:
""
token
:
(
window
.
layout
&&
layout
.
session
&&
layout
.
session
.
user
)
?
layout
.
session
.
user
.
token
:
""
,
tokenName
:
o2
.
tokenName
}
}
var
actionWorker
=
new
Worker
(
"
../o2_core/o2/actionWorker.js
"
);
var
actionWorker
=
new
Worker
(
"
../o2_core/o2/actionWorker.js
"
);
var
p
=
new
Promise
(
function
(
s
,
f
){
var
p
=
new
Promise
(
function
(
s
,
f
){
...
...
o2web/source/o2_core/o2/actionWorker.js
浏览文件 @
5879fee0
...
@@ -34,6 +34,7 @@ function V(httpRequest) {
...
@@ -34,6 +34,7 @@ function V(httpRequest) {
var
body
=
data
.
body
;
var
body
=
data
.
body
;
var
debug
=
data
.
debug
;
var
debug
=
data
.
debug
;
var
token
=
data
.
token
;
var
token
=
data
.
token
;
var
tokenName
=
data
.
tokenName
;
if
(
noCache
)
url
=
url
+
(((
url
.
indexOf
(
"
?
"
)
!==-
1
)
?
"
&
"
:
"
?
"
)
+
(
new
Date
()).
getTime
());
if
(
noCache
)
url
=
url
+
(((
url
.
indexOf
(
"
?
"
)
!==-
1
)
?
"
&
"
:
"
?
"
)
+
(
new
Date
()).
getTime
());
...
@@ -44,8 +45,8 @@ function V(httpRequest) {
...
@@ -44,8 +45,8 @@ function V(httpRequest) {
this
.
request
.
setRequestHeader
(
"
Accept
"
,
"
text/html,application/json,*/*
"
);
this
.
request
.
setRequestHeader
(
"
Accept
"
,
"
text/html,application/json,*/*
"
);
if
(
debug
)
this
.
request
.
setRequestHeader
(
"
x-debugger
"
,
"
true
"
);
if
(
debug
)
this
.
request
.
setRequestHeader
(
"
x-debugger
"
,
"
true
"
);
if
(
token
){
if
(
token
){
this
.
request
.
setRequestHeader
(
o2
.
tokenName
,
token
);
this
.
request
.
setRequestHeader
(
tokenName
,
token
);
this
.
request
.
setRequestHeader
(
"
a
uthorization
"
,
token
);
this
.
request
.
setRequestHeader
(
"
A
uthorization
"
,
token
);
}
}
this
.
request
.
send
(
body
);
this
.
request
.
send
(
body
);
...
...
o2web/source/o2_core/o2/widget/JavascriptEditor.js
浏览文件 @
5879fee0
...
@@ -21,6 +21,7 @@ o2.widget.JavascriptEditor = new Class({
...
@@ -21,6 +21,7 @@ o2.widget.JavascriptEditor = new Class({
this
.
unbindEvents
=
[];
this
.
unbindEvents
=
[];
this
.
node
=
$
(
node
);
this
.
node
=
$
(
node
);
this
.
id
=
o2
.
uuid
();
this
.
id
=
o2
.
uuid
();
if
(
!
o2
.
JSEditorCWE
.
isInit
)
o2
.
JSEditorCWE
.
init
();
},
},
getDefaultEditorData
:
function
(){
getDefaultEditorData
:
function
(){
switch
(
this
.
options
.
type
)
{
switch
(
this
.
options
.
type
)
{
...
@@ -850,6 +851,7 @@ o2.widget.JavascriptEditor.completionWorkerEnvironment = o2.JSEditorCWE = {
...
@@ -850,6 +851,7 @@ o2.widget.JavascriptEditor.completionWorkerEnvironment = o2.JSEditorCWE = {
this
.
scriptWorker
.
onmessage
=
function
(
e
)
{
this
.
scriptWorker
.
onmessage
=
function
(
e
)
{
if
(
e
.
data
&&
e
.
data
.
type
==
"
ready
"
)
this
.
setOnMessage
();
if
(
e
.
data
&&
e
.
data
.
type
==
"
ready
"
)
this
.
setOnMessage
();
}.
bind
(
this
);
}.
bind
(
this
);
this
.
isInit
=
true
;
return
this
;
return
this
;
},
},
setOnMessage
:
function
(){
setOnMessage
:
function
(){
...
@@ -872,4 +874,4 @@ o2.widget.JavascriptEditor.completionWorkerEnvironment = o2.JSEditorCWE = {
...
@@ -872,4 +874,4 @@ o2.widget.JavascriptEditor.completionWorkerEnvironment = o2.JSEditorCWE = {
this
.
scriptWorker
.
postMessage
(
o
);
this
.
scriptWorker
.
postMessage
(
o
);
}
}
}
}
}
.
init
()
;
};
o2web/source/o2_core/scriptWorker.js
浏览文件 @
5879fee0
...
@@ -157,6 +157,7 @@ o2.addReady(function () {
...
@@ -157,6 +157,7 @@ o2.addReady(function () {
o2
.
getJSON
(
"
../x_desktop/res/config/config.json
"
,
function
(
config
)
{
o2
.
getJSON
(
"
../x_desktop/res/config/config.json
"
,
function
(
config
)
{
layout
.
config
=
config
;
layout
.
config
=
config
;
o2
.
tokenName
=
config
.
tokenName
||
"
x-token
"
;
configLoaded
=
true
;
configLoaded
=
true
;
if
(
configLoaded
&&
commonLoaded
&&
lpLoaded
)
_getDistribute
(
function
()
{
_load
();
});
if
(
configLoaded
&&
commonLoaded
&&
lpLoaded
)
_getDistribute
(
function
()
{
_load
();
});
});
});
...
...
o2web/source/x_component_process_ProcessDesigner/$Process/route.html
浏览文件 @
5879fee0
...
@@ -36,8 +36,8 @@
...
@@ -36,8 +36,8 @@
<tr>
<tr>
<td
class=
"editTableTitle"
>
{{$.lp.opinionRequired}}:
</td>
<td
class=
"editTableTitle"
>
{{$.lp.opinionRequired}}:
</td>
<td
class=
"editTableValue"
id=
"text{$.id}opinionRequired"
>
<td
class=
"editTableValue"
id=
"text{$.id}opinionRequired"
>
<input
class=
"editTableRadio"
name=
"opinionRequired"
text
{($.
opinionRequired
)?'
checked
'
:
''}
type=
"radio"
value=
"true"
/>
是
<input
class=
"editTableRadio"
name=
"opinionRequired"
text
{($.
opinionRequired
)?'
checked
'
:
''}
type=
"radio"
value=
"true"
/>
{{$.lp.yes}}
<input
class=
"editTableRadio"
name=
"opinionRequired"
text
{(!$.
opinionRequired
)?'
checked
'
:
''}
type=
"radio"
value=
"false"
/>
否
<input
class=
"editTableRadio"
name=
"opinionRequired"
text
{(!$.
opinionRequired
)?'
checked
'
:
''}
type=
"radio"
value=
"false"
/>
{{$.lp.no}}
</td>
</td>
</tr>
</tr>
</table>
</table>
...
...
o2web/source/x_desktop/index.html
浏览文件 @
5879fee0
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<link
rel=
"stylesheet"
type=
"text/css"
href=
"css/style.css"
charset=
"UTF-8"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"css/style.css"
charset=
"UTF-8"
/>
<link
rel=
"stylesheet"
href=
"css/mBoxNotice.css"
charset=
"UTF-8"
/>
<link
rel=
"stylesheet"
href=
"css/mBoxNotice.css"
charset=
"UTF-8"
/>
<link
rel=
"stylesheet"
href=
"css/mBoxTooltip.css"
charset=
"UTF-8"
/>
<link
rel=
"stylesheet"
href=
"css/mBoxTooltip.css"
charset=
"UTF-8"
/>
<title>
O2
</title>
<title>
O2
OA
</title>
<meta
http-equiv=
"Content-Type"
content=
"text/html; charset=UTF-8"
/>
<meta
http-equiv=
"Content-Type"
content=
"text/html; charset=UTF-8"
/>
</head>
</head>
<body>
<body>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录