diff --git a/o2web/source/x_component_portal_PageDesigner/Module/View/view.html b/o2web/source/x_component_portal_PageDesigner/Module/View/view.html
index 47bd9c1bef621a80f51762284fdb8b14f2470ac2..5deb983f1dafb261abe3aa36c81fb8f65cdfdf75 100644
--- a/o2web/source/x_component_portal_PageDesigner/Module/View/view.html
+++ b/o2web/source/x_component_portal_PageDesigner/Module/View/view.html
@@ -105,6 +105,13 @@
+
+ | 操作条 |
+
+ 显示
+ 不显示
+ |
+
diff --git a/o2web/source/x_component_process_FormDesigner/Module/View.js b/o2web/source/x_component_process_FormDesigner/Module/View.js
index 83ffb8c567055660db96e827967b42dad4ea60c7..78ab95dcbb5ac7c2bcd13720507b21b906667547 100644
--- a/o2web/source/x_component_process_FormDesigner/Module/View.js
+++ b/o2web/source/x_component_process_FormDesigner/Module/View.js
@@ -107,6 +107,10 @@ MWF.xApplication.process.FormDesigner.Module.View = MWF.FCView = new Class({
if (this.viewNode){
this.node.setStyle("background", "transparent");
this.actionbarNode = this.viewNode.getChildren("div")[0];
+ if( this.actionbarNode ){
+ this.actionbarNode.destroy();
+ this.actionbarNode = null;
+ }
this.viewTable = this.viewNode.getElement("table").setStyles(this.css.viewTitleTableNode);
this.viewLine = this.viewTable.getElement("tr").setStyles(this.css.viewTitleLineNode);
this.viewSelectCell = this.viewLine.getElement("td");
@@ -192,7 +196,7 @@ MWF.xApplication.process.FormDesigner.Module.View = MWF.FCView = new Class({
this.node.set("id", this.json.id);
}
if(name=="actionbar"){
- input.get("value") === "show" ? this._showActionbar() : this._hideActionbar();
+ this.json.actionbar === "show" ? this._showActionbar() : this._hideActionbar();
}
this._setEditStyle_custom(name, input, oldValue);
@@ -255,7 +259,9 @@ MWF.xApplication.process.FormDesigner.Module.View = MWF.FCView = new Class({
if(this.actionbarNode)this.actionbarNode.hide();
},
_showActionbar : function(){
+ if( this.actionbarLoading )return;
if( !this.actionbarNode )return;
+ this.actionbarLoading = true;
MWF.require("MWF.widget.Toolbar", null, false);
this.actionbarNode.show();
if( !this.viewData.actionbarList )this.viewData.actionbarList = [];
@@ -273,10 +279,13 @@ MWF.xApplication.process.FormDesigner.Module.View = MWF.FCView = new Class({
toolbarWidget.load();
this.actionbarList.push( toolbarWidget );
+ this.actionbarLoading = false;
}.bind(this));
}else{
-
+ this.actionbarLoading = false;
}
+ }else{
+ this.actionbarLoading = false;
}
},
setToolbars: function(tools, node, json){
diff --git a/o2web/source/x_component_process_FormDesigner/Module/ViewSelector/ViewSelector.html b/o2web/source/x_component_process_FormDesigner/Module/ViewSelector/ViewSelector.html
index 03d04dfe4faefb7d6fe8dff4433bf66f652ac450..c0d514286f78adb5762db9d6a892a6ae9aa23756 100644
--- a/o2web/source/x_component_process_FormDesigner/Module/ViewSelector/ViewSelector.html
+++ b/o2web/source/x_component_process_FormDesigner/Module/ViewSelector/ViewSelector.html
@@ -46,6 +46,13 @@
多选
+
+ | 操作条 |
+
+ 显示
+ 不显示
+ |
+
diff --git a/o2web/source/x_component_process_Xform/View.js b/o2web/source/x_component_process_Xform/View.js
index 16972178a09202e1d2454848dbca408b0c675d74..a6a4ef1254538ba73f42676eae2f4bcee380dc39 100644
--- a/o2web/source/x_component_process_Xform/View.js
+++ b/o2web/source/x_component_process_Xform/View.js
@@ -59,6 +59,7 @@ MWF.xApplication.process.Xform.View = MWF.APPView = new Class({
"titleStyles": this.json.titleStyles,
"itemStyles": this.json.itemStyles,
"isExpand": this.json.isExpand || "no",
+ "showActionbar" : this.json.actionbar === "show",
"filter": filter
};
@@ -102,6 +103,7 @@ MWF.xApplication.process.Xform.View = MWF.APPView = new Class({
"titleStyles": this.json.titleStyles,
"itemStyles": this.json.itemStyles,
"isExpand": this.json.isExpand || "no",
+ "showActionbar" : this.json.actionbar === "show",
"filter": filter
};
MWF.xDesktop.requireApp("process.Application", "Viewer", function(){
@@ -131,6 +133,7 @@ MWF.xApplication.process.Xform.View = MWF.APPView = new Class({
"titleStyles": this.json.titleStyles,
"itemStyles": this.json.itemStyles,
"isExpand": this.json.isExpand || "no",
+ "showActionbar" : this.json.actionbar === "show",
"filter": filter
};
diff --git a/o2web/source/x_component_process_Xform/ViewSelector.js b/o2web/source/x_component_process_Xform/ViewSelector.js
index 3fcc2a776de634e944a2613f4ef33ecc4737ee5e..63f3b8808e8d7da83c472a4a3b10db90569a1ebe 100644
--- a/o2web/source/x_component_process_Xform/ViewSelector.js
+++ b/o2web/source/x_component_process_Xform/ViewSelector.js
@@ -68,6 +68,7 @@ MWF.xApplication.process.Xform.ViewSelector = MWF.APPViewSelector = new Class({
"titleStyles": this.json.titleStyles,
"itemStyles": this.json.itemStyles,
"isExpand": this.json.isExpand || "no",
+ "showActionbar" : this.json.actionbar === "show",
"filter": filter
};
var options = {};
@@ -175,6 +176,7 @@ MWF.xApplication.process.Xform.ViewSelector = MWF.APPViewSelector = new Class({
"titleStyles": this.json.titleStyles,
"itemStyles": this.json.itemStyles,
"isExpand": this.json.isExpand || "no",
+ "showActionbar" : this.json.actionbar === "show",
"filter": filter
};
var options = {};
@@ -279,11 +281,12 @@ MWF.xApplication.process.Xform.ViewSelector = MWF.APPViewSelector = new Class({
"titleStyles": this.json.titleStyles,
"itemStyles": this.json.itemStyles,
"isExpand": this.json.isExpand || "no",
+ "showActionbar" : this.json.actionbar === "show",
"filter": filter
};
var options = {};
- var width = options.width || "800";
- var height = options.height || "600";
+ var width = options.width || "850";
+ var height = options.height || "700";
if (layout.mobile){
var size = document.body.getSize();
diff --git a/o2web/source/x_component_query_Query/$Viewer/select/css.wcss b/o2web/source/x_component_query_Query/$Viewer/select/css.wcss
index 368f6f7f6db39bcf5bf7d12d6e4534179654f830..768948e43ee56b8f419de159be976f208ecbca4f 100644
--- a/o2web/source/x_component_query_Query/$Viewer/select/css.wcss
+++ b/o2web/source/x_component_query_Query/$Viewer/select/css.wcss
@@ -13,11 +13,11 @@
},
"viewPageNode": {
- "padding-top": "10px",
- "height": "30px"
+// "padding-top": "10px",
+// "height": "30px"
},
"viewPageAreaNode": {
- "height": "24px"
+// "height": "24px"
//"margin-top": "28px"
},
"viewPageContentNode": {
diff --git a/o2web/source/x_component_query_Query/Viewer.js b/o2web/source/x_component_query_Query/Viewer.js
index 981c4c9a1191a6ee16e3499a70bae7798a5fc911..b06ba93c34b4ce915cbd71dffddb09b677e6bdb9 100644
--- a/o2web/source/x_component_query_Query/Viewer.js
+++ b/o2web/source/x_component_query_Query/Viewer.js
@@ -182,6 +182,7 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
},
createActionbarNode : function(){
this.actionbarAreaNode.empty();
+ if( typeOf(this.json.showActionbar) === "boolean" && this.json.showActionbar !== true )return;
if( typeOf( this.viewJson.actionbarHidden ) === "boolean" ){
if( this.viewJson.actionbarHidden === true || !this.viewJson.actionbarList || !this.viewJson.actionbarList.length )return;
this.actionbar = new MWF.xApplication.query.Query.Viewer.Actionbar(this.actionbarAreaNode, this.viewJson.actionbarList[0], this, {});
@@ -1987,7 +1988,7 @@ MWF.xApplication.query.Query.Viewer.Actionbar = new Class({
"MWFnodetype": tool.type,
//"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": path+this.options.style+"/actionbar/"+tool.img,
+ "MWFButtonImage": path+this.options.style+"/actionbar/"+ ( this.json.iconStyle || "default" ) +"/"+tool.img,
"title": tool.title,
"MWFButtonAction": tool.action,
"MWFButtonText": tool.text
diff --git a/o2web/source/x_component_query_ViewDesigner/$View/default/actionbar/blue/export.png b/o2web/source/x_component_query_ViewDesigner/$View/default/actionbar/blue/export.png
new file mode 100644
index 0000000000000000000000000000000000000000..01e852053011638e0ed4bfd7445c3a6cbb5fa6fd
Binary files /dev/null and b/o2web/source/x_component_query_ViewDesigner/$View/default/actionbar/blue/export.png differ
diff --git a/o2web/source/x_component_query_ViewDesigner/$View/default/actionbar/default/export.png b/o2web/source/x_component_query_ViewDesigner/$View/default/actionbar/default/export.png
new file mode 100644
index 0000000000000000000000000000000000000000..14376de0f9158b40e71a77cffb9350212bf9385f
Binary files /dev/null and b/o2web/source/x_component_query_ViewDesigner/$View/default/actionbar/default/export.png differ
diff --git a/o2web/source/x_component_query_ViewDesigner/$View/default/actionbar/red/export.png b/o2web/source/x_component_query_ViewDesigner/$View/default/actionbar/red/export.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6aef03971b708e318e4291d7c5d1e4aa7e4d67b
Binary files /dev/null and b/o2web/source/x_component_query_ViewDesigner/$View/default/actionbar/red/export.png differ
diff --git a/o2web/source/x_component_query_ViewDesigner/$View/default/actionbar/white/export.png b/o2web/source/x_component_query_ViewDesigner/$View/default/actionbar/white/export.png
new file mode 100644
index 0000000000000000000000000000000000000000..16abde22763117ad4bf0c1990c781a28d0ffef86
Binary files /dev/null and b/o2web/source/x_component_query_ViewDesigner/$View/default/actionbar/white/export.png differ
diff --git a/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-flat.json b/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-flat.json
index c9c4664fabb8c323c6e6f54c1b5f85539c46de6f..e6b446802c2ccb49cebe18475ab50e666afd515a 100644
--- a/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-flat.json
+++ b/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-flat.json
@@ -85,7 +85,8 @@
},
"actionbar": {
"style": "xform_blue_flat",
- "iconOverStyle": "xform_blue_flat_over",
+ "iconStyle" : "blue",
+ "iconOverStyle": "white",
"customIconStyle" : "blue",
"customIconOverStyle" : "white",
"forceStyles" : {
diff --git a/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_cmcc.json b/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_cmcc.json
index 3b55bfddd6040943df5271640bbb4850d553058d..8a0ce93ff079e295b1ae9a7b334211d58eb9c569 100644
--- a/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_cmcc.json
+++ b/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_cmcc.json
@@ -85,6 +85,7 @@
},
"actionbar": {
"style": "cmcc",
+ "iconStyle" : "white",
"customIconStyle" : "white",
"forceStyles" : {
"container" : {
diff --git a/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_official.json b/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_official.json
index 21f73358a4d73559d85a73b956454d91b7211bff..3f133ae16b708377c5053ebb71144ca585acd0fc 100644
--- a/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_official.json
+++ b/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_official.json
@@ -13,13 +13,13 @@
"titleTr":{ //viewTitleTrNode viewTitleLineNode
"line-height": "40px",
"height": "40px",
- "color": "#666666",
- "background-color": "#EEE"
+ "color": "#fd1113",
+ "background-color": "#fff"
},
"titleTd":{ //viewTitleColumnNode viewTitleCellNode
"font-weight": "bold",
"padding": "0px 10px",
- "border-bottom": "1px solid #CCC"
+ "border-bottom": "1px solid #fd1113"
},
"contentTr" : {
"background": "#ffffff"
@@ -31,7 +31,7 @@
"height": "30px",
"line-height": "30px",
"padding": "5px 5px",
- "border-bottom": "1px solid #CCC"
+ "border-bottom": "1px solid #fd1113"
},
"contentGroupTd": {
"padding": "5px 5px",
diff --git a/o2web/source/x_component_query_ViewDesigner/View.js b/o2web/source/x_component_query_ViewDesigner/View.js
index 12aa8b426a26575934d894127c930cd58b5510d9..2e3f844ce8862b38a9bced25454696d5472ca08a 100644
--- a/o2web/source/x_component_query_ViewDesigner/View.js
+++ b/o2web/source/x_component_query_ViewDesigner/View.js
@@ -1661,6 +1661,7 @@ MWF.xApplication.query.ViewDesigner.View.Actionbar = new Class({
},
setTemplateStyles: function(styles){
this.json.style = styles.style;
+ this.json.iconStyle = styles.iconStyle || "";
this.json.iconOverStyle = styles.iconOverStyle || "";
this.json.customIconStyle = styles.customIconStyle;
this.json.customIconOverStyle = styles.customIconOverStyle || "";
@@ -1668,6 +1669,7 @@ MWF.xApplication.query.ViewDesigner.View.Actionbar = new Class({
},
clearTemplateStyles: function(styles){
this.json.style = "form";
+ this.json.iconStyle = "";
this.json.iconOverStyle = "";
this.json.customIconStyle = "";
this.json.customIconOverStyle = "";
@@ -1852,7 +1854,7 @@ MWF.xApplication.query.ViewDesigner.View.Actionbar = new Class({
tools.each(function(tool){
var actionNode = new Element("div", {
"MWFnodetype": tool.type,
- "MWFButtonImage": this.imagePath_default+""+this.options.style+"/actionbar/"+tool.img,
+ "MWFButtonImage": this.imagePath_default+""+this.options.style+"/actionbar/"+( this.json.iconStyle || "default" )+"/"+tool.img,
"title": tool.title,
"MWFButtonAction": tool.action,
"MWFButtonText": tool.text