Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
浙江兰德纵横网络技术股份有限公司
o2oa
提交
3b892e2b
o2oa
项目概览
浙江兰德纵横网络技术股份有限公司
/
o2oa
通知
338
Star
10
Fork
6
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
3b892e2b
编写于
9月 27, 2022
作者:
NoSubject
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/master'
上级
65e547b2
64069a09
变更
33
展开全部
显示空白变更内容
内联
并排
Showing
33 changed file
with
318 addition
and
165 deletion
+318
-165
o2server/x_base_core_project/src/main/java/com/x/base/core/container/EntityManagerContainer.java
...ava/com/x/base/core/container/EntityManagerContainer.java
+7
-3
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/General.java
...src/main/java/com/x/base/core/project/config/General.java
+10
-0
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Message.java
...src/main/java/com/x/base/core/project/config/Message.java
+9
-0
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Query.java
...t/src/main/java/com/x/base/core/project/config/Query.java
+8
-8
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/MailConsumeQueue.java
.../com/x/message/assemble/communicate/MailConsumeQueue.java
+1
-0
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/workcompleted/ActionRollback.java
...ervice/processing/jaxrs/workcompleted/ActionRollback.java
+19
-9
o2server/x_query_core_express/src/main/java/com/x/query/core/express/plan/Plan.java
...ess/src/main/java/com/x/query/core/express/plan/Plan.java
+2
-2
o2web/source/o2_core/o2/xScript/ViewEnvironment.js
o2web/source/o2_core/o2/xScript/ViewEnvironment.js
+36
-42
o2web/source/x_component_cms_FormDesigner/Module/Actionbar.js
...b/source/x_component_cms_FormDesigner/Module/Actionbar.js
+26
-2
o2web/source/x_component_cms_FormDesigner/widget/ActionsEditor.js
...urce/x_component_cms_FormDesigner/widget/ActionsEditor.js
+2
-0
o2web/source/x_component_cms_Xform/Actionbar.js
o2web/source/x_component_cms_Xform/Actionbar.js
+27
-2
o2web/source/x_component_process_Application/$Main/default/view/snap/list_title.html
...ocess_Application/$Main/default/view/snap/list_title.html
+1
-1
o2web/source/x_component_process_Application/$Main/default/view/taskDone/list.html
...process_Application/$Main/default/view/taskDone/list.html
+2
-0
o2web/source/x_component_process_Application/$Main/default/view/taskDone/list_title.html
...s_Application/$Main/default/view/taskDone/list_title.html
+2
-0
o2web/source/x_component_process_Application/Main.js
o2web/source/x_component_process_Application/Main.js
+9
-5
o2web/source/x_component_process_FormDesigner/Module/Actionbar.js
...urce/x_component_process_FormDesigner/Module/Actionbar.js
+17
-2
o2web/source/x_component_process_FormDesigner/widget/ActionsEditor.js
.../x_component_process_FormDesigner/widget/ActionsEditor.js
+1
-0
o2web/source/x_component_process_Xform/Actionbar.js
o2web/source/x_component_process_Xform/Actionbar.js
+19
-2
o2web/source/x_component_process_Xform/Htmleditor.js
o2web/source/x_component_process_Xform/Htmleditor.js
+2
-1
o2web/source/x_component_process_Xform/widget/OOXML.js
o2web/source/x_component_process_Xform/widget/OOXML.js
+10
-6
o2web/source/x_component_query_Query/$Viewer/default/css.wcss
...b/source/x_component_query_Query/$Viewer/default/css.wcss
+8
-8
o2web/source/x_component_query_Query/$Viewer/select/css.wcss
o2web/source/x_component_query_Query/$Viewer/select/css.wcss
+8
-8
o2web/source/x_component_query_Query/Statement.js
o2web/source/x_component_query_Query/Statement.js
+4
-1
o2web/source/x_component_systemconfig/public/lp/en.js
o2web/source/x_component_systemconfig/public/lp/en.js
+6
-5
o2web/source/x_component_systemconfig/public/lp/zh-cn.js
o2web/source/x_component_systemconfig/public/lp/zh-cn.js
+7
-6
o2web/source/x_component_systemconfig/src/components/content/SecurityPasswordConfig/PersonPassword.vue
...ponents/content/SecurityPasswordConfig/PersonPassword.vue
+3
-2
o2web/source/x_component_systemconfig/src/components/content/ServerMessageConfig/ConsumerConfig.vue
...components/content/ServerMessageConfig/ConsumerConfig.vue
+1
-0
o2web/source/x_component_systemconfig/src/components/content/ServerMessageConfig/MessageTypeConfig.vue
...ponents/content/ServerMessageConfig/MessageTypeConfig.vue
+1
-0
o2web/source/x_component_systemconfig/src/components/content/ServerServersConfig/ServerTaskConfig.vue
...mponents/content/ServerServersConfig/ServerTaskConfig.vue
+3
-3
o2web/source/x_desktop/js/app.js
o2web/source/x_desktop/js/app.js
+8
-4
o2web/source/x_desktop/js/initialScriptText.js
o2web/source/x_desktop/js/initialScriptText.js
+43
-35
o2web/source/x_desktop/js/portal.js
o2web/source/x_desktop/js/portal.js
+8
-4
o2web/source/x_desktop/js/work.js
o2web/source/x_desktop/js/work.js
+8
-4
未找到文件。
o2server/x_base_core_project/src/main/java/com/x/base/core/container/EntityManagerContainer.java
浏览文件 @
3b892e2b
...
@@ -37,6 +37,7 @@ import com.x.base.core.entity.annotation.CheckRemoveType;
...
@@ -37,6 +37,7 @@ import com.x.base.core.entity.annotation.CheckRemoveType;
import
com.x.base.core.entity.annotation.RestrictFlag
;
import
com.x.base.core.entity.annotation.RestrictFlag
;
import
com.x.base.core.entity.tools.JpaObjectTools
;
import
com.x.base.core.entity.tools.JpaObjectTools
;
import
com.x.base.core.project.bean.WrapCopier
;
import
com.x.base.core.project.bean.WrapCopier
;
import
com.x.base.core.project.config.Config
;
import
com.x.base.core.project.exception.ExceptionWhen
;
import
com.x.base.core.project.exception.ExceptionWhen
;
import
com.x.base.core.project.gson.GsonPropertyObject
;
import
com.x.base.core.project.gson.GsonPropertyObject
;
import
com.x.base.core.project.tools.ListTools
;
import
com.x.base.core.project.tools.ListTools
;
...
@@ -156,10 +157,13 @@ public class EntityManagerContainer extends EntityManagerContainerBasic {
...
@@ -156,10 +157,13 @@ public class EntityManagerContainer extends EntityManagerContainerBasic {
private
void
checkIdFormat
(
JpaObject
jpa
)
throws
Exception
{
private
void
checkIdFormat
(
JpaObject
jpa
)
throws
Exception
{
String
value
=
jpa
.
getId
();
String
value
=
jpa
.
getId
();
if
(
null
==
value
||
(!
StringTools
.
UUID_REGEX
.
matcher
(
value
).
matches
()))
{
if
(
StringUtils
.
isNotBlank
(
value
)
&&
((
StringUtils
.
isNotBlank
(
Config
.
general
().
getIdFormatCheckRegular
())
throw
new
Exception
(
"check id error, class:"
+
jpa
.
getClass
().
getName
()
+
", field:id, value:"
+
value
&&
value
.
matches
(
Config
.
general
().
getIdFormatCheckRegular
()))
+
", invalid format."
);
||
StringTools
.
UUID_REGEX
.
matcher
(
value
).
matches
()))
{
return
;
}
}
throw
new
IllegalStateException
(
"check id error, class:"
+
jpa
.
getClass
().
getName
()
+
", field:id, value:"
+
value
+
", invalid format."
);
}
}
@SuppressWarnings
(
"unchecked"
)
@SuppressWarnings
(
"unchecked"
)
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/General.java
浏览文件 @
3b892e2b
...
@@ -35,6 +35,8 @@ public class General extends ConfigObject {
...
@@ -35,6 +35,8 @@ public class General extends ConfigObject {
private
static
final
String
DEFAULT_REFERERHEADCHECKREGULAR
=
""
;
private
static
final
String
DEFAULT_REFERERHEADCHECKREGULAR
=
""
;
private
static
final
String
DEFAULT_ACCESSCONTROLALLOWORIGIN
=
""
;
private
static
final
String
DEFAULT_ACCESSCONTROLALLOWORIGIN
=
""
;
private
static
final
String
DEFAULT_IDFORMATCHECKREGULAR
=
""
;
public
static
General
defaultInstance
()
{
public
static
General
defaultInstance
()
{
General
o
=
new
General
();
General
o
=
new
General
();
o
.
webSocketEnable
=
DEFAULT_WEBSOCKETENABLE
;
o
.
webSocketEnable
=
DEFAULT_WEBSOCKETENABLE
;
...
@@ -50,6 +52,7 @@ public class General extends ConfigObject {
...
@@ -50,6 +52,7 @@ public class General extends ConfigObject {
o
.
exposeJest
=
DEFAULT_EXPOSEJEST
;
o
.
exposeJest
=
DEFAULT_EXPOSEJEST
;
o
.
refererHeadCheckRegular
=
DEFAULT_REFERERHEADCHECKREGULAR
;
o
.
refererHeadCheckRegular
=
DEFAULT_REFERERHEADCHECKREGULAR
;
o
.
accessControlAllowOrigin
=
DEFAULT_ACCESSCONTROLALLOWORIGIN
;
o
.
accessControlAllowOrigin
=
DEFAULT_ACCESSCONTROLALLOWORIGIN
;
o
.
idFormatCheckRegular
=
DEFAULT_IDFORMATCHECKREGULAR
;
o
.
attachmentConfig
=
new
AttachmentConfig
();
o
.
attachmentConfig
=
new
AttachmentConfig
();
return
o
;
return
o
;
}
}
...
@@ -96,6 +99,13 @@ public class General extends ConfigObject {
...
@@ -96,6 +99,13 @@ public class General extends ConfigObject {
@FieldDescribe
(
"附件上传限制大小或者类型."
)
@FieldDescribe
(
"附件上传限制大小或者类型."
)
private
AttachmentConfig
attachmentConfig
;
private
AttachmentConfig
attachmentConfig
;
@FieldDescribe
(
"对象id格式校验正则表达式."
)
private
String
idFormatCheckRegular
=
""
;
public
String
getIdFormatCheckRegular
()
{
return
this
.
idFormatCheckRegular
;
}
public
String
getRefererHeadCheckRegular
()
{
public
String
getRefererHeadCheckRegular
()
{
return
(
StringUtils
.
isBlank
(
refererHeadCheckRegular
)
?
DEFAULT_REFERERHEADCHECKREGULAR
return
(
StringUtils
.
isBlank
(
refererHeadCheckRegular
)
?
DEFAULT_REFERERHEADCHECKREGULAR
:
this
.
refererHeadCheckRegular
);
:
this
.
refererHeadCheckRegular
);
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Message.java
浏览文件 @
3b892e2b
...
@@ -289,6 +289,7 @@ public class Message extends GsonPropertyObject {
...
@@ -289,6 +289,7 @@ public class Message extends GsonPropertyObject {
o
.
host
=
DEFAULT_HOST
;
o
.
host
=
DEFAULT_HOST
;
o
.
port
=
DEFAULT_PORT
;
o
.
port
=
DEFAULT_PORT
;
o
.
sslEnable
=
DEFAULT_SSLENABLE
;
o
.
sslEnable
=
DEFAULT_SSLENABLE
;
o
.
startTlsEnable
=
DEFAULT_STARTTLSENABLE
;
o
.
auth
=
DEFAULT_AUTH
;
o
.
auth
=
DEFAULT_AUTH
;
o
.
from
=
DEFAULT_FROM
;
o
.
from
=
DEFAULT_FROM
;
o
.
password
=
DEFAULT_PASSWORD
;
o
.
password
=
DEFAULT_PASSWORD
;
...
@@ -304,6 +305,7 @@ public class Message extends GsonPropertyObject {
...
@@ -304,6 +305,7 @@ public class Message extends GsonPropertyObject {
private
static
final
String
DEFAULT_HOST
=
""
;
private
static
final
String
DEFAULT_HOST
=
""
;
private
static
final
Integer
DEFAULT_PORT
=
465
;
private
static
final
Integer
DEFAULT_PORT
=
465
;
private
static
final
Boolean
DEFAULT_SSLENABLE
=
true
;
private
static
final
Boolean
DEFAULT_SSLENABLE
=
true
;
private
static
final
Boolean
DEFAULT_STARTTLSENABLE
=
false
;
private
static
final
Boolean
DEFAULT_AUTH
=
true
;
private
static
final
Boolean
DEFAULT_AUTH
=
true
;
private
static
final
String
DEFAULT_FROM
=
"admin@o2oa.net"
;
private
static
final
String
DEFAULT_FROM
=
"admin@o2oa.net"
;
private
static
final
String
DEFAULT_PASSWORD
=
"password"
;
private
static
final
String
DEFAULT_PASSWORD
=
"password"
;
...
@@ -317,6 +319,9 @@ public class Message extends GsonPropertyObject {
...
@@ -317,6 +319,9 @@ public class Message extends GsonPropertyObject {
@FieldDescribe
(
"smtp 使用ssl加密."
)
@FieldDescribe
(
"smtp 使用ssl加密."
)
private
Boolean
sslEnable
;
private
Boolean
sslEnable
;
@FieldDescribe
(
"smtp 启用升级到加密链接."
)
private
Boolean
startTlsEnable
;
@FieldDescribe
(
"stmp启用认证."
)
@FieldDescribe
(
"stmp启用认证."
)
private
Boolean
auth
;
private
Boolean
auth
;
...
@@ -338,6 +343,10 @@ public class Message extends GsonPropertyObject {
...
@@ -338,6 +343,10 @@ public class Message extends GsonPropertyObject {
return
null
==
sslEnable
?
DEFAULT_SSLENABLE
:
this
.
sslEnable
;
return
null
==
sslEnable
?
DEFAULT_SSLENABLE
:
this
.
sslEnable
;
}
}
public
Boolean
getStartTlsEnable
()
{
return
null
==
startTlsEnable
?
DEFAULT_STARTTLSENABLE
:
this
.
startTlsEnable
;
}
public
Boolean
getAuth
()
{
public
Boolean
getAuth
()
{
return
null
==
auth
?
DEFAULT_AUTH
:
this
.
auth
;
return
null
==
auth
?
DEFAULT_AUTH
:
this
.
auth
;
}
}
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Query.java
浏览文件 @
3b892e2b
...
@@ -42,13 +42,13 @@ public class Query extends ConfigObject {
...
@@ -42,13 +42,13 @@ public class Query extends ConfigObject {
private
CrawlCms
crawlCms
;
private
CrawlCms
crawlCms
;
@FieldDescribe
(
"抽取office中的文本."
)
@FieldDescribe
(
"抽取office中的文本."
)
private
Boolean
extractOffice
=
tru
e
;
private
Boolean
extractOffice
=
fals
e
;
@FieldDescribe
(
"抽取pdf中的文本."
)
@FieldDescribe
(
"抽取pdf中的文本."
)
private
Boolean
extractPdf
=
tru
e
;
private
Boolean
extractPdf
=
fals
e
;
@FieldDescribe
(
"抽取文本中的文本."
)
@FieldDescribe
(
"抽取文本中的文本."
)
private
Boolean
extractText
=
tru
e
;
private
Boolean
extractText
=
fals
e
;
@FieldDescribe
(
"抽取图像中的文本."
)
@FieldDescribe
(
"抽取图像中的文本."
)
private
Boolean
extractImage
=
false
;
private
Boolean
extractImage
=
false
;
...
@@ -59,9 +59,9 @@ public class Query extends ConfigObject {
...
@@ -59,9 +59,9 @@ public class Query extends ConfigObject {
@FieldDescribe
(
"查询批次大小."
)
@FieldDescribe
(
"查询批次大小."
)
private
Integer
planQueryBatchSize
=
DEFAULT_PLANQUERYBATCHSIZE
;
private
Integer
planQueryBatchSize
=
DEFAULT_PLANQUERYBATCHSIZE
;
public
static
final
Boolean
DEFAULT_EXTRACTOFFICE
=
tru
e
;
public
static
final
Boolean
DEFAULT_EXTRACTOFFICE
=
fals
e
;
public
static
final
Boolean
DEFAULT_EXTRACTPDF
=
tru
e
;
public
static
final
Boolean
DEFAULT_EXTRACTPDF
=
fals
e
;
public
static
final
Boolean
DEFAULT_EXTRACTTEXT
=
tru
e
;
public
static
final
Boolean
DEFAULT_EXTRACTTEXT
=
fals
e
;
public
static
final
Boolean
DEFAULT_EXTRACTIMAGE
=
false
;
public
static
final
Boolean
DEFAULT_EXTRACTIMAGE
=
false
;
public
static
final
String
DEFAULT_TESSLANGUAGE
=
"chi_sim"
;
public
static
final
String
DEFAULT_TESSLANGUAGE
=
"chi_sim"
;
public
static
final
Integer
DEFAULT_PLANQUERYBATCHSIZE
=
500
;
public
static
final
Integer
DEFAULT_PLANQUERYBATCHSIZE
=
500
;
...
@@ -115,7 +115,7 @@ public class Query extends ConfigObject {
...
@@ -115,7 +115,7 @@ public class Query extends ConfigObject {
return
o
;
return
o
;
}
}
public
final
static
Boolean
DEFAULT_ENABLE
=
tru
e
;
public
final
static
Boolean
DEFAULT_ENABLE
=
fals
e
;
public
final
static
String
DEFAULT_CRON
=
"30 30 9,12,15,18 * * ?"
;
public
final
static
String
DEFAULT_CRON
=
"30 30 9,12,15,18 * * ?"
;
...
...
o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/MailConsumeQueue.java
浏览文件 @
3b892e2b
...
@@ -97,6 +97,7 @@ public class MailConsumeQueue extends AbstractQueue<Message> {
...
@@ -97,6 +97,7 @@ public class MailConsumeQueue extends AbstractQueue<Message> {
properties
.
put
(
"mail.smtp.host"
,
consumer
.
getHost
());
properties
.
put
(
"mail.smtp.host"
,
consumer
.
getHost
());
properties
.
put
(
"mail.smtp.port"
,
consumer
.
getPort
());
properties
.
put
(
"mail.smtp.port"
,
consumer
.
getPort
());
properties
.
put
(
"mail.smtp.ssl.enable"
,
consumer
.
getSslEnable
());
properties
.
put
(
"mail.smtp.ssl.enable"
,
consumer
.
getSslEnable
());
properties
.
put
(
"mail.smtp.starttls.enable"
,
consumer
.
getStartTlsEnable
());
properties
.
put
(
"mail.smtp.auth"
,
consumer
.
getAuth
());
properties
.
put
(
"mail.smtp.auth"
,
consumer
.
getAuth
());
Session
session
=
Session
.
getInstance
(
properties
,
new
javax
.
mail
.
Authenticator
()
{
Session
session
=
Session
.
getInstance
(
properties
,
new
javax
.
mail
.
Authenticator
()
{
@Override
@Override
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/workcompleted/ActionRollback.java
浏览文件 @
3b892e2b
...
@@ -5,6 +5,7 @@ import java.util.List;
...
@@ -5,6 +5,7 @@ import java.util.List;
import
java.util.concurrent.Callable
;
import
java.util.concurrent.Callable
;
import
java.util.concurrent.TimeUnit
;
import
java.util.concurrent.TimeUnit
;
import
com.x.processplatform.core.entity.content.*
;
import
org.apache.commons.lang3.BooleanUtils
;
import
org.apache.commons.lang3.BooleanUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
...
@@ -23,15 +24,6 @@ import com.x.base.core.project.jaxrs.WoId;
...
@@ -23,15 +24,6 @@ import com.x.base.core.project.jaxrs.WoId;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.tools.ListTools
;
import
com.x.base.core.project.tools.ListTools
;
import
com.x.processplatform.core.entity.content.Attachment
;
import
com.x.processplatform.core.entity.content.Read
;
import
com.x.processplatform.core.entity.content.ReadCompleted
;
import
com.x.processplatform.core.entity.content.Review
;
import
com.x.processplatform.core.entity.content.TaskCompleted
;
import
com.x.processplatform.core.entity.content.Work
;
import
com.x.processplatform.core.entity.content.WorkCompleted
;
import
com.x.processplatform.core.entity.content.WorkLog
;
import
com.x.processplatform.core.entity.content.WorkStatus
;
import
com.x.processplatform.core.entity.element.Application
;
import
com.x.processplatform.core.entity.element.Application
;
import
com.x.processplatform.core.entity.element.Process
;
import
com.x.processplatform.core.entity.element.Process
;
import
com.x.processplatform.core.entity.element.util.WorkLogTree
;
import
com.x.processplatform.core.entity.element.util.WorkLogTree
;
...
@@ -116,6 +108,7 @@ class ActionRollback extends BaseAction {
...
@@ -116,6 +108,7 @@ class ActionRollback extends BaseAction {
emc
.
beginTransaction
(
Read
.
class
);
emc
.
beginTransaction
(
Read
.
class
);
emc
.
beginTransaction
(
ReadCompleted
.
class
);
emc
.
beginTransaction
(
ReadCompleted
.
class
);
emc
.
beginTransaction
(
Review
.
class
);
emc
.
beginTransaction
(
Review
.
class
);
emc
.
beginTransaction
(
Record
.
class
);
Work
work
=
createWork
(
business
,
workCompleted
,
workLog
);
Work
work
=
createWork
(
business
,
workCompleted
,
workLog
);
emc
.
persist
(
work
,
CheckPersistType
.
all
);
emc
.
persist
(
work
,
CheckPersistType
.
all
);
...
@@ -134,6 +127,9 @@ class ActionRollback extends BaseAction {
...
@@ -134,6 +127,9 @@ class ActionRollback extends BaseAction {
rollbackReview
(
business
,
work
,
nodes
,
rollbackReview
(
business
,
work
,
nodes
,
emc
.
listEqual
(
Review
.
class
,
Review
.
job_FIELDNAME
,
work
.
getJob
()));
emc
.
listEqual
(
Review
.
class
,
Review
.
job_FIELDNAME
,
work
.
getJob
()));
rollbackRecord
(
business
,
work
,
nodes
,
workLog
,
emc
.
listEqual
(
Record
.
class
,
Record
.
job_FIELDNAME
,
work
.
getJob
()));
rollbackWorkLog
(
business
,
work
,
nodes
,
workLogs
);
rollbackWorkLog
(
business
,
work
,
nodes
,
workLogs
);
rollbackAttachment
(
business
,
work
,
rollbackAttachment
(
business
,
work
,
...
@@ -258,6 +254,20 @@ class ActionRollback extends BaseAction {
...
@@ -258,6 +254,20 @@ class ActionRollback extends BaseAction {
}
}
}
}
private
void
rollbackRecord
(
Business
business
,
Work
work
,
Nodes
nodes
,
WorkLog
workLog
,
List
<
Record
>
list
)
throws
Exception
{
for
(
Record
o
:
list
)
{
if
(!
nodes
.
containsWorkLogWithActivityToken
(
o
.
getFromActivityToken
())
||
StringUtils
.
equals
(
o
.
getFromActivityToken
(),
workLog
.
getFromActivityToken
()))
{
business
.
entityManagerContainer
().
remove
(
o
);
}
else
{
o
.
setCompleted
(
false
);
o
.
setWorkCompleted
(
""
);
o
.
setWork
(
work
.
getId
());
}
}
}
private
void
rollbackWorkLog
(
Business
business
,
Work
work
,
Nodes
nodes
,
List
<
WorkLog
>
list
)
throws
Exception
{
private
void
rollbackWorkLog
(
Business
business
,
Work
work
,
Nodes
nodes
,
List
<
WorkLog
>
list
)
throws
Exception
{
for
(
WorkLog
o
:
list
)
{
for
(
WorkLog
o
:
list
)
{
if
(!
nodes
.
containsWorkLog
(
o
))
{
if
(!
nodes
.
containsWorkLog
(
o
))
{
...
...
o2server/x_query_core_express/src/main/java/com/x/query/core/express/plan/Plan.java
浏览文件 @
3b892e2b
...
@@ -361,10 +361,10 @@ public abstract class Plan extends GsonPropertyObject {
...
@@ -361,10 +361,10 @@ public abstract class Plan extends GsonPropertyObject {
}
}
public
List
<
String
>
fetchBundles
()
throws
Exception
{
public
List
<
String
>
fetchBundles
()
throws
Exception
{
// 先获取所有记录对应的job值作为返回的结果集
List
<
String
>
bundles
=
this
.
listBundle
();
// 先进行字段调整
// 先进行字段调整
this
.
adjust
();
this
.
adjust
();
// 先获取所有记录对应的job值作为返回的结果集
List
<
String
>
bundles
=
this
.
listBundle
();
this
.
group
=
this
.
findGroupSelectEntry
();
this
.
group
=
this
.
findGroupSelectEntry
();
this
.
orderList
=
this
.
listOrderSelectEntry
();
this
.
orderList
=
this
.
listOrderSelectEntry
();
if
((
null
!=
this
.
runtime
.
count
)
&&
(
this
.
runtime
.
count
>
0
)
&&
(
this
.
runtime
.
count
<
bundles
.
size
()))
{
if
((
null
!=
this
.
runtime
.
count
)
&&
(
this
.
runtime
.
count
>
0
)
&&
(
this
.
runtime
.
count
<
bundles
.
size
()))
{
...
...
o2web/source/o2_core/o2/xScript/ViewEnvironment.js
浏览文件 @
3b892e2b
此差异已折叠。
点击以展开。
o2web/source/x_component_cms_FormDesigner/Module/Actionbar.js
浏览文件 @
3b892e2b
...
@@ -274,12 +274,36 @@ MWF.xApplication.cms.FormDesigner.Module.Actionbar = MWF.CMSFCActionbar = new Cl
...
@@ -274,12 +274,36 @@ MWF.xApplication.cms.FormDesigner.Module.Actionbar = MWF.CMSFCActionbar = new Cl
}
}
}.
bind
(
this
));
}.
bind
(
this
));
},
},
getImagePath
:
function
(
img
,
iscustom
){
if
(
iscustom
){
var
style
;
if
(
this
.
json
.
customIconStyle
){
style
=
this
.
json
.
customIconStyle
;
}
else
{
style
=
(
this
.
json
.
style
||
"
default
"
).
indexOf
(
"
red
"
)
>
-
1
?
"
red
"
:
"
blue
"
;
}
return
this
.
path
+
""
+
this
.
options
.
style
+
"
/custom/
"
+
style
+
"
/
"
+
img
;
}
else
{
return
this
.
path
+
""
+
this
.
options
.
style
+
"
/tools/
"
+
(
this
.
json
.
style
||
"
default
"
)
+
"
/
"
+
img
;
}
},
getImageOverPath
:
function
(
img_over
,
img
,
iscustom
){
if
(
iscustom
){
var
style_over
=
this
.
json
.
customIconOverStyle
||
"
white
"
;
return
this
.
path
+
""
+
this
.
options
.
style
+
"
/custom/
"
+
style_over
+
"
/
"
+
img
;
}
else
{
return
this
.
path
+
""
+
this
.
options
.
style
+
"
/tools/
"
+
(
this
.
json
.
style
||
"
default
"
)
+
"
/
"
+
img_over
;
}
},
setToolbars
:
function
(
tools
,
node
){
setToolbars
:
function
(
tools
,
node
){
tools
.
each
(
function
(
tool
){
tools
.
each
(
function
(
tool
){
var
actionNode
=
new
Element
(
"
div
"
,
{
var
actionNode
=
new
Element
(
"
div
"
,
{
"
MWFnodetype
"
:
tool
.
type
,
"
MWFnodetype
"
:
tool
.
type
,
"
MWFButtonImage
"
:
this
.
path
+
""
+
this
.
options
.
style
+
"
/tools/
"
+
(
this
.
json
.
style
||
"
default
"
)
+
"
/
"
+
tool
.
img
,
//"MWFButtonImage": this.path+""+this.options.style +"/tools/"+ (this.json.style || "default") +"/"+tool.img,
"
MWFButtonImageOver
"
:
this
.
path
+
""
+
this
.
options
.
style
+
"
/tools/
"
+
(
this
.
json
.
style
||
"
default
"
)
+
"
/
"
+
tool
.
img_over
,
//"MWFButtonImageOver": this.path+""+this.options.style+"/tools/"+ (this.json.style || "default") +"/"+tool.img_over,
"
MWFButtonImage
"
:
this
.
getImagePath
(
tool
.
img
,
tool
.
customImg
),
"
MWFButtonImageOver
"
:
this
.
getImageOverPath
(
tool
.
img_over
,
tool
.
img
,
tool
.
customImg
),
"
title
"
:
tool
.
title
,
"
title
"
:
tool
.
title
,
"
MWFButtonAction
"
:
tool
.
action
,
"
MWFButtonAction
"
:
tool
.
action
,
"
MWFButtonText
"
:
tool
.
text
"
MWFButtonText
"
:
tool
.
text
...
...
o2web/source/x_component_cms_FormDesigner/widget/ActionsEditor.js
浏览文件 @
3b892e2b
...
@@ -244,6 +244,7 @@ MWF.xApplication.cms.FormDesigner.widget.ActionsEditor.ButtonAction = new Class(
...
@@ -244,6 +244,7 @@ MWF.xApplication.cms.FormDesigner.widget.ActionsEditor.ButtonAction = new Class(
var
item
=
this
.
iconMenu
.
addMenuItem
(
""
,
"
click
"
,
function
(
ev
){
var
item
=
this
.
iconMenu
.
addMenuItem
(
""
,
"
click
"
,
function
(
ev
){
var
src
=
this
.
item
.
getElement
(
"
img
"
).
get
(
"
src
"
);
var
src
=
this
.
item
.
getElement
(
"
img
"
).
get
(
"
src
"
);
_self
.
data
.
img
=
src
.
substr
(
src
.
lastIndexOf
(
"
/
"
)
+
1
,
src
.
length
);
_self
.
data
.
img
=
src
.
substr
(
src
.
lastIndexOf
(
"
/
"
)
+
1
,
src
.
length
);
_self
.
data
.
customImg
=
true
;
_self
.
iconNode
.
setStyle
(
"
background-image
"
,
"
url(
"
+
src
+
"
)
"
);
_self
.
iconNode
.
setStyle
(
"
background-image
"
,
"
url(
"
+
src
+
"
)
"
);
_self
.
editor
.
fireEvent
(
"
change
"
);
_self
.
editor
.
fireEvent
(
"
change
"
);
ev
.
stopPropagation
();
ev
.
stopPropagation
();
...
@@ -256,6 +257,7 @@ MWF.xApplication.cms.FormDesigner.widget.ActionsEditor.ButtonAction = new Class(
...
@@ -256,6 +257,7 @@ MWF.xApplication.cms.FormDesigner.widget.ActionsEditor.ButtonAction = new Class(
var
item
=
this
.
iconMenu
.
addMenuItem
(
""
,
"
click
"
,
function
(
ev
){
var
item
=
this
.
iconMenu
.
addMenuItem
(
""
,
"
click
"
,
function
(
ev
){
var
src
=
this
.
item
.
getElement
(
"
img
"
).
get
(
"
src
"
);
var
src
=
this
.
item
.
getElement
(
"
img
"
).
get
(
"
src
"
);
_self
.
data
.
img
=
src
.
substr
(
src
.
lastIndexOf
(
"
/
"
)
+
1
,
src
.
length
);
_self
.
data
.
img
=
src
.
substr
(
src
.
lastIndexOf
(
"
/
"
)
+
1
,
src
.
length
);
_self
.
data
.
customImg
=
true
;
_self
.
iconNode
.
setStyle
(
"
background-image
"
,
"
url(
"
+
src
+
"
)
"
);
_self
.
iconNode
.
setStyle
(
"
background-image
"
,
"
url(
"
+
src
+
"
)
"
);
_self
.
editor
.
fireEvent
(
"
change
"
);
_self
.
editor
.
fireEvent
(
"
change
"
);
ev
.
stopPropagation
();
ev
.
stopPropagation
();
...
...
o2web/source/x_component_cms_Xform/Actionbar.js
浏览文件 @
3b892e2b
...
@@ -135,6 +135,29 @@ MWF.xApplication.cms.Xform.Actionbar = MWF.CMSActionbar = new Class({
...
@@ -135,6 +135,29 @@ MWF.xApplication.cms.Xform.Actionbar = MWF.CMSActionbar = new Class({
}
}
}.
bind
(
this
));
}.
bind
(
this
));
},
},
getImagePath
:
function
(
img
,
iscustom
){
var
path
=
"
../x_component_cms_FormDesigner/Module/Actionbar/
"
;
if
(
iscustom
){
var
style
;
if
(
this
.
json
.
customIconStyle
){
style
=
this
.
json
.
customIconStyle
;
}
else
{
style
=
(
this
.
json
.
style
||
"
default
"
).
indexOf
(
"
red
"
)
>
-
1
?
"
red
"
:
"
blue
"
;
}
return
path
+
""
+
this
.
form
.
options
.
style
+
"
/custom/
"
+
style
+
"
/
"
+
img
;
}
else
{
return
path
+
(
this
.
options
.
style
||
"
default
"
)
+
"
/tools/
"
+
(
this
.
json
.
style
||
"
default
"
)
+
"
/
"
+
img
}
},
getImageOverPath
:
function
(
img_over
,
img
,
iscustom
){
var
path
=
"
../x_component_cms_FormDesigner/Module/Actionbar/
"
;
if
(
iscustom
){
var
style_over
=
this
.
json
.
customIconOverStyle
||
"
white
"
;
return
path
+
""
+
this
.
form
.
options
.
style
+
"
/custom/
"
+
style_over
+
"
/
"
+
img
;
}
else
{
return
path
+
(
this
.
options
.
style
||
"
default
"
)
+
"
/tools/
"
+
(
this
.
json
.
style
||
"
default
"
)
+
"
/
"
+
img_over
;
}
},
setToolbars
:
function
(
tools
,
node
,
readonly
,
noCondition
){
setToolbars
:
function
(
tools
,
node
,
readonly
,
noCondition
){
tools
.
each
(
function
(
tool
){
tools
.
each
(
function
(
tool
){
var
flag
=
true
;
var
flag
=
true
;
...
@@ -162,8 +185,10 @@ MWF.xApplication.cms.Xform.Actionbar = MWF.CMSActionbar = new Class({
...
@@ -162,8 +185,10 @@ MWF.xApplication.cms.Xform.Actionbar = MWF.CMSActionbar = new Class({
var
actionNode
=
new
Element
(
"
div
"
,
{
var
actionNode
=
new
Element
(
"
div
"
,
{
"
id
"
:
tool
.
id
,
"
id
"
:
tool
.
id
,
"
MWFnodetype
"
:
tool
.
type
,
"
MWFnodetype
"
:
tool
.
type
,
"
MWFButtonImage
"
:
"
../x_component_cms_FormDesigner/Module/Actionbar/
"
+
(
this
.
options
.
style
||
"
default
"
)
+
"
/tools/
"
+
(
this
.
json
.
style
||
"
default
"
)
+
"
/
"
+
tool
.
img
,
//"MWFButtonImage": "../x_component_cms_FormDesigner/Module/Actionbar/"+(this.options.style||"default") +"/tools/"+ (this.json.style || "default") +"/"+tool.img,
"
MWFButtonImageOver
"
:
"
../x_component_cms_FormDesigner/Module/Actionbar/
"
+
(
this
.
options
.
style
||
"
default
"
)
+
"
/tools/
"
+
(
this
.
json
.
style
||
"
default
"
)
+
"
/
"
+
tool
.
img_over
,
//"MWFButtonImageOver": "../x_component_cms_FormDesigner/Module/Actionbar/"+(this.options.style||"default")+"/tools/"+ (this.json.style || "default") +"/"+tool.img_over,
"
MWFButtonImage
"
:
this
.
getImagePath
(
tool
.
img
,
tool
.
customImg
),
"
MWFButtonImageOver
"
:
this
.
getImageOverPath
(
tool
.
img_over
,
tool
.
img
,
tool
.
customImg
),
"
title
"
:
tool
.
title
,
"
title
"
:
tool
.
title
,
"
MWFButtonAction
"
:
tool
.
action
,
"
MWFButtonAction
"
:
tool
.
action
,
"
MWFButtonText
"
:
tool
.
text
"
MWFButtonText
"
:
tool
.
text
...
...
o2web/source/x_component_process_Application/$Main/default/view/snap/list_title.html
浏览文件 @
3b892e2b
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<th>
<th>
<div
class=
"selectFlag"
>
<div
class=
"selectFlag"
>
<div
class=
"selectFlagArea"
style=
"cursor: pointer"
<div
class=
"selectFlagArea"
style=
"cursor: pointer"
data-o2-events=
"click:selectAll
File
"
>
data-o2-events=
"click:selectAll"
>
<div
class=
"selectFlagIcon o2WorkApplication"
></div>
<div
class=
"selectFlagIcon o2WorkApplication"
></div>
</div>
</div>
</div>
</div>
...
...
o2web/source/x_component_process_Application/$Main/default/view/taskDone/list.html
浏览文件 @
3b892e2b
...
@@ -6,6 +6,7 @@
...
@@ -6,6 +6,7 @@
<col
width=
"15%"
>
<col
width=
"15%"
>
<col
width=
"10%"
>
<col
width=
"10%"
>
<col
width=
"10%"
>
<col
width=
"10%"
>
<col
width=
"10%"
>
<col
width=
"15%"
>
<col
width=
"15%"
>
<col
width=
"15%"
>
<col
width=
"15%"
>
</colgroup>
</colgroup>
...
@@ -22,6 +23,7 @@
...
@@ -22,6 +23,7 @@
</div>
</div>
</td>
</td>
<td
style=
"text-align: left;"
><span>
{{$.processName}}
</span></td>
<td
style=
"text-align: left;"
><span>
{{$.processName}}
</span></td>
<td
style=
"text-align: left;"
><span>
{{$.activityName}}
</span></td>
<td
style=
"text-align: left;"
><span>
{{$.creatorPersonName}}
</span></td>
<td
style=
"text-align: left;"
><span>
{{$.creatorPersonName}}
</span></td>
<td
style=
"text-align: left;"
><span>
{{$.creatorUnitName}}
</span></td>
<td
style=
"text-align: left;"
><span>
{{$.creatorUnitName}}
</span></td>
<td
style=
"text-align: left;"
><span>
{{$.startTime}}
</span></td>
<td
style=
"text-align: left;"
><span>
{{$.startTime}}
</span></td>
...
...
o2web/source/x_component_process_Application/$Main/default/view/taskDone/list_title.html
浏览文件 @
3b892e2b
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
<col
width=
"15%"
>
<col
width=
"15%"
>
<col
width=
"10%"
>
<col
width=
"10%"
>
<col
width=
"10%"
>
<col
width=
"10%"
>
<col
width=
"10%"
>
<col
width=
"15%"
>
<col
width=
"15%"
>
<col
width=
"15%"
>
<col
width=
"15%"
>
</colgroup>
</colgroup>
...
@@ -12,6 +13,7 @@
...
@@ -12,6 +13,7 @@
<tr
class=
"listItem"
>
<tr
class=
"listItem"
>
<th><span
style=
"padding-left: 10px"
>
{{$.lp.subject}}
</span></th>
<th><span
style=
"padding-left: 10px"
>
{{$.lp.subject}}
</span></th>
<th><span>
{{$.lp.process}}
</span></th>
<th><span>
{{$.lp.process}}
</span></th>
<th><span>
{{$.lp.activity}}
</span></th>
<th><span>
{{$.lp.creator}}
</span></th>
<th><span>
{{$.lp.creator}}
</span></th>
<th><span>
{{$.lp.createunit}}
</span></th>
<th><span>
{{$.lp.createunit}}
</span></th>
<th><span>
{{$.lp.startTime}}
</span></th>
<th><span>
{{$.lp.startTime}}
</span></th>
...
...
o2web/source/x_component_process_Application/Main.js
浏览文件 @
3b892e2b
...
@@ -13,12 +13,18 @@ MWF.xApplication.process.Application.Main = new Class({
...
@@ -13,12 +13,18 @@ MWF.xApplication.process.Application.Main = new Class({
"
icon
"
:
"
icon.png
"
,
"
icon
"
:
"
icon.png
"
,
"
application
"
:
""
,
"
application
"
:
""
,
"
id
"
:
""
,
"
id
"
:
""
,
"
navi
"
:
"
all
"
,
"
title
"
:
MWF
.
xApplication
.
process
.
Application
.
LP
.
title
"
title
"
:
MWF
.
xApplication
.
process
.
Application
.
LP
.
title
},
},
onQueryLoad
:
function
(){
onQueryLoad
:
function
(){
this
.
lp
=
MWF
.
xApplication
.
process
.
Application
.
LP
;
this
.
lp
=
MWF
.
xApplication
.
process
.
Application
.
LP
;
this
.
action
=
o2
.
Actions
.
load
(
"
x_processplatform_assemble_surface
"
);
this
.
action
=
o2
.
Actions
.
load
(
"
x_processplatform_assemble_surface
"
);
if
(
this
.
status
)
this
.
options
.
id
=
this
.
status
.
id
;
if
(
this
.
status
)
{
this
.
options
.
id
=
this
.
status
.
id
;
if
(
this
.
status
.
navi
){
this
.
options
.
navi
=
this
.
status
.
navi
;
}
}
this
.
_loadCss
();
this
.
_loadCss
();
},
},
loadApplication
:
function
(
callback
){
loadApplication
:
function
(
callback
){
...
@@ -30,7 +36,7 @@ MWF.xApplication.process.Application.Main = new Class({
...
@@ -30,7 +36,7 @@ MWF.xApplication.process.Application.Main = new Class({
var
url
=
this
.
path
+
this
.
options
.
style
+
"
/view/view.html
"
;
var
url
=
this
.
path
+
this
.
options
.
style
+
"
/view/view.html
"
;
this
.
content
.
loadHtml
(
url
,
{
"
bind
"
:
{
"
acl
"
:
this
.
acl
,
"
lp
"
:
this
.
lp
,
"
data
"
:{
"
application
"
:
this
.
application
}},
"
module
"
:
this
},
function
(){
this
.
content
.
loadHtml
(
url
,
{
"
bind
"
:
{
"
acl
"
:
this
.
acl
,
"
lp
"
:
this
.
lp
,
"
data
"
:{
"
application
"
:
this
.
application
}},
"
module
"
:
this
},
function
(){
this
.
setLayout
();
this
.
setLayout
();
this
.
loadList
(
"
all
"
);
this
.
loadList
(
this
.
options
.
navi
);
if
(
callback
)
callback
();
if
(
callback
)
callback
();
}.
bind
(
this
));
}.
bind
(
this
));
}
}
...
@@ -1309,17 +1315,15 @@ MWF.xApplication.process.Application.Toolbar = new Class({
...
@@ -1309,17 +1315,15 @@ MWF.xApplication.process.Application.Toolbar = new Class({
});
});
}
else
{
}
else
{
_self
.
action
.
WorkAction
.
manageD
elete
(
data
.
id
,
function
(){
_self
.
action
.
WorkAction
.
d
elete
(
data
.
id
,
function
(){
count
++
;
count
++
;
if
(
dataList
.
length
==
count
){
if
(
dataList
.
length
==
count
){
_self
.
app
.
notice
(
"
成功删除
"
+
count
+
"
个工作。
"
);
_self
.
app
.
notice
(
"
成功删除
"
+
count
+
"
个工作。
"
);
_self
.
explorer
.
refresh
();
_self
.
explorer
.
refresh
();
}
}
});
});
}
}
}.
bind
(
this
));
}.
bind
(
this
));
this
.
close
();
this
.
close
();
...
...
o2web/source/x_component_process_FormDesigner/Module/Actionbar.js
浏览文件 @
3b892e2b
...
@@ -247,17 +247,32 @@ MWF.xApplication.process.FormDesigner.Module.Actionbar = MWF.FCActionbar = new C
...
@@ -247,17 +247,32 @@ MWF.xApplication.process.FormDesigner.Module.Actionbar = MWF.FCActionbar = new C
}
}
}.
bind
(
this
));
}.
bind
(
this
));
},
},
getImagePath
:
function
(
img
,
iscustom
){
if
(
iscustom
){
var
path
=
this
.
json
.
customIconStyle
?
(
this
.
json
.
customIconStyle
+
"
/
"
)
:
""
;
return
this
.
path
+
""
+
this
.
options
.
style
+
"
/custom/
"
+
path
+
img
}
else
{
return
this
.
path
+
""
+
this
.
options
.
style
+
"
/tools/
"
+
(
this
.
json
.
style
||
"
default
"
)
+
"
/
"
+
img
;
}
},
getImageOverPath
:
function
(
img
,
iscustom
){
if
(
iscustom
&&
this
.
json
.
customIconOverStyle
){
return
this
.
path
+
""
+
this
.
options
.
style
+
"
/custom/
"
+
this
.
json
.
customIconOverStyle
+
"
/
"
+
img
;
}
else
{
return
this
.
path
+
""
+
this
.
options
.
style
+
"
/tools/
"
+
this
.
json
.
iconOverStyle
+
"
/
"
+
img
;
}
},
setToolbars
:
function
(
tools
,
node
){
setToolbars
:
function
(
tools
,
node
){
tools
.
each
(
function
(
tool
){
tools
.
each
(
function
(
tool
){
var
actionNode
=
new
Element
(
"
div
"
,
{
var
actionNode
=
new
Element
(
"
div
"
,
{
"
MWFnodetype
"
:
tool
.
type
,
"
MWFnodetype
"
:
tool
.
type
,
"
MWFButtonImage
"
:
this
.
path
+
""
+
this
.
options
.
style
+
"
/tools/
"
+
(
this
.
json
.
style
||
"
default
"
)
+
"
/
"
+
tool
.
img
,
"
MWFButtonImage
"
:
this
.
getImagePath
(
tool
.
img
,
tool
.
customImg
)
,
"
title
"
:
tool
.
title
,
"
title
"
:
tool
.
title
,
"
MWFButtonAction
"
:
tool
.
action
,
"
MWFButtonAction
"
:
tool
.
action
,
"
MWFButtonText
"
:
tool
.
text
"
MWFButtonText
"
:
tool
.
text
}).
inject
(
node
);
}).
inject
(
node
);
if
(
this
.
json
.
iconOverStyle
){
if
(
this
.
json
.
iconOverStyle
){
actionNode
.
set
(
"
MWFButtonImageOver
"
,
this
.
path
+
""
+
this
.
options
.
style
+
"
/tools/
"
+
this
.
json
.
iconOverStyle
+
"
/
"
+
tool
.
img
);
actionNode
.
set
(
"
MWFButtonImageOver
"
,
this
.
getImageOverPath
(
tool
.
img
,
tool
.
customImg
)
);
}
}
actionNode
.
isSystemTool
=
true
;
actionNode
.
isSystemTool
=
true
;
this
.
systemTools
.
push
(
actionNode
);
this
.
systemTools
.
push
(
actionNode
);
...
...
o2web/source/x_component_process_FormDesigner/widget/ActionsEditor.js
浏览文件 @
3b892e2b
...
@@ -363,6 +363,7 @@ MWF.xApplication.process.FormDesigner.widget.ActionsEditor.ButtonAction = new Cl
...
@@ -363,6 +363,7 @@ MWF.xApplication.process.FormDesigner.widget.ActionsEditor.ButtonAction = new Cl
var
item
=
this
.
iconMenu
.
addMenuItem
(
""
,
"
click
"
,
function
(
ev
){
var
item
=
this
.
iconMenu
.
addMenuItem
(
""
,
"
click
"
,
function
(
ev
){
var
src
=
this
.
item
.
getElement
(
"
img
"
).
get
(
"
src
"
);
var
src
=
this
.
item
.
getElement
(
"
img
"
).
get
(
"
src
"
);
_self
.
data
.
img
=
src
.
substr
(
src
.
lastIndexOf
(
"
/
"
)
+
1
,
src
.
length
);
_self
.
data
.
img
=
src
.
substr
(
src
.
lastIndexOf
(
"
/
"
)
+
1
,
src
.
length
);
_self
.
data
.
customImg
=
true
;
_self
.
iconNode
.
setStyle
(
"
background-image
"
,
"
url(
"
+
src
+
"
)
"
);
_self
.
iconNode
.
setStyle
(
"
background-image
"
,
"
url(
"
+
src
+
"
)
"
);
_self
.
editor
.
fireEvent
(
"
change
"
);
_self
.
editor
.
fireEvent
(
"
change
"
);
ev
.
stopPropagation
();
ev
.
stopPropagation
();
...
...
o2web/source/x_component_process_Xform/Actionbar.js
浏览文件 @
3b892e2b
...
@@ -201,6 +201,23 @@ MWF.xApplication.process.Xform.Actionbar = MWF.APPActionbar = new Class(
...
@@ -201,6 +201,23 @@ MWF.xApplication.process.Xform.Actionbar = MWF.APPActionbar = new Class(
}.
bind
(
this
));
}.
bind
(
this
));
},
},
getImagePath
:
function
(
img
,
iscustom
){
var
path
=
"
../x_component_process_FormDesigner/Module/Actionbar/
"
;
if
(
iscustom
){
var
iconPath
=
this
.
json
.
customIconStyle
?
(
this
.
json
.
customIconStyle
+
"
/
"
)
:
""
;
return
path
+
""
+
this
.
form
.
options
.
style
+
"
/custom/
"
+
iconPath
+
img
;
}
else
{
return
path
+
(
this
.
options
.
style
||
"
default
"
)
+
"
/tools/
"
+
(
this
.
json
.
style
||
"
default
"
)
+
"
/
"
+
img
;
}
},
getImageOverPath
:
function
(
img
,
iscustom
){
var
path
=
"
../x_component_process_FormDesigner/Module/Actionbar/
"
;
if
(
iscustom
&&
this
.
json
.
customIconOverStyle
){
return
path
+
""
+
this
.
form
.
options
.
style
+
"
/custom/
"
+
this
.
json
.
customIconOverStyle
+
"
/
"
+
img
}
else
{
return
path
+
""
+
(
this
.
options
.
style
||
"
default
"
)
+
"
/tools/
"
+
(
this
.
json
.
iconOverStyle
||
"
default
"
)
+
"
/
"
+
img
;
}
},
setToolbarItem
:
function
(
tool
,
node
,
readonly
,
noCondition
){
setToolbarItem
:
function
(
tool
,
node
,
readonly
,
noCondition
){
var
path
=
"
../x_component_process_FormDesigner/Module/Actionbar/
"
;
var
path
=
"
../x_component_process_FormDesigner/Module/Actionbar/
"
;
var
flag
=
true
;
var
flag
=
true
;
...
@@ -235,13 +252,13 @@ MWF.xApplication.process.Xform.Actionbar = MWF.APPActionbar = new Class(
...
@@ -235,13 +252,13 @@ MWF.xApplication.process.Xform.Actionbar = MWF.APPActionbar = new Class(
"
id
"
:
tool
.
id
,
"
id
"
:
tool
.
id
,
"
MWFnodetype
"
:
tool
.
type
,
"
MWFnodetype
"
:
tool
.
type
,
//"MWFButtonImage": this.form.path+""+this.form.options.style+"/actionbar/"+tool.img,
//"MWFButtonImage": this.form.path+""+this.form.options.style+"/actionbar/"+tool.img,
"
MWFButtonImage
"
:
path
+
(
this
.
options
.
style
||
"
default
"
)
+
"
/tools/
"
+
(
this
.
json
.
style
||
"
default
"
)
+
"
/
"
+
tool
.
img
,
"
MWFButtonImage
"
:
this
.
getImagePath
(
tool
.
img
,
tool
.
customImg
)
,
"
title
"
:
tool
.
title
,
"
title
"
:
tool
.
title
,
"
MWFButtonAction
"
:
tool
.
action
,
"
MWFButtonAction
"
:
tool
.
action
,
"
MWFButtonText
"
:
tool
.
text
"
MWFButtonText
"
:
tool
.
text
}).
inject
(
node
);
}).
inject
(
node
);
if
(
this
.
json
.
iconOverStyle
){
if
(
this
.
json
.
iconOverStyle
){
actionNode
.
set
(
"
MWFButtonImageOver
"
,
path
+
""
+
(
this
.
options
.
style
||
"
default
"
)
+
"
/tools/
"
+
(
this
.
json
.
iconOverStyle
||
"
default
"
)
+
"
/
"
+
tool
.
img
);
actionNode
.
set
(
"
MWFButtonImageOver
"
,
this
.
getImageOverPath
(
tool
.
img
,
tool
.
customImg
)
);
}
}
if
(
tool
.
properties
){
if
(
tool
.
properties
){
actionNode
.
set
(
tool
.
properties
);
actionNode
.
set
(
tool
.
properties
);
...
...
o2web/source/x_component_process_Xform/Htmleditor.js
浏览文件 @
3b892e2b
...
@@ -82,8 +82,9 @@ MWF.xApplication.process.Xform.Htmleditor = MWF.APPHtmleditor = new Class(
...
@@ -82,8 +82,9 @@ MWF.xApplication.process.Xform.Htmleditor = MWF.APPHtmleditor = new Class(
this
.
fireEvent
(
"
afterLoad
"
);
this
.
fireEvent
(
"
afterLoad
"
);
this
.
fieldModuleLoaded
=
true
;
this
.
fieldModuleLoaded
=
true
;
}
}
}.
bind
(
this
))
}.
bind
(
this
))
;
}
}
this
.
node
.
loadCss
(
"
../o2_lib/htmleditor/ckeditor4161/contents.css
"
);
}
else
{
}
else
{
var
config
=
Object
.
clone
(
this
.
json
.
editorProperties
);
var
config
=
Object
.
clone
(
this
.
json
.
editorProperties
);
if
(
this
.
json
.
config
){
if
(
this
.
json
.
config
){
...
...
o2web/source/x_component_process_Xform/widget/OOXML.js
浏览文件 @
3b892e2b
...
@@ -1080,10 +1080,12 @@ o2.xApplication.process.Xform.widget.OOXML.WordprocessingML = o2.OOXML.WML = new
...
@@ -1080,10 +1080,12 @@ o2.xApplication.process.Xform.widget.OOXML.WordprocessingML = o2.OOXML.WML = new
var
bg
=
table
.
getStyle
(
"
background-color
"
);
var
bg
=
table
.
getStyle
(
"
background-color
"
);
if
(
bg
&&
bg
!==
"
transparent
"
){
if
(
bg
&&
bg
!==
"
transparent
"
){
bg
=
this
.
getColorHex
(
bg
);
bg
=
this
.
getColorHex
(
bg
);
if
(
bg
!==
"
transparent
"
){
var
oo_shd
=
this
.
createEl
(
oo_doc
,
"
shd
"
);
var
oo_shd
=
this
.
createEl
(
oo_doc
,
"
shd
"
);
this
.
setAttrs
(
oo_shd
,
{
"
val
"
:
"
clear
"
,
"
color
"
:
"
auto
"
,
"
fill
"
:
bg
});
this
.
setAttrs
(
oo_shd
,
{
"
val
"
:
"
clear
"
,
"
color
"
:
"
auto
"
,
"
fill
"
:
bg
});
oo_tblPr
.
appendChild
(
oo_shd
);
oo_tblPr
.
appendChild
(
oo_shd
);
}
}
}
// table.style
// table.style
...
@@ -1198,10 +1200,12 @@ o2.xApplication.process.Xform.widget.OOXML.WordprocessingML = o2.OOXML.WML = new
...
@@ -1198,10 +1200,12 @@ o2.xApplication.process.Xform.widget.OOXML.WordprocessingML = o2.OOXML.WML = new
var
bg
=
td
.
getStyle
(
"
background-color
"
);
var
bg
=
td
.
getStyle
(
"
background-color
"
);
if
(
bg
&&
bg
!==
"
transparent
"
){
if
(
bg
&&
bg
!==
"
transparent
"
){
bg
=
this
.
getColorHex
(
bg
);
bg
=
this
.
getColorHex
(
bg
);
if
(
bg
!==
"
transparent
"
){
var
oo_shd
=
this
.
createEl
(
oo_doc
,
"
shd
"
);
var
oo_shd
=
this
.
createEl
(
oo_doc
,
"
shd
"
);
this
.
setAttrs
(
oo_shd
,
{
"
val
"
:
"
clear
"
,
"
color
"
:
"
auto
"
,
"
fill
"
:
bg
});
this
.
setAttrs
(
oo_shd
,
{
"
val
"
:
"
clear
"
,
"
color
"
:
"
auto
"
,
"
fill
"
:
bg
});
oo_tcPr
.
appendChild
(
oo_shd
);
oo_tcPr
.
appendChild
(
oo_shd
);
}
}
}
//单元格边距
//单元格边距
var
left
=
td
.
getStyle
(
"
padding-left
"
);
var
left
=
td
.
getStyle
(
"
padding-left
"
);
...
...
o2web/source/x_component_query_Query/$Viewer/default/css.wcss
浏览文件 @
3b892e2b
...
@@ -139,7 +139,7 @@
...
@@ -139,7 +139,7 @@
"overflow": "hidden",
"overflow": "hidden",
"float": "right",
"float": "right",
"cursor": "pointer",
"cursor": "pointer",
"background": "url(../x_component_
process_Application
/$Viewer/default/icon/search.png) center center no-repeat",
"background": "url(../x_component_
query_Query
/$Viewer/default/icon/search.png) center center no-repeat",
},
},
"searchSimpleInputNode": {
"searchSimpleInputNode": {
"border": "0px",
"border": "0px",
...
@@ -182,7 +182,7 @@
...
@@ -182,7 +182,7 @@
"viewFilterSearchIconNode": {
"viewFilterSearchIconNode": {
"height": "24px",
"height": "24px",
"width": "40px",
"width": "40px",
"background": "url("+"../x_component_
process_Application
/$Viewer/default/icon/search.png) center center no-repeat",
"background": "url("+"../x_component_
query_Query
/$Viewer/default/icon/search.png) center center no-repeat",
"float": "right",
"float": "right",
"cursor": "pointer"
"cursor": "pointer"
},
},
...
@@ -203,7 +203,7 @@
...
@@ -203,7 +203,7 @@
"width": "20px",
"width": "20px",
"height": "80px",
"height": "80px",
"float": "right",
"float": "right",
"background": "url("+"../x_component_
process_Application
/$Viewer/default/icon/back.png) center 5px no-repeat",
"background": "url("+"../x_component_
query_Query
/$Viewer/default/icon/back.png) center 5px no-repeat",
"cursor": "pointer"
"cursor": "pointer"
},
},
"viewFilterSearchCustomContentNode": {
"viewFilterSearchCustomContentNode": {
...
@@ -237,7 +237,7 @@
...
@@ -237,7 +237,7 @@
"cursor": "pointer"
"cursor": "pointer"
},
},
"viewFilterSearchCustomAddIconNode": {
"viewFilterSearchCustomAddIconNode": {
"background": "url("+"../x_component_
process_Application
/$Viewer/default/icon/right.png) center center no-repeat",
"background": "url("+"../x_component_
query_Query
/$Viewer/default/icon/right.png) center center no-repeat",
"height": "80px"
"height": "80px"
},
},
"viewFilterSearchCustomFilterContentNode": {
"viewFilterSearchCustomFilterContentNode": {
...
@@ -325,11 +325,11 @@
...
@@ -325,11 +325,11 @@
"viewSearchFilterDeleteNode": {
"viewSearchFilterDeleteNode": {
"width": "20px",
"width": "20px",
"height": "19px",
"height": "19px",
"background": "url("+"../x_component_
process_Application
/$Viewer/default/icon/delFilter.png) center center no-repeat",
"background": "url("+"../x_component_
query_Query
/$Viewer/default/icon/delFilter.png) center center no-repeat",
"float": "left"
"float": "left"
},
},
"viewSearchFilterDeleteNode_over": {
"viewSearchFilterDeleteNode_over": {
"background": "url("+"../x_component_
process_Application
/$Viewer/default/icon/delFilter_over.png) center center no-repeat"
"background": "url("+"../x_component_
query_Query
/$Viewer/default/icon/delFilter_over.png) center center no-repeat"
},
},
"contentAreaNode": {
"contentAreaNode": {
//"padding": "0px 20px",
//"padding": "0px 20px",
...
@@ -361,7 +361,7 @@
...
@@ -361,7 +361,7 @@
"viewLoadingIconNode": {
"viewLoadingIconNode": {
"height": "26px",
"height": "26px",
"width": "28px",
"width": "28px",
"background": "url("+"../x_component_
process_Application
/$Viewer/default/icon/loading.gif) center center no-repeat",
"background": "url("+"../x_component_
query_Query
/$Viewer/default/icon/loading.gif) center center no-repeat",
"float": "left"
"float": "left"
},
},
"viewLoadingTextNode": {
"viewLoadingTextNode": {
...
@@ -433,7 +433,7 @@
...
@@ -433,7 +433,7 @@
"width": "20px",
"width": "20px",
"height": "20px",
"height": "20px",
"float": "right",
"float": "right",
"background": "url("+"../x_component_
process_Application
/$Viewer/default/icon/close.png) center center no-repeat",
"background": "url("+"../x_component_
query_Query
/$Viewer/default/icon/close.png) center center no-repeat",
"cursor": "pointer"
"cursor": "pointer"
},
},
"worksAreaContentNode": {
"worksAreaContentNode": {
...
...
o2web/source/x_component_query_Query/$Viewer/select/css.wcss
浏览文件 @
3b892e2b
...
@@ -136,7 +136,7 @@
...
@@ -136,7 +136,7 @@
"overflow": "hidden",
"overflow": "hidden",
"float": "right",
"float": "right",
"cursor": "pointer",
"cursor": "pointer",
"background": "url(../x_component_
process_Application
/$Viewer/default/icon/search.png) center center no-repeat",
"background": "url(../x_component_
query_Query
/$Viewer/default/icon/search.png) center center no-repeat",
},
},
"searchSimpleInputNode": {
"searchSimpleInputNode": {
"border": "0px",
"border": "0px",
...
@@ -179,7 +179,7 @@
...
@@ -179,7 +179,7 @@
"viewFilterSearchIconNode": {
"viewFilterSearchIconNode": {
"height": "24px",
"height": "24px",
"width": "40px",
"width": "40px",
"background": "url("+"../x_component_
process_Application
/$Viewer/default/icon/search.png) center center no-repeat",
"background": "url("+"../x_component_
query_Query
/$Viewer/default/icon/search.png) center center no-repeat",
"float": "right",
"float": "right",
"cursor": "pointer"
"cursor": "pointer"
},
},
...
@@ -200,7 +200,7 @@
...
@@ -200,7 +200,7 @@
"width": "20px",
"width": "20px",
"height": "80px",
"height": "80px",
"float": "right",
"float": "right",
"background": "url("+"../x_component_
process_Application
/$Viewer/default/icon/back.png) center 5px no-repeat",
"background": "url("+"../x_component_
query_Query
/$Viewer/default/icon/back.png) center 5px no-repeat",
"cursor": "pointer"
"cursor": "pointer"
},
},
"viewFilterSearchCustomContentNode": {
"viewFilterSearchCustomContentNode": {
...
@@ -234,7 +234,7 @@
...
@@ -234,7 +234,7 @@
"cursor": "pointer"
"cursor": "pointer"
},
},
"viewFilterSearchCustomAddIconNode": {
"viewFilterSearchCustomAddIconNode": {
"background": "url("+"../x_component_
process_Application
/$Viewer/default/icon/right.png) center center no-repeat",
"background": "url("+"../x_component_
query_Query
/$Viewer/default/icon/right.png) center center no-repeat",
"height": "80px"
"height": "80px"
},
},
"viewFilterSearchCustomFilterContentNode": {
"viewFilterSearchCustomFilterContentNode": {
...
@@ -323,11 +323,11 @@
...
@@ -323,11 +323,11 @@
"viewSearchFilterDeleteNode": {
"viewSearchFilterDeleteNode": {
"width": "20px",
"width": "20px",
"height": "19px",
"height": "19px",
"background": "url("+"../x_component_
process_Application
/$Viewer/default/icon/delFilter.png) center center no-repeat",
"background": "url("+"../x_component_
query_Query
/$Viewer/default/icon/delFilter.png) center center no-repeat",
"float": "left"
"float": "left"
},
},
"viewSearchFilterDeleteNode_over": {
"viewSearchFilterDeleteNode_over": {
"background": "url("+"../x_component_
process_Application
/$Viewer/default/icon/delFilter_over.png) center center no-repeat"
"background": "url("+"../x_component_
query_Query
/$Viewer/default/icon/delFilter_over.png) center center no-repeat"
},
},
"contentAreaNode": {
"contentAreaNode": {
//"padding": "0px 20px",
//"padding": "0px 20px",
...
@@ -359,7 +359,7 @@
...
@@ -359,7 +359,7 @@
"viewLoadingIconNode": {
"viewLoadingIconNode": {
"height": "26px",
"height": "26px",
"width": "28px",
"width": "28px",
"background": "url("+"../x_component_
process_Application
/$Viewer/default/icon/loading.gif) center center no-repeat",
"background": "url("+"../x_component_
query_Query
/$Viewer/default/icon/loading.gif) center center no-repeat",
"float": "left"
"float": "left"
},
},
"viewLoadingTextNode": {
"viewLoadingTextNode": {
...
@@ -431,7 +431,7 @@
...
@@ -431,7 +431,7 @@
"width": "20px",
"width": "20px",
"height": "20px",
"height": "20px",
"float": "right",
"float": "right",
"background": "url("+"../x_component_
process_Application
/$Viewer/default/icon/close.png) center center no-repeat",
"background": "url("+"../x_component_
query_Query
/$Viewer/default/icon/close.png) center center no-repeat",
"cursor": "pointer"
"cursor": "pointer"
},
},
"worksAreaContentNode": {
"worksAreaContentNode": {
...
...
o2web/source/x_component_query_Query/Statement.js
浏览文件 @
3b892e2b
...
@@ -688,9 +688,12 @@ MWF.xApplication.query.Query.Statement = MWF.QStatement = new Class({
...
@@ -688,9 +688,12 @@ MWF.xApplication.query.Query.Statement = MWF.QStatement = new Class({
if
((
/
(
^
[
1-9
]\d
*$
)
/
.
test
(
p
)))
p
=
p
.
toInt
();
if
((
/
(
^
[
1-9
]\d
*$
)
/
.
test
(
p
)))
p
=
p
.
toInt
();
if
(
obj
[
p
])
{
if
(
obj
[
p
])
{
obj
=
obj
[
p
];
obj
=
obj
[
p
];
}
else
{
}
else
if
(
obj
[
p
]
===
undefined
||
obj
[
p
]
===
null
)
{
obj
=
""
;
obj
=
""
;
break
;
break
;
}
else
{
obj
=
obj
[
p
];
break
;
}
}
}
}
return
obj
return
obj
...
...
o2web/source/x_component_systemconfig/public/lp/en.js
浏览文件 @
3b892e2b
...
@@ -289,7 +289,7 @@ o2.xApplication.systemconfig.LP = {
...
@@ -289,7 +289,7 @@ o2.xApplication.systemconfig.LP = {
"
initialPasswordType
"
:
{
"
initialPasswordType
"
:
{
"
mobileScript
"
:
"
return person.getMobile().slice(-6)
"
,
"
mobileScript
"
:
"
return person.getMobile().slice(-6)
"
,
"
uniqueScript
"
:
"
return person.getunique().slice(-6)
"
,
"
uniqueScript
"
:
"
return person.getunique().slice(-6)
"
,
"
employee
s
Script
"
:
"
return person.getEmployee()
"
,
"
employeeScript
"
:
"
return person.getEmployee()
"
,
"
pinyinScript
"
:
"
return person.getPinyin()
"
,
"
pinyinScript
"
:
"
return person.getPinyin()
"
,
"
textInfo
"
:
"
在下面的输入框中输入的密码,将作为新创建用户的初始密码。
"
,
"
textInfo
"
:
"
在下面的输入框中输入的密码,将作为新创建用户的初始密码。
"
,
'
scriptInfo
'
:
"
在下面的编辑器中输入脚本,返回一个字符串值,作为新创建用户的初始密码。您可以使用person对象获取人员相关信息。如将人员姓名全拼作为初始密码,可使用脚本:return person.getPinyin()
"
'
scriptInfo
'
:
"
在下面的编辑器中输入脚本,返回一个字符串值,作为新创建用户的初始密码。您可以使用person对象获取人员相关信息。如将人员姓名全拼作为初始密码,可使用脚本:return person.getPinyin()
"
...
@@ -583,8 +583,8 @@ o2.xApplication.systemconfig.LP = {
...
@@ -583,8 +583,8 @@ o2.xApplication.systemconfig.LP = {
"
saveDatabaseConfigSuccess
"
:
"
数据库配置保存成功,请重启服务器
"
,
"
saveDatabaseConfigSuccess
"
:
"
数据库配置保存成功,请重启服务器
"
,
"
saveEntityConfigSuccess
"
:
"
实体类配置保存成功,请重启服务器
"
,
"
saveEntityConfigSuccess
"
:
"
实体类配置保存成功,请重启服务器
"
,
"
dumpRestoreTools
"
:
"
数据库备份
回
复工具
"
,
"
dumpRestoreTools
"
:
"
数据库备份
恢
复工具
"
,
"
toolsInfo
"
:
"
O2OA提供了数据备份和
回
复工具,<span style='color: red'>修改数据库配置在大部分情况下都会影响到系统现有数据</span>,
"
+
"
toolsInfo
"
:
"
O2OA提供了数据备份和
恢
复工具,<span style='color: red'>修改数据库配置在大部分情况下都会影响到系统现有数据</span>,
"
+
"
所以在修改数据库配置之前,建议您先使用O2OA的备份功能将系统数据进行备份,在修改完数据库配置后重启服务器,然后将备份的数据恢复到数据库。<br>
"
+
"
所以在修改数据库配置之前,建议您先使用O2OA的备份功能将系统数据进行备份,在修改完数据库配置后重启服务器,然后将备份的数据恢复到数据库。<br>
"
+
"
<span class='mainColor_color'>在您进行备份或恢复数据时,请勿离开本页面。您可以在另一个浏览器窗口中进行其它操作</span>
"
,
"
<span class='mainColor_color'>在您进行备份或恢复数据时,请勿离开本页面。您可以在另一个浏览器窗口中进行其它操作</span>
"
,
...
@@ -1392,7 +1392,8 @@ o2.xApplication.systemconfig.LP = {
...
@@ -1392,7 +1392,8 @@ o2.xApplication.systemconfig.LP = {
"
key
"
:
"
通道名称
"
,
"
key
"
:
"
通道名称
"
,
"
type
"
:
"
类型
"
,
"
type
"
:
"
类型
"
,
"
filter
"
:
"
过滤器
"
,
"
filter
"
:
"
过滤器
"
,
"
loader
"
:
"
加载器
"
"
loader
"
:
"
加载器
"
,
"
startTlsEnable
"
:
"
升级传输加密
"
},
},
"
none
"
:
"
无
"
,
"
none
"
:
"
无
"
,
"
editConsumer
"
:
"
编辑消息通道
"
,
"
editConsumer
"
:
"
编辑消息通道
"
,
...
@@ -1404,7 +1405,7 @@ o2.xApplication.systemconfig.LP = {
...
@@ -1404,7 +1405,7 @@ o2.xApplication.systemconfig.LP = {
"
kafka
"
:
[
'
bootstrapServers
'
,
'
topic
'
,
'
securityProtocol
'
,
'
saslMechanism
'
,
'
saslMechanism
'
,
'
username
'
,
'
password
'
],
"
kafka
"
:
[
'
bootstrapServers
'
,
'
topic
'
,
'
securityProtocol
'
,
'
saslMechanism
'
,
'
saslMechanism
'
,
'
username
'
,
'
password
'
],
"
activemq
"
:
[
'
url
'
,
'
queueName
'
,
'
username
'
,
'
password
'
],
"
activemq
"
:
[
'
url
'
,
'
queueName
'
,
'
username
'
,
'
password
'
],
"
restful
"
:
[
'
url
'
,
'
method
'
,
'
internal
'
],
"
restful
"
:
[
'
url
'
,
'
method
'
,
'
internal
'
],
"
mail
"
:
[
'
host
'
,
'
port
'
,
'
sslEnable
'
,
'
auth
'
,
'
from
'
,
'
password
'
],
"
mail
"
:
[
'
host
'
,
'
port
'
,
'
sslEnable
'
,
'
auth
'
,
'
startTlsEnable
'
,
'
from
'
,
'
password
'
],
"
jdbc
"
:
[
'
driverClass
'
,
'
url
'
,
'
catalog
'
,
'
schema
'
,
'
table
'
,
'
username
'
,
'
password
'
],
"
jdbc
"
:
[
'
driverClass
'
,
'
url
'
,
'
catalog
'
,
'
schema
'
,
'
table
'
,
'
username
'
,
'
password
'
],
"
table
"
:
[
'
table
'
],
"
table
"
:
[
'
table
'
],
"
hadoop
"
:
[
'
fsDefaultFS
'
,
'
path
'
,
'
username
'
]
"
hadoop
"
:
[
'
fsDefaultFS
'
,
'
path
'
,
'
username
'
]
...
...
o2web/source/x_component_systemconfig/public/lp/zh-cn.js
浏览文件 @
3b892e2b
...
@@ -288,8 +288,8 @@ o2.xApplication.systemconfig.LP = {
...
@@ -288,8 +288,8 @@ o2.xApplication.systemconfig.LP = {
},
},
"
initialPasswordType
"
:
{
"
initialPasswordType
"
:
{
"
mobileScript
"
:
"
return person.getMobile().slice(-6)
"
,
"
mobileScript
"
:
"
return person.getMobile().slice(-6)
"
,
"
uniqueScript
"
:
"
return person.get
u
nique().slice(-6)
"
,
"
uniqueScript
"
:
"
return person.get
U
nique().slice(-6)
"
,
"
employee
s
Script
"
:
"
return person.getEmployee()
"
,
"
employeeScript
"
:
"
return person.getEmployee()
"
,
"
pinyinScript
"
:
"
return person.getPinyin()
"
,
"
pinyinScript
"
:
"
return person.getPinyin()
"
,
"
textInfo
"
:
"
在下面的输入框中输入的密码,将作为新创建用户的初始密码。
"
,
"
textInfo
"
:
"
在下面的输入框中输入的密码,将作为新创建用户的初始密码。
"
,
'
scriptInfo
'
:
"
在下面的编辑器中输入脚本,返回一个字符串值,作为新创建用户的初始密码。您可以使用person对象获取人员相关信息。如将人员姓名全拼作为初始密码,可使用脚本:return person.getPinyin()
"
'
scriptInfo
'
:
"
在下面的编辑器中输入脚本,返回一个字符串值,作为新创建用户的初始密码。您可以使用person对象获取人员相关信息。如将人员姓名全拼作为初始密码,可使用脚本:return person.getPinyin()
"
...
@@ -583,8 +583,8 @@ o2.xApplication.systemconfig.LP = {
...
@@ -583,8 +583,8 @@ o2.xApplication.systemconfig.LP = {
"
saveDatabaseConfigSuccess
"
:
"
数据库配置保存成功,请重启服务器
"
,
"
saveDatabaseConfigSuccess
"
:
"
数据库配置保存成功,请重启服务器
"
,
"
saveEntityConfigSuccess
"
:
"
实体类配置保存成功,请重启服务器
"
,
"
saveEntityConfigSuccess
"
:
"
实体类配置保存成功,请重启服务器
"
,
"
dumpRestoreTools
"
:
"
数据库备份
回
复工具
"
,
"
dumpRestoreTools
"
:
"
数据库备份
恢
复工具
"
,
"
toolsInfo
"
:
"
O2OA提供了数据备份和
回
复工具,<span style='color: red'>修改数据库配置在大部分情况下都会影响到系统现有数据</span>,
"
+
"
toolsInfo
"
:
"
O2OA提供了数据备份和
恢
复工具,<span style='color: red'>修改数据库配置在大部分情况下都会影响到系统现有数据</span>,
"
+
"
所以在修改数据库配置之前,建议您先使用O2OA的备份功能将系统数据进行备份,在修改完数据库配置后重启服务器,然后将备份的数据恢复到数据库。<br>
"
+
"
所以在修改数据库配置之前,建议您先使用O2OA的备份功能将系统数据进行备份,在修改完数据库配置后重启服务器,然后将备份的数据恢复到数据库。<br>
"
+
"
<span class='mainColor_color'>在您进行备份或恢复数据时,请勿离开本页面。您可以在另一个浏览器窗口中进行其它操作</span>
"
,
"
<span class='mainColor_color'>在您进行备份或恢复数据时,请勿离开本页面。您可以在另一个浏览器窗口中进行其它操作</span>
"
,
...
@@ -1393,7 +1393,8 @@ o2.xApplication.systemconfig.LP = {
...
@@ -1393,7 +1393,8 @@ o2.xApplication.systemconfig.LP = {
"
key
"
:
"
通道名称
"
,
"
key
"
:
"
通道名称
"
,
"
type
"
:
"
类型
"
,
"
type
"
:
"
类型
"
,
"
filter
"
:
"
过滤器
"
,
"
filter
"
:
"
过滤器
"
,
"
loader
"
:
"
加载器
"
"
loader
"
:
"
加载器
"
,
"
startTlsEnable
"
:
"
升级传输加密
"
},
},
"
none
"
:
"
无
"
,
"
none
"
:
"
无
"
,
"
editConsumer
"
:
"
编辑消息通道
"
,
"
editConsumer
"
:
"
编辑消息通道
"
,
...
@@ -1405,7 +1406,7 @@ o2.xApplication.systemconfig.LP = {
...
@@ -1405,7 +1406,7 @@ o2.xApplication.systemconfig.LP = {
"
kafka
"
:
[
'
bootstrapServers
'
,
'
topic
'
,
'
securityProtocol
'
,
'
saslMechanism
'
,
'
saslMechanism
'
,
'
username
'
,
'
password
'
],
"
kafka
"
:
[
'
bootstrapServers
'
,
'
topic
'
,
'
securityProtocol
'
,
'
saslMechanism
'
,
'
saslMechanism
'
,
'
username
'
,
'
password
'
],
"
activemq
"
:
[
'
url
'
,
'
queueName
'
,
'
username
'
,
'
password
'
],
"
activemq
"
:
[
'
url
'
,
'
queueName
'
,
'
username
'
,
'
password
'
],
"
restful
"
:
[
'
url
'
,
'
method
'
,
'
internal
'
],
"
restful
"
:
[
'
url
'
,
'
method
'
,
'
internal
'
],
"
mail
"
:
[
'
host
'
,
'
port
'
,
'
sslEnable
'
,
'
auth
'
,
'
from
'
,
'
password
'
],
"
mail
"
:
[
'
host
'
,
'
port
'
,
'
sslEnable
'
,
'
auth
'
,
'
startTlsEnable
'
,
'
from
'
,
'
password
'
],
"
jdbc
"
:
[
'
driverClass
'
,
'
url
'
,
'
catalog
'
,
'
schema
'
,
'
table
'
,
'
username
'
,
'
password
'
],
"
jdbc
"
:
[
'
driverClass
'
,
'
url
'
,
'
catalog
'
,
'
schema
'
,
'
table
'
,
'
username
'
,
'
password
'
],
"
table
"
:
[
'
table
'
],
"
table
"
:
[
'
table
'
],
"
hadoop
"
:
[
'
fsDefaultFS
'
,
'
path
'
,
'
username
'
]
"
hadoop
"
:
[
'
fsDefaultFS
'
,
'
path
'
,
'
username
'
]
...
...
o2web/source/x_component_systemconfig/src/components/content/SecurityPasswordConfig/PersonPassword.vue
浏览文件 @
3b892e2b
...
@@ -4,12 +4,12 @@
...
@@ -4,12 +4,12 @@
<div
class=
"item_title"
>
{{
lp
.
_passwordConfig
.
newPersonPassword
}}
</div>
<div
class=
"item_title"
>
{{
lp
.
_passwordConfig
.
newPersonPassword
}}
</div>
<div
class=
"item_info"
>
{{
lp
.
_passwordConfig
.
newPersonPasswordInfo
}}
</div>
<div
class=
"item_info"
>
{{
lp
.
_passwordConfig
.
newPersonPasswordInfo
}}
</div>
<BaseSelect
:label=
"lp._passwordConfig.initialPassword"
@
change=
"changePasswordType"
v-model:value=
"initialPasswordType"
:options=
"lp._passwordConfig.initialPasswordTypeOptions"
></BaseSelect>
<BaseSelect
:label=
"lp._passwordConfig.initialPassword"
:label-style=
"
{width: '100px'}"
@change="changePasswordType" v-model:value="initialPasswordType" :options="lp._passwordConfig.initialPasswordTypeOptions">
</BaseSelect>
<div
ref=
"passwordNode"
class=
"item_hide"
>
<div
ref=
"passwordNode"
class=
"item_hide"
>
<div
class=
"item_info"
>
{{
lp
.
_passwordConfig
.
initialPasswordType
.
textInfo
}}
</div>
<div
class=
"item_info"
>
{{
lp
.
_passwordConfig
.
initialPasswordType
.
textInfo
}}
</div>
<form>
<form>
<BaseInput
:label=
"lp._passwordConfig.initialPasswordText"
input-type=
"password"
:show-password=
"true"
v-model:value=
"passwordText"
></BaseInput>
<BaseInput
:label=
"lp._passwordConfig.initialPasswordText"
:label-style=
"
{width: '100px'}"
input-type="password" :show-password="true" v-model:value="passwordText">
</BaseInput>
<div
class=
"item_info"
style=
"padding-left: 20px"
>
<div
class=
"item_info"
style=
"padding-left: 20px"
>
<button
class=
"mainColor_bg"
style=
"width: 100px"
@
click=
"saveInitialPassword"
>
{{
lp
.
operation
.
ok
}}
</button>
<button
class=
"mainColor_bg"
style=
"width: 100px"
@
click=
"saveInitialPassword"
>
{{
lp
.
operation
.
ok
}}
</button>
</div>
</div>
...
@@ -182,6 +182,7 @@ const savePasswordRuleConfig = async ()=>{
...
@@ -182,6 +182,7 @@ const savePasswordRuleConfig = async ()=>{
}
}
const
saveInitialPasswordConfig
=
async
(
type
)
=>
{
const
saveInitialPasswordConfig
=
async
(
type
)
=>
{
initialPasswordType
.
value
=
type
;
personData
.
value
.
extension
.
initialPasswordType
=
type
||
initialPasswordType
.
value
;
personData
.
value
.
extension
.
initialPasswordType
=
type
||
initialPasswordType
.
value
;
switch
(
initialPasswordType
.
value
)
{
switch
(
initialPasswordType
.
value
)
{
case
'
text
'
:
case
'
text
'
:
...
...
o2web/source/x_component_systemconfig/src/components/content/ServerMessageConfig/ConsumerConfig.vue
浏览文件 @
3b892e2b
...
@@ -62,6 +62,7 @@
...
@@ -62,6 +62,7 @@
<BaseInput
label=
"port"
v-model:value=
"currentData.port"
:label-style=
"labelStyle"
/>
<BaseInput
label=
"port"
v-model:value=
"currentData.port"
:label-style=
"labelStyle"
/>
<BaseSwitch
label=
"sslEnable"
v-model:value=
"currentData.sslEnable"
:label-style=
"labelStyle"
/>
<BaseSwitch
label=
"sslEnable"
v-model:value=
"currentData.sslEnable"
:label-style=
"labelStyle"
/>
<BaseSwitch
label=
"auth"
v-model:value=
"currentData.auth"
:label-style=
"labelStyle"
/>
<BaseSwitch
label=
"auth"
v-model:value=
"currentData.auth"
:label-style=
"labelStyle"
/>
<BaseSwitch
:label=
"lp._messageConfig.consumerLabel.startTlsEnable"
v-model:value=
"currentData.startTlsEnable"
:label-style=
"labelStyle"
/>
<BaseInput
label=
"from"
v-model:value=
"currentData.from"
:label-style=
"labelStyle"
/>
<BaseInput
label=
"from"
v-model:value=
"currentData.from"
:label-style=
"labelStyle"
/>
<BaseInput
label=
"password"
v-model:value=
"currentData.password"
:label-style=
"labelStyle"
/>
<BaseInput
label=
"password"
v-model:value=
"currentData.password"
:label-style=
"labelStyle"
/>
</div>
</div>
...
...
o2web/source/x_component_systemconfig/src/components/content/ServerMessageConfig/MessageTypeConfig.vue
浏览文件 @
3b892e2b
...
@@ -134,6 +134,7 @@
...
@@ -134,6 +134,7 @@
<BaseInput
label=
"port"
v-model:value=
"currentData.port"
:label-style=
"labelStyle"
/>
<BaseInput
label=
"port"
v-model:value=
"currentData.port"
:label-style=
"labelStyle"
/>
<BaseSwitch
label=
"sslEnable"
v-model:value=
"currentData.sslEnable"
:label-style=
"labelStyle"
/>
<BaseSwitch
label=
"sslEnable"
v-model:value=
"currentData.sslEnable"
:label-style=
"labelStyle"
/>
<BaseSwitch
label=
"auth"
v-model:value=
"currentData.auth"
:label-style=
"labelStyle"
/>
<BaseSwitch
label=
"auth"
v-model:value=
"currentData.auth"
:label-style=
"labelStyle"
/>
<BaseSwitch
:label=
"lp._messageConfig.consumerLabel.startTlsEnable"
v-model:value=
"currentData.startTlsEnable"
:label-style=
"labelStyle"
/>
<BaseInput
label=
"from"
v-model:value=
"currentData.from"
:label-style=
"labelStyle"
/>
<BaseInput
label=
"from"
v-model:value=
"currentData.from"
:label-style=
"labelStyle"
/>
<BaseInput
label=
"password"
v-model:value=
"currentData.password"
:label-style=
"labelStyle"
/>
<BaseInput
label=
"password"
v-model:value=
"currentData.password"
:label-style=
"labelStyle"
/>
</div>
</div>
...
...
o2web/source/x_component_systemconfig/src/components/content/ServerServersConfig/ServerTaskConfig.vue
浏览文件 @
3b892e2b
...
@@ -61,7 +61,7 @@
...
@@ -61,7 +61,7 @@
type=
"textarea"
type=
"textarea"
:input-style=
"
{width: '310px'}"
:input-style=
"
{width: '310px'}"
:options="{rows: 2, spellcheck: false, style: 'word-break: break-all;'}"
:options="{rows: 2, spellcheck: false, style: 'word-break: break-all;'}"
@changeConfig="(value)=>{const v =
value.split(/\s*,\s*/g
); generalData.attachmentConfig.fileTypeIncludes=v; saveConfig('general', 'attachmentConfig.fileTypeIncludes', v)}"
@changeConfig="(value)=>{const v =
(value
&&
!Array.isArray(value)) ? value.split(/\s*,\s*/g): (value||[]
); generalData.attachmentConfig.fileTypeIncludes=v; saveConfig('general', 'attachmentConfig.fileTypeIncludes', v)}"
>
</BaseItem>
>
</BaseItem>
<div
class=
"item_info"
>
{{
lp
.
_serversConfig
.
fileTypeIncludesInfo
}}
</div>
<div
class=
"item_info"
>
{{
lp
.
_serversConfig
.
fileTypeIncludesInfo
}}
</div>
</div>
</div>
...
@@ -76,7 +76,7 @@
...
@@ -76,7 +76,7 @@
type=
"textarea"
type=
"textarea"
:input-style=
"
{width: '310px'}"
:input-style=
"
{width: '310px'}"
:options="{rows: 2, spellcheck: false, style: 'word-break: break-all;'}"
:options="{rows: 2, spellcheck: false, style: 'word-break: break-all;'}"
@changeConfig="(value)=>{const v =
value.split(/\s*,\s*/g
); generalData.attachmentConfig.fileTypeExcludes=v; saveConfig('general', 'attachmentConfig.fileTypeExcludes', v)}"
@changeConfig="(value)=>{const v =
(value
&&
!Array.isArray(value)) ? value.split(/\s*,\s*/g): (value||[]
); generalData.attachmentConfig.fileTypeExcludes=v; saveConfig('general', 'attachmentConfig.fileTypeExcludes', v)}"
>
</BaseItem>
>
</BaseItem>
<div
class=
"item_info"
>
{{
lp
.
_serversConfig
.
fileTypeExcludesInfo
}}
</div>
<div
class=
"item_info"
>
{{
lp
.
_serversConfig
.
fileTypeExcludesInfo
}}
</div>
</div>
</div>
...
@@ -124,7 +124,7 @@
...
@@ -124,7 +124,7 @@
:config=
"generalData.scriptingBlockedClasses"
:config=
"generalData.scriptingBlockedClasses"
:allowEditor=
"true"
:allowEditor=
"true"
type=
"textarea"
type=
"textarea"
@
changeConfig=
"(value)=>
{
generalData.scriptingBlockedClasses=value; saveConfig('general', 'scriptingBlockedClasses', value.split(/\s*,\s*/g)
)}"
@
changeConfig=
"(value)=>
{
const v = (value
&&
!Array.isArray(value)) ? value.split(/\s*,\s*/g): (value||[]); generalData.scriptingBlockedClasses=v; saveConfig('general', 'scriptingBlockedClasses', v
)}"
>
</BaseItem>
>
</BaseItem>
<BaseItem
<BaseItem
...
...
o2web/source/x_desktop/js/app.js
浏览文件 @
3b892e2b
...
@@ -28,10 +28,14 @@ layout.addReady(function(){
...
@@ -28,10 +28,14 @@ layout.addReady(function(){
}
}
layout
.
openApplication
(
null
,
appName
,
option
||
{},
m_status
);
layout
.
openApplication
(
null
,
appName
,
option
||
{},
m_status
);
if
(
layout
.
session
.
user
.
name
===
"
anonymous
"
){
o2
.
loadCss
(
"
../o2_core/o2/xDesktop/$Default/blue/style-skin.css
"
);
}
else
{
o2
.
xDesktop
.
getUserLayout
(
function
(){
o2
.
xDesktop
.
getUserLayout
(
function
(){
var
style
=
layout
.
userLayout
.
flatStyle
;
var
style
=
layout
.
userLayout
.
flatStyle
;
o2
.
loadCss
(
"
../o2_core/o2/xDesktop/$Default/
"
+
style
+
"
/style-skin.css
"
);
o2
.
loadCss
(
"
../o2_core/o2/xDesktop/$Default/
"
+
style
+
"
/style-skin.css
"
);
});
});
}
};
};
if
(
layout
.
session
&&
layout
.
session
.
user
){
if
(
layout
.
session
&&
layout
.
session
.
user
){
...
...
o2web/source/x_desktop/js/initialScriptText.js
浏览文件 @
3b892e2b
此差异已折叠。
点击以展开。
o2web/source/x_desktop/js/portal.js
浏览文件 @
3b892e2b
...
@@ -30,10 +30,14 @@ layout.addReady(function(){
...
@@ -30,10 +30,14 @@ layout.addReady(function(){
layout
.
openApplication
(
null
,
appName
,
option
||
{},
m_status
);
layout
.
openApplication
(
null
,
appName
,
option
||
{},
m_status
);
if
(
layout
.
session
.
user
.
name
===
"
anonymous
"
){
o2
.
loadCss
(
"
../o2_core/o2/xDesktop/$Default/blue/style-skin.css
"
);
}
else
{
o2
.
xDesktop
.
getUserLayout
(
function
(){
o2
.
xDesktop
.
getUserLayout
(
function
(){
var
style
=
layout
.
userLayout
.
flatStyle
;
var
style
=
layout
.
userLayout
.
flatStyle
;
o2
.
loadCss
(
"
../o2_core/o2/xDesktop/$Default/
"
+
style
+
"
/style-skin.css
"
);
o2
.
loadCss
(
"
../o2_core/o2/xDesktop/$Default/
"
+
style
+
"
/style-skin.css
"
);
});
});
}
};
};
// if (layout.session && layout.session.user){
// if (layout.session && layout.session.user){
...
...
o2web/source/x_desktop/js/work.js
浏览文件 @
3b892e2b
...
@@ -112,10 +112,14 @@ layout.addReady(function(){
...
@@ -112,10 +112,14 @@ layout.addReady(function(){
layout
.
openApplication
(
null
,
appName
,
option
||
{},
m_status
);
layout
.
openApplication
(
null
,
appName
,
option
||
{},
m_status
);
}
}
if
(
layout
.
session
.
user
.
name
===
"
anonymous
"
){
o2
.
loadCss
(
"
../o2_core/o2/xDesktop/$Default/blue/style-skin.css
"
);
}
else
{
o2
.
xDesktop
.
getUserLayout
(
function
(){
o2
.
xDesktop
.
getUserLayout
(
function
(){
var
style
=
layout
.
userLayout
.
flatStyle
;
var
style
=
layout
.
userLayout
.
flatStyle
;
o2
.
loadCss
(
"
../o2_core/o2/xDesktop/$Default/
"
+
style
+
"
/style-skin.css
"
);
o2
.
loadCss
(
"
../o2_core/o2/xDesktop/$Default/
"
+
style
+
"
/style-skin.css
"
);
});
});
}
};
};
if
(
layout
.
session
&&
layout
.
session
.
user
){
if
(
layout
.
session
&&
layout
.
session
.
user
){
_load
();
_load
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录