Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
62833b0d
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,发现更多精彩内容 >>
提交
62833b0d
编写于
11月 23, 2022
作者:
NoSubject
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
流程配置映射增加列名显示
增加系统配置SSO密钥提示
上级
74fd4938
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
49 addition
and
10 deletion
+49
-10
o2web/source/o2_core/o2/xDesktop/Authentication.js
o2web/source/o2_core/o2/xDesktop/Authentication.js
+1
-1
o2web/source/x_component_process_ProcessDesigner/$Process/process.html
...x_component_process_ProcessDesigner/$Process/process.html
+2
-2
o2web/source/x_component_process_ProcessDesigner/Activity.js
o2web/source/x_component_process_ProcessDesigner/Activity.js
+2
-1
o2web/source/x_component_process_ProcessDesigner/lp/en.js
o2web/source/x_component_process_ProcessDesigner/lp/en.js
+2
-1
o2web/source/x_component_process_ProcessDesigner/lp/zh-cn.js
o2web/source/x_component_process_ProcessDesigner/lp/zh-cn.js
+1
-0
o2web/source/x_component_process_ProcessDesigner/widget/ProjectionEditor.js
...ponent_process_ProcessDesigner/widget/ProjectionEditor.js
+36
-3
o2web/source/x_component_systemconfig/o2.config.js
o2web/source/x_component_systemconfig/o2.config.js
+2
-2
o2web/source/x_component_systemconfig/public/lp/en.js
o2web/source/x_component_systemconfig/public/lp/en.js
+1
-0
o2web/source/x_component_systemconfig/public/lp/zh-cn.js
o2web/source/x_component_systemconfig/public/lp/zh-cn.js
+1
-0
o2web/source/x_component_systemconfig/src/components/content/SecuritySSOConfig/SSOConfig.vue
...ig/src/components/content/SecuritySSOConfig/SSOConfig.vue
+1
-0
未找到文件。
o2web/source/o2_core/o2/xDesktop/Authentication.js
浏览文件 @
62833b0d
...
...
@@ -461,7 +461,7 @@ MWF.xDesktop.Authentication.LoginForm = new Class({
var
_self
=
this
;
var
res
=
new
Request
.
JSON
({
"
method
"
:
"
POST
"
,
"
url
"
:
url
+
"
/jaxrs/sso
"
,
"
url
"
:
o2
.
filterUrl
(
url
+
"
/jaxrs/sso
"
)
,
"
data
"
:
JSON
.
stringify
(
json
),
secure
:
false
,
emulation
:
false
,
...
...
o2web/source/x_component_process_ProcessDesigner/$Process/process.html
浏览文件 @
62833b0d
...
...
@@ -335,10 +335,10 @@
</td>
</tr>
</table>
<div
class=
"MWFScriptText"
name=
"targetAssignDataScriptText"
data-o2-api=
"../api/server.module_assignData.html#server.module_
body
"
></div>
<div
class=
"MWFScriptText"
name=
"targetAssignDataScriptText"
data-o2-api=
"../api/server.module_assignData.html#server.module_
data
"
></div>
<div
style=
"margin: 5px;"
>
{{$.lp.getOldData}}: var data = Object.clone(this.data);
</div>
<div
style=
"margin: 5px;"
>
{{$.lp.setNewPublishData}}: return data;
</div>
<div
style=
"padding: 5px"
><a
href=
"../api/server.module_body.html#server.module_
body
"
target=
"_blank"
>
{{$.lp.apiDoc}}
</a></div>
<div
style=
"padding: 5px"
><a
href=
"../api/server.module_body.html#server.module_
data
"
target=
"_blank"
>
{{$.lp.apiDoc}}
</a></div>
</div>
...
...
o2web/source/x_component_process_ProcessDesigner/Activity.js
浏览文件 @
62833b0d
...
...
@@ -157,7 +157,7 @@ MWF.xApplication.process.ProcessDesigner.Activity = new Class({
this
.
set
.
click
(
function
(
e
){
if
(
this
.
process
.
isCreateRoute
){
this
.
checkCreateRoute
();
//
this.checkCreateRoute();
}
else
{
if
(
this
.
process
.
selectedActivitys
.
length
){
if
(
!
this
.
noselected
){
...
...
@@ -248,6 +248,7 @@ MWF.xApplication.process.ProcessDesigner.Activity = new Class({
if
(
!
route
.
fromActivity
){
this
.
process
.
routeCreateFromActivity
(
this
);
}
else
{
debugger
;
this
.
process
.
routeCreateToActivity
(
this
);
}
}
...
...
o2web/source/x_component_process_ProcessDesigner/lp/en.js
浏览文件 @
62833b0d
...
...
@@ -116,9 +116,10 @@ MWF.xApplication.process.ProcessDesigner.LP = {
"
projectionTitle
"
:
"
Mapping business data
"
,
"
projectionActionNode_add
"
:
"
Add mapping entry
"
,
"
projectionActionNode_modify
"
:
"
Modify the mapping entry
"
,
"
projectionDataName
"
:
"
Name
"
,
"
projectionDataName
"
:
"
Data
Name
"
,
"
projectionPath
"
:
"
Path
"
,
"
projectionType
"
:
"
Type
"
,
"
projectionName
"
:
"
Name
"
,
"
projectionInputError
"
:
"
Please enter the data name and data path
"
,
"
projectionTypeCountError
"
:
"
{type} type data mapping entries, up to {count} allowed.
"
,
"
projectionSameNameError
"
:
"
Same data name already exists
"
,
...
...
o2web/source/x_component_process_ProcessDesigner/lp/zh-cn.js
浏览文件 @
62833b0d
...
...
@@ -119,6 +119,7 @@ MWF.xApplication.process.ProcessDesigner.LP = {
"
projectionDataName
"
:
"
数据名称
"
,
"
projectionPath
"
:
"
数据路径
"
,
"
projectionType
"
:
"
数据类型
"
,
"
projectionName
"
:
"
列名
"
,
"
projectionInputError
"
:
"
请输入数据名称和数据路径
"
,
"
projectionTypeCountError
"
:
"
{type}类型的数据映射条目,最多允许{count}条。
"
,
"
projectionSameNameError
"
:
"
相同的数据名称已存在
"
,
...
...
o2web/source/x_component_process_ProcessDesigner/widget/ProjectionEditor.js
浏览文件 @
62833b0d
...
...
@@ -12,7 +12,7 @@ MWF.xApplication.process.ProcessDesigner.widget.ProjectionEditor = new Class({
"
boolean
"
:
2
,
"
date
"
:
2
,
"
time
"
:
2
,
"
date
t
ime
"
:
5
"
date
T
ime
"
:
5
}
},
initialize
:
function
(
node
,
text
,
options
){
...
...
@@ -47,6 +47,7 @@ MWF.xApplication.process.ProcessDesigner.widget.ProjectionEditor = new Class({
"
<th>
"
+
MWF
.
xApplication
.
process
.
ProcessDesigner
.
LP
.
projectionDataName
+
"
</th>
"
+
"
<th>
"
+
MWF
.
xApplication
.
process
.
ProcessDesigner
.
LP
.
projectionPath
+
"
</th>
"
+
"
<th>
"
+
MWF
.
xApplication
.
process
.
ProcessDesigner
.
LP
.
projectionType
+
"
</th>
"
+
"
<th>
"
+
MWF
.
xApplication
.
process
.
ProcessDesigner
.
LP
.
projectionName
+
"
</th>
"
+
"
<th></th>
"
+
"
</tr></table>
"
;
this
.
tableArea
.
set
(
"
html
"
,
html
);
...
...
@@ -127,6 +128,24 @@ MWF.xApplication.process.ProcessDesigner.widget.ProjectionEditor = new Class({
}
return
true
;
},
checkItemColumn
:
function
(){
var
columnNames
=
{
"
string
"
:
0
,
"
long
"
:
0
,
"
double
"
:
0
,
"
boolean
"
:
0
,
"
date
"
:
0
,
"
time
"
:
0
,
"
dateTime
"
:
0
};
var
rows
=
this
.
table
.
rows
;
for
(
var
i
=
0
;
i
<
this
.
data
.
length
;
i
++
){
columnNames
[
this
.
data
[
i
].
type
]
++
;
var
n
=
columnNames
[
this
.
data
[
i
].
type
]
||
1
;
var
c
=
this
.
data
[
i
].
type
+
"
Value
"
+
(
n
>=
10
?
n
:
"
0
"
+
n
);
rows
[
i
+
1
].
cells
[
3
].
set
(
"
text
"
,
c
);
}
},
modifyProjectionItem
:
function
(){
var
name
=
this
.
nameInput
.
get
(
"
value
"
);
var
path
=
this
.
pathInput
.
get
(
"
value
"
);
...
...
@@ -138,6 +157,9 @@ MWF.xApplication.process.ProcessDesigner.widget.ProjectionEditor = new Class({
this
.
currentItem
.
data
.
type
=
type
;
this
.
currentItem
.
refresh
();
this
.
currentItem
.
unSelected
();
this
.
checkItemColumn
();
this
.
fireEvent
(
"
change
"
);
this
.
fireEvent
(
"
modifyItem
"
);
}
...
...
@@ -151,6 +173,9 @@ MWF.xApplication.process.ProcessDesigner.widget.ProjectionEditor = new Class({
var
o
=
{
"
name
"
:
name
,
"
path
"
:
path
,
"
type
"
:
type
};
this
.
data
.
push
(
o
);
new
MWF
.
xApplication
.
process
.
ProcessDesigner
.
widget
.
ProjectionEditor
.
Item
(
o
,
this
);
this
.
checkItemColumn
();
this
.
fireEvent
(
"
change
"
);
this
.
fireEvent
(
"
addItem
"
);
}
...
...
@@ -159,6 +184,7 @@ MWF.xApplication.process.ProcessDesigner.widget.ProjectionEditor = new Class({
this
.
data
.
each
(
function
(
d
){
new
MWF
.
xApplication
.
process
.
ProcessDesigner
.
widget
.
ProjectionEditor
.
Item
(
d
,
this
);
}.
bind
(
this
));
this
.
checkItemColumn
();
}
});
...
...
@@ -176,6 +202,8 @@ MWF.xApplication.process.ProcessDesigner.widget.ProjectionEditor.Item = new Clas
td
=
this
.
tr
.
insertCell
().
setStyles
(
this
.
css
.
projectionTableTd
).
set
(
"
text
"
,
this
.
data
.
path
);
td
=
this
.
tr
.
insertCell
().
setStyles
(
this
.
css
.
projectionTableTd
).
set
(
"
text
"
,
this
.
data
.
type
);
td
=
this
.
tr
.
insertCell
().
setStyles
(
this
.
css
.
projectionTableTd
).
set
(
"
text
"
,
this
.
data
.
type
);
td
=
this
.
tr
.
insertCell
().
setStyles
(
this
.
css
.
projectionTableTd
);
this
.
delAction
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
css
.
projectionItemAction
}).
inject
(
td
);
...
...
@@ -197,8 +225,9 @@ MWF.xApplication.process.ProcessDesigner.widget.ProjectionEditor.Item = new Clas
this
.
tr
.
addEvents
({
"
click
"
:
function
(){
if
(
this
.
editor
.
currentItem
)
this
.
editor
.
currentItem
.
unSelected
();
this
.
selected
();
var
item
=
this
.
editor
.
currentItem
;
if
(
item
)
item
.
unSelected
();
if
(
item
!==
this
)
this
.
selected
();
}.
bind
(
this
)
})
},
...
...
@@ -228,8 +257,12 @@ MWF.xApplication.process.ProcessDesigner.widget.ProjectionEditor.Item = new Clas
tds
[
2
].
set
(
"
text
"
,
this
.
data
.
type
);
},
destroy
:
function
(){
this
.
unSelected
();
this
.
tr
.
destroy
();
this
.
editor
.
data
.
erase
(
this
.
data
);
this
.
editor
.
checkItemColumn
();
this
.
editor
.
fireEvent
(
"
change
"
);
this
.
editor
.
fireEvent
(
"
deleteItem
"
);
o2
.
release
(
this
);
...
...
o2web/source/x_component_systemconfig/o2.config.js
浏览文件 @
62833b0d
module
.
exports
=
{
"
server
"
:
{
"
host
"
:
"
qywx
.o2oa.net
"
,
"
port
"
:
"
2003
0
"
,
"
host
"
:
"
develop
.o2oa.net
"
,
"
port
"
:
"
8
0
"
,
"
httpPort
"
:
"
80
"
,
"
https
"
:
false
}
...
...
o2web/source/x_component_systemconfig/public/lp/en.js
浏览文件 @
62833b0d
...
...
@@ -420,6 +420,7 @@ o2.xApplication.systemconfig.LP = {
"
isEnable
"
:
"
是否启用
"
,
"
ssoConfigName
"
:
"
鉴权名称
"
,
"
ssoConfigKey
"
:
"
密钥
"
,
"
ssoConfigKeyInfo
"
:
"
密钥长度8位
"
,
"
removeSSOConfigTitle
"
:
"
删除鉴权配置确认
"
,
"
removeSSOConfig
"
:
"
您确定要删除鉴权配置:“{name}” 吗?
"
,
...
...
o2web/source/x_component_systemconfig/public/lp/zh-cn.js
浏览文件 @
62833b0d
...
...
@@ -427,6 +427,7 @@ o2.xApplication.systemconfig.LP = {
"
isEnable
"
:
"
是否启用
"
,
"
ssoConfigName
"
:
"
鉴权名称
"
,
"
ssoConfigKey
"
:
"
密钥
"
,
"
ssoConfigKeyInfo
"
:
"
密钥长度8位
"
,
"
removeSSOConfigTitle
"
:
"
删除鉴权配置确认
"
,
"
removeSSOConfig
"
:
"
您确定要删除鉴权配置:“{name}” 吗?
"
,
...
...
o2web/source/x_component_systemconfig/src/components/content/SecuritySSOConfig/SSOConfig.vue
浏览文件 @
62833b0d
...
...
@@ -55,6 +55,7 @@
<BaseSwitch
:label=
"lp._ssoConfig.isEnable"
v-model:value=
"currentSSOData.enable"
/>
<BaseInput
:label=
"lp._ssoConfig.ssoConfigName"
v-model:value=
"currentSSOData.client"
/>
<BaseInput
:label=
"lp._ssoConfig.ssoConfigKey"
v-model:value=
"currentSSOData.key"
/>
<div
style=
"color: #999999; margin-left: 120px"
>
{{
lp
.
_ssoConfig
.
ssoConfigKeyInfo
}}
</div>
</div>
</div>
</
template
>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录