查询语句增加视图

o2web/source/x_component_process_FormDesigner/widget/ActionsEditor.js

@@ -197,7 +197,7 @@ MWF.xApplication.process.FormDesigner.widget.ActionsEditor.ButtonAction = new Cl
         this.loadNode();
 
         var form = this.editor.designer.form || this.editor.designer.page || this.editor.designer.view;
-        if (form.scriptDesigner){
+        if (form && form.scriptDesigner){
             this.scriptItem = form.scriptDesigner.addScriptItem(this.data, "actionScript", this.editor.module, "action.tools", this.data.text);
         }
 

o2web/source/x_component_query_StatementDesigner/$Statement/actionbar.html

@@ -0,0 +1,42 @@
+<div style="background-color: #FFF; overflow: hidden">
+	<div title="基本" class="MWFTab">
+		<table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+		  <tr>
+		    <td class="editTableTitle">标识:</td>
+		    <td class="editTableValue"><input type="text" name="id" value="text{$.id}" class="editTableInput"/></td>
+		  </tr>
+		  <tr>
+		    <td class="editTableTitle">名称:</td>
+		    <td class="editTableValue"><input type="text" name="name" value="text{$.name}" class="editTableInput"/></td>
+		  </tr>
+		  <tr>
+		    <td class="editTableTitle">描述:</td>
+		    <td class="editTableValue"><input type="text" name="description" value="text{$.description}" class="editTableInput"/></td>
+		  </tr>
+<!--          <tr>-->
+<!--            <td class="editTableTitle">系统操作:</td>-->
+<!--            <td class="editTableValue">-->
+<!--                <input type="radio" name="hideSystemTools" value="false" text{(!$.hideSystemTools)?'checked':''}/>显示-->
+<!--                <input type="radio" name="hideSystemTools" value="true" text{($.hideSystemTools)?'checked':''}/>不显示-->
+<!--            </td>-->
+<!--          </tr>-->
+
+		</table>
+	</div>
+    <div title="操作"  class="MWFTab" style="overflow: hidden">
+<!--		<div class="MWFDefaultActionArea" name="defaultTools"></div>-->
+        <div class="MWFActionArea" name="tools"></div>
+    </div>
+    <div title="样式"  class="MWFTab">
+        <div class="MWFActionStylesArea" name="actionStyles"></div>
+    </div>
+	<div title="事件"  class="MWFTab">
+		<div class="MWFEventsArea" name="events"></div>
+	</div>
+	<!--<div title="HTML"  class="MWFTab">-->
+		<!--<div class="MWFHTMLArea" style="font-family: Verdana, Geneva, sans-serif; font-size:14px"></div>-->
+	<!--</div>-->
+	<div title="JSON"  class="MWFTab">
+		<div class="MWFJSONArea" style="font-family: Verdana, Geneva, sans-serif; font-size:14px"></div>
+	</div>
+</div>

o2web/source/x_component_query_StatementDesigner/Statement.js

@@ -575,7 +575,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% - 10px)", "overflow": "auto", "width" : "calc(100% - 10px)" }});
+        this.areaNode = new Element("div", {"styles": {"height": "calc(100% - 2px)", "overflow": "auto" }});
         this.areaNode.setStyles(this.css.areaNode);
 
         //MWF.require("MWF.widget.ScrollBar", function(){
@@ -969,11 +969,11 @@ MWF.xApplication.query.StatementDesigner.View = new Class({
         var size = this.areaNode.getSize();
 
         if (width>size.x){
-            this.viewTitleNode.setStyle("width", ""+width+"px");
-            this.viewAreaNode.setStyle("width", ""+width+"px");
+            this.viewTitleNode.setStyle("width", ""+(width-2)+"px");
+            this.viewAreaNode.setStyle("width", ""+(width-2)+"px");
         }else{
-            this.viewTitleNode.setStyle("width", ""+size.x+"px");
-            this.viewAreaNode.setStyle("width", ""+size.x+"px");
+            this.viewTitleNode.setStyle("width", ""+(size.x-2)+"px");
+            this.viewAreaNode.setStyle("width", ""+(size.x-2)+"px");
         }
         this.setContentColumnWidth();
         this.setContentHeight();
@@ -1194,8 +1194,24 @@ 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 );
+        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.view = view;
+        this.json = json;
+        this.jsonList = jsonList;
+        this.css = this.view.css;
+        this.container = this.view.actionbarNode;
+        this.moduleName = "actionbar";
+        this.load();
+    },
     getJsonPath : function(){
-        return "../x_component_query_StatementDesigner/$statement/toolbars.json";
+        return "../x_component_query_StatementDesigner/$Statement/toolbars.json";
     },
     selected: function(){
         if (this.view.statement.currentSelectedModule){

o2web/source/x_component_query_ViewDesigner/View.js

@@ -1936,7 +1936,7 @@ MWF.xApplication.query.ViewDesigner.View.Actionbar = new Class({
                 this.toolbarWidget.load();
                 //json = null;
             }else{
-                MWF.getJSON(this.path+"toolbars.json", function(json){
+                MWF.getJSON( this.getJsonPath(), function(json){
                     this.json.defaultTools = json;
                     var json = Array.clone(this.json.defaultTools);
                     //if (this.json.tools) json.append(this.json.tools);