Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
此号慢热型
o2oa
提交
7cb26dd8
o2oa
项目概览
此号慢热型
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
7cb26dd8
编写于
4月 20, 2020
作者:
NoSubject
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修正保存新版本时,弹出窗口大小不合适的问题
上级
b6c96731
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
31 addition
and
41 deletion
+31
-41
o2web/source/o2_core/o2/widget/$Dialog/default/css.wcss
o2web/source/o2_core/o2/widget/$Dialog/default/css.wcss
+20
-1
o2web/source/o2_core/o2/widget/$Dialog/user/css.wcss
o2web/source/o2_core/o2/widget/$Dialog/user/css.wcss
+1
-1
o2web/source/o2_core/o2/widget/Dialog.js
o2web/source/o2_core/o2/widget/Dialog.js
+2
-2
o2web/source/o2_core/o2/xDesktop/Dialog.js
o2web/source/o2_core/o2/xDesktop/Dialog.js
+1
-36
o2web/source/x_component_process_FormDesigner/$Main/default/tools.json
...x_component_process_FormDesigner/$Main/default/tools.json
+5
-0
o2web/source/x_component_process_ProcessDesigner/Process.js
o2web/source/x_component_process_ProcessDesigner/Process.js
+2
-1
未找到文件。
o2web/source/o2_core/o2/widget/$Dialog/default/css.wcss
浏览文件 @
7cb26dd8
...
...
@@ -41,5 +41,24 @@
"font-size": "12px",
"color": "#333",
"margin": "0px 5px"
}
},
"okButton": {
"border": "0px",
"background-color": "#3C76B7",
"color": "#fff",
"height": "30px",
"border-radius": "20px",
"min-width": "80px",
"margin": "10px 5px"
},
cancelButton: {
"border": "0px",
"height": "30px",
"border-radius": "20px",
"min-width": "80px",
"margin": "10px 5px",
"color": "#fff",
"background-color": "#999999 !important",
},
}
\ No newline at end of file
o2web/source/o2_core/o2/widget/$Dialog/user/css.wcss
浏览文件 @
7cb26dd8
...
...
@@ -73,7 +73,7 @@
"min-width": "80px",
"margin": "10px 5px",
"color": "#fff",
"background-color": "#999999
!important",
"background-color": "#999999
"
},
"closeAction": {
...
...
o2web/source/o2_core/o2/widget/Dialog.js
浏览文件 @
7cb26dd8
...
...
@@ -236,7 +236,7 @@ o2.widget.Dialog = o2.DL = new Class({
}
}).
inject
(
this
.
button
);
}
debugger
;
if
(
this
.
options
.
buttonList
){
this
.
options
.
buttonList
.
each
(
function
(
bt
){
var
styles
=
this
.
css
.
button
;
...
...
@@ -247,7 +247,7 @@ o2.widget.Dialog = o2.DL = new Class({
"
type
"
:
"
button
"
,
"
value
"
:
bt
.
text
,
"
title
"
:
bt
.
title
,
"
class
"
:
"
mainColor_bg
"
,
"
class
"
:
(
bt
.
type
!==
"
cancel
"
)
?
"
mainColor_bg
"
:
"
"
,
"
styles
"
:
styles
,
"
events
"
:
{
"
click
"
:
function
(
e
){
bt
.
action
.
call
(
this
,
this
,
e
)}.
bind
(
this
)
...
...
o2web/source/o2_core/o2/xDesktop/Dialog.js
浏览文件 @
7cb26dd8
...
...
@@ -120,7 +120,6 @@ o2.xDesktop.Dialog = o2.DDL = new Class({
}
}).
inject
(
this
.
button
);
}
debugger
;
if
(
this
.
options
.
buttonList
){
this
.
options
.
buttonList
.
each
(
function
(
bt
){
var
styles
=
this
.
css
.
button
;
...
...
@@ -143,7 +142,7 @@ o2.xDesktop.Dialog = o2.DDL = new Class({
"
value
"
:
bt
.
text
,
"
title
"
:
bt
.
title
,
"
styles
"
:
styles
,
"
class
"
:
"
mainColor_bg
"
,
"
class
"
:
(
bt
.
type
!==
"
cancel
"
)
?
"
mainColor_bg
"
:
"
"
,
"
events
"
:
{
"
click
"
:
function
(
e
){
bt
.
action
.
call
(
this
,
this
,
e
)}.
bind
(
this
)
}
...
...
@@ -224,19 +223,6 @@ o2.xDesktop.Dialog = o2.DDL = new Class({
}
}
//this.options.top = 0;
//this.options.left = 0;
//this.options.fromTop = 0;
//this.options.fromLeft = 0;
//this.options.contentHeight = 0;
//this.options.contentWidth = 0;
//this.options.maxHeightPercent = null;
//this.options.maxHeight = null;
//this.options.maxWidth = null;
//this.height = null;
//this.width = null;
var
container
=
$
(
document
.
body
);
if
(
layout
.
desktop
.
currentApp
){
container
=
layout
.
desktop
.
currentApp
.
content
;
...
...
@@ -263,27 +249,6 @@ o2.xDesktop.Dialog = o2.DDL = new Class({
this
.
fireEvent
(
"
max
"
);
},
restoreSize
:
function
(){
//if( this.oldCoordinate){
// this.options.height = this.oldCoordinate.height;
// this.options.width = this.oldCoordinate.width;
// this.options.top = this.oldCoordinate.top;
// this.options.left = this.oldCoordinate.left;
// this.options.fromTop = this.oldCoordinate.fromTop;
// this.options.fromLeft = this.oldCoordinate.fromLeft;
// this.options.contentHeight = this.oldCoordinate.contentHeight;
// this.options.contentWidth = this.oldCoordinate.contentWidth;
// this.options.maxHeightPercent = this.oldCoordinate.maxHeightPercent;
// this.options.maxHeight = this.oldCoordinate.maxHeight;
// this.options.maxWidth = this.oldCoordinate.maxWidth;
//}
//
//if( this.oldSize ){
// this.width = this.oldSize.width;
// this.height = this.oldSize.height;
//}
//this.setContentSize( this.oldNodeSize.height, this.oldNodeSize.width );
//this.node.setStyles( this.getNodeSize() );
this
.
contentHeight
=
this
.
oldContentSize
.
height
;
this
.
contentWidth
=
this
.
oldContentSize
.
width
;
...
...
o2web/source/x_component_process_FormDesigner/$Main/default/tools.json
浏览文件 @
7cb26dd8
...
...
@@ -167,6 +167,11 @@
"text"
:
"流程记录"
,
"className"
:
"Log"
},
"readLog"
:
{
"icon"
:
"readLog.png"
,
"text"
:
"阅读记录"
,
"className"
:
"ReadLog"
},
"monitor"
:
{
"icon"
:
"monitor.png"
,
"text"
:
"流程监控"
,
...
...
o2web/source/x_component_process_ProcessDesigner/Process.js
浏览文件 @
7cb26dd8
...
...
@@ -551,7 +551,8 @@ MWF.xApplication.process.ProcessDesigner.Process = new Class({
"
content
"
:
node
,
"
title
"
:
this
.
designer
.
lp
.
upgradeConfirm
,
"
offset
"
:
{
"
y
"
:
-
100
},
"
height
"
:
330
,
"
height
"
:
340
,
"
width
"
:
580
,
"
buttonList
"
:
[{
"
type
"
:
"
ok
"
,
"
text
"
:
this
.
designer
.
lp
.
ok
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录