Skip to content

o2oa
o2oa

浙江兰德纵横网络技术股份有限公司 / o2oa

通知 332
Star 10
Fork 6
o2oa
o2oa

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 d62ce5d5 编写于 作者: 蔡 蔡祥熠
浏览文件
操作

Merge branch 'cherry-pick-0558c26c' into 'master_java8' 

Merge branch 'hotfix/delete_resource_execption' into 'master'

See merge request o2oa/o2oa!3774
上级 14803488 5306c7bf
隐藏空白更改
内联 并排
Showing with 32 addition and 32 deletion
o2web/source/x_component_process_Application/$WorkExplorer/default/css.wcss
浏览文件 @ d62ce5d5
...@@ -1083,7 +1083,7 @@ ...@@ -1083,7 +1083,7 @@
"float": "left", "float": "left",
"width": "20px", "width": "20px",
"height": "20px", "height": "20px",
"background": "url("+"../x_component_process_ViewDesigner/$View/default/icon/right.png) center center no-repeat", "background": "url("+"../x_component_query_ViewDesigner/$View/default/icon/right.png) center center no-repeat",
}, },
"viewContentTdGroupTextNode": { "viewContentTdGroupTextNode": {
"height": "20px", "height": "20px",
......
o2web/source/x_component_query_StatementDesigner/widget/$ViewFilter/default/css.wcss
浏览文件 @ d62ce5d5
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
}, },
"actionNode": { "actionNode": {
"height": "20px", "height": "20px",
"background": "url("+"../x_component_process_ViewDesigner/widget/$ViewFilter/default/down.png) no-repeat center -2px" "background": "url(../x_component_query_ViewDesigner/widget/$ViewFilter/default/down.png) no-repeat center -2px"
}, },
"verificationNode": { "verificationNode": {
"background-color": "#fbe8e8", "background-color": "#fbe8e8",
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
"line-height": "24px" "line-height": "24px"
}, },
"verificationTextNode": { "verificationTextNode": {
"background": "url("+"../x_component_process_ViewDesigner/widget/$ViewFilter/default/icon/error.png) no-repeat 5px center", "background": "url(../x_component_query_ViewDesigner/widget/$ViewFilter/default/icon/error.png) no-repeat 5px center",
"padding-left": "26px" "padding-left": "26px"
}, },
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
"width": "20px", "width": "20px",
"height": "24px", "height": "24px",
"float": "right", "float": "right",
"background": "url("+"../x_component_process_ViewDesigner/widget/$ViewFilter/default/icon/delete1.png) no-repeat center center", "background": "url(../x_component_query_ViewDesigner/widget/$ViewFilter/default/icon/delete1.png) no-repeat center center",
"cursor": "pointer" "cursor": "pointer"
}, },
"itemContentNode": { "itemContentNode": {
......
o2web/source/x_component_query_ViewDesigner/$Main/default/css.wcss
浏览文件 @ d62ce5d5
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
"background": "#FFF", "background": "#FFF",
"-webkit-user-select": "none", "-webkit-user-select": "none",
"overflow": "hidden", "overflow": "hidden",
"background": "url("+"../x_component_process_ViewDesigner/$Main/default/designerBg.png)", "background": "url(../x_component_query_ViewDesigner/$Main/default/designerBg.png)",
"-moz-user-select": "none" "-moz-user-select": "none"
}, },
"propertyTitleNode": { "propertyTitleNode": {
......
o2web/source/x_component_query_ViewDesigner/$View/default/css.wcss
浏览文件 @ d62ce5d5
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
"float": "left", "float": "left",
"width": "20px", "width": "20px",
"height": "20px", "height": "20px",
"background": "url("+"../x_component_process_ViewDesigner/$View/default/icon/right.png) center center no-repeat", "background": "url(../x_component_query_ViewDesigner/$View/default/icon/right.png) center center no-repeat",
}, },
"viewContentTdGroupTextNode": { "viewContentTdGroupTextNode": {
"height": "20px", "height": "20px",
...@@ -88,13 +88,13 @@ ...@@ -88,13 +88,13 @@
"refreshNode": { "refreshNode": {
"width": "29px", "width": "29px",
"height": "40px", "height": "40px",
"background": "url("+"../x_component_process_ViewDesigner/$View/default/icon/refresh.png) center center no-repeat", "background": "url(../x_component_query_ViewDesigner/$View/default/icon/refresh.png) center center no-repeat",
"float": "left" "float": "left"
}, },
"addColumnNode": { "addColumnNode": {
"width": "29px", "width": "29px",
"height": "40px", "height": "40px",
"background": "url("+"../x_component_process_ViewDesigner/$View/default/icon/addColumn.png) center center no-repeat", "background": "url(../x_component_query_ViewDesigner/$View/default/icon/addColumn.png) center center no-repeat",
"float": "right" "float": "right"
}, },
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
"height": "26px", "height": "26px",
"width": "26px", "width": "26px",
"float": "left", "float": "left",
"background": "url("+"../x_component_process_ViewDesigner/$View/default/icon/column.png) center center no-repeat" "background": "url(../x_component_query_ViewDesigner/$View/default/icon/column.png) center center no-repeat"
}, },
"cloumnListTextNode": { "cloumnListTextNode": {
"margin-left": "26px" "margin-left": "26px"
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
"text-align": "right", "text-align": "right",
"cursor": "pointer", "cursor": "pointer",
"font-size": "12px", "font-size": "12px",
"background": "url("+"../x_component_process_ViewDesigner/$View/default/icon/add.png) 3px center no-repeat" "background": "url(../x_component_query_ViewDesigner/$View/default/icon/add.png) 3px center no-repeat"
}, },
"columnFilterValueNode": { "columnFilterValueNode": {
"width": "95%", "width": "95%",
...@@ -267,12 +267,12 @@ ...@@ -267,12 +267,12 @@
"font-size": "12px" "font-size": "12px"
}, },
"filterAddActionNode":{ "filterAddActionNode":{
"background": "url("+"../x_component_process_ViewDesigner/$View/default/icon/add.png) 3px center no-repeat", "background": "url(../x_component_query_ViewDesigner/$View/default/icon/add.png) 3px center no-repeat",
"height": "24px", "height": "24px",
"cursor": "pointer" "cursor": "pointer"
}, },
"filterDelActionNode":{ "filterDelActionNode":{
"background": "url("+"../x_component_process_ViewDesigner/$View/default/icon/del.png) 3px center no-repeat", "background": "url(../x_component_query_ViewDesigner/$View/default/icon/del.png) 3px center no-repeat",
"height": "24px", "height": "24px",
"cursor": "pointer" "cursor": "pointer"
}, },
...@@ -341,7 +341,7 @@ ...@@ -341,7 +341,7 @@
}, },
"columnHideFlagNode": { "columnHideFlagNode": {
"height": "40px", "height": "40px",
"background": "url("+"../x_component_process_ViewDesigner/$View/default/icon/hidden.png) right center no-repeat", "background": "url(../x_component_query_ViewDesigner/$View/default/icon/hidden.png) right center no-repeat",
"position": "relative", "position": "relative",
"margin-right": "8px", "margin-right": "8px",
"top": "-38px" "top": "-38px"
......
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-flat.json
浏览文件 @ d62ce5d5
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
"height": "30px", "height": "30px",
"line-height": "30px", "line-height": "30px",
"padding-left" : "20px", "padding-left" : "20px",
"background-image": "url(../x_component_process_ViewDesigner/$View/default/icon/right.png)", "background-image": "url(../x_component_query_ViewDesigner/$View/default/icon/right.png)",
"background-repeat" : "no-repeat", "background-repeat" : "no-repeat",
"background-position": "left center" "background-position": "left center"
}, },
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
"height": "30px", "height": "30px",
"line-height": "30px", "line-height": "30px",
"padding-left" : "20px", "padding-left" : "20px",
"background-image": "url(../x_component_process_ViewDesigner/$View/default/icon/down.png)", "background-image": "url(../x_component_query_ViewDesigner/$View/default/icon/down.png)",
"background-repeat" : "no-repeat", "background-repeat" : "no-repeat",
"background-position": "left center" "background-position": "left center"
}, },
......
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-simple.json
浏览文件 @ d62ce5d5
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
"height": "30px", "height": "30px",
"line-height": "30px", "line-height": "30px",
"padding-left" : "20px", "padding-left" : "20px",
"background-image": "url(../x_component_process_ViewDesigner/$View/default/icon/right.png)", "background-image": "url(../x_component_query_ViewDesigner/$View/default/icon/right.png)",
"background-repeat" : "no-repeat", "background-repeat" : "no-repeat",
"background-position": "left center" "background-position": "left center"
}, },
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
"height": "30px", "height": "30px",
"line-height": "30px", "line-height": "30px",
"padding-left" : "20px", "padding-left" : "20px",
"background-image": "url(../x_component_process_ViewDesigner/$View/default/icon/down.png)", "background-image": "url(../x_component_query_ViewDesigner/$View/default/icon/down.png)",
"background-repeat" : "no-repeat", "background-repeat" : "no-repeat",
"background-position": "left center" "background-position": "left center"
}, },
......
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_cmcc.json
浏览文件 @ d62ce5d5
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
"height": "30px", "height": "30px",
"line-height": "30px", "line-height": "30px",
"padding-left" : "20px", "padding-left" : "20px",
"background-image": "url(../x_component_process_ViewDesigner/$View/default/icon/right.png)", "background-image": "url(../x_component_query_ViewDesigner/$View/default/icon/right.png)",
"background-repeat" : "no-repeat", "background-repeat" : "no-repeat",
"background-position": "left center" "background-position": "left center"
}, },
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
"height": "30px", "height": "30px",
"line-height": "30px", "line-height": "30px",
"padding-left" : "20px", "padding-left" : "20px",
"background-image": "url(../x_component_process_ViewDesigner/$View/default/icon/down.png)", "background-image": "url(../x_component_query_ViewDesigner/$View/default/icon/down.png)",
"background-repeat" : "no-repeat", "background-repeat" : "no-repeat",
"background-position": "left center" "background-position": "left center"
}, },
......
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_default.json
浏览文件 @ d62ce5d5
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
"height": "30px", "height": "30px",
"line-height": "30px", "line-height": "30px",
"padding-left" : "20px", "padding-left" : "20px",
"background-image": "url(../x_component_process_ViewDesigner/$View/default/icon/right.png)", "background-image": "url(../x_component_query_ViewDesigner/$View/default/icon/right.png)",
"background-repeat" : "no-repeat", "background-repeat" : "no-repeat",
"background-position": "left center" "background-position": "left center"
}, },
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
"height": "30px", "height": "30px",
"line-height": "30px", "line-height": "30px",
"padding-left" : "20px", "padding-left" : "20px",
"background-image": "url(../x_component_process_ViewDesigner/$View/default/icon/down.png)", "background-image": "url(../x_component_query_ViewDesigner/$View/default/icon/down.png)",
"background-repeat" : "no-repeat", "background-repeat" : "no-repeat",
"background-position": "left center" "background-position": "left center"
}, },
......
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_official.json
浏览文件 @ d62ce5d5
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
"height": "30px", "height": "30px",
"line-height": "30px", "line-height": "30px",
"padding-left" : "20px", "padding-left" : "20px",
"background-image": "url(../x_component_process_ViewDesigner/$View/default/icon/right.png)", "background-image": "url(../x_component_query_ViewDesigner/$View/default/icon/right.png)",
"background-repeat" : "no-repeat", "background-repeat" : "no-repeat",
"background-position": "left center" "background-position": "left center"
}, },
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
"height": "30px", "height": "30px",
"line-height": "30px", "line-height": "30px",
"padding-left" : "20px", "padding-left" : "20px",
"background-image": "url(../x_component_process_ViewDesigner/$View/default/icon/down.png)", "background-image": "url(../x_component_query_ViewDesigner/$View/default/icon/down.png)",
"background-repeat" : "no-repeat", "background-repeat" : "no-repeat",
"background-position": "left center" "background-position": "left center"
}, },
......
o2web/source/x_component_query_ViewDesigner/$View/skin/styles_red-simple.json
浏览文件 @ d62ce5d5
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
"height": "30px", "height": "30px",
"line-height": "30px", "line-height": "30px",
"padding-left" : "20px", "padding-left" : "20px",
"background-image": "url(../x_component_process_ViewDesigner/$View/default/icon/right.png)", "background-image": "url(../x_component_query_ViewDesigner/$View/default/icon/right.png)",
"background-repeat" : "no-repeat", "background-repeat" : "no-repeat",
"background-position": "left center" "background-position": "left center"
}, },
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
"height": "30px", "height": "30px",
"line-height": "30px", "line-height": "30px",
"padding-left" : "20px", "padding-left" : "20px",
"background-image": "url(../x_component_process_ViewDesigner/$View/default/icon/down.png)", "background-image": "url(../x_component_query_ViewDesigner/$View/default/icon/down.png)",
"background-repeat" : "no-repeat", "background-repeat" : "no-repeat",
"background-position": "left center" "background-position": "left center"
}, },
......
o2web/source/x_component_query_ViewDesigner/View.js
浏览文件 @ d62ce5d5
...@@ -261,14 +261,14 @@ MWF.xApplication.query.ViewDesigner.View = new Class({ ...@@ -261,14 +261,14 @@ MWF.xApplication.query.ViewDesigner.View = new Class({
if (subtrs[0].getStyle("display")=="none"){ if (subtrs[0].getStyle("display")=="none"){
subtrs.each(function(subtr){ subtr.setStyle("display", "table-row"); }); subtrs.each(function(subtr){ subtr.setStyle("display", "table-row"); });
if( iconNode ) { if( iconNode ) {
iconNode.setStyle("background", "url(" + "../x_component_process_ViewDesigner/$View/default/icon/down.png) center center no-repeat"); iconNode.setStyle("background", "url(" + "../x_component_query_ViewDesigner/$View/default/icon/down.png) center center no-repeat");
}else{ }else{
this.setStyles( _self.json.data.viewStyles["groupExpandNode"] ) this.setStyles( _self.json.data.viewStyles["groupExpandNode"] )
} }
}else{ }else{
subtrs.each(function(subtr){ subtr.setStyle("display", "none"); }); subtrs.each(function(subtr){ subtr.setStyle("display", "none"); });
if( iconNode ) { if( iconNode ) {
iconNode.setStyle("background", "url(" + "../x_component_process_ViewDesigner/$View/default/icon/right.png) center center no-repeat"); iconNode.setStyle("background", "url(" + "../x_component_query_ViewDesigner/$View/default/icon/right.png) center center no-repeat");
}else{ }else{
this.setStyles( _self.json.data.viewStyles["groupCollapseNode"] ) this.setStyles( _self.json.data.viewStyles["groupCollapseNode"] )
} }
......
o2web/source/x_component_query_ViewDesigner/ViewBase.js
浏览文件 @ d62ce5d5
...@@ -209,10 +209,10 @@ MWF.xApplication.query.ViewDesigner.ViewBase = new Class({ ...@@ -209,10 +209,10 @@ MWF.xApplication.query.ViewDesigner.ViewBase = new Class({
if (subtrs[0]){ if (subtrs[0]){
if (subtrs[0].getStyle("display")=="none"){ if (subtrs[0].getStyle("display")=="none"){
subtrs.each(function(subtr){ subtr.setStyle("display", "table-row"); }); subtrs.each(function(subtr){ subtr.setStyle("display", "table-row"); });
iconNode.setStyle("background", "url("+"../x_component_process_ViewDesigner/$View/default/icon/down.png) center center no-repeat"); iconNode.setStyle("background", "url("+"../x_component_query_ViewDesigner/$View/default/icon/down.png) center center no-repeat");
}else{ }else{
subtrs.each(function(subtr){ subtr.setStyle("display", "none"); }); subtrs.each(function(subtr){ subtr.setStyle("display", "none"); });
iconNode.setStyle("background", "url("+"../x_component_process_ViewDesigner/$View/default/icon/right.png) center center no-repeat"); iconNode.setStyle("background", "url("+"../x_component_query_ViewDesigner/$View/default/icon/right.png) center center no-repeat");
} }
} }
_self.setContentHeight(); _self.setContentHeight();
......
o2web/source/x_component_query_ViewDesigner/widget/$ViewFilter/default/css.wcss
浏览文件 @ d62ce5d5
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
}, },
"actionNode": { "actionNode": {
"height": "20px", "height": "20px",
"background": "url("+"../x_component_process_ViewDesigner/widget/$ViewFilter/default/down.png) no-repeat center -2px" "background": "url(../x_component_query_ViewDesigner/widget/$ViewFilter/default/down.png) no-repeat center -2px"
}, },
"verificationNode": { "verificationNode": {
"background-color": "#fbe8e8", "background-color": "#fbe8e8",
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
"line-height": "24px" "line-height": "24px"
}, },
"verificationTextNode": { "verificationTextNode": {
"background": "url("+"../x_component_process_ViewDesigner/widget/$ViewFilter/default/icon/error.png) no-repeat 5px center", "background": "url(../x_component_query_ViewDesigner/widget/$ViewFilter/default/icon/error.png) no-repeat 5px center",
"padding-left": "26px" "padding-left": "26px"
}, },
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
"width": "20px", "width": "20px",
"height": "24px", "height": "24px",
"float": "right", "float": "right",
"background": "url("+"../x_component_process_ViewDesigner/widget/$ViewFilter/default/icon/delete1.png) no-repeat center center", "background": "url(../x_component_query_ViewDesigner/widget/$ViewFilter/default/icon/delete1.png) no-repeat center center",
"cursor": "pointer" "cursor": "pointer"
}, },
"itemContentNode": { "itemContentNode": {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或