diff --git a/o2web/source/x_component_query_StatementDesigner/Statement.js b/o2web/source/x_component_query_StatementDesigner/Statement.js
index 8ab9fa0a9b41333153900ffeab279759e9bd60a1..f96a5fa89f2015964edc3bff6027915ea722a937 100644
--- a/o2web/source/x_component_query_StatementDesigner/Statement.js
+++ b/o2web/source/x_component_query_StatementDesigner/Statement.js
@@ -3,7 +3,7 @@ MWF.xApplication.query = MWF.xApplication.query || {};
 MWF.xApplication.query.StatementDesigner = MWF.xApplication.query.StatementDesigner || {};
 MWF.APPDSMD = MWF.xApplication.query.StatementDesigner;
 
-MWF.xDesktop.requireApp("query.StatementDesigner", "lp."+MWF.language, null, false);
+MWF.xDesktop.requireApp("query.StatementDesigner", "lp." + MWF.language, null, false);
 MWF.xDesktop.requireApp("query.StatementDesigner", "Property", null, false);
 MWF.xDesktop.requireApp("query.ViewDesigner", "View", null, false);
 o2.require("o2.widget.JavascriptEditor", null, false);
@@ -19,11 +19,11 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
         "propertyPath": "../x_component_query_StatementDesigner/$Statement/statement.html"
     },
 
-    initialize: function(designer, data, options){
+    initialize: function (designer, data, options) {
         this.setOptions(options);
 
         this.path = "../x_component_query_StatementDesigner/$Statement/";
-        this.cssPath = "../x_component_query_StatementDesigner/$Statement/"+this.options.style+"/css.wcss";
+        this.cssPath = "../x_component_query_StatementDesigner/$Statement/" + this.options.style + "/css.wcss";
 
         this._loadCss();
 
@@ -36,47 +36,47 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
 
         //this.statementRunNode = this.designer.designerStatementArea;
 
-        if(this.designer.application) this.data.applicationName = this.designer.application.name;
-        if(this.designer.application) this.data.application = this.designer.application.id;
+        if (this.designer.application) this.data.applicationName = this.designer.application.name;
+        if (this.designer.application) this.data.application = this.designer.application.id;
 
         this.isNewStatement = (this.data.id) ? false : true;
 
         this.view = this;
 
         this.autoSave();
-        this.designer.addEvent("queryClose", function(){
+        this.designer.addEvent("queryClose", function () {
             if (this.autoSaveTimerID) window.clearInterval(this.autoSaveTimerID);
         }.bind(this));
     },
-    parseData: function(){
+    parseData: function () {
         this.json = this.data;
         if (!this.json.type) this.json.type = "select";
         if (!this.json.format) this.json.format = "jpql";
         if (!this.json.entityCategory) this.json.entityCategory = "official";
         if (!this.json.entityClassName) this.json.entityClassName = "com.x.processplatform.core.entity.content.Task";
     },
-    autoSave: function(){
-        this.autoSaveTimerID = window.setInterval(function(){
+    autoSave: function () {
+        this.autoSaveTimerID = window.setInterval(function () {
             if (!this.autoSaveCheckNode) this.autoSaveCheckNode = this.designer.contentToolbarNode.getElement("#MWFAutoSaveCheck");
-            if (this.autoSaveCheckNode){
-                if (this.autoSaveCheckNode.get("checked")){
+            if (this.autoSaveCheckNode) {
+                if (this.autoSaveCheckNode.get("checked")) {
                     this.save();
                 }
             }
         }.bind(this), 60000);
     },
 
-    load : function(){
+    load: function () {
 
 
         // this.setAreaNodeSize();
         // this.designer.addEvent("resize", this.setAreaNodeSize.bind(this));
         this.areaNode.inject(this.node);
 
-        this.designer.statementListAreaNode.getChildren().each(function(node){
+        this.designer.statementListAreaNode.getChildren().each(function (node) {
             var statement = node.retrieve("statement");
-            if (statement.id==this.data.id){
-                if (this.designer.currentListStatementItem){
+            if (statement.id == this.data.id) {
+                if (this.designer.currentListStatementItem) {
                     this.designer.currentListStatementItem.setStyles(this.designer.css.listStatementItem);
                 }
                 node.setStyles(this.designer.css.listStatementItem_current);
@@ -89,15 +89,15 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
         // this.showProperty();
         this.selected();
     },
-    selected: function(){
-        if (this.currentSelectedModule){
-            if (this.currentSelectedModule==this){
+    selected: function () {
+        if (this.currentSelectedModule) {
+            if (this.currentSelectedModule == this) {
                 return true;
-            }else{
+            } else {
                 this.currentSelectedModule.unSelected();
             }
         }
-        if( this.view && this.view.domListNode ){
+        if (this.view && this.view.domListNode) {
             this.view.domListNode.hide();
         }
 
@@ -105,28 +105,28 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
         this.isSelected = true;
         this.showProperty();
     },
-    unSelected: function(){
+    unSelected: function () {
         this.currentSelectedModule = null;
         this.isSelected = false;
         this.hideProperty();
     },
-    showProperty: function(){
-        if (!this.property){
+    showProperty: function () {
+        if (!this.property) {
             this.property = new MWF.xApplication.query.StatementDesigner.Property(this, this.designer.designerContentArea, this.designer, {
                 "path": this.options.propertyPath,
-                "onPostLoad": function(){
+                "onPostLoad": function () {
                     this.property.show();
                 }.bind(this)
             });
             this.property.load();
-        }else{
+        } else {
             this.property.show();
         }
     },
-    hideProperty: function(){
+    hideProperty: function () {
         if (this.property) this.property.hide();
     },
-    loadJpqlTab: function(callback){
+    loadJpqlTab: function (callback) {
         var _self = this;
         MWF.require("MWF.widget.Tab", null, false);
 
@@ -134,13 +134,13 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
         this.jpqlTab.load();
 
         this.tabJpqlNode = Element("div");
-        this.jpqlTabPageNode.inject( this.tabJpqlNode );
+        this.jpqlTabPageNode.inject(this.tabJpqlNode);
 
         this.tabCountJpqlNode = Element("div");
-        this.countJpqlTabPageNode.inject( this.tabCountJpqlNode );
+        this.countJpqlTabPageNode.inject(this.tabCountJpqlNode);
 
         this.jpqlPage = this.jpqlTab.addTab(this.tabJpqlNode, this.designer.lp.queryStatement);
-        this.countJpqlPage = this.jpqlTab.addTab(this.tabCountJpqlNode, this.designer.lp.countStatement );
+        this.countJpqlPage = this.jpqlTab.addTab(this.tabCountJpqlNode, this.designer.lp.countStatement);
 
         this.jpqlPage.showTabIm();
 
@@ -154,7 +154,7 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
         //     this.selected();
         // }.bind(this));
     },
-    loadTab: function(callback){
+    loadTab: function (callback) {
         var _self = this;
         MWF.require("MWF.widget.Tab", null, false);
 
@@ -162,31 +162,36 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
         this.tab.load();
 
         this.tabRunNode = Element("div");
-        this.pageRunNode = new Element("div", {"styles": {"overflow": "auto","background-color":"#fff"}}).inject(this.tabRunNode);
-        this.runArea.inject( this.pageRunNode );
+        this.pageRunNode = new Element("div", {
+            "styles": {
+                "overflow": "auto",
+                "background-color": "#fff"
+            }
+        }).inject(this.tabRunNode);
+        this.runArea.inject(this.pageRunNode);
 
-        this.tabViewNode = Element("div", {"styles": { "height": "100%" }});
+        this.tabViewNode = Element("div", {"styles": {"height": "100%"}});
         this.pageViewNode = new Element("div.pageViewNode").inject(this.tabViewNode);
-        this.viewArea.inject( this.pageViewNode );
+        this.viewArea.inject(this.pageViewNode);
 
         this.runPage = this.tab.addTab(this.tabRunNode, this.designer.lp.runTest);
-        this.viewPage = this.tab.addTab(this.tabViewNode, this.designer.lp.view );
+        this.viewPage = this.tab.addTab(this.tabViewNode, this.designer.lp.view);
 
         this.runPage.showTabIm();
 
-        this.viewPage.addEvent("postShow", function(){
-            if( this.view ){
+        this.viewPage.addEvent("postShow", function () {
+            if (this.view) {
                 this.view.setContentHeight();
                 this.view.selected();
             }
         }.bind(this));
-        this.runPage.addEvent("postShow", function(){
+        this.runPage.addEvent("postShow", function () {
             this.selected();
         }.bind(this));
     },
-    loadStatement: function(){
+    loadStatement: function () {
         //this.statementDesignerNode = new Element("div", {"styles": this.css.statementDesignerNode}).inject(this.areaNode);
-        this.loadStatementHtml(function(){
+        this.loadStatementHtml(function () {
             this.designerArea = this.areaNode.getElement(".o2_statement_statementDesignerNode");
 
             this.jpqlTabPageNode = this.areaNode.getElement(".o2_statement_statementJpqlTabPageNode");
@@ -211,7 +216,6 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
             this.jpqlTypeSelect = this.areaNode.getElement(".o2_statement_statementDesignerTypeContent").getElement("select");
 
 
-
             // this.jpqlSelectEditor = this.areaNode.getElement(".o2_statement_statementDesignerJpql_select");
             // this.jpqlUpdateEditor = this.areaNode.getElement(".o2_statement_statementDesignerJpql_update");
             // this.jpqlDeleteEditor = this.areaNode.getElement(".o2_statement_statementDesignerJpql_sdelete");
@@ -239,10 +243,10 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
             this.runResultNode = this.runContentNode.getLast();
             this.setRunnerSize();
             this.designer.addEvent("resize", this.setRunnerSize.bind(this));
-            if (this.json.format=="script"){
+            if (this.json.format == "script") {
                 this.loadStatementScriptEditor();
                 this.loadStatementCountScriptEditor();
-            }else{
+            } else {
                 this.loadStatementEditor();
                 this.loadStatementCountEditor();
             }
@@ -256,15 +260,15 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
             this.setEvent();
         }.bind(this));
     },
-    loadStatementScriptEditor: function(){
-        if (! this.scriptEditor){
+    loadStatementScriptEditor: function () {
+        if (!this.scriptEditor) {
             debugger;
-            o2.require("o2.widget.ScriptArea", function(){
+            o2.require("o2.widget.ScriptArea", function () {
                 this.scriptEditor = new o2.widget.ScriptArea(this.scriptArea, {
                     "isbind": false,
                     "maxObj": this.designer.designNode,
                     "title": this.designer.lp.scriptTitle,
-                    "onChange": function(){
+                    "onChange": function () {
                         this.json.scriptText = this.scriptEditor.toJson().code;
                     }.bind(this)
                 });
@@ -272,15 +276,15 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
             }.bind(this), false);
         }
     },
-    loadStatementCountScriptEditor: function(){
-        if (! this.countScriptEditor){
+    loadStatementCountScriptEditor: function () {
+        if (!this.countScriptEditor) {
             debugger;
-            o2.require("o2.widget.ScriptArea", function(){
+            o2.require("o2.widget.ScriptArea", function () {
                 this.countScriptEditor = new o2.widget.ScriptArea(this.countScriptArea, {
                     "isbind": false,
                     "maxObj": this.designer.designNode,
                     "title": this.designer.lp.scriptTitle,
-                    "onChange": function(){
+                    "onChange": function () {
                         this.json.countScriptText = this.countScriptEditor.toJson().code;
                     }.bind(this)
                 });
@@ -288,50 +292,53 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
             }.bind(this), false);
         }
     },
-    setRunnerSize: function(){
+    setRunnerSize: function () {
         debugger;
         var size = this.areaNode.getSize();
         var designerSize = this.designerArea.getComputedSize();
-        var y = size.y-designerSize.totalHeight;
+        var y = size.y - designerSize.totalHeight;
         var mTop = this.runArea.getStyle("margin-top").toInt();
         var mBottom = this.runArea.getStyle("margin-bottom").toInt();
         var pTop = this.runArea.getStyle("padding-top").toInt();
         var pBottom = this.runArea.getStyle("padding-bottom").toInt();
-        y = y-mTop-mBottom-pTop-pBottom-1;
+        y = y - mTop - mBottom - pTop - pBottom - 1;
 
         var tabSize = this.tabNode.getComputedSize();
         y = y - tabSize.totalHeight;
 
-        this.runArea.setStyle("height", ""+y+"px");
+        this.runArea.setStyle("height", "" + y + "px");
 
         // var titleSize = this.runTitleNode.getComputedSize();
         // y = y - titleSize.totalHeight;
 
-        this.runContentNode.setStyle("height", ""+y+"px");
+        this.runContentNode.setStyle("height", "" + y + "px");
     },
-    loadStatementEditor: function(){
-        if (!this.editor){
-            o2.require("o2.widget.JavascriptEditor", function(){
-                this.editor = new o2.widget.JavascriptEditor(this.jpqlEditorNode, {"title": "JPQL", "option": {"mode": "sql"}});
-                this.editor.load(function(){
-                    if (this.json.data){
+    loadStatementEditor: function () {
+        if (!this.editor) {
+            o2.require("o2.widget.JavascriptEditor", function () {
+                this.editor = new o2.widget.JavascriptEditor(this.jpqlEditorNode, {
+                    "title": "JPQL",
+                    "option": {"mode": "sql"}
+                });
+                this.editor.load(function () {
+                    if (this.json.data) {
                         this.editor.editor.setValue(this.json.data);
-                    }else{
+                    } else {
                         var table = "table";
                         switch (this.json.type) {
                             case "update":
-                                this.editor.editor.setValue("UPDATE "+table+" o SET ");
+                                this.editor.editor.setValue("UPDATE " + table + " o SET ");
                                 break;
                             case "delete":
-                                this.editor.editor.setValue("DELETE "+table+" o WHERE ");
+                                this.editor.editor.setValue("DELETE " + table + " o WHERE ");
                                 break;
                             default:
-                                this.editor.editor.setValue("SELECT * FROM "+table+" o");
+                                this.editor.editor.setValue("SELECT * FROM " + table + " o");
                         }
                     }
                     this.json.data = this.editor.editor.getValue();
 
-                    this.editor.addEditorEvent("change", function(){
+                    this.editor.addEditorEvent("change", function () {
                         debugger;
                         this.data.data = this.editor.getValue();
                         this.checkJpqlType();
@@ -346,20 +353,23 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
         }
 
     },
-    loadStatementCountEditor: function(){
-        if (!this.countEditor){
-            o2.require("o2.widget.JavascriptEditor", function(){
-                this.countEditor = new o2.widget.JavascriptEditor(this.countJpqlEditorNode, {"title": "JPQL", "option": {"mode": "sql"}});
-                this.countEditor.load(function(){
-                    if (this.json.countData){
+    loadStatementCountEditor: function () {
+        if (!this.countEditor) {
+            o2.require("o2.widget.JavascriptEditor", function () {
+                this.countEditor = new o2.widget.JavascriptEditor(this.countJpqlEditorNode, {
+                    "title": "JPQL",
+                    "option": {"mode": "sql"}
+                });
+                this.countEditor.load(function () {
+                    if (this.json.countData) {
                         this.countEditor.editor.setValue(this.json.countData);
-                    }else{
+                    } else {
                         var table = "table";
-                        this.countEditor.editor.setValue("SELECT count(o.id) FROM "+table+" o");
+                        this.countEditor.editor.setValue("SELECT count(o.id) FROM " + table + " o");
                     }
                     this.json.countData = this.countEditor.editor.getValue();
 
-                    this.countEditor.addEditorEvent("change", function(){
+                    this.countEditor.addEditorEvent("change", function () {
                         debugger;
                         this.data.countData = this.countEditor.getValue();
                     }.bind(this));
@@ -373,27 +383,27 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
         }
 
     },
-    setSatementTable: function(){
+    setSatementTable: function () {
         if (!this.json.type) this.json.type = "select";
         this.changeType(this.json.type, true);
-        if (this.json.data){
+        if (this.json.data) {
             this.editor.editor.setValue(this.json.data);
-        }else{
+        } else {
             var table = (this.json.tableObj) ? this.json.tableObj.name : "table";
             switch (this.json.type) {
                 case "update":
-                    this.editor.editor.setValue("UPDATE "+table+" o SET ");
+                    this.editor.editor.setValue("UPDATE " + table + " o SET ");
                     break;
                 case "delete":
-                    this.editor.editor.setValue("DELETE "+table+" o WHERE ");
+                    this.editor.editor.setValue("DELETE " + table + " o WHERE ");
                     break;
                 default:
-                    this.editor.editor.setValue("SELECT * FROM "+table+" o");
+                    this.editor.editor.setValue("SELECT * FROM " + table + " o");
             }
         }
     },
 
-    checkJpqlType: function(){
+    checkJpqlType: function () {
         var str = this.json.data;
         this.json.data = str;
         var jpql_select = /^select/i;
@@ -403,44 +413,47 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
         if (jpql_update.test(str)) return this.changeType("update");
         if (jpql_delete.test(str)) return this.changeType("delete");
     },
-    changeType: function(type, force){
-        if (this.json.type!=type) this.json.type=type;
-        if (type != this.jpqlTypeSelect.options[this.jpqlTypeSelect.selectedIndex].value || force){
-            for (var i=0; i<this.jpqlTypeSelect.options.length; i++){
-                if (this.jpqlTypeSelect.options[i].value==type){
+    changeType: function (type, force) {
+        if (this.json.type != type) this.json.type = type;
+        if (type != this.jpqlTypeSelect.options[this.jpqlTypeSelect.selectedIndex].value || force) {
+            for (var i = 0; i < this.jpqlTypeSelect.options.length; i++) {
+                if (this.jpqlTypeSelect.options[i].value == type) {
                     this.jpqlTypeSelect.options[i].set("selected", true);
                     break;
                 }
             }
         }
     },
-    loadStatementHtml: function(callback){
+    loadStatementHtml: function (callback) {
         this.areaNode.loadAll({
-            "css": this.path+this.options.style+"/statement.css",
-            "html": this.path+"statementDesigner.html"
+            "css": this.path + this.options.style + "/statement.css",
+            "html": this.path + "statementDesigner.html"
         }, {
             "bind": {"lp": this.designer.lp, "data": this.data}
-        },function(){
+        }, function () {
             if (callback) callback();
         }.bind(this));
     },
-     loadStatementRunner: function(){
-        o2.require("o2.widget.JavascriptEditor", function(){
-            this.jsonEditor = new o2.widget.JavascriptEditor(this.runJsonNode, {"title": "JPQL", "option": {"mode": "json"}});
-            this.jsonEditor.load(function(){
+    loadStatementRunner: function () {
+        o2.require("o2.widget.JavascriptEditor", function () {
+            this.jsonEditor = new o2.widget.JavascriptEditor(this.runJsonNode, {
+                "title": "JPQL",
+                "option": {"mode": "json"}
+            });
+            this.jsonEditor.load(function () {
                 this.jsonEditor.editor.setValue("{}");
             }.bind(this));
         }.bind(this), false);
     },
-    setEvent: function(){
+    setEvent: function () {
         this.designerArea.addEvent("click", function (e) {
             this.selected();
             e.stopPropagation();
         }.bind(this));
-        this.formatTypeArea.getElements("input").addEvent("click", function(e){
-            if (e.target.checked){
+        this.formatTypeArea.getElements("input").addEvent("click", function (e) {
+            if (e.target.checked) {
                 var v = e.target.get("value");
-                if (v==="script"){
+                if (v === "script") {
                     this.scriptArea.show();
                     this.jpqlArea.hide();
                     this.loadStatementScriptEditor();
@@ -448,7 +461,7 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
                     this.countScriptArea.show();
                     this.countJpqlArea.hide();
                     this.loadStatementCountScriptEditor();
-                }else{
+                } else {
                     this.scriptArea.hide();
                     this.jpqlArea.show();
                     this.loadStatementEditor();
@@ -460,7 +473,7 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
                 this.json.format = v;
             }
         }.bind(this));
-        this.entityCategorySelect.addEvent("change", function(e){
+        this.entityCategorySelect.addEvent("change", function (e) {
             var entityCategory = e.target.options[e.target.selectedIndex].value;
             switch (entityCategory) {
                 case "dynamic":
@@ -482,98 +495,98 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
             this.json.entityCategory = entityCategory
         }.bind(this));
         //@todo change table
-        this.officialTableSelect.addEvent("change", function(e){
+        this.officialTableSelect.addEvent("change", function (e) {
             debugger;
             var entityClassName = e.target.options[e.target.selectedIndex].value;
             this.json.entityClassName = entityClassName;
-            if (this.json.format=="jpql"){
-                if (this.editor){
+            if (this.json.format == "jpql") {
+                if (this.editor) {
                     var re = /(.*from\s*)/ig;
-                    if (this.json.type=="update") re = /(.*update\s*)/ig;
+                    if (this.json.type == "update") re = /(.*update\s*)/ig;
 
                     //if (this.json.type=="select" && this.editor){
-                        var v = this.json.data;
-
-                        var re2 = /(\s+)/ig;
-                        var arr = re.exec(v);
-                        if (arr && arr[0]){
-                            var left = arr[0]
-                            v = v.substring(left.length, v.length);
-                            //var ar = re2.exec(v);
-                            var right = v.substring(v.indexOf(" "),v.length);
-                            this.json.data = left+entityClassName+right;
-                            this.editor.editor.setValue(this.json.data);
-                        }
+                    var v = this.json.data;
+
+                    var re2 = /(\s+)/ig;
+                    var arr = re.exec(v);
+                    if (arr && arr[0]) {
+                        var left = arr[0]
+                        v = v.substring(left.length, v.length);
+                        //var ar = re2.exec(v);
+                        var right = v.substring(v.indexOf(" "), v.length);
+                        this.json.data = left + entityClassName + right;
+                        this.editor.editor.setValue(this.json.data);
+                    }
                     //}
                 }
 
             }
 
 
-        //     var className = e.target.options[e.target.selectedIndex].value;
-        //     if (this.json.type=="select"){
-        //         this.json.data
-        //         /(select)*(where|)/g
-        //     }
-        // }.bind(this));
-
-        // this.jpqlTypeSelect.addEvent("change", function(){
-        //     var type = e.target.options[e.target.selectedIndex].value;
-        //     switch (entityCategory) {
-        //         case "update":
-        //             this.jpqlSelectEditor.hide();
-        //             this.jpqlUpdateEditor.show();
-        //             this.jpqlDeleteEditor.hide();
-        //             this.loadJpqlUpdateEditor();
-        //             break;
-        //         case "delete":
-        //             this.jpqlSelectEditor.hide();
-        //             this.jpqlUpdateEditor.hide();
-        //             this.jpqlDeleteEditor.show();
-        //             break;
-        //         default:
-        //             this.jpqlSelectEditor.show();
-        //             this.jpqlUpdateEditor.hide();
-        //             this.jpqlDeleteEditor.hide();
-        //             break;
-        //     }
+            //     var className = e.target.options[e.target.selectedIndex].value;
+            //     if (this.json.type=="select"){
+            //         this.json.data
+            //         /(select)*(where|)/g
+            //     }
+            // }.bind(this));
+
+            // this.jpqlTypeSelect.addEvent("change", function(){
+            //     var type = e.target.options[e.target.selectedIndex].value;
+            //     switch (entityCategory) {
+            //         case "update":
+            //             this.jpqlSelectEditor.hide();
+            //             this.jpqlUpdateEditor.show();
+            //             this.jpqlDeleteEditor.hide();
+            //             this.loadJpqlUpdateEditor();
+            //             break;
+            //         case "delete":
+            //             this.jpqlSelectEditor.hide();
+            //             this.jpqlUpdateEditor.hide();
+            //             this.jpqlDeleteEditor.show();
+            //             break;
+            //         default:
+            //             this.jpqlSelectEditor.show();
+            //             this.jpqlUpdateEditor.hide();
+            //             this.jpqlDeleteEditor.hide();
+            //             break;
+            //     }
         }.bind(this));
 
         this.runActionNode.getFirst().addEvent("click", this.runStatement.bind(this));
 
         this.dynamicTableSelect.addEvent("click", this.selectTable.bind(this));
-        this.jpqlTypeSelect.addEvent("change", function(){
+        this.jpqlTypeSelect.addEvent("change", function () {
             var t = this.jpqlTypeSelect.options[this.jpqlTypeSelect.selectedIndex].value;
-            if (t!=this.json.type){
+            if (t != this.json.type) {
                 this.json.type = t;
             }
-            if( t!="select"){
+            if (t != "select") {
                 this.jpqlPage.showTabIm();
                 this.countJpqlPage.disableTab();
 
                 this.runPage.showTabIm();
                 this.viewPage.disableTab();
-            }else{
-                this.countJpqlPage.enableTab( true );
-                this.viewPage.enableTab( true );
+            } else {
+                this.countJpqlPage.enableTab(true);
+                this.viewPage.enableTab(true);
             }
         }.bind(this));
     },
 
-    selectTable: function(){
+    selectTable: function () {
         new MWF.O2Selector(this.designer.content, {
             "type": "queryTable",
             "count": 1,
             "values": (this.json.table) ? [this.json.table] : [],
             "title": this.designer.lp.selectTable,
-            "onComplete": function(items){
-                if (items.length){
+            "onComplete": function (items) {
+                if (items.length) {
                     var id = items[0].data.id;
                     var name = items[0].data.name;
                     this.dynamicTableContent.set("text", name);
                     this.json.table = name;
                     this.json.tableObj = items[0].data;
-                }else{
+                } else {
                     this.dynamicTableContent.set("text", "");
                     this.json.table = "";
                 }
@@ -581,7 +594,7 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
         });
     },
 
-    runStatement:function(){
+    runStatement: function () {
         debugger;
         // if (!this.json.data){
         //     this.designer.notice(this.designer.lp.inputStatementData, "error");
@@ -591,73 +604,132 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
         this.runMask = new o2.widget.Mask();
         this.runMask.loadNode(this.node);
 
-        this.saveSilence(function(){
+        this.saveSilence(function () {
 
             debugger;
-
-            var json = this.jsonEditor.editor.getValue();
-            var o = JSON.parse(json);
-
-            var mode = "data";
-            if( this.data.type === "select" ){
-                if( this.data.format === "script" ){
-                    if( this.data.scriptText && this.data.countScriptText ){
-                        mode = "all"
-                    }else if( this.data.scriptText && !this.data.countScriptText ){
-                        mode = "data"
-                    }else if( !this.data.scriptText && this.data.countScriptText ){
-                        mode = "count"
-                    }else{
-                        this.designer.notice(this.designer.lp.inputStatementData, "error");
-                        return false;
-                    }
-                }else{
-                    if( this.data.data && this.data.countData ){
-                        mode = "all"
-                    }else if( this.data.data && !this.data.countData ){
-                        mode = "data"
-                    }else if( !this.data.data && this.data.countData ){
-                        mode = "count"
-                    }else{
-                        this.designer.notice(this.designer.lp.inputStatementData, "error");
-                        return false;
-                    }
-                }
-            }
-            o2.Actions.get("x_query_assemble_designer").StatementAction.executeV2(this.json.id, mode, 1, 50 , o, function(json){
-                o2.require("o2.widget.JsonParse", function(){
+            this.execute(function (json) {
+                o2.require("o2.widget.JsonParse", function () {
                     this.runResultNode.empty();
                     var jsonResult = new o2.widget.JsonParse(json, this.runResultNode);
                     jsonResult.load();
                 }.bind(this));
                 this.runMask.hide();
-            }.bind(this), function(xhr, text, error){
-                debugger;
+            }.bind(this), function () {
                 if (this.runMask) this.runMask.hide();
-                var errorText = error;
-                if (xhr){
-                    var json = JSON.decode(xhr.responseText);
-                    if (json){
-                        errorText = json.message.trim() || "request json error";
-                    }else{
-                        errorText = "request json error: "+xhr.responseText;
-                    }
-                }
-                errorText = errorText.replace(/\</g, "&lt;");
-                errorText = errorText.replace(/\</g, "&gt;");
-                MWF.xDesktop.notice("error", {x: "right", y:"top"}, errorText);
             }.bind(this))
+
+            // var json = this.jsonEditor.editor.getValue();
+            // var o = JSON.parse(json);
+            //
+            // var mode = "data";
+            // if( this.data.type === "select" ){
+            //     if( this.data.format === "script" ){
+            //         if( this.data.scriptText && this.data.countScriptText ){
+            //             mode = "all"
+            //         }else if( this.data.scriptText && !this.data.countScriptText ){
+            //             mode = "data"
+            //         }else if( !this.data.scriptText && this.data.countScriptText ){
+            //             mode = "count"
+            //         }else{
+            //             this.designer.notice(this.designer.lp.inputStatementData, "error");
+            //             return false;
+            //         }
+            //     }else{
+            //         if( this.data.data && this.data.countData ){
+            //             mode = "all"
+            //         }else if( this.data.data && !this.data.countData ){
+            //             mode = "data"
+            //         }else if( !this.data.data && this.data.countData ){
+            //             mode = "count"
+            //         }else{
+            //             this.designer.notice(this.designer.lp.inputStatementData, "error");
+            //             return false;
+            //         }
+            //     }
+            // }
+            // o2.Actions.load("x_query_assemble_designer").StatementAction.executeV2(this.json.id, mode, 1, 50 , o, function(json){
+            //     o2.require("o2.widget.JsonParse", function(){
+            //         this.runResultNode.empty();
+            //         var jsonResult = new o2.widget.JsonParse(json, this.runResultNode);
+            //         jsonResult.load();
+            //     }.bind(this));
+            //     this.runMask.hide();
+            // }.bind(this), function(xhr, text, error){
+            //     debugger;
+            //     if (this.runMask) this.runMask.hide();
+            //     var errorText = error;
+            //     if (xhr){
+            //         var json = JSON.decode(xhr.responseText);
+            //         if (json){
+            //             errorText = json.message.trim() || "request json error";
+            //         }else{
+            //             errorText = "request json error: "+xhr.responseText;
+            //         }
+            //     }
+            //     errorText = errorText.replace(/\</g, "&lt;");
+            //     errorText = errorText.replace(/\</g, "&gt;");
+            //     MWF.xDesktop.notice("error", {x: "right", y:"top"}, errorText);
+            // }.bind(this))
         }.bind(this));
     },
+    execute: function (success, failure) {
+        var json = this.jsonEditor.editor.getValue();
+        var o = JSON.parse(json);
+
+        var mode = "data";
+        if (this.data.type === "select") {
+            if (this.data.format === "script") {
+                if (this.data.scriptText && this.data.countScriptText) {
+                    mode = "all"
+                } else if (this.data.scriptText && !this.data.countScriptText) {
+                    mode = "data"
+                } else if (!this.data.scriptText && this.data.countScriptText) {
+                    mode = "count"
+                } else {
+                    this.designer.notice(this.designer.lp.inputStatementData, "error");
+                    return false;
+                }
+            } else {
+                if (this.data.data && this.data.countData) {
+                    mode = "all"
+                } else if (this.data.data && !this.data.countData) {
+                    mode = "data"
+                } else if (!this.data.data && this.data.countData) {
+                    mode = "count"
+                } else {
+                    this.designer.notice(this.designer.lp.inputStatementData, "error");
+                    return false;
+                }
+            }
+        }
+        o2.Actions.load("x_query_assemble_designer").StatementAction.executeV2(this.json.id, mode, 1, 50, o, function (json) {
+            if (success) success(json)
+        }.bind(this), function (xhr, text, error) {
+            debugger;
+            if (failure) failure();
+            var errorText = error;
+            if (xhr) {
+                var json = JSON.decode(xhr.responseText);
+                if (json) {
+                    errorText = json.message.trim() || "request json error";
+                } else {
+                    errorText = "request json error: " + xhr.responseText;
+                }
+            }
+            errorText = errorText.replace(/\</g, "&lt;");
+            errorText = errorText.replace(/\</g, "&gt;");
+            MWF.xDesktop.notice("error", {x: "right", y: "top"}, errorText);
+        }.bind(this))
+    },
 
-    save: function(callback){
+    save: function (callback) {
         debugger;
-        if (!this.data.name){
+        if (!this.data.name) {
             this.designer.notice(this.designer.lp.inputStatementName, "error");
             return false;
         }
 
-        if( typeOf(this.viewJson) === "object" ){
+        if (typeOf(this.viewJson) === "object") {
             this.data.view = JSON.stringify(this.viewJson);
         }
         //if( !this.data.tableType ){
@@ -666,96 +738,97 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({
         if (this.editor) this.data.data = this.editor.editor.getValue();
         if (this.scriptEditor) this.data.scriptText = this.scriptEditor.toJson().code;
 
-        this.designer.actions.saveStatement(this.data, function(json){
+        this.designer.actions.saveStatement(this.data, function (json) {
             this.designer.notice(this.designer.lp.save_success, "success", this.node, {"x": "left", "y": "bottom"});
 
             this.data.id = json.data.id;
             if (this.lisNode) {
-                this.lisNode.getLast().set("text", this.data.name+"("+this.data.alias+")");
+                this.lisNode.getLast().set("text", this.data.name + "(" + this.data.alias + ")");
             }
             if (callback) callback();
         }.bind(this));
     },
-    _setEditStyle: function(){},
+    _setEditStyle: function () {
+    },
 
-    saveSilence: function(callback){
-        if (!this.data.name){
+    saveSilence: function (callback) {
+        if (!this.data.name) {
             this.designer.notice(this.designer.lp.inputStatementName, "error");
             return false;
         }
 
-        if( typeOf(this.viewJson) === "object" ){
+        if (typeOf(this.viewJson) === "object") {
             this.data.view = JSON.stringify(this.viewJson);
         }
 
         if (this.editor) this.data.data = this.editor.editor.getValue();
         if (this.scriptEditor) this.data.scriptText = this.scriptEditor.toJson().code;
 
-        this.designer.actions.saveStatement(this.data, function(json){
+        this.designer.actions.saveStatement(this.data, function (json) {
             //this.designer.notice(this.designer.lp.save_success, "success", this.node, {"x": "left", "y": "bottom"});
 
             this.data.id = json.data.id;
             if (this.lisNode) {
-                this.lisNode.getLast().set("text", this.data.name+"("+this.data.alias+")");
+                this.lisNode.getLast().set("text", this.data.name + "(" + this.data.alias + ")");
             }
             if (callback) callback();
         }.bind(this));
     },
 
-    loadView : function( callback ){
+    loadView: function (callback) {
         this.setViewSize();
         this.designer.addEvent("resize", this.setViewSize.bind(this));
 
-        if( !this.data.view ){
+        if (!this.data.view) {
             this.viewJson = {};
-        }else{
+        } else {
             this.viewJson = JSON.parse(this.data.view)
         }
         this.view = new MWF.xApplication.query.StatementDesigner.View(this.designer, this, this.viewJson, {});
-        this.view.load( function () {
+        this.view.load(function () {
             this.view.setContentHeight();
         }.bind(this));
     },
-    setViewSize: function(){
+    setViewSize: function () {
         debugger;
         var size = this.areaNode.getSize();
         var designerSize = this.designerArea.getComputedSize();
-        var y = size.y-designerSize.totalHeight;
+        var y = size.y - designerSize.totalHeight;
         var mTop = this.viewArea.getStyle("margin-top").toInt();
         var mBottom = this.viewArea.getStyle("margin-bottom").toInt();
         var pTop = this.viewArea.getStyle("padding-top").toInt();
         var pBottom = this.viewArea.getStyle("padding-bottom").toInt();
-        y = y-mTop-mBottom-pTop-pBottom-1;
+        y = y - mTop - mBottom - pTop - pBottom - 1;
 
         var tabSize = this.tabNode.getComputedSize();
         y = y - tabSize.totalHeight;
 
-        this.viewArea.setStyle("height", ""+y+"px");
+        this.viewArea.setStyle("height", "" + y + "px");
 
         // var titleSize = this.runTitleNode.getComputedSize();
         // y = y - titleSize.totalHeight;
         // this.runContentNode.setStyle("height", ""+y+"px");
     },
-    preview: function(){
-        if( this.isNewStatement ){
-            this.designer.notice( this.designer.lp.saveStatementNotice, "error" );
+    preview: function () {
+        if (this.isNewStatement) {
+            this.designer.notice(this.designer.lp.saveStatementNotice, "error");
             return;
         }
-        if( this.data.type !== "select" ){
-            this.designer.notice( this.designer.lp.previewNotSelectStatementNotice, "error" );
+        if (this.data.type !== "select") {
+            this.designer.notice(this.designer.lp.previewNotSelectStatementNotice, "error");
             return;
         }
-        if( !this.data.view ){
-            this.designer.notice( this.designer.lp.noViewNotice, "error" );
+        if (!this.data.view) {
+            this.designer.notice(this.designer.lp.noViewNotice, "error");
 
         }
-        this.saveSilence( function () {
+        this.saveSilence(function () {
             var url = "../x_desktop/app.html?app=query.Query&status=";
             url += JSON.stringify({
-                id : this.data.application,
-                statementId : this.data.id
+                id: this.data.application,
+                statementId: this.data.id
             });
-            window.open(o2.filterUrl(url),"_blank");
+            window.open(o2.filterUrl(url), "_blank");
         }.bind(this));
     }
 });
@@ -770,11 +843,11 @@ MWF.xApplication.query.StatementDesigner.View = new Class({
         "propertyPath": "../x_component_query_StatementDesigner/$Statement/view.html"
     },
 
-    initialize: function(designer, statement, data, options){
+    initialize: function (designer, statement, data, options) {
         this.setOptions(options);
 
         this.path = "../x_component_query_ViewDesigner/$View/";
-        this.cssPath = "../x_component_query_ViewDesigner/$View/"+this.options.style+"/css.wcss";
+        this.cssPath = "../x_component_query_ViewDesigner/$View/" + this.options.style + "/css.wcss";
 
         this._loadCss();
 
@@ -788,7 +861,7 @@ MWF.xApplication.query.StatementDesigner.View = new Class({
         this.node = this.statement.viewArea;
         //this.tab = this.designer.tab;
 
-        this.areaNode = new Element("div", {"styles": {"height": "calc(100% - 2px)", "overflow": "auto" }});
+        this.areaNode = new Element("div", {"styles": {"height": "calc(100% - 2px)", "overflow": "auto"}});
         this.areaNode.setStyles(this.css.areaNode);
 
         //MWF.require("MWF.widget.ScrollBar", function(){
@@ -812,14 +885,14 @@ MWF.xApplication.query.StatementDesigner.View = new Class({
         //     if (this.autoSaveTimerID) window.clearInterval(this.autoSaveTimerID);
         // }.bind(this));
     },
-    load : function( callback ){
+    load: function (callback) {
         this.setAreaNodeSize();
         this.designer.addEvent("resize", this.setAreaNodeSize.bind(this));
         this.areaNode.inject(this.node);
 
         this.domListNode = new Element("div", {"styles": {"overflow": "hidden"}}).inject(this.designer.propertyDomArea);
 
-        this.loadTemplateStyle( function () {
+        this.loadTemplateStyle(function () {
 
             this.loadActionbar();
 
@@ -835,51 +908,58 @@ MWF.xApplication.query.StatementDesigner.View = new Class({
 
             this.designer.addEvent("resize", this.setViewWidth.bind(this));
 
-            if(callback)callback();
+            if (callback) callback();
         }.bind(this))
     },
-    parseData: function(){
+    parseData: function () {
         this.json = this.data;
-        if( !this.json.id ){
+        if (!this.json.id) {
             this.json.id = (new o2.widget.UUID).id;
         }
-        if( !this.json.data || !this.json.data.events ){
+        if (!this.json.data || !this.json.data.events) {
             var url = "../x_component_query_StatementDesigner/$Statement/view.json";
             MWF.getJSON(url, {
-                "onSuccess": function(obj){
-                    if(!this.json.data)this.json.data = obj.data;
-                    if(!this.json.data.events)this.json.data.events = obj.data.events;
+                "onSuccess": function (obj) {
+                    if (!this.json.data) this.json.data = obj.data;
+                    if (!this.json.data.events) this.json.data.events = obj.data.events;
                 }.bind(this),
-                "onerror": function(text){
+                "onerror": function (text) {
                     this.notice(text, "error");
                 }.bind(this),
-                "onRequestFailure": function(xhr){
+                "onRequestFailure": function (xhr) {
                     this.notice(xhr.responseText, "error");
                 }.bind(this)
-            },false);
+            }, false);
         }
     },
-    setEvent: function(){
+    setEvent: function () {
         this.areaNode.addEvents({
-            "click": function(e){ this.selected();  e.stopPropagation(); }.bind(this),
-            "mouseover": function(){ if (!this.isSelected) this.areaNode.setStyles(this.css.areaNode_over)}.bind(this),
-            "mouseout": function(){if (!this.isSelected) this.areaNode.setStyles(this.css.areaNode)}.bind(this)
+            "click": function (e) {
+                this.selected();
+                e.stopPropagation();
+            }.bind(this),
+            "mouseover": function () {
+                if (!this.isSelected) this.areaNode.setStyles(this.css.areaNode_over)
+            }.bind(this),
+            "mouseout": function () {
+                if (!this.isSelected) this.areaNode.setStyles(this.css.areaNode)
+            }.bind(this)
         });
-        this.refreshNode.addEvent("click", function(e){
+        this.refreshNode.addEvent("click", function (e) {
             this.loadViewData();
             e.stopPropagation();
         }.bind(this));
-        this.addColumnNode.addEvent("click", function(e){
+        this.addColumnNode.addEvent("click", function (e) {
             this.addColumn();
             e.stopPropagation();
         }.bind(this));
     },
-    selected: function(){
+    selected: function () {
         debugger;
-        if (this.statement.currentSelectedModule){
-            if (this.statement.currentSelectedModule==this){
+        if (this.statement.currentSelectedModule) {
+            if (this.statement.currentSelectedModule == this) {
                 return true;
-            }else{
+            } else {
                 this.statement.currentSelectedModule.unSelected();
             }
         }
@@ -889,33 +969,33 @@ MWF.xApplication.query.StatementDesigner.View = new Class({
         this.isSelected = true;
         this.showProperty();
     },
-    unSelected: function(){
+    unSelected: function () {
         this.statement.currentSelectedModule = null;
         this.isSelected = false;
         this.areaNode.setStyles(this.css.areaNode);
         this.hideProperty();
     },
 
-    showProperty: function(){
-        if (!this.property){
+    showProperty: function () {
+        if (!this.property) {
             this.property = new MWF.xApplication.query.StatementDesigner.Property(this, this.designer.propertyContentArea, this.designer, {
                 "path": this.options.propertyPath,
-                "onPostLoad": function(){
+                "onPostLoad": function () {
                     this.property.show();
                 }.bind(this)
             });
             this.property.load();
-        }else{
+        } else {
             this.property.show();
         }
     },
-    hideProperty: function(){
+    hideProperty: function () {
         if (this.property) this.property.hide();
     },
 
-    loadViewData: function(){
-        if (this.data.id){
-            this.saveSilence(function(){
+    loadViewData: function () {
+        if (this.data.id) {
+            this.statement.saveSilence(function () {
                 this.viewContentBodyNode.empty();
                 this.viewContentTableNode = new Element("table", {
                     "styles": this.css.viewContentTableNode,
@@ -924,193 +1004,67 @@ MWF.xApplication.query.StatementDesigner.View = new Class({
                     "cellSpacing": "0"
                 }).inject(this.viewContentBodyNode);
 
-                this.designer.actions.loadView(this.data.id, null,function(json){
+                this.statement.execute( function (json) {
                     var entries = {};
 
-                    json.data.selectList.each(function(entry){entries[entry.column] = entry;}.bind(this));
-
-                    if (this.json.data.group.column){
-                        if (json.data.groupGrid.length){
-                            var groupColumn = null;
-                            for (var c = 0; c<json.data.selectList.length; c++){
-                                if (json.data.selectList[c].column === json.data.group.column){
-                                    groupColumn = json.data.selectList[c];
-                                    break;
-                                }
-                            }
-
-                            json.data.groupGrid.each(function(line, idx){
-                                var groupTr = new Element("tr", {
-                                    "styles": this.json.data.viewStyles ? this.json.data.viewStyles["contentTr"] : this.css.viewContentTrNode,
-                                    "data-is-group" : "yes"
-                                }).inject(this.viewContentTableNode);
-                                var colSpan = this.items.length ;
-                                var td = new Element("td", {
-                                    "styles": this.json.data.viewStyles ? this.json.data.viewStyles["contentGroupTd"] : this.css.viewContentGroupTdNode,
-                                    "colSpan": colSpan
-                                }).inject(groupTr);
-
-                                var groupAreaNode;
-                                if( this.json.data.viewStyles ){
-                                    groupAreaNode = new Element("div", {"styles": this.json.data.viewStyles["groupCollapseNode"]}).inject(td);
-                                    groupAreaNode.set("text", line.group);
-                                }else{
-                                    groupAreaNode = new Element("div", {"styles": this.css.viewContentTdGroupNode}).inject(td);
-                                    var groupIconNode = new Element("div", {"styles": this.css.viewContentTdGroupIconNode}).inject(groupAreaNode);
-                                    var groupTextNode = new Element("div", {"styles": this.css.viewContentTdGroupTextNode}).inject(groupAreaNode);
-                                    if (groupColumn){
-                                        //groupTextNode.set("text", (groupColumn.code) ? MWF.Macro.exec(groupColumn.code, {"value": line.group, "gridData": json.data.groupGrid, "data": json.data, "entry": line}) : line.group);
-                                        groupTextNode.set("text", line.group);
-                                    }else{
-                                        groupTextNode.set("text", line.group);
-                                    }
-
-                                }
-
-
-
-                                var subtrs = [];
+                    json.data.selectList.each(function (entry) {
+                        entries[entry.column] = entry;
+                    }.bind(this));
 
-                                line.list.each(function(entry){
-                                    var tr = new Element("tr", {
-                                        "styles": this.json.data.viewStyles ? this.json.data.viewStyles["contentTr"] : this.css.viewContentTrNode
-                                    }).inject(this.viewContentTableNode);
-                                    tr.setStyle("display", "none");
+                    if (json.data.grid.length) {
+                        json.data.grid.each(function (line, idx) {
+                            var tr = new Element("tr", {
+                                "styles": this.json.data.viewStyles ? this.json.data.viewStyles["contentTr"] : this.css.viewContentTrNode
+                            }).inject(this.viewContentTableNode);
 
-                                    //this.createViewCheckboxTd( tr );
+                            //this.createViewCheckboxTd( tr );
 
+                            Object.each(entries, function (c, k) {
+                                var d = line.data[k];
+                                if (d != undefined) {
                                     var td = new Element("td", {
                                         "styles": this.json.data.viewStyles ? this.json.data.viewStyles["contentTd"] : this.css.viewContentTdNode
                                     }).inject(tr);
-
-                                    Object.each(entries, function(c, k){
-                                        var d = entry.data[k];
-                                        if (d!=undefined){
-                                            if (k!=this.json.data.group.column){
-                                                var td = new Element("td", {
-                                                    "styles": this.json.data.viewStyles ? this.json.data.viewStyles["contentTd"] : this.css.viewContentTdNode
-                                                }).inject(tr);
-                                                //td.set("text", (entries[k].code) ? MWF.Macro.exec(entries[k].code, {"value": d, "gridData": json.data.groupGrid, "data": json.data, "entry": entry}) : d);
-
-                                                if (c.isHtml){
-                                                    td.set("html", d);
-                                                }else{
-                                                    td.set("text", d);
-                                                }
-
-                                            }
-                                        }
-                                    }.bind(this));
-
-                                    // Object.each(entry.data, function(d, k){
-                                    //     if (k!=this.json.data.group.column){
-                                    //         var td = new Element("td", {"styles": this.css.viewContentTdNode}).inject(tr);
-                                    //         td.set("text", (entries[k].code) ? MWF.Macro.exec(entries[k].code, {"value": d, "gridData": json.data.groupGrid, "data": json.data, "entry": entry}) : d);
-                                    //     }
-                                    // }.bind(this));
-                                    subtrs.push(tr)
-                                }.bind(this));
-
-                                groupAreaNode.store("subtrs", subtrs);
-
-                                var _self = this;
-                                groupAreaNode.addEvent("click", function(){
-                                    var subtrs = this.retrieve("subtrs");
-                                    var iconNode = groupAreaNode.getFirst("div");
-                                    if (subtrs[0]){
-                                        if (subtrs[0].getStyle("display")=="none"){
-                                            subtrs.each(function(subtr){ subtr.setStyle("display", "table-row"); });
-                                            if( iconNode ) {
-                                                iconNode.setStyle("background", "url(" + "../x_component_process_StatementDesigner/$View/default/icon/down.png) center center no-repeat");
-                                            }else{
-                                                this.setStyles( _self.json.data.viewStyles["groupExpandNode"] )
-                                            }
-                                        }else{
-                                            subtrs.each(function(subtr){ subtr.setStyle("display", "none"); });
-                                            if( iconNode ) {
-                                                iconNode.setStyle("background", "url(" + "../x_component_process_StatementDesigner/$View/default/icon/right.png) center center no-repeat");
-                                            }else{
-                                                this.setStyles( _self.json.data.viewStyles["groupCollapseNode"] )
-                                            }
-                                        }
+                                    //td.set("text", (entries[k].code) ? MWF.Macro.exec(entries[k].code, {"value": d, "gridData": json.data.grid, "data": json.data, "entry": line}) : d);
+                                    if (c.isHtml) {
+                                        td.set("html", d);
+                                    } else {
+                                        td.set("text", d);
                                     }
-                                    _self.setContentHeight();
-                                });
-                            }.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
+                                    //td.set("text", d);
                                 }
-                            }
-                            this.noDataTextNode = new Element( "div", {
-                                "styles": noDataTextNodeStyle,
-                                "text" : this.json.data.noDataText
-                            }).inject( this.viewContentBodyNode );
-                        }
-
-                    }else{
-
-                        if (json.data.grid.length){
-                            json.data.grid.each(function(line, idx){
-                                var tr = new Element("tr", {
-                                    "styles": this.json.data.viewStyles ? this.json.data.viewStyles["contentTr"] : this.css.viewContentTrNode
-                                }).inject(this.viewContentTableNode);
-
-                                //this.createViewCheckboxTd( tr );
-
-                                Object.each(entries, function(c, k){
-                                    var d = line.data[k];
-                                    if (d!=undefined){
-                                        var td = new Element("td", {
-                                            "styles": this.json.data.viewStyles ? this.json.data.viewStyles["contentTd"] : this.css.viewContentTdNode
-                                        }).inject(tr);
-                                        //td.set("text", (entries[k].code) ? MWF.Macro.exec(entries[k].code, {"value": d, "gridData": json.data.grid, "data": json.data, "entry": line}) : d);
-                                        if (c.isHtml){
-                                            td.set("html", d);
-                                        }else{
-                                            td.set("text", d);
-                                        }
-                                        //td.set("text", d);
-                                    }
-                                }.bind(this));
-
-                                // Object.each(line.data, function(d, k){
-                                //     var td = new Element("td", {"styles": this.css.viewContentTdNode}).inject(tr);
-                                //     td.set("text", (entries[k].code) ? MWF.Macro.exec(entries[k].code, {"value": d, "gridData": json.data.grid, "data": json.data, "entry": line}) : d);
-                                // }.bind(this));
                             }.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
-                                }
+
+                            // Object.each(line.data, function(d, k){
+                            //     var td = new Element("td", {"styles": this.css.viewContentTdNode}).inject(tr);
+                            //     td.set("text", (entries[k].code) ? MWF.Macro.exec(entries[k].code, {"value": d, "gridData": json.data.grid, "data": json.data, "entry": line}) : d);
+                            // }.bind(this));
+                        }.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 );
                         }
+                        this.noDataTextNode = new Element("div", {
+                            "styles": noDataTextNodeStyle,
+                            "text": this.json.data.noDataText
+                        }).inject(this.viewContentBodyNode);
                     }
                 }.bind(this));
             }.bind(this));
         }
     },
-    addColumn: function(){
+    addColumn: function () {
 
         debugger;
 
-        MWF.require("MWF.widget.UUID", function(){
+        MWF.require("MWF.widget.UUID", function () {
             var id = (new MWF.widget.UUID).id;
             var json = {
                 "id": id,
@@ -1124,9 +1078,9 @@ MWF.xApplication.query.StatementDesigner.View = new Class({
             this.items.push(column);
             column.selected();
 
-            if (this.viewContentTableNode){
+            if (this.viewContentTableNode) {
                 var trs = this.viewContentTableNode.getElements("tr");
-                trs.each(function(tr){
+                trs.each(function (tr) {
                     new Element("td", {"styles": this.css.viewContentTdNode}).inject(tr)
                 }.bind(this));
                 //this.setContentColumnWidth();
@@ -1137,24 +1091,24 @@ MWF.xApplication.query.StatementDesigner.View = new Class({
         }.bind(this));
         //new Fx.Scroll(this.view.areaNode, {"wheelStops": false, "duration": 0}).toRight();
     },
-    setContentHeight: function(){
+    setContentHeight: function () {
         var size = this.areaNode.getSize();
         var titleSize = this.viewTitleNode.getSize();
-        var actionbarSize = this.actionbarNode ? this.actionbarNode.getSize() : {x:0, y:0};
-        var pagingSize = this.pagingNode ? this.pagingNode.getSize() : {x:0, y:0};
-        var height = size.y-titleSize.y-actionbarSize.y-pagingSize.y-4;
+        var actionbarSize = this.actionbarNode ? this.actionbarNode.getSize() : {x: 0, y: 0};
+        var pagingSize = this.pagingNode ? this.pagingNode.getSize() : {x: 0, y: 0};
+        var height = size.y - titleSize.y - actionbarSize.y - pagingSize.y - 4;
 
         this.viewContentScrollNode.setStyle("height", height);
 
         var contentSize = this.viewContentBodyNode.getSize();
-        if (height<contentSize.y) height = contentSize.y+10;
+        if (height < contentSize.y) height = contentSize.y + 10;
 
         this.viewContentNode.setStyle("height", height);
         this.contentLeftNode.setStyle("height", height);
         this.contentRightNode.setStyle("height", height);
         //this.viewContentBodyNode.setStyle("min-height", height);
     },
-    loadViewColumns: function(){
+    loadViewColumns: function () {
         //    for (var i=0; i<10; i++){
         if (this.json.data.selectList) {
             this.json.data.selectList.each(function (json) {
@@ -1164,87 +1118,87 @@ MWF.xApplication.query.StatementDesigner.View = new Class({
         }
         //    }
     },
-    showActionbar : function( noSetHeight ){
+    showActionbar: function (noSetHeight) {
         this.actionbarNode.show();
-        if( !this.json.data.actionbarList )this.json.data.actionbarList = [];
-        if( !this.actionbarList || this.actionbarList.length == 0 ){
-            if( this.json.data.actionbarList.length ){
-                this.json.data.actionbarList.each( function(json){
-                    this.actionbarList.push( new MWF.xApplication.query.StatementDesigner.View.Actionbar( json, this.json.data.actionbarList, this) )
+        if (!this.json.data.actionbarList) this.json.data.actionbarList = [];
+        if (!this.actionbarList || this.actionbarList.length == 0) {
+            if (this.json.data.actionbarList.length) {
+                this.json.data.actionbarList.each(function (json) {
+                    this.actionbarList.push(new MWF.xApplication.query.StatementDesigner.View.Actionbar(json, this.json.data.actionbarList, this))
                 }.bind(this));
-            }else{
-                this.actionbarList.push( new MWF.xApplication.query.StatementDesigner.View.Actionbar( null, this.json.data.actionbarList, this) )
+            } else {
+                this.actionbarList.push(new MWF.xApplication.query.StatementDesigner.View.Actionbar(null, this.json.data.actionbarList, this))
             }
         }
-        if( !noSetHeight )this.setContentHeight();
+        if (!noSetHeight) this.setContentHeight();
     },
-    loadPaging: function( noSetHeight ){
+    loadPaging: function (noSetHeight) {
         this.pagingNode = new Element("div#pagingNode", {"styles": this.css.pagingNode}).inject(this.areaNode);
         this.pagingList = [];
-        if( !this.json.data.pagingList )this.json.data.pagingList = [];
-        if( !this.pagingList || this.pagingList.length == 0 ){
-            if( this.json.data.pagingList.length ){
-                this.json.data.pagingList.each( function(json){
-                    this.pagingList.push( new MWF.xApplication.query.StatementDesigner.View.Paging( json, this.json.data.pagingList, this) )
+        if (!this.json.data.pagingList) this.json.data.pagingList = [];
+        if (!this.pagingList || this.pagingList.length == 0) {
+            if (this.json.data.pagingList.length) {
+                this.json.data.pagingList.each(function (json) {
+                    this.pagingList.push(new MWF.xApplication.query.StatementDesigner.View.Paging(json, this.json.data.pagingList, this))
                 }.bind(this));
-            }else{
-                this.pagingList.push( new MWF.xApplication.query.StatementDesigner.View.Paging( null, this.json.data.pagingList, this) )
+            } else {
+                this.pagingList.push(new MWF.xApplication.query.StatementDesigner.View.Paging(null, this.json.data.pagingList, this))
             }
         }
         // if( !noSetHeight )this.setContentHeight();
     },
-    setViewWidth: function(){
-        if( !this.viewAreaNode )return;
+    setViewWidth: function () {
+        if (!this.viewAreaNode) return;
         this.viewAreaNode.setStyle("width", "auto");
         this.viewTitleNode.setStyle("width", "auto");
 
         var s1 = this.viewTitleTableNode.getSize();
         var s2 = this.refreshNode.getSize();
         var s3 = this.addColumnNode.getSize();
-        var width = s1.x+s2.x+s2.x;
+        var width = s1.x + s2.x + s2.x;
         var size = this.areaNode.getSize();
 
-        if (width>size.x){
-            this.viewTitleNode.setStyle("width", ""+(width-2)+"px");
-            this.viewAreaNode.setStyle("width", ""+(width-2)+"px");
-        }else{
-            this.viewTitleNode.setStyle("width", ""+(size.x-2)+"px");
-            this.viewAreaNode.setStyle("width", ""+(size.x-2)+"px");
+        if (width > size.x) {
+            this.viewTitleNode.setStyle("width", "" + (width - 2) + "px");
+            this.viewAreaNode.setStyle("width", "" + (width - 2) + "px");
+        } else {
+            this.viewTitleNode.setStyle("width", "" + (size.x - 2) + "px");
+            this.viewAreaNode.setStyle("width", "" + (size.x - 2) + "px");
         }
         this.setContentColumnWidth();
         this.setContentHeight();
     },
 
-    _setEditStyle: function(name, input, oldValue){
-        if( name=="data.actionbarHidden" ){
-            if( this.json.data.actionbarHidden ){
+    _setEditStyle: function (name, input, oldValue) {
+        if (name == "data.actionbarHidden") {
+            if (this.json.data.actionbarHidden) {
                 this.hideActionbar()
-            }else{
+            } else {
                 this.showActionbar()
             }
         }
-        if( name=="data.selectAllEnable" ){
-            if( this.json.data.selectAllEnable ){
-                this.viewTitleTrNode.getElement(".viewTitleCheckboxTd").setStyle("display","table-cell");
-                this.viewContentTableNode.getElements(".viewContentCheckboxTd").setStyle("display","table-cell");
-            }else{
-                this.viewTitleTrNode.getElement(".viewTitleCheckboxTd").setStyle("display","none");
-                this.viewContentTableNode.getElements(".viewContentCheckboxTd").setStyle("display","none");
+        if (name == "data.selectAllEnable") {
+            if (this.json.data.selectAllEnable) {
+                this.viewTitleTrNode.getElement(".viewTitleCheckboxTd").setStyle("display", "table-cell");
+                this.viewContentTableNode.getElements(".viewContentCheckboxTd").setStyle("display", "table-cell");
+            } else {
+                this.viewTitleTrNode.getElement(".viewTitleCheckboxTd").setStyle("display", "none");
+                this.viewContentTableNode.getElements(".viewContentCheckboxTd").setStyle("display", "none");
             }
         }
-        if (name=="data.viewStyleType"){
+        if (name == "data.viewStyleType") {
 
             var file = (this.stylesList && this.json.data.viewStyleType) ? this.stylesList[this.json.data.viewStyleType].file : null;
             var extendFile = (this.stylesList && this.json.data.viewStyleType) ? this.stylesList[this.json.data.viewStyleType].extendFile : null;
-            this.loadTemplateStyles( file, extendFile, function( templateStyles ){
+            this.loadTemplateStyles(file, extendFile, function (templateStyles) {
                 this.templateStyles = templateStyles;
 
                 var oldFile, oldExtendFile;
-                if( oldValue && this.stylesList[oldValue] ){
+                if (oldValue && this.stylesList[oldValue]) {
                     oldFile = this.stylesList[oldValue].file;
                     oldExtendFile = this.stylesList[oldValue].extendFile;
                 }
-                this.loadTemplateStyles( oldFile, oldExtendFile, function( oldTemplateStyles ){
+                this.loadTemplateStyles(oldFile, oldExtendFile, function (oldTemplateStyles) {
 
                     this.json.data.styleConfig = (this.stylesList && this.json.data.viewStyleType) ? this.stylesList[this.json.data.viewStyleType] : null;
 
@@ -1252,16 +1206,16 @@ MWF.xApplication.query.StatementDesigner.View = new Class({
                     if (this.templateStyles["view"]) this.setTemplateStyles(this.templateStyles["view"]);
                     this.setAllStyles();
 
-                    this.actionbarList.each( function (module) {
-                        if (oldTemplateStyles["actionbar"]){
+                    this.actionbarList.each(function (module) {
+                        if (oldTemplateStyles["actionbar"]) {
                             module.clearTemplateStyles(oldTemplateStyles["actionbar"]);
                         }
                         module.setStyleTemplate();
                         module.setAllStyles();
                     })
 
-                    this.pagingList.each( function (module) {
-                        if (oldTemplateStyles["paging"]){
+                    this.pagingList.each(function (module) {
+                        if (oldTemplateStyles["paging"]) {
                             module.clearTemplateStyles(oldTemplateStyles["paging"]);
                         }
                         module.setStyleTemplate();
@@ -1279,41 +1233,41 @@ MWF.xApplication.query.StatementDesigner.View = new Class({
 
             }.bind(this))
         }
-        if (name=="data.viewStyles"){
+        if (name == "data.viewStyles") {
             this.setCustomStyles();
         }
     },
 
-    loadTemplateStyle : function( callback ){
-        this.loadStylesList(function(){
+    loadTemplateStyle: function (callback) {
+        this.loadStylesList(function () {
             var oldStyleValue = "";
-            if ((!this.json.data.viewStyleType) || !this.stylesList[this.json.data.viewStyleType]) this.json.data.viewStyleType="default";
-            this.loadTemplateStyles( this.stylesList[this.json.data.viewStyleType].file, this.stylesList[this.json.data.viewStyleType].extendFile,
-                function( templateStyles ){
+            if ((!this.json.data.viewStyleType) || !this.stylesList[this.json.data.viewStyleType]) this.json.data.viewStyleType = "default";
+            this.loadTemplateStyles(this.stylesList[this.json.data.viewStyleType].file, this.stylesList[this.json.data.viewStyleType].extendFile,
+                function (templateStyles) {
                     this.templateStyles = templateStyles;
-                    if( !this.json.data.viewStyleType )this.json.data.viewStyleType = "default";
+                    if (!this.json.data.viewStyleType) this.json.data.viewStyleType = "default";
 
-                    if ( this.templateStyles && this.templateStyles["view"]){
+                    if (this.templateStyles && this.templateStyles["view"]) {
                         var viewStyles = Object.clone(this.templateStyles["view"]);
-                        if( viewStyles.contentGroupTd )delete viewStyles.contentGroupTd;
-                        if( viewStyles.groupCollapseNode )delete viewStyles.groupCollapseNode;
-                        if( viewStyles.groupExpandNode )delete viewStyles.groupExpandNode;
-                        if(!this.json.data.viewStyles){
+                        if (viewStyles.contentGroupTd) delete viewStyles.contentGroupTd;
+                        if (viewStyles.groupCollapseNode) delete viewStyles.groupCollapseNode;
+                        if (viewStyles.groupExpandNode) delete viewStyles.groupExpandNode;
+                        if (!this.json.data.viewStyles) {
                             this.json.data.viewStyles = viewStyles;
-                        }else{
-                            this.setTemplateStyles( viewStyles );
+                        } else {
+                            this.setTemplateStyles(viewStyles);
                         }
                     }
 
                     this.setCustomStyles();
 
-                    if(callback)callback();
+                    if (callback) callback();
                 }.bind(this)
             );
         }.bind(this));
     },
-    clearTemplateStyles: function(styles){
-        if (styles){
+    clearTemplateStyles: function (styles) {
+        if (styles) {
             if (styles.container) this.removeStyles(styles.container, "container");
             if (styles.table) this.removeStyles(styles.table, "table");
             if (styles.titleTr) this.removeStyles(styles.titleTr, "titleTr");
@@ -1332,7 +1286,7 @@ MWF.xApplication.query.StatementDesigner.View = new Class({
         }
     },
 
-    setTemplateStyles: function(styles){
+    setTemplateStyles: function (styles) {
         if (styles.container) this.copyStyles(styles.container, "container");
         if (styles.table) this.copyStyles(styles.table, "table");
         if (styles.titleTr) this.copyStyles(styles.titleTr, "titleTr");
@@ -1349,18 +1303,18 @@ MWF.xApplication.query.StatementDesigner.View = new Class({
         if (styles.checkedRadioNode) this.copyStyles(styles.checkedRadioNode, "checkedRadioNode");
         if (styles.tableProperties) this.copyStyles(styles.tableProperties, "tableProperties");
     },
-    removeStyles: function(from, to){
-        if (this.json.data.viewStyles[to]){
-            Object.each(from, function(style, key){
-                if (this.json.data.viewStyles[to][key] && this.json.data.viewStyles[to][key]==style){
+    removeStyles: function (from, to) {
+        if (this.json.data.viewStyles[to]) {
+            Object.each(from, function (style, key) {
+                if (this.json.data.viewStyles[to][key] && this.json.data.viewStyles[to][key] == style) {
                     delete this.json.data.viewStyles[to][key];
                 }
             }.bind(this));
         }
     },
-    copyStyles: function(from, to){
+    copyStyles: function (from, to) {
         if (!this.json.data.viewStyles[to]) this.json.data.viewStyles[to] = {};
-        Object.each(from, function(style, key){
+        Object.each(from, function (style, key) {
             if (!this.json.data.viewStyles[to][key]) this.json.data.viewStyles[to][key] = style;
         }.bind(this));
     }
@@ -1458,7 +1412,7 @@ MWF.xApplication.query.StatementDesigner.View = new Class({
 
 MWF.xApplication.query.StatementDesigner.View.Column = new Class({
     Extends: MWF.xApplication.query.ViewDesigner.View.Column,
-    initialize: function(json, view, next){
+    initialize: function (json, view, next) {
         this.propertyPath = "../x_component_query_StatementDesigner/$Statement/column.html";
         this.view = view;
         this.json = json;
@@ -1468,11 +1422,11 @@ MWF.xApplication.query.StatementDesigner.View.Column = new Class({
         this.domListNode = this.view.domListNode;
         this.load();
     },
-    selected: function(){
-        if (this.view.statement.currentSelectedModule){
-            if (this.view.statement.currentSelectedModule==this){
+    selected: function () {
+        if (this.view.statement.currentSelectedModule) {
+            if (this.view.statement.currentSelectedModule == this) {
                 return true;
-            }else{
+            } else {
                 this.view.statement.currentSelectedModule.unSelected();
             }
         }
@@ -1480,19 +1434,22 @@ MWF.xApplication.query.StatementDesigner.View.Column = new Class({
         this.node.setStyles(this.css.viewTitleColumnNode_selected);
         this.listNode.setStyles(this.css.cloumnListNode_selected);
         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);
+        new Fx.Scroll(this.view.designer.propertyDomArea, {
+            "wheelStops": false,
+            "duration": 100
+        }).toElement(this.listNode);
 
         this.view.statement.currentSelectedModule = this;
         this.isSelected = true;
         this._showActions();
         this.showProperty();
     },
-    unSelected: function(){
+    unSelected: function () {
         this.view.statement.currentSelectedModule = null;
         //this.node.setStyles(this.css.viewTitleColumnNode);
-        if (this.isError){
+        if (this.isError) {
             this.node.setStyles(this.css.viewTitleColumnNode_error)
-        }else{
+        } else {
             this.node.setStyles(this.css.viewTitleColumnNode)
         }
 
@@ -1505,13 +1462,13 @@ MWF.xApplication.query.StatementDesigner.View.Column = new Class({
 
 MWF.xApplication.query.StatementDesigner.View.Actionbar = new Class({
     Extends: MWF.xApplication.query.ViewDesigner.View.Actionbar,
-    initialize: function(json, jsonList, view, options){
-        this.setOptions( options );
+    initialize: function (json, jsonList, view, options) {
+        this.setOptions(options);
         this.propertyPath = "../x_component_query_StatementDesigner/$Statement/actionbar.html";
         this.path = "../x_component_query_ViewDesigner/$View/";
         this.imagePath_default = "../x_component_query_ViewDesigner/$View/";
         this.imagePath_custom = "../x_component_process_FormDesigner/Module/Actionbar/";
-        this.cssPath = "../x_component_query_ViewDesigner/$View/"+this.options.style+"/actionbar.wcss";
+        this.cssPath = "../x_component_query_ViewDesigner/$View/" + this.options.style + "/actionbar.wcss";
 
         this.view = view;
         this.json = json;
@@ -1521,14 +1478,14 @@ MWF.xApplication.query.StatementDesigner.View.Actionbar = new Class({
         this.moduleName = "actionbar";
         this.load();
     },
-    getJsonPath : function(){
+    getJsonPath: function () {
         return "../x_component_query_StatementDesigner/$Statement/toolbars.json";
     },
-    selected: function(){
-        if (this.view.statement.currentSelectedModule){
-            if (this.view.statement.currentSelectedModule==this){
+    selected: function () {
+        if (this.view.statement.currentSelectedModule) {
+            if (this.view.statement.currentSelectedModule == this) {
                 return true;
-            }else{
+            } else {
                 this.view.statement.currentSelectedModule.unSelected();
             }
         }
@@ -1543,7 +1500,7 @@ MWF.xApplication.query.StatementDesigner.View.Actionbar = new Class({
         //this._showActions();
         this.showProperty();
     },
-    unSelected: function(){
+    unSelected: function () {
         this.view.statement.currentSelectedModule = null;
         this.node.setStyles(this.css.toolbarWarpNode);
 
@@ -1556,11 +1513,11 @@ MWF.xApplication.query.StatementDesigner.View.Actionbar = new Class({
 
 MWF.xApplication.query.StatementDesigner.View.Paging = new Class({
     Extends: MWF.xApplication.query.ViewDesigner.View.Paging,
-    selected: function(){
-        if (this.view.statement.currentSelectedModule){
-            if (this.view.statement.currentSelectedModule==this){
+    selected: function () {
+        if (this.view.statement.currentSelectedModule) {
+            if (this.view.statement.currentSelectedModule == this) {
                 return true;
-            }else{
+            } else {
                 this.view.statement.currentSelectedModule.unSelected();
             }
         }
@@ -1572,7 +1529,7 @@ MWF.xApplication.query.StatementDesigner.View.Paging = new Class({
         this.isSelected = true;
         this.showProperty();
     },
-    unSelected: function(){
+    unSelected: function () {
         this.view.statement.currentSelectedModule = null;
         this.node.setStyles(this.css.pagingWarpNode);