From f2c57c8b9ccd975572697d32ace440a7fa553c4c Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 23 Nov 2021 11:22:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E8=A1=A8?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E7=9A=84=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../x_component_query_TableDesigner/Main.js | 2 +- .../x_component_query_TableDesigner/Table.js | 30 +++++++++++-------- .../x_component_query_TableDesigner/lp/en.js | 4 +-- .../lp/zh-cn.js | 6 ++-- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/o2web/source/x_component_query_TableDesigner/Main.js b/o2web/source/x_component_query_TableDesigner/Main.js index 0f2fb158ee..31bdb484a9 100644 --- a/o2web/source/x_component_query_TableDesigner/Main.js +++ b/o2web/source/x_component_query_TableDesigner/Main.js @@ -194,7 +194,7 @@ MWF.xApplication.query.TableDesigner.Main = new Class({ "title": "table help", "content": content, "width": 500, - "height": 300, + "height": 320, "buttonList": [ { "text": "ok", diff --git a/o2web/source/x_component_query_TableDesigner/Table.js b/o2web/source/x_component_query_TableDesigner/Table.js index 2ec2efc388..a3bc7f5d82 100644 --- a/o2web/source/x_component_query_TableDesigner/Table.js +++ b/o2web/source/x_component_query_TableDesigner/Table.js @@ -507,23 +507,27 @@ 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, 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; + // 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; - this.designer.confirm("warn", e, MWF.APPDTBD.LP.buildAllViewTitle, MWF.APPDTBD.LP.buildAllViewInfor, 480, 120, function(){ + 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)); diff --git a/o2web/source/x_component_query_TableDesigner/lp/en.js b/o2web/source/x_component_query_TableDesigner/lp/en.js index f927a22fbc..f3686efd45 100644 --- a/o2web/source/x_component_query_TableDesigner/lp/en.js +++ b/o2web/source/x_component_query_TableDesigner/lp/en.js @@ -76,8 +76,8 @@ MWF.xApplication.query.TableDesigner.LP = { "exportExcelFileName": "Export Data", - "buildAllViewInfor": "All data tables will be compiled, including all data tables in data applications. After compilation, you may need to restart the server to use this data table. Are you sure you want to perform this operation?", - "buildAllView_success": "All data tables have been compiled, and the new changes will take effect after you restart the server", + "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.", "propertyTemplate": { "base": "Basic", 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 ea01cf0944..5be7b50260 100644 --- a/o2web/source/x_component_query_TableDesigner/lp/zh-cn.js +++ b/o2web/source/x_component_query_TableDesigner/lp/zh-cn.js @@ -76,9 +76,9 @@ MWF.xApplication.query.TableDesigner.LP = { "exportExcelFileName" : "导出数据", - "buildAllViewInfor": "即将编译所有数据表,包括所有数据应用中的数据表,编译后您可能需要重启服务器后才能使用此数据表。您确定要执行此操作吗?", - "buildAllView_success": "已编译所有数据表,新的更改需要您重启服务器后生效", - "tableHelp": "数据表能够在系统数据库中自动创建真实表,并生成java实体对象,您可以使用JPQL操作数据表。创建数据表需要以下步骤:

1、创建数据表,并创建每一列;
2、点击工具栏按钮,将数据表发布到编译状态;
3、点击工具栏按钮,执行“编译所有数据表”操作
4、重启服务器,数据表就可以使用了。", + "buildAllViewInfor": "即将编译所有数据表,包括所有数据应用中的数据表,编译后您请马上重启服务器,否则可能造成JVM崩溃。您确定要执行此操作吗?", + "buildAllView_success": "已编译所有数据表,请马上重启服务器!", + "tableHelp": "数据表能够在系统数据库中自动创建真实表,并生成java实体对象,您可以使用JPQL操作数据表。创建数据表需要以下步骤:

1、创建数据表,并创建每一列;
2、点击工具栏按钮,将数据表发布到编译状态;
3、点击工具栏按钮,执行“编译所有数据表”操作
4、马上重启服务器(否则可能造成JVM崩溃),数据表就可使用了。", "propertyTemplate": { "base": "基本", "event": "事件", -- GitLab