Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!1941

o2web/source/x_component_ConfigDesigner/$Main/default/css.wcss

@@ -34,7 +34,7 @@
     "scriptListAreaSccrollNode": {
         "margin": "4px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",

o2web/source/x_component_cms_DictionaryDesigner/$Main/default/css.wcss

@@ -35,7 +35,7 @@
     "dictionaryListAreaSccrollNode": {
         "margin": "4px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",

o2web/source/x_component_cms_QueryViewDesigner/$Main/default/css.wcss

@@ -35,7 +35,7 @@
     "viewListAreaSccrollNode": {
         "margin": "4px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",

o2web/source/x_component_cms_ViewDesigner/$Main/default/css.wcss

@@ -29,7 +29,7 @@
     "viewListAreaSccrollNode": {
         "margin": "4px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",

o2web/source/x_component_process_DictionaryDesigner/$Main/default/css.wcss

@@ -35,7 +35,7 @@
     "dictionaryListAreaSccrollNode": {
         "margin": "4px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",

o2web/source/x_component_process_StatDesigner/$Main/default/css.wcss

@@ -35,7 +35,7 @@
     "viewListAreaSccrollNode": {
         "margin": "4px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",

o2web/source/x_component_process_ViewDesigner/$Main/default/css.wcss

@@ -35,7 +35,7 @@
     "viewListAreaSccrollNode": {
         "margin": "4px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",

o2web/source/x_component_process_Work/Main.js

@@ -144,7 +144,6 @@ MWF.xApplication.process.Work.Main = new Class({
     loadWorkByWork: function(id){
         //var getWorkLogMothed = "getWorkLog";    //以前使用worklog，现在改成record了
         //var getWorkLogMothed = (this.options.worklogType.toLowerCase()==="worklog") ? "getWorkLog" : "getRecordLog";
-
         var loadFormFlag = false;
         var loadWorkFlag = false;
 
@@ -172,12 +171,12 @@ MWF.xApplication.process.Work.Main = new Class({
             }
         }.bind(this);
 
-        if (this.options.form && this.options.form.id && this.options.form.app){
+        if (this.options.form && this.options.form.id){
             o2.Actions.invokeAsync([
                 {"action": this.action, "name": "loadWorkV2"},
                 {"action": this.action, "name": "getWorkLog"},
                 {"action": this.action, "name": "getWorkControl"},
-                {"action": this.action, "name": "getForm"}
+                {"action": this.action, "name": ((layout.mobile) ? "getFormV2Mobile": "getFormV2")}
             ], {"success": function(jsonWork, jsonLog, jsonControl, jsonForm){
                     json_work = jsonWork;
                     json_log = jsonLog;
@@ -188,18 +187,25 @@ MWF.xApplication.process.Work.Main = new Class({
                     check();
                 }.bind(this), "failure": function(){
                     //this.close();
-                }.bind(this)}, id, id, id, [this.options.form.id, this.options.form.app]);
+                }.bind(this)}, id, id, id, [this.options.form.id]);
         }else{
             this.action.lookupFormWithWork(id, function(json){
                 var formId = json.data.id;
-                this.action[((layout.mobile) ? "getFormV2Mobile": "getFormV2")](formId, function(formJson){
-                    json_form = formJson;
-                    loadFormFlag = true;
-                    check();
-                }, function(){
+                if (json.data.form){
+                    json_form = json;
                     loadFormFlag = true;
                     check();
-                });
+                }else{
+                    this.action[((layout.mobile) ? "getFormV2Mobile": "getFormV2")](formId, function(formJson){
+                        json_form = formJson;
+                        loadFormFlag = true;
+                        check();
+                    }, function(){
+                        loadFormFlag = true;
+                        check();
+                    });
+                }
+
             }.bind(this), function(){
                 loadFormFlag = true;
                 check();

o2web/source/x_component_query_StatDesigner/$Main/default/css.wcss

@@ -35,7 +35,7 @@
     "viewListAreaSccrollNode": {
         "margin": "4px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",

o2web/source/x_component_query_StatementDesigner/$Main/default/css.wcss

@@ -46,7 +46,7 @@
     "statementListAreaSccrollNode": {
         "margin": "4px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",

o2web/source/x_component_query_TableDesigner/$Main/default/css.wcss

@@ -35,7 +35,7 @@
     "viewListAreaSccrollNode": {
         "margin": "4px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",

o2web/source/x_component_query_ViewDesigner/$Main/default/css.wcss

@@ -35,7 +35,7 @@
     "viewListAreaSccrollNode": {
         "margin": "4px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",

o2web/source/x_component_service_AgentDesigner/Main.js

@@ -104,7 +104,7 @@ MWF.xApplication.service.AgentDesigner.Main = new Class({
         }).inject(this.agentListNode);
 
         this.agentListResizeNode = new Element("div", {"styles": this.css.agentListResizeNode}).inject(this.agentListNode);
-        this.agentListAreaSccrollNode = new Element("div", {"styles": this.css.agentListAreaSccrollNode}).inject(this.agentListNode);
+        this.agentListAreaSccrollNode = new Element("div.agentListAreaSccrollNode", {"styles": this.css.agentListAreaSccrollNode}).inject(this.agentListNode);
         this.agentListAreaNode = new Element("div", {"styles": this.css.agentListAreaNode}).inject(this.agentListAreaSccrollNode);
 
         this.loadAgentListResize();

o2web/source/x_component_service_InvokeDesigner/Main.js

@@ -104,7 +104,7 @@ MWF.xApplication.service.InvokeDesigner.Main = new Class({
         }).inject(this.invokeListNode);
 
         this.invokeListResizeNode = new Element("div", {"styles": this.css.invokeListResizeNode}).inject(this.invokeListNode);
-        this.invokeListAreaSccrollNode = new Element("div", {"styles": this.css.invokeListAreaSccrollNode}).inject(this.invokeListNode);
+        this.invokeListAreaSccrollNode = new Element("div.invokeListAreaSccrollNode", {"styles": this.css.invokeListAreaSccrollNode}).inject(this.invokeListNode);
         this.invokeListAreaNode = new Element("div", {"styles": this.css.invokeListAreaNode}).inject(this.invokeListAreaSccrollNode);
 
         this.loadInvokeListResize();

o2web/source/x_desktop/printWork.html

@@ -6,9 +6,8 @@
         <link rel="stylesheet" href="css/mBoxNotice.css" charset="UTF-8" />
         <link rel="stylesheet" href="css/mBoxTooltip.css" charset="UTF-8" />
         <script src="../o2_core/o2.min.js"></script>
-        <script src="js/base.min.js"></script>
+        <script src="js/base_work.js"></script>
         <script src="js/printWork.js"></script>
-        <script src="../o2_lib/Decimal.js"></script>
 
         <title>WORK</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />