Merge branch 'fix/Calendar.load_execption' into 'develop'

Merge of fix/[日常管理]修复打开日常管理的时候会重复执行listMyCalendar的问题  to develop

See merge request o2oa/o2oa!612

o2web/source/o2_core/o2/widget/$AttachmentController/mobile_blue_flat/css.wcss

@@ -15,7 +15,7 @@
         "height": "auto"
     },
     "minActionAreaNode": {
-        "margin-top" : "10px"
+//        "margin-top" : "10px"
 //        "float": "right"
 //        "height": "80px",
 //        "margin": "2px",
@@ -60,7 +60,7 @@
 //        "background-image": "url("+o2.session.path+"/widget/$AttachmentController/default/buttonbg.png)"
     },
     "actionsGroupNode": {
-        "margin-top" : "10px"
+//        "margin-top" : "10px"
 //        "height": "26px",
 //        "border": "1px solid #979797",
 //        "border-radius": "3px",

o2web/source/x_component_Calendar/Main.js

@@ -30,6 +30,7 @@ MWF.xApplication.Calendar.Main = new Class({
         //if (!this.personActions) this.personActions = MWF.Actions.get("x_organization_assemble_express");
     },
     loadApplication: function(callback) {
+        this.canlendarData = null;
         MWF.UD.getDataJson("calendarConfig", function(json){
             this.calendarConfig = json || {};
 
@@ -68,17 +69,22 @@ MWF.xApplication.Calendar.Main = new Class({
         }.bind(this));
     },
     listCalendar : function( callback ){
-        this.actions.listMyCalendar( function( json ){
-            if( ( json.data.myCalendars || [] ).length == 0 ){
-               this.createDefaultCalendar(function(){
-                       if(callback)callback()
-                   });
-            }else{
-                this.calendarDataList = json.data.myCalendars;
-                this.currentCalendarData = json.data.myCalendars[0];
-                if(callback)callback()
-            }
-        }.bind(this))
+        if( this.canlendarData ){
+            if(callback)callback( this.canlendarData )
+        }else{
+            this.actions.listMyCalendar( function( json ){
+                if( ( json.data.myCalendars || [] ).length == 0 ){
+                    this.createDefaultCalendar(function(){
+                        if(callback)callback( json.data )
+                    });
+                }else{
+                    this.canlendarData = json.data;
+                    this.calendarDataList = json.data.myCalendars;
+                    this.currentCalendarData = json.data.myCalendars[0];
+                    if(callback)callback( json.data )
+                }
+            }.bind(this))
+        }
     },
     getSelectedCalendarId : function(){
         if( this.leftNavi ){
@@ -101,6 +107,7 @@ MWF.xApplication.Calendar.Main = new Class({
           this.actions.listMyCalendar( function( json ){
               if( ( json.data.myCalendars || [] ).length == 0 ){
               }else{
+                  this.canlendarData = json.data;
                   this.calendarDataList = json.data.myCalendars;
                   this.currentCalendarData = json.data.myCalendars[0];
                   if(callback)callback()
@@ -652,10 +659,11 @@ MWF.xApplication.Calendar.Navi = new Class({
         this.unitCalendarNaviItem = [];
         this.followCalendarNaviItem = [];
 
-        this.app.actions.listMyCalendar( function( json ){
-            this.myCalendars =json.data.myCalendars;
-            this.unitCalendars =json.data.unitCalendars;
-            this.followCalendars =json.data.followCalendars;
+        this.app.listCalendar( function( data ){
+            this.myCalendars = data.myCalendars;
+            this.unitCalendars = data.unitCalendars;
+            this.followCalendars = data.followCalendars;
+            this.app.canlendarData = null;
             this.loadNode();
         }.bind(this));
 

o2web/source/x_component_Selector/$Selector/blue_flat_mobile/css.wcss

@@ -209,7 +209,7 @@
 	  "margin-left" : "5px"
 	},
 	"searchInputDiv": {
-	  	"padding" : "0px 15px",
+	  	"padding" : "0px 15px 5px 15px",
 		"height": "50px",
 		"color": "#999",
         "background": "#fff",
@@ -443,7 +443,7 @@
 
 	"selectorItemTextNode": {
 		"height": "44px",
-	  	"margin-left": "23px",
+	  	"margin-left": "30px",
 	  	"margin-right" : "23px",
 		"word-wrap": "break-word",
 		"color": "#333"
@@ -530,23 +530,30 @@
   },
   "flatCategoryItemNode" : {
 	"border-left" : "4px solid #F5F5F5",
-	"background-color" : "#F5F5F5"
+	"background-color" : "#F5F5F5",
+	  "overflow" : "hidden"
   },
   "flatCategoryItemNode_selected" : {
 	"border-left" : "4px solid #32AAFF",
 	"background-color" : "#fff"
   },
   "flatCategoryItemTextNode" : {
-	"padding-left" : "11px",
-	"width" : "115px",
-	"height" : "44px",
-	"line-height" : "44px",
+	"margin-left" : "11px",
+	  "margin-right" : "11px",
+	  "margin-top" : "10px",
+	  "margin-bottom" : "10px",
+	  "width" : "104px",
+//	"min-height" : "44px",
+//	"line-height" : "24px",
 	"font-size" : "16px",
 	"color" : "#333",
-	"white-space" : "nowrap",
-	"word-break" : "break-all",
-	"text-overflow" : "ellipsis",
-	"overflow" : "hidden"
+	  //	"white-space" : "nowrap",
+	  //	"word-break" : "break-all",
+	  //	"text-overflow" : "ellipsis",
+	  "display": "-webkit-box",
+	  "-webkit-box-orient": "vertical",
+	  "-webkit-line-clamp" : "2",
+		"overflow" : "hidden"
   },
   "flatCategory_selectAllWrap" : {
 	"overflow" : "hidden",

o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_mobile-blue-flat.json

@@ -151,7 +151,7 @@
       "margin-top": "10px",
       "margin-left": "15px",
       "margin-right": "15px",
-      "border" : "1px solid #999999",
+      "border" : "0px",
       "table-layout" : "fixed"
     },
     "titleStyles":{
@@ -159,8 +159,8 @@
       "color": "#333",
       "border-top": "0px",
       "border-left": "0px",
-      "border-right" : "1px solid #999999",
-      "border-bottom" : "1px solid #999999",
+      "border-right" : "0px",
+      "border-bottom" : "1px solid #cfd9df",
       "height": "23px",
       "font-size": "16px",
       "width": "65px",
@@ -174,9 +174,9 @@
       "font-size": "16px",
       "border-top": "0px",
       "border-left": "0px",
-      "border-right" : "1px solid #999999",
-      "border-bottom" : "1px solid #999999",
-      "text-align": "left"
+      "border-right" : "0px",
+      "border-bottom" : "1px solid #cfd9df",
+      "text-align": "right"
     },
     "layoutStyles": {},
     "properties": {
@@ -193,7 +193,7 @@
       "margin-top": "0px",
       "margin-left": "0px",
       "margin-right": "0px",
-      "border" : "1px solid #999999",
+//      "border" : "0px",
       "table-layout" : "fixed"
     },
     "titleStyles":{
@@ -201,8 +201,8 @@
       "color": "#333",
       "border-top": "0px",
       "border-left": "0px",
-      "border-right" : "1px solid #999999",
-      "border-bottom" : "1px solid #999999",
+      "border-right" : "0px",
+      "border-bottom" : "1px solid #cfd9df",
       "height": "23px",
       "font-size": "16px",
       "width": "65px",
@@ -216,9 +216,9 @@
       "font-size": "16px",
       "border-top": "0px",
       "border-left": "0px",
-      "border-right" : "1px solid #999999",
-      "border-bottom" : "1px solid #999999",
-      "text-align": "left"
+      "border-right" : "0px",
+      "border-bottom" : "1px solid #cfd9df",
+      "text-align": "right"
     },
     "properties": {
       "width": "100%",
@@ -238,8 +238,8 @@
       "position" : "static"
     },
     "tableStyles": {
-      "border-top": "1px solid #999999",
-      "border-left": "1px solid #999999",
+      "border-top": "1px solid #cfd9df",
+      "border-left": "0px",
       "border-right" : "0px",
       "border-bottom" : "0px",
       "table-layout" : "fixed"
@@ -249,8 +249,8 @@
       "color": "#333",
       "border-top": "0px",
       "border-left": "0px",
-      "border-right" : "1px solid #999999",
-      "border-bottom" : "1px solid #999999",
+      "border-right" : "0px",
+      "border-bottom" : "1px solid #cfd9df",
       "height": "23px",
       "font-size": "16px",
       "width": "65px",
@@ -264,9 +264,9 @@
       "font-size": "16px",
       "border-top": "0px",
       "border-left": "0px",
-      "border-right" : "1px solid #999999",
-      "border-bottom" : "1px solid #999999",
-      "text-align": "left"
+      "border-right" : "0px",
+      "border-bottom" : "1px solid #cfd9df",
+      "text-align": "right"
     },
     "actionStyles": {
       "background-color": "#F1F4F9"
@@ -277,8 +277,8 @@
       "height": "auto",
       "border-top": "0px",
       "border-left": "0px",
-      "border-right" : "1px solid #999999",
-      "border-bottom" : "1px solid #999999"
+      "border-right" : "0px",
+      "border-bottom" : "1px solid #cfd9df"
     },
     "amountStyles": {
       "background-color": "#FFFFFF",
@@ -286,8 +286,8 @@
       "font-size": "16px",
       "border-top": "0px",
       "border-left": "0px",
-      "border-right" : "1px solid #999999",
-      "border-bottom" : "1px solid #999999",
+      "border-right" : "0px",
+      "border-bottom" : "1px solid #cfd9df",
       "text-align": "left"
     },
     "itemTitleStyles": {
@@ -346,7 +346,7 @@
       "border-radius": "0px",
       "border-bottom": "0px",
       "border": "0px solid #979797",
-      "height": "40px",
+      "height": "auto",
       "color": "#000",
       "font-size": "15px",
       "float": "left",
@@ -360,10 +360,11 @@
       "color": "#000"
     },
     "inputStyles": {
+      "padding-left" : "0px",
       "border-radius": "0px",
       "border-bottom": "0px",
       "border": "0px solid #979797",
-      "height": "40px",
+      "height": "auto",
       "color": "#000",
       "font-size": "15px",
       "float": "left",
@@ -396,7 +397,7 @@
       "border-radius": "0px",
       "border-bottom": "0px",
       "border": "0px solid #979797",
-      "height": "40px",
+      "height": "auto",
       "color": "#000",
       "font-size": "15px",
       "float": "left",
@@ -413,7 +414,7 @@
       "border-radius": "0px",
       "border-bottom": "0px",
       "border": "0px solid #979797",
-      "height": "40px",
+      "height": "auto",
       "color": "#000",
       "font-size": "15px",
       "float": "left",

o2web/source/x_component_process_Work/$Processor/mobile/css.wcss

@@ -77,7 +77,7 @@
     },
     "routeOpinionArea": {
         "height": "129px",
-        "border-bottom": "0px solid #6681a5",
+        "border-bottom": "0px solid #6681a5"
     },
 
     "inputOpinionNode": {
@@ -130,7 +130,7 @@
         "height": "3em",
         "width": "3em",
         "float": "left",
-        "background": "url("+"../x_component_process_Work/$Processor/default/ok-18.png) no-repeat center center",
+        "background": "url(../x_component_process_Work/$Processor/default/ok-18.png) no-repeat center center"
     },
     "okTextNode": {
         "font-size": "1em",
@@ -153,7 +153,7 @@
         "height": "3em",
         "width": "3em",
         "float": "left",
-        "background": "url("+"../x_component_process_Work/$Processor/default/cancel-18.png) no-repeat center center",
+        "background": "url(../x_component_process_Work/$Processor/default/cancel-18.png) no-repeat center center"
     },
     "cancelTextNode": {
         "font-size": "1em",
@@ -190,7 +190,7 @@
         "padding-left": "24px",
         "padding-right": "5px",
         "margin-left": "5px",
-        "background": "url("+"../x_component_process_Work/$Processor/default/write.png) no-repeat 5px center"
+        "background": "url(../x_component_process_Work/$Processor/default/write.png) no-repeat 5px center"
     },
     "handwritingNode": {
         "position": "absolute",
@@ -219,7 +219,7 @@
         "padding-left": "24px",
         "padding-right": "5px",
         "margin-left": "5px",
-        "background": "url("+"../x_component_process_Work/$Processor/default/audioRecord.png) no-repeat 5px center"
+        "background": "url(../x_component_process_Work/$Processor/default/audioRecord.png) no-repeat 5px center"
     },
     "orgsTitle": {
         "overflow": "hidden",
@@ -244,34 +244,11 @@
         "border-left": "5px solid #ffffff"
     },
 
-    //    "selectIdeaNode": {
-    //        "background-color": "#eee",
-    //        "max-height": "200px",
-    //        "clear": "both",
-    //        "overflow": "hidden"
-    //    },
-    //    "selectIdeaScrollNode": {
-    //        "max-height": "200px",
-    //        "overflow": "auto"
-    //    },
-    //    "selectIdeaItemNode": {
-    //        "line-height": "18px",
-    //        "font-size": "14px",
-    //        "cursor": "pointer",
-    //        "background-color": "#FFF",
-    //        "padding": "4px 4px 4px 4px",
-    //        "overflow": "hidden"
-    //    },
-    //    "selectIdeaItemNode_over": {
-    //        "background-color": "#e6ecf8"
-    //    },
-
     "selectorTitle": {
         "padding": "0px 4px",
         "height": "30px",
         "line-height": "30px",
         "font-size": "14px",
-        //        "font-weight": "bold",
         "color": "#000",
         "cursor" : "pointer",
         "background": "url(../x_component_process_Work/$Processor/mobile/arrow_right2.png) no-repeat right 10px center",
@@ -281,10 +258,8 @@
         "background-color": "#e6ecf8"
     },
     "selectorTitleText": {
-//        "float": "left"
     },
     "selectorErrorNode" : {
-        //"float" : "right",
         "background-color" : "#fff",
         "margin-right" : "5px",
         "font-weight" : "normal"