diff --git a/o2web/source/x_component_query_StatementDesigner/Statement.js b/o2web/source/x_component_query_StatementDesigner/Statement.js index def0bf32eaa580c95384f8337b7113a22890ca71..290427082a2ac4f0ee6ecb07d4b64a95e985067a 100644 --- a/o2web/source/x_component_query_StatementDesigner/Statement.js +++ b/o2web/source/x_component_query_StatementDesigner/Statement.js @@ -626,6 +626,10 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({ this.designer.notice(this.designer.lp.inputStatementName, "error"); return false; } + + if( typeOf(this.viewJson) === "object" ){ + this.data.view = JSON.stringify(this.viewJson); + } //if( !this.data.tableType ){ // this.data.tableType = "dynamic"; //} @@ -649,6 +653,11 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({ this.designer.notice(this.designer.lp.inputStatementName, "error"); return false; } + + 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; @@ -667,8 +676,12 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({ this.setViewSize(); this.designer.addEvent("resize", this.setViewSize.bind(this)); - if( !this.data.view )this.data.view = {}; - this.view = new MWF.xApplication.query.StatementDesigner.View(this.designer, this, this.data.view, {}); + if( !this.data.view ){ + this.viewJson = {}; + }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.setContentHeight(); }.bind(this)); diff --git a/o2web/source/x_component_query_StatementDesigner/lp/zh-cn.js b/o2web/source/x_component_query_StatementDesigner/lp/zh-cn.js index 52ca332da24b0da7c5d9bc26b625995177e32274..678927ed5e06e7dcdfc38daaedd4116b9cdd7f9e 100644 --- a/o2web/source/x_component_query_StatementDesigner/lp/zh-cn.js +++ b/o2web/source/x_component_query_StatementDesigner/lp/zh-cn.js @@ -18,7 +18,7 @@ MWF.xApplication.query.StatementDesigner.LP = Object.merge( MWF.xApplication.que "inputStatementData": "请先编辑JPQL查询语句", "saveStatementNotice" : "请先保存!", "noViewNotice" : "未创建视图,请先创建视图!", - "previewNotSelectStatementNotice" : "只有查询语句才可以预览", + "previewNotSelectStatementNotice" : "只有语句类型为‘Select’才可以预览", "statementFormat": "如何创建语句:", "statementJpql": "直接编写JPQL创建语句",