视图样式调整，增加开发界面的预览功能

o2web/source/o2_core/o2/widget/$Paging/default/css.wcss

@@ -1,7 +1,12 @@
 {
+    "pagingBarWraper" : {
+        "height" : "60px",
+        "overflow" : "hidden"
+    },
     "pagingBar" : {
         "float": "left",
         "margin-left": "10px",
+        "margin-top": "18px",
         "height": "24px",
         "color": "#777777"
     },

o2web/source/o2_core/o2/widget/$Paging/forum/css.wcss

@@ -1,4 +1,8 @@
 {
+    "pagingBarWraper" : {
+        "height" : "56px",
+        "overflow" : "hidden"
+    },
     "pagingBar" : {
         "float" : "right",
         "margin-right" : "10px",

o2web/source/o2_core/o2/widget/$Paging/red/css.wcss

@@ -1,7 +1,12 @@
 {
+    "pagingBarWraper" : {
+        "height" : "60px",
+        "overflow" : "hidden"
+    },
     "pagingBar" : {
         "float": "left",
         "margin-left": "10px",
+        "margin-top": "18px",
         "height": "24px",
         "color": "#777777"
     },

o2web/source/o2_core/o2/widget/Paging.js

@@ -56,7 +56,9 @@ o2.widget.Paging = new Class({
     createNode: function() {
         var _self = this;
 
-        this.node = new Element("div.pagingBar", {styles: this.css.pagingBar}).inject(this.container);
+        this.wraper = new Element("div.pagingBarWraper", {styles: this.css.pagingBarWraper}).inject(this.container);
+
+        this.node = new Element("div.pagingBar", {styles: this.css.pagingBar}).inject(this.wraper);
 
         var i, max, min;
 

o2web/source/x_component_query_Query/$Viewer/default/css.wcss

@@ -16,11 +16,11 @@
         "overflow": "hidden"
     },
     "viewPageNode": {
-        "height": "80px"
+//        "height": "80px"
     },
     "viewPageAreaNode": {
-        "height": "24px",
-        "margin-top": "28px"
+//        "height": "24px",
+//        "margin-top": "28px"
     },
     "viewPageContentNode": {
         "float": "left",

o2web/source/x_component_query_Query/Viewer.js

@@ -108,12 +108,12 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
     },
     loadLayout: function(){
         this.node = new Element("div", {"styles": this.css.node}).inject(this.container);
-        this.actionbarAreaNode =  new Element("div", {"styles": this.css.actionbarAreaNode}).inject(this.node);
+        this.actionbarAreaNode =  new Element("div.actionbarAreaNode", {"styles": this.css.actionbarAreaNode}).inject(this.node);
         //if (this.options.export) this.exportAreaNode = new Element("div", {"styles": this.css.exportAreaNode}).inject(this.node);
         this.searchAreaNode = new Element("div", {"styles": this.css.searchAreaNode}).inject(this.node);
         this.viewAreaNode = new Element("div", {"styles": this.css.viewAreaNode}).inject(this.node);
-        this.viewPageNode = new Element("div", {"styles": this.css.viewPageNode}).inject(this.node);
-        this.viewPageAreaNode = new Element("div", {"styles": this.css.viewPageAreaNode}).inject(this.viewPageNode);
+        // this.viewPageNode = new Element("div", {"styles": this.css.viewPageNode}).inject(this.node);
+        this.viewPageAreaNode = new Element("div", {"styles": this.css.viewPageAreaNode}).inject(this.node);
     },
     loadMacro: function (callback) {
         MWF.require("MWF.xScript.Macro", function () {
@@ -169,7 +169,7 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
             var exportSize = this.actionbarAreaNode.getComputedSize();
             h = h-exportSize.totalHeight;
         }
-        var pageSize = this.viewPageNode.getComputedSize();
+        var pageSize = this.viewPageAreaNode.getComputedSize();
         h = h-pageSize.totalHeight;
         this.viewAreaNode.setStyle("height", ""+h+"px");
     },
@@ -2040,13 +2040,14 @@ MWF.xApplication.query.Query.Viewer.Paging = new Class({
         this.loadPaging( false )
     },
     loadPaging : function( firstLoading ){
-        this.pagingNode = this.node.getFirst("div");
-        if( !this.pagingNode ){
-            this.pagingNode = new Element("div").inject( this.node );
-        }
-        this.pagingNode.empty();
+        // this.pagingNode = this.node.getFirst("div");
+        // if( !this.pagingNode ){
+        //     this.pagingNode = new Element("div").inject( this.node );
+        // }
+        // this.pagingNode.empty();
+        this.node.empty();
 
-        this.paging = new o2.widget.Paging(this.pagingNode, {
+        this.paging = new o2.widget.Paging(this.node, {
             //style : this.options.skin && this.options.skin.pagingBar ? this.options.skin.pagingBar : "default",
             countPerPage: this.view.json.pageSize || this.view.options.perPageCount,
             visiblePages: this.json.visiblePages ? this.json.visiblePages.toInt() : 9,

o2web/source/x_component_query_ViewDesigner/$Main/default/toolbars.html

@@ -2,7 +2,7 @@
 	<span MWFnodetype="MWFToolBarSeparator"></span>
 	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="save.gif" title="保存视图" MWFButtonAction="saveView" MWFButtonText=""></span>
 	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="saveNew.gif" title="视图另存为" MWFButtonAction="saveViewAs" MWFButtonText=""></span>
-	
+	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="preview.png" title="预览" MWFButtonAction="preview" MWFButtonText=""></span>
 	<span MWFnodetype="MWFToolBarSeparator"></span>
 	
 	<span MWFnodetype="MWFToolBarButton" MWFButtonImage="formExplode.gif" title="视图导出" MWFButtonAction="viewExplode" MWFButtonText=""></span>

o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-flat.json

@@ -45,7 +45,9 @@
       "container" : {
         "width" : "100%",
         "padding-left" : "10px",
-        "padding-right" : "10px"
+        "padding-right" : "10px",
+        "border-top" : "0px",
+        "border-bottom" : "1px solid #4a90e2"
       }
     }
   },

o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-simple.json

@@ -2,7 +2,14 @@
   "name": "蓝色简洁",
   "actionbar": {
     "style": "xform_blue_simple",
-    "customIconStyle" : ""
+    "customIconStyle" : "",
+    "forceStyles" : {
+      "container" : {
+        "width" : "100%",
+        "border-top" : "0px",
+        "border-bottom" : "1px solid #4a90e2"
+      }
+    }
   },
   "paging" : {
     "style" : "default"

o2web/source/x_component_query_ViewDesigner/$View/skin/styles_cmcc.json

@@ -2,7 +2,14 @@
   "name": "集团样式",
   "actionbar": {
     "style": "cmcc",
-    "customIconStyle" : "white"
+    "customIconStyle" : "white",
+    "forceStyles" : {
+      "container" : {
+        "width" : "100%",
+        "border-top" : "0px",
+        "border-bottom" : "1px solid #4a90e2"
+      }
+    }
   },
   "paging" : {
     "style" : "default"

o2web/source/x_component_query_ViewDesigner/$View/skin/styles_default.json

@@ -37,7 +37,14 @@
   },
   "actionbar": {
     "style": "xform_blue_simple",
-    "customIconStyle" : ""
+    "customIconStyle" : "",
+    "forceStyles" : {
+      "container" : {
+        "width" : "100%",
+        "border-top" : "0px",
+        "border-bottom" : "1px solid #4a90e2"
+      }
+    }
   },
   "paging" : {
     "style" : "default"

o2web/source/x_component_query_ViewDesigner/$View/skin/styles_official.json

@@ -1,7 +1,15 @@
 {
   "name": "公文样式",
   "actionbar": {
-    "style": "xform_red_simple"
+    "style": "xform_red_simple",
+    "customIconStyle" : "",
+    "forceStyles" : {
+      "container" : {
+        "width" : "100%",
+        "border-top" : "0px",
+        "border-bottom" : "1px solid #cc3d3d"
+      }
+    }
   },
   "paging" : {
     "style" : "default"

o2web/source/x_component_query_ViewDesigner/$View/skin/styles_red-simple.json

@@ -2,7 +2,14 @@
   "name": "红色简洁",
   "actionbar": {
     "style": "xform_red_simple",
-    "customIconStyle" : ""
+    "customIconStyle" : "",
+    "forceStyles" : {
+      "container" : {
+        "width" : "100%",
+        "border-top" : "0px",
+        "border-bottom" : "1px solid #cc3d3d"
+      }
+    }
   },
   "paging" : {
     "style" : "red"

o2web/source/x_component_query_ViewDesigner/Main.js

@@ -782,6 +782,9 @@ MWF.xApplication.query.ViewDesigner.Main = new Class({
             this.options.id = this.view.data.id;
         }.bind(this));
     },
+    preview : function(){
+	    this.view.preview();
+    },
     saveViewAs: function(){
         this.view.saveAs();
 	},

o2web/source/x_component_query_ViewDesigner/View.js

@@ -28,6 +28,7 @@ MWF.xApplication.query.ViewDesigner.View = new Class({
 
         this.designer = designer;
         this.data = data;
+
         if (!this.data.data) this.data.data = {};
         this.parseData();
 
@@ -47,7 +48,7 @@ MWF.xApplication.query.ViewDesigner.View = new Class({
         if(this.designer.application) this.data.applicationName = this.designer.application.name;
         if(this.designer.application) this.data.application = this.designer.application.id;
 
-        this.isNewView = (this.data.id) ? false : true;
+        this.isNewView = (this.data.name) ? false : true;
 
         this.items = [];
         this.view = this;
@@ -575,6 +576,20 @@ MWF.xApplication.query.ViewDesigner.View = new Class({
     //     this.items.push(new MWF.xApplication.process.DictionaryDesigner.Dictionary.item("ROOT", this.data.data, null, 0, this, true));
     // },
 
+    preview: function(){
+        if( this.isNewView ){
+            this.designer.notice( this.designer.lp.saveViewNotice, "error" );
+            return;
+        }
+        this.saveSilence( function () {
+            var url = "/x_desktop/app.html?app=query.Query&status=";
+            url += JSON.stringify({
+                id : this.data.application,
+                viewId : this.data.id
+            });
+            window.open(url,"_blank");
+        }.bind(this));
+    },
     saveSilence: function(callback){
         if (!this.data.name){
             this.designer.notice(this.designer.lp.notice.inputName, "error");
@@ -583,6 +598,7 @@ MWF.xApplication.query.ViewDesigner.View = new Class({
 
         this.designer.actions.saveView(this.data, function(json){
             this.data.id = json.data.id;
+            this.isNewView = false;
             //this.page.textNode.set("text", this.data.name);
             if (this.lisNode) {
                 this.lisNode.getLast().set("text", this.data.name+"("+this.data.alias+")");
@@ -599,7 +615,7 @@ MWF.xApplication.query.ViewDesigner.View = new Class({
         //}
         this.designer.actions.saveView(this.data, function(json){
             this.designer.notice(this.designer.lp.notice.save_success, "success", this.node, {"x": "left", "y": "bottom"});
-
+            this.isNewView = false;
             this.data.id = json.data.id;
             //this.page.textNode.set("text", this.data.name);
             if (this.lisNode) {

o2web/source/x_component_query_ViewDesigner/lp/zh-cn.js

@@ -13,6 +13,7 @@ MWF.xApplication.query.ViewDesigner.LP = {
     "name": "名称",
     "alias": "别名",
     "description": "描述",
+    "saveViewNotice" : "请先保存视图！",
 
     "application" : "数据应用",
     "newView" : "新视图",