Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
255b10d6
o2oa
项目概览
fuyue82
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
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,发现更多精彩内容 >>
提交
255b10d6
编写于
5月 07, 2020
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
【数据中心】视图中增加无到数据显示”设置的
上级
953f7fea
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
103 addition
and
5 deletion
+103
-5
o2web/source/x_component_process_Xform/Form.js
o2web/source/x_component_process_Xform/Form.js
+11
-5
o2web/source/x_component_query_Query/$Viewer/default/css.wcss
...b/source/x_component_query_Query/$Viewer/default/css.wcss
+6
-0
o2web/source/x_component_query_Query/Viewer.js
o2web/source/x_component_query_Query/Viewer.js
+11
-0
o2web/source/x_component_query_ViewDesigner/$View/default/css.wcss
...rce/x_component_query_ViewDesigner/$View/default/css.wcss
+6
-0
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-flat.json
...onent_query_ViewDesigner/$View/skin/styles_blue-flat.json
+6
-0
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-simple.json
...ent_query_ViewDesigner/$View/skin/styles_blue-simple.json
+6
-0
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_cmcc.json
..._component_query_ViewDesigner/$View/skin/styles_cmcc.json
+6
-0
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_default.json
...mponent_query_ViewDesigner/$View/skin/styles_default.json
+6
-0
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_official.json
...ponent_query_ViewDesigner/$View/skin/styles_official.json
+6
-0
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_red-simple.json
...nent_query_ViewDesigner/$View/skin/styles_red-simple.json
+6
-0
o2web/source/x_component_query_ViewDesigner/$View/view.html
o2web/source/x_component_query_ViewDesigner/$View/view.html
+6
-0
o2web/source/x_component_query_ViewDesigner/$View/view.json
o2web/source/x_component_query_ViewDesigner/$View/view.json
+1
-0
o2web/source/x_component_query_ViewDesigner/View.js
o2web/source/x_component_query_ViewDesigner/View.js
+26
-0
未找到文件。
o2web/source/x_component_process_Xform/Form.js
浏览文件 @
255b10d6
...
...
@@ -1678,6 +1678,7 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
},
processWork
:
function
()
{
var
_self
=
this
;
if
(
!
this
.
businessData
.
work
.
startTime
)
{
this
.
startDraftProcess
();
}
else
{
...
...
@@ -1717,15 +1718,18 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
});
var
s
=
dlg
.
setContentSize
();
if
(
dlg
.
content
.
getStyle
(
"
overflow-y
"
)
===
"
auto
"
&&
dlg
.
content
.
getStyle
(
"
overflow-x
"
)
!==
"
auto
"
)
{
dlg
.
node
.
setStyle
(
"
width
"
,
dlg
.
node
.
getStyle
(
"
width
"
).
toInt
()
+
20
+
"
px
"
);
dlg
.
content
.
setStyle
(
"
width
"
,
dlg
.
content
.
getStyle
(
"
width
"
).
toInt
()
+
20
+
"
px
"
);
var
paddingRight
=
(
dlg
.
content
.
getStyle
(
"
padding-right
"
).
toInt
()
||
0
);
if
(
paddingRight
<
20
){
dlg
.
node
.
setStyle
(
"
width
"
,
dlg
.
node
.
getStyle
(
"
width
"
).
toInt
()
+
20
+
"
px
"
);
dlg
.
content
.
setStyle
(
"
width
"
,
dlg
.
content
.
getStyle
(
"
width
"
).
toInt
()
+
20
+
"
px
"
);
}
}
if
(
!
notRecenter
)
dlg
.
reCenter
();
}
//var node = new Element("div", {"styles": this.css.rollbackAreaNode});
var
processNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
this
.
app
.
css
.
processNode_Area
}).
inject
(
this
.
node
);
this
.
setProcessNode
(
processNode
,
"
process
"
,
function
(
)
{
this
.
setProcessNode
(
processNode
,
"
process
"
,
function
(
processor
)
{
this
.
processDlg
=
o2
.
DL
.
open
({
"
title
"
:
this
.
app
.
lp
.
process
,
"
style
"
:
this
.
json
.
dialogStyle
||
"
user
"
,
...
...
@@ -1756,6 +1760,7 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
}
],
"
onPostLoad
"
:
function
()
{
processor
.
options
.
mediaNode
=
this
.
content
;
setSize
.
call
(
this
)
}
});
...
...
@@ -1866,14 +1871,15 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
if
(
layout
.
mobile
)
{
innerNode
=
new
Element
(
"
div
"
).
inject
(
processNode
);
}
this
.
processor
=
new
MWF
.
xApplication
.
process
.
Work
.
Processor
(
innerNode
||
processNode
,
this
.
businessData
.
task
,
{
"
style
"
:
(
layout
.
mobile
)
?
"
mobile
"
:
(
style
||
"
default
"
),
"
opinion
"
:
op
.
opinion
,
"
tabletWidth
"
:
this
.
json
.
tabletWidth
||
0
,
"
tabletHeight
"
:
this
.
json
.
tabletHeight
||
0
,
"
onPostLoad
"
:
function
()
{
if
(
postLoadFun
)
postLoadFun
();
}
.
bind
(
this
)
,
if
(
postLoadFun
)
postLoadFun
(
this
);
},
"
onResize
"
:
function
()
{
if
(
resizeFun
)
resizeFun
();
},
...
...
o2web/source/x_component_query_Query/$Viewer/default/css.wcss
浏览文件 @
255b10d6
...
...
@@ -471,5 +471,11 @@
"workAreaLeftNode": {
"margin-right": "80px",
"overflow": "hidden"
},
"noDataTextNode" : {
"height" : "50px",
"font-size" : "16px",
"margin" : "20px auto",
"text-align" : "center"
}
}
\ No newline at end of file
o2web/source/x_component_query_Query/Viewer.js
浏览文件 @
255b10d6
...
...
@@ -368,12 +368,23 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
this
.
_initPage
();
if
(
this
.
bundleItems
.
length
){
if
(
this
.
noDataTextNode
)
this
.
noDataTextNode
.
destroy
();
this
.
loadCurrentPageData
(
function
()
{
this
.
fireEvent
(
"
postLoad
"
);
//用户配置的事件
}.
bind
(
this
));
}
else
{
//this._loadPageNode();
this
.
viewPageAreaNode
.
empty
();
if
(
this
.
viewJson
.
noDataText
){
var
noDataTextNodeStyle
=
this
.
css
.
noDataTextNode
;
if
(
this
.
viewJson
.
viewStyles
&&
this
.
viewJson
.
viewStyles
[
"
noDataTextNode
"
]
){
noDataTextNodeStyle
=
this
.
viewJson
.
viewStyles
[
"
noDataTextNode
"
];
}
this
.
noDataTextNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
noDataTextNodeStyle
,
"
text
"
:
this
.
viewJson
.
noDataText
}).
inject
(
this
.
contentAreaNode
);
}
if
(
this
.
loadingAreaNode
){
this
.
loadingAreaNode
.
destroy
();
this
.
loadingAreaNode
=
null
;
...
...
o2web/source/x_component_query_ViewDesigner/$View/default/css.wcss
浏览文件 @
255b10d6
...
...
@@ -68,6 +68,12 @@
"line-height": "20px",
"margin-left": "20px"
},
"noDataTextNode" : {
"height" : "50px",
"font-size" : "16px",
"margin" : "20px auto",
"text-align" : "center"
},
"refreshNode": {
"width": "29px",
...
...
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-flat.json
浏览文件 @
255b10d6
...
...
@@ -76,6 +76,12 @@
"background-repeat"
:
"no-repeat"
,
"background-position"
:
"center center"
},
"noDataTextNode"
:
{
"height"
:
"50px"
,
"font-size"
:
"16px"
,
"margin"
:
"20px auto"
,
"text-align"
:
"center"
},
"tableProperties"
:
{
"width"
:
"100%"
,
"border"
:
"0"
,
...
...
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-simple.json
浏览文件 @
255b10d6
...
...
@@ -76,6 +76,12 @@
"background-repeat"
:
"no-repeat"
,
"background-position"
:
"center center"
},
"noDataTextNode"
:
{
"height"
:
"50px"
,
"font-size"
:
"16px"
,
"margin"
:
"20px auto"
,
"text-align"
:
"center"
},
"tableProperties"
:
{
"width"
:
"100%"
,
"border"
:
"0"
,
...
...
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_cmcc.json
浏览文件 @
255b10d6
...
...
@@ -76,6 +76,12 @@
"background-repeat"
:
"no-repeat"
,
"background-position"
:
"center center"
},
"noDataTextNode"
:
{
"height"
:
"50px"
,
"font-size"
:
"16px"
,
"margin"
:
"20px auto"
,
"text-align"
:
"center"
},
"tableProperties"
:
{
"width"
:
"100%"
,
"border"
:
"0"
,
...
...
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_default.json
浏览文件 @
255b10d6
...
...
@@ -76,6 +76,12 @@
"background-repeat"
:
"no-repeat"
,
"background-position"
:
"center center"
},
"noDataTextNode"
:
{
"height"
:
"50px"
,
"font-size"
:
"16px"
,
"margin"
:
"20px auto"
,
"text-align"
:
"center"
},
"tableProperties"
:
{
"width"
:
"100%"
,
"border"
:
"0"
,
...
...
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_official.json
浏览文件 @
255b10d6
...
...
@@ -76,6 +76,12 @@
"background-repeat"
:
"no-repeat"
,
"background-position"
:
"center center"
},
"noDataTextNode"
:
{
"height"
:
"50px"
,
"font-size"
:
"16px"
,
"margin"
:
"20px auto"
,
"text-align"
:
"center"
},
"tableProperties"
:
{
"width"
:
"100%"
,
"border"
:
"0"
,
...
...
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_red-simple.json
浏览文件 @
255b10d6
...
...
@@ -76,6 +76,12 @@
"background-repeat"
:
"no-repeat"
,
"background-position"
:
"center center"
},
"noDataTextNode"
:
{
"height"
:
"50px"
,
"font-size"
:
"16px"
,
"margin"
:
"20px auto"
,
"text-align"
:
"center"
},
"tableProperties"
:
{
"width"
:
"100%"
,
"border"
:
"0"
,
...
...
o2web/source/x_component_query_ViewDesigner/$View/view.html
浏览文件 @
255b10d6
...
...
@@ -67,6 +67,12 @@
<input
class=
"editTableRadio"
name=
"data.select"
text
{($
.data.select=
=='multi')?'checked':''}
type=
"radio"
value=
"multi"
/>
多选
</td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
无数据显示:
</td>
<td
class=
"editTableValue"
>
<input
type=
"text"
name=
"data.noDataText"
value=
"text{$.data.noDataText}"
class=
"editTableInput"
/>
</td>
</tr>
<!--<tr>-->
<!--<td class="editTableTitle">最大行数:</td>-->
<!--<td class="editTableValue"><input type="text" name="max" value="text{$.max}" class="editTableInput"/></td>-->
...
...
o2web/source/x_component_query_ViewDesigner/$View/view.json
浏览文件 @
255b10d6
...
...
@@ -31,6 +31,7 @@
"creatorUnitList"
:
[],
"creatorIdentityList"
:
[]
},
"noDataText"
:
"未找到数据"
,
"selectList"
:
[],
"filterList"
:
[],
"orderList"
:
[],
...
...
o2web/source/x_component_query_ViewDesigner/View.js
浏览文件 @
255b10d6
...
...
@@ -275,6 +275,19 @@ MWF.xApplication.query.ViewDesigner.View = new Class({
}.
bind
(
this
));
this
.
setContentColumnWidth
();
this
.
setContentHeight
();
}
else
if
(
this
.
json
.
data
.
noDataText
){
var
noDataTextNodeStyle
=
this
.
css
.
noDataTextNode
;
if
(
this
.
json
.
data
.
viewStyles
){
if
(
this
.
json
.
data
.
viewStyles
[
"
noDataTextNode
"
]
){
noDataTextNodeStyle
=
this
.
json
.
data
.
viewStyles
[
"
noDataTextNode
"
]
}
else
{
this
.
json
.
data
.
viewStyles
[
"
noDataTextNode
"
]
=
this
.
css
.
noDataTextNode
}
}
this
.
noDataTextNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
noDataTextNodeStyle
,
"
text
"
:
this
.
json
.
data
.
noDataText
}).
inject
(
this
.
viewContentBodyNode
);
}
}
else
{
...
...
@@ -310,6 +323,19 @@ MWF.xApplication.query.ViewDesigner.View = new Class({
}.
bind
(
this
));
this
.
setContentColumnWidth
();
this
.
setContentHeight
();
}
else
if
(
this
.
json
.
data
.
noDataText
){
var
noDataTextNodeStyle
=
this
.
css
.
noDataTextNode
;
if
(
this
.
json
.
data
.
viewStyles
){
if
(
this
.
json
.
data
.
viewStyles
[
"
noDataTextNode
"
]
){
noDataTextNodeStyle
=
this
.
json
.
data
.
viewStyles
[
"
noDataTextNode
"
]
}
else
{
this
.
json
.
data
.
viewStyles
[
"
noDataTextNode
"
]
=
this
.
css
.
noDataTextNode
}
}
this
.
noDataTextNode
=
new
Element
(
"
div
"
,
{
"
styles
"
:
noDataTextNodeStyle
,
"
text
"
:
this
.
json
.
data
.
noDataText
}).
inject
(
this
.
viewContentBodyNode
);
}
}
}.
bind
(
this
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录