Merge branch 'fix/query.Statement' into 'wrdp'

Merge of fix/query.Statement 修复查询语句设计界面属性滚动条问题，拖拽问题 to wrdp

See merge request o2oa/o2oa!5647

o2web/source/x_component_query_StatementDesigner/$Main/default/css.wcss

@@ -8,7 +8,7 @@
         "background-color": "#EEE"
     },
     "designerNode": {
-        "width": "320px",
+        "width": "340px",
         "min-width": "300px",
         "overflow": "hidden",
         "float": "right",
@@ -17,7 +17,7 @@
     },
 	"contentNode": {
 	    "margin-left": "261px",
-		"margin-right": "320px",
+		"margin-right": "340px",
 		"border-right": "1px solid #505050",
 		"border-left": "1px solid #505050",
 		"background-color": "#FFF",
@@ -74,7 +74,7 @@
     "listStatementItemIcon": {
         "height": "24px",
         "width": "26px",
-        "background": "url("+"../x_component_query_StatementDesigner/$Main/default/statement.png) no-repeat center center",
+        "background": "url(../x_component_query_StatementDesigner/$Main/default/statement.png) no-repeat center center",
         "float": "left"
     },
     "listStatementItemText": {
@@ -98,7 +98,7 @@
 		"background": "#FFF",
 		"-webkit-user-select": "none",
 		"overflow": "hidden",
-		"background": "url("+"../x_component_query_ViewDesigner/$Main/default/designerBg.png)",
+		"background": "url(../x_component_query_ViewDesigner/$Main/default/designerBg.png)",
 		"-moz-user-select": "none"
 	},
 	"designerTitleNode": {
@@ -144,7 +144,7 @@
         "border-right": "1px solid #DDD"
     },
     "designerContentArea": {
-        "height": "100%",
+        //"height": "100%",
 		"overflow": "hidden",
 		"margin-bottom": "2px",
 		"background-color": "#ffffff"

o2web/source/x_component_query_StatementDesigner/Main.js

@@ -102,10 +102,10 @@ MWF.xApplication.query.StatementDesigner.Main = new Class({
                 if (callback) callback();
             });
 
-            // this.setScrollBar(this.designerStatementArea, null, {
-            //     "V": {"x": 0, "y": 0},
-            //     "H": {"x": 0, "y": 0}
-            // });
+            this.setScrollBar(this.designerStatementArea, null, {
+                "V": {"x": 0, "y": 0},
+                "H": {"x": 0, "y": 0}
+            });
         }.bind(this));
     },
     loadNodes: function(){
@@ -281,7 +281,7 @@ MWF.xApplication.query.StatementDesigner.Main = new Class({
         r.send();
     },
     loadEditContent: function(callback){
-        this.designNode = new Element("div", {
+        this.designNode = new Element("div.designNode", {
             "styles": this.css.designNode
         }).inject(this.editContentNode);
     },
@@ -298,26 +298,27 @@ MWF.xApplication.query.StatementDesigner.Main = new Class({
         }).inject(this.designerNode);
         this.loadDesignerResize();
 
-        this.designerContentNode = new Element("div", {
+        this.designerContentNode = new Element("div.designerContentNode", {
             "styles": this.css.designerContentNode
         }).inject(this.designerNode);
 
-        this.designerStatementArea = new Element("div", {
+        this.designerStatementArea = new Element("div.designerStatementArea", {
             "styles": this.css.designerStatementArea
         }).inject(this.designerContentNode);
         this.propertyDomArea = this.designerStatementArea;
 
-        this.designerStatementPercent = 0.6;
-        this.designerContentResizeNode = new Element("div", {
+        this.designerStatementPercent = 0.3;
+        this.designerContentResizeNode = new Element("div.designerContentResizeNode", {
             "styles": this.css.designerContentResizeNode
         }).inject(this.designerContentNode);
 
-        this.designerContentArea = new Element("div", {
+        this.designerContentArea = new Element("div.designerContentArea", {
             "styles": this.css.designerContentArea
         }).inject(this.designerContentNode);
         this.propertyContentArea = this.designerContentArea;
 
         this.loadDesignerStatementResize();
+
         //this.setPropertyContent();
         this.designerNode.addEvent("keydown", function(e){e.stopPropagation();});
     },
@@ -386,15 +387,46 @@ MWF.xApplication.query.StatementDesigner.Main = new Class({
     },
     setDesignerStatementResize: function(){
         var size = this.designerContentNode.getSize();
-        //var resizeNodeSize = this.designerContentResizeNode.getSize();
-        //var height = size.y-resizeNodeSize.y;
-        var height = size.y
+        var contentHeight;
+        if( this.statement && this.statement.selectMode.contains("view") ){
+            this.designerContentResizeNode.show();
+            this.designerStatementArea.show();
+
+            var resizeNodeSize = this.designerContentResizeNode.getSize();
+            var height = size.y-resizeNodeSize.y;
+
+            var domHeight = this.designerStatementPercent*height;
+            contentHeight = height-domHeight;
 
-        // var domHeight = this.designerStatementPercent*height;
-        // var contentHeight = height-domHeight;
+            this.designerStatementArea.setStyle("height", ""+domHeight+"px");
+            this.designerContentArea.setStyle("height", ""+contentHeight+"px");
+        }else{
+            contentHeight = size.y;
+            this.designerContentResizeNode.hide();
+            this.designerStatementArea.hide();
+
+            this.designerContentArea.setStyle("height", ""+contentHeight+"px");
+        }
 
-        //this.designerStatementArea.setStyle("height", ""+domHeight+"px");
-        this.designerContentArea.setStyle("height", ""+height+"px");
+        if (this.statement){
+            if (this.statement.currentSelectedModule){
+                if (this.statement.currentSelectedModule.property){
+                    var tab = this.statement.currentSelectedModule.property.propertyTab;
+                    if (tab){
+                        var tabTitleSize = tab.tabNodeContainer.getSize();
+
+                        tab.pages.each(function(page){
+                            var topMargin = page.contentNodeArea.getStyle("margin-top").toFloat();
+                            var bottomMargin = page.contentNodeArea.getStyle("margin-bottom").toFloat();
+
+                            var tabContentNodeAreaHeight = contentHeight - topMargin - bottomMargin - tabTitleSize.y.toFloat()-15;
+                            page.contentNodeArea.setStyle("height", tabContentNodeAreaHeight);
+                        }.bind(this));
+
+                    }
+                }
+            }
+        }
     },
 
     //resizeNode------------------------------------------------

o2web/source/x_component_query_StatementDesigner/Statement.js

@@ -134,9 +134,11 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
             this.view.domListNode.hide();
         }
 
+        this.selectMode = "statement";
         this.currentSelectedModule = this;
         this.isSelected = true;
         this.showProperty();
+        this.designer.setDesignerStatementResize();
     },
     unSelected: function () {
         this.currentSelectedModule = null;
@@ -1273,7 +1275,6 @@ MWF.xApplication.query.StatementDesigner.View = new Class({
         }.bind(this));
     },
     selected: function () {
-        debugger;
         if (this.statement.currentSelectedModule) {
             if (this.statement.currentSelectedModule == this) {
                 return true;
@@ -1283,9 +1284,11 @@ MWF.xApplication.query.StatementDesigner.View = new Class({
         }
         this.areaNode.setStyles(this.css.areaNode_selected);
         this.statement.currentSelectedModule = this;
+        this.statement.selectMode = "view";
         this.domListNode.show();
         this.isSelected = true;
         this.showProperty();
+        this.statement.designer.setDesignerStatementResize();
     },
     unSelected: function () {
         this.statement.currentSelectedModule = null;
@@ -1831,10 +1834,12 @@ MWF.xApplication.query.StatementDesigner.View.Column = new Class({
             "duration": 100
         }).toElement(this.listNode);
 
+        this.view.statement.selectMode = "viewColumn";
         this.view.statement.currentSelectedModule = this;
         this.isSelected = true;
         this._showActions();
         this.showProperty();
+        this.view.statement.designer.setDesignerStatementResize();
     },
     unSelected: function () {
         this.view.statement.currentSelectedModule = null;
@@ -1849,6 +1854,41 @@ MWF.xApplication.query.StatementDesigner.View.Column = new Class({
         this.isSelected = false;
         this._hideActions();
         this.hideProperty();
+    },
+    addColumn: function(e, data){
+        MWF.require("MWF.widget.UUID", function(){
+            var json;
+            if (data){
+                json = Object.clone(data);
+                json.id = (new MWF.widget.UUID).id;
+                json.column = (new MWF.widget.UUID).id;
+            }else{
+                var id = (new MWF.widget.UUID).id;
+                json = {
+                    "id": id,
+                    "column": id,
+                    "displayName": this.view.designer.lp.unnamed,
+                    "orderType": "original"
+                };
+            }
+
+            var idx = this.view.json.data.selectList.indexOf(this.json);
+            this.view.json.data.selectList.splice(idx, 0, json);
+
+            var column = new MWF.xApplication.query.StatementDesigner.View.Column(json, this.view, this);
+            this.view.items.splice(idx, 0, column);
+            column.selected();
+
+            if (this.view.viewContentTableNode){
+                var trs = this.view.viewContentTableNode.getElements("tr");
+                trs.each(function(tr){
+                    var td = tr.insertCell(idx);
+                    td.setStyles(this.css.viewContentTdNode);
+                }.bind(this));
+            }
+            this.view.setViewWidth();
+
+        }.bind(this));
     }
 });
 
@@ -1887,10 +1927,12 @@ MWF.xApplication.query.StatementDesigner.View.Actionbar = new Class({
         new Fx.Scroll(this.view.areaNode, {"wheelStops": false, "duration": 100}).toElementEdge(this.node);
         //new Fx.Scroll(this.view.designer.propertyDomArea, {"wheelStops": false, "duration": 100}).toElement(this.listNode);
 
+        this.view.statement.selectMode = "viewActionbar";
         this.view.statement.currentSelectedModule = this;
         this.isSelected = true;
         //this._showActions();
         this.showProperty();
+        this.view.statement.designer.setDesignerStatementResize();
     },
     unSelected: function () {
         this.view.statement.currentSelectedModule = null;
@@ -1930,9 +1972,11 @@ MWF.xApplication.query.StatementDesigner.View.Paging = new Class({
         this.node.setStyles(this.css.pagingWarpNode_selected);
         new Fx.Scroll(this.view.areaNode, {"wheelStops": false, "duration": 100}).toElementEdge(this.node);
 
+        this.view.statement.selectMode = "viewPaging";
         this.view.statement.currentSelectedModule = this;
         this.isSelected = true;
         this.showProperty();
+        this.view.statement.designer.setDesignerStatementResize();
     },
     unSelected: function () {
         this.view.statement.currentSelectedModule = null;