Merge branch 'feat/dynamicCompile' into 'develop'

Merge of feat/dynamicCompile 修复编译提示的问题，修改设计元素列表双击打开为单击打开 to develop

See merge request o2oa/o2oa!430

o2web/source/x_component_ConfigDesigner/Main.js

@@ -166,7 +166,7 @@ o2.xApplication.ConfigDesigner.Main = new Class({
 
         listScriptItem.store("script", {id:id,name:name});
         listScriptItem.addEvents({
-            "dblclick": function(e){_self.loadScriptByData(this, e);},
+            "click": function(e){_self.loadScriptByData(this, e);},
             "mouseover": function(){if (_self.currentListScriptItem!=this) this.setStyles(_self.css.listScriptItem_over);},
             "mouseout": function(){if (_self.currentListScriptItem!=this) this.setStyles(_self.css.listScriptItem);}
         });

o2web/source/x_component_cms_DictionaryDesigner/Main.js

@@ -326,7 +326,7 @@ MWF.xApplication.cms.DictionaryDesigner.Main = new Class({
 
         listDictionaryItem.store("dictionary", dictionary);
         listDictionaryItem.addEvents({
-            "dblclick": function(e){_self.loadDictionaryByData(this, e);},
+            "click": function(e){_self.loadDictionaryByData(this, e);},
             "mouseover": function(){if (_self.currentListDictionaryItem!=this) this.setStyles(_self.css.listDictionaryItem_over);},
             "mouseout": function(){if (_self.currentListDictionaryItem!=this) this.setStyles(_self.css.listDictionaryItem);}
         });

o2web/source/x_component_cms_ScriptDesigner/Main.js

@@ -168,7 +168,7 @@ MWF.xApplication.cms.ScriptDesigner.Main = new Class({
 
         listScriptItem.store("script", script);
         listScriptItem.addEvents({
-            "dblclick": function(e){_self.loadScriptByData(this, e);},
+            "click": function(e){_self.loadScriptByData(this, e);},
             "mouseover": function(){if (_self.currentListScriptItem!=this) this.setStyles(_self.css.listScriptItem_over);},
             "mouseout": function(){if (_self.currentListScriptItem!=this) this.setStyles(_self.css.listScriptItem);}
         });

o2web/source/x_component_cms_ViewDesigner/Main.js

@@ -175,7 +175,7 @@ MWF.xApplication.cms.ViewDesigner.Main = new Class({
 
         listViewItem.store("view", view);
         listViewItem.addEvents({
-            "dblclick": function(e){_self.loadViewByData(this, e);},
+            "click": function(e){_self.loadViewByData(this, e);},
             "mouseover": function(){if (_self.currentListViewItem!=this) this.setStyles(_self.css.listViewItem_over);},
             "mouseout": function(){if (_self.currentListViewItem!=this) this.setStyles(_self.css.listViewItem);}
         });

o2web/source/x_component_portal_ScriptDesigner/Main.js

@@ -170,7 +170,7 @@ MWF.xApplication.portal.ScriptDesigner.Main = new Class({
 
         listScriptItem.store("script", script);
         listScriptItem.addEvents({
-            "dblclick": function(e){_self.loadScriptByData(this, e);},
+            "click": function(e){_self.loadScriptByData(this, e);},
             "mouseover": function(){if (_self.currentListScriptItem!=this) this.setStyles(_self.css.listScriptItem_over);},
             "mouseout": function(){if (_self.currentListScriptItem!=this) this.setStyles(_self.css.listScriptItem);}
         });

o2web/source/x_component_process_DictionaryDesigner/Main.js

@@ -336,7 +336,7 @@ MWF.xApplication.process.DictionaryDesigner.Main = new Class({
 
         listDictionaryItem.store("dictionary", dictionary);
         listDictionaryItem.addEvents({
-            "dblclick": function(e){_self.loadDictionaryByData(this, e);},
+            "click": function(e){_self.loadDictionaryByData(this, e);},
             "mouseover": function(){if (_self.currentListDictionaryItem!=this) this.setStyles(_self.css.listDictionaryItem_over);},
             "mouseout": function(){if (_self.currentListDictionaryItem!=this) this.setStyles(_self.css.listDictionaryItem);}
         });

o2web/source/x_component_query_ImporterDesigner/Main.js

@@ -79,7 +79,7 @@ MWF.xApplication.query.ImporterDesigner.Main = new Class({
 
         listImporterItem.store("importer", importer);
         listImporterItem.addEvents({
-            "dblclick": function(e){_self.loadImporterByData(this, e);},
+            "click": function(e){_self.loadImporterByData(this, e);},
             "mouseover": function(){if (_self.currentListViewItem!=this) this.setStyles(_self.css.listViewItem_over);},
             "mouseout": function(){if (_self.currentListViewItem!=this) this.setStyles(_self.css.listViewItem);}
         });

o2web/source/x_component_query_StatDesigner/Main.js

@@ -87,7 +87,7 @@ MWF.xApplication.query.StatDesigner.Main = new Class({
 
         listViewItem.store("view", view);
         listViewItem.addEvents({
-            "dblclick": function(e){_self.loadViewByData(this, e);},
+            "click": function(e){_self.loadViewByData(this, e);},
             "mouseover": function(){if (_self.currentListViewItem!=this) this.setStyles(_self.css.listViewItem_over);},
             "mouseout": function(){if (_self.currentListViewItem!=this) this.setStyles(_self.css.listViewItem);}
         });

o2web/source/x_component_query_StatementDesigner/Main.js

@@ -204,7 +204,7 @@ MWF.xApplication.query.StatementDesigner.Main = new Class({
 
         listStatementItem.store("statement", statement);
         listStatementItem.addEvents({
-            "dblclick": function(e){_self.loadStatementByData(this, e);},
+            "click": function(e){_self.loadStatementByData(this, e);},
             "mouseover": function(){if (_self.currentListStatementItem!=this) this.setStyles(_self.css.listStatementItem_over);},
             "mouseout": function(){if (_self.currentListStatementItem!=this) this.setStyles(_self.css.listStatementItem);}
         });

o2web/source/x_component_query_TableDesigner/Main.js

@@ -79,7 +79,7 @@ MWF.xApplication.query.TableDesigner.Main = new Class({
 
         listTableItem.store("table", table);
         listTableItem.addEvents({
-            "dblclick": function(e){_self.loadTableByData(this, e);},
+            "click": function(e){_self.loadTableByData(this, e);},
             "mouseover": function(){if (_self.currentListViewItem!=this) this.setStyles(_self.css.listViewItem_over);},
             "mouseout": function(){if (_self.currentListViewItem!=this) this.setStyles(_self.css.listViewItem);}
         });

o2web/source/x_component_query_TableDesigner/Table.js

@@ -530,15 +530,32 @@ MWF.xApplication.query.TableDesigner.Table = new Class({
         MWF.require("MWF.widget.Mask", null, false);
         var _self = this;
         if (!e) e = this.node;
-         var html = MWF.APPDTBD.LP.buildCurrentAppInfor;
 
         this.designer.actions.listTable(this.designer.application.id, function (json) {
-            var listStr = "";
+            var bulidStr = "";
+            var draftStr = "";
+            debugger;
             json.data.each(function(table){
-                listStr += "<div style='line-height: 24px;padding-left: 10px;'>" + table.name + "</div>"; //+ (table.alias ? ("  (" + table.alias + ")") : "")
+                if( table.status === "build" ){
+                    bulidStr += "<div style='line-height: 24px;padding-left: 10px;'>" + table.name + "</div>";
+                }else{
+                    draftStr += "<div style='line-height: 24px;padding-left: 10px;'>" + table.name + "</div>";
+                }
             }.bind(this));
-            var h = "<div style='min-height: 70px; max-height: 200px; width: 400px; overflow:auto; font-size: 12px;'>"+listStr+"</div>";
-            html = html.replace("{tablelist}", h);
+
+            var html = "";
+            if( bulidStr ){
+                var h1 = MWF.APPDTBD.LP.buildCurrentAppInfor;
+                var h2 = "<div style='min-height: 70px; max-height: 150px; width: 400px; overflow:auto; font-size: 12px;'>"+bulidStr+"</div>";
+                html += h1.replace("{buildlist}", h2);
+            }
+            if( draftStr ){
+                var h3 = MWF.APPDTBD.LP.unbuildCurrentAppInfor;
+                var h4 = "<div style='min-height: 70px; max-height: 150pxpx; width: 400px; overflow:auto; font-size: 12px;'>"+draftStr+"</div>";
+                html += h3.replace("{draftList}", h4);
+            }
+            html += MWF.APPDTBD.LP.buildCurrentAppQuection;
+
             this.designer.confirm("warn", e, MWF.APPDTBD.LP.buildCurrentAppTitle, {
                 "html": html
             }, 480, 120, function(){

o2web/source/x_component_query_TableDesigner/lp/en.js

@@ -66,8 +66,10 @@ MWF.xApplication.query.TableDesigner.LP = {
     "tableExplodeInfo": "By default, up to 2000 rows can be exported. Are you sure you want to export?",
     "tableExplode_success": "Export successful",
 
-    "buildCurrentAppTitle": "Compile the current application data table",
-    "buildCurrentAppInfor": "The data table for this app will be built: <br/>{tablelist}. Are you sure you want to do this?",
+    "buildCurrentAppTitle": "Build current application data table",
+    "buildCurrentAppInfor": "The following data tables will be built:</br>{buildlist}",
+    "unbuildCurrentAppInfor": "The following data tables are not compiled or uncompiled:</br>{draftList}",
+    "buildCurrentAppQuection": "Are you sure you want to do this?",
     "buildCurrentApp_success": "All data tables of the current application have been compiled!",
     "building": "Building...",
 

o2web/source/x_component_query_TableDesigner/lp/zh-cn.js

@@ -67,8 +67,10 @@ MWF.xApplication.query.TableDesigner.LP = {
     "tableExplode_success": "导出成功",
 
     "buildCurrentAppTitle": "编译当前应用数据表",
-    "buildCurrentAppInfor": "即将编译本应用的所有数据表：<br/>{tablelist}您确定要执行此操作吗？",
-    "buildCurrentApp_success": "已编译当前应用所有数据表！",
+    "buildCurrentAppInfor": "下列数据表将被编译：</br>{buildlist}",
+    "unbuildCurrentAppInfor":   "下列数据表不编译或取消编译：</br>{draftList}",
+    "buildCurrentAppQuection": "</br>您确定要执行此操作吗？",
+    "buildCurrentApp_success": "已编译当前应用数据表！",
     "building": "正在编译...",
 
     "tableImplodeTitle": "导入数据",

o2web/source/x_component_query_ViewDesigner/Main.js

@@ -332,7 +332,7 @@ MWF.xApplication.query.ViewDesigner.Main = new Class({
 
         listViewItem.store("view", view);
         listViewItem.addEvents({
-            "dblclick": function(e){_self.loadViewByData(this, e);},
+            "click": function(e){_self.loadViewByData(this, e);},
             "mouseover": function(){if (_self.currentListViewItem!=this) this.setStyles(_self.css.listViewItem_over);},
             "mouseout": function(){if (_self.currentListViewItem!=this) this.setStyles(_self.css.listViewItem);}
         });

o2web/source/x_component_service_AgentDesigner/Main.js

@@ -157,7 +157,7 @@ MWF.xApplication.service.AgentDesigner.Main = new Class({
 
         listAgentItem.store("agent", agent);
         listAgentItem.addEvents({
-            "dblclick": function(e){_self.loadAgentByData(this, e);},
+            "click": function(e){_self.loadAgentByData(this, e);},
             "mouseover": function(){if (_self.currentListAgentItem!=this) this.setStyles(_self.css.listAgentItem_over);},
             "mouseout": function(){if (_self.currentListAgentItem!=this) this.setStyles(_self.css.listAgentItem);}
         });

o2web/source/x_component_service_InvokeDesigner/Main.js

@@ -157,7 +157,7 @@ MWF.xApplication.service.InvokeDesigner.Main = new Class({
 
         listInvokeItem.store("invoke", invoke);
         listInvokeItem.addEvents({
-            "dblclick": function(e){_self.loadInvokeByData(this, e);},
+            "click": function(e){_self.loadInvokeByData(this, e);},
             "mouseover": function(){if (_self.currentListInvokeItem!=this) this.setStyles(_self.css.listInvokeItem_over);},
             "mouseout": function(){if (_self.currentListInvokeItem!=this) this.setStyles(_self.css.listInvokeItem);}
         });