diff --git a/o2web/source/o2_core/o2/widget/Mask.js b/o2web/source/o2_core/o2/widget/Mask.js index 93b10febab695f78302d6c721efd57c302a77d4f..edfe5161fddc581fe813715f57ad1fbf08398d97 100644 --- a/o2web/source/o2_core/o2/widget/Mask.js +++ b/o2web/source/o2_core/o2/widget/Mask.js @@ -7,7 +7,8 @@ o2.widget.Mask = new Class({ "style": "default", "zIndex": 100, "loading": true, - "progress": false + "progress": false, + "html": "" }, initialize: function(options){ this.setOptions(options); @@ -40,7 +41,9 @@ o2.widget.Mask = new Class({ if (this.options.loading){ this.loadBar = new Element("div", { "styles": this.css.loadingBar, - "html": "
loading...
" + "html": "
"+ + ( this.options.html ? this.options.html : "loading..." ) + + "
" }); this.loadBar.setStyle("z-index", this.options.zIndex+2); this.loadBar.inject(this.container); diff --git a/o2web/source/x_component_query_TableDesigner/Table.js b/o2web/source/x_component_query_TableDesigner/Table.js index 28a68b0fd804b33b800116502f84e5e63faa5f43..9ece832aac8c9cf0c087689773478383d286c8e8 100644 --- a/o2web/source/x_component_query_TableDesigner/Table.js +++ b/o2web/source/x_component_query_TableDesigner/Table.js @@ -512,21 +512,6 @@ MWF.xApplication.query.TableDesigner.Table = new Class({ this.close(); }, null); }, - // buildAllView: function(e){ - // var _self = this; - // if (!e) e = this.node; - // this.designer.confirm("warn", e, MWF.APPDTBD.LP.buildAllViewTitle, { - // "html": MWF.APPDTBD.LP.buildAllViewInfor - // }, 480, 120, function(){ - // _self.designer.actions.buildAllTable(function(json){ - // this.designer.notice(this.designer.lp.buildAllView_success, "success", this.node, {"x": "left", "y": "bottom"}); - // }.bind(_self)); - // this.close(); - // }, function(){ - // this.close(); - // }, null); - // }, - buildAllView: function(e){ var _self = this; if (!e) e = this.node; @@ -542,18 +527,38 @@ MWF.xApplication.query.TableDesigner.Table = new Class({ }, null); }, bulidCurrentApp: function(e){ + MWF.require("MWF.widget.Mask", null, false); var _self = this; if (!e) e = this.node; - this.designer.confirm("warn", e, MWF.APPDTBD.LP.buildCurrentAppTitle, { - "html": MWF.APPDTBD.LP.buildCurrentAppInfor - }, 480, 120, function(){ - o2.Actions.load("x_query_assemble_designer").TableAction.buildDispatch( _self.data.application , function(json){ - this.designer.notice(this.designer.lp.buildCurrentApp_success, "success", this.node, {"x": "left", "y": "bottom"}); - }.bind(_self)); - this.close(); - }, function(){ - this.close(); - }, null); + var html = MWF.APPDTBD.LP.buildCurrentAppInfor; + + this.designer.actions.listTable(this.designer.application.id, function (json) { + var listStr = ""; + json.data.each(function(table){ + listStr += "
" + table.name + "
"; //+ (table.alias ? (" (" + table.alias + ")") : "") + }.bind(this)); + var h = "
"+listStr+"
"; + html = html.replace("{tablelist}", h); + this.designer.confirm("warn", e, MWF.APPDTBD.LP.buildCurrentAppTitle, { + "html": html + }, 480, 120, function(){ + + _self.mask = new MWF.widget.Mask({"style": "desktop", "html": MWF.APPDTBD.LP.building}); + _self.mask.loadNode(_self.designer.content); + + this.close(); + + o2.Actions.load("x_query_assemble_designer").TableAction.buildDispatch( _self.data.application , function(json){ + + _self.designer.notice(MWF.APPDTBD.LP.buildCurrentApp_success, "success", _self.node, {"x": "left", "y": "bottom"}); + _self.mask.hide(); + + _self.designer.refresh(); + }); + }, function(){ + this.close(); + }, null); + }.bind(this)); }, tableClear: function(e){ var _self = this; diff --git a/o2web/source/x_component_query_TableDesigner/lp/en.js b/o2web/source/x_component_query_TableDesigner/lp/en.js index 66846d82bdd4d0898da47e6788ab154d70df2190..b191586049d1facca181a4ee36fa513d36a216a6 100644 --- a/o2web/source/x_component_query_TableDesigner/lp/en.js +++ b/o2web/source/x_component_query_TableDesigner/lp/en.js @@ -67,8 +67,9 @@ MWF.xApplication.query.TableDesigner.LP = { "tableExplode_success": "Export successful", "buildCurrentAppTitle": "Compile the current application data table", - "buildCurrentAppInfor": "All data tables of the current application are about to be compiled, After compiling, please restart the server immediately, otherwise it may cause the JVM to crash. Are you sure you want to perform this operation ?", - "buildCurrentApp_success": "All data tables of the current application have been compiled, please restart the server immediately!", + "buildCurrentAppInfor": "The data table for this app will be built:
{tablelist}. Are you sure you want to do this?", + "buildCurrentApp_success": "All data tables of the current application have been compiled!", + "building": "Building...", "tableImplodeTitle": "Import Data", "tableImplodeInfo": "The imported data will be overwritten. Are you sure to import?", @@ -83,7 +84,9 @@ MWF.xApplication.query.TableDesigner.LP = { "buildAllViewInfor": "All data tables will be compiled, including data tables in all data applications. After compiling, please restart the server immediately, otherwise it will cause the JVM to crash. Are you sure you want to perform this operation?", "buildAllView_success": "All data tables have been compiled, please restart the server immediately!", - "tableHelp": "Data tables can automatically create real tables in the system database and generate java entity objects. You can use JPQL to manipulate data tables. Creating a data table requires the following steps:

1, create a data table, And create each column;
2, click the toolbar button to publish the data table to the compiled state;
3, click the toolbar button to execute the \"compile all data tables\" operation
4, restart the server, data The table is ready to use.", + // "tableHelp": "Data tables can automatically create real tables in the system database and generate java entity objects. You can use JPQL to manipulate data tables. Creating a data table requires the following steps:

1, create a data table, And create each column;
2, click the toolbar button to publish the data table to the compiled state;
3, click the toolbar button to execute the \"compile all data tables\" operation
4, restart the server, data The table is ready to use.", + + "tableHelp": "The data table can automatically create a real table in the system database and generate java entity objects. You can use JPQL to operate the data table. The following steps are required to create a data table:

1. Create a data table, And create each column;
2. Click the toolbar button to publish the data table to the compilation state;
3. Click the toolbar button to execute the \"compile all data tables of the current application\" operation, after the success, the data table can be used.", "propertyTemplate": { "base": "Basic", "event": "Event", diff --git a/o2web/source/x_component_query_TableDesigner/lp/zh-cn.js b/o2web/source/x_component_query_TableDesigner/lp/zh-cn.js index fce6e7bd40ebfb1977c3119d2617cf041b8f4c5f..8b48ac00a94bb68641c12f47dcdb95fe9e3031fe 100644 --- a/o2web/source/x_component_query_TableDesigner/lp/zh-cn.js +++ b/o2web/source/x_component_query_TableDesigner/lp/zh-cn.js @@ -67,8 +67,9 @@ MWF.xApplication.query.TableDesigner.LP = { "tableExplode_success": "导出成功", "buildCurrentAppTitle": "编译当前应用数据表", - "buildCurrentAppInfor": "即将编译当前应用所有数据表，编译后您请马上重启服务器，否则可能造成JVM崩溃。您确定要执行此操作吗？", - "buildCurrentApp_success": "已编译当前应用所有数据表，请马上重启服务器！", + "buildCurrentAppInfor": "即将编译本应用的所有数据表：
{tablelist}您确定要执行此操作吗？", + "buildCurrentApp_success": "已编译当前应用所有数据表！", + "building": "正在编译...", "tableImplodeTitle": "导入数据", "tableImplodeInfo": "导入的数据会覆盖。确认是否导入？", @@ -80,10 +81,12 @@ MWF.xApplication.query.TableDesigner.LP = { "tableClear_success": "清空成功", "exportExcelFileName" : "导出数据", - "buildAllViewInfor": "即将编译所有数据表，包括所有数据应用中的数据表，编译后您请马上重启服务器，否则可能造成JVM崩溃。您确定要执行此操作吗？", "buildAllView_success": "已编译所有数据表，请马上重启服务器！", - "tableHelp": "数据表能够在系统数据库中自动创建真实表，并生成java实体对象，您可以使用JPQL操作数据表。创建数据表需要以下步骤：

1、创建数据表，并创建每一列；
2、点击工具栏按钮，将数据表发布到编译状态；
3、点击工具栏按钮，执行“编译当前应用所有数据表”操作
4、马上重启服务器(否则可能造成JVM崩溃)，数据表就可使用了。", + // "tableHelp": "数据表能够在系统数据库中自动创建真实表，并生成java实体对象，您可以使用JPQL操作数据表。创建数据表需要以下步骤：

1、创建数据表，并创建每一列；
2、点击工具栏按钮，将数据表发布到编译状态；
3、点击工具栏按钮，执行“编译当前应用所有数据表”操作
4、马上重启服务器(否则可能造成JVM崩溃)，数据表就可使用了。", + + "tableHelp": "数据表能够在系统数据库中自动创建真实表，并生成java实体对象，您可以使用JPQL操作数据表。创建数据表需要以下步骤：

1、创建数据表，并创建每一列；
2、点击工具栏按钮，将数据表发布到编译状态；
3、点击工具栏按钮，执行“编译当前应用所有数据表”操作，成功后数据表就可使用了。", + "propertyTemplate": { "base": "基本", "event": "事件",