修正保存新版本时，弹出窗口大小不合适的问题

o2web/source/o2_core/o2/widget/$Dialog/default/css.wcss

@@ -41,5 +41,24 @@
 		"font-size": "12px",
 		"color": "#333",
 		"margin": "0px 5px"
-	}
+	},
+	"okButton": {
+        "border": "0px",
+        "background-color": "#3C76B7",
+        "color": "#fff",
+        "height": "30px",
+        "border-radius": "20px",
+        "min-width": "80px",
+        "margin": "10px 5px"
+    },
+    cancelButton: {
+        "border": "0px",
+        "height": "30px",
+        "border-radius": "20px",
+        "min-width": "80px",
+        "margin": "10px 5px",
+        "color": "#fff",
+        "background-color": "#999999 !important",
+
+    },
 }

o2web/source/o2_core/o2/widget/$Dialog/user/css.wcss

@@ -73,7 +73,7 @@
         "min-width": "80px",
         "margin": "10px 5px",
         "color": "#fff",
-        "background-color": "#999999 !important",
+        "background-color": "#999999"
 
     },
 	"closeAction": {

o2web/source/o2_core/o2/widget/Dialog.js

@@ -236,7 +236,7 @@ o2.widget.Dialog = o2.DL = new Class({
 				}
 			}).inject(this.button);
 		}
-		debugger;
+
 		if (this.options.buttonList){
 			this.options.buttonList.each(function(bt){
 				var styles = this.css.button;
@@ -247,7 +247,7 @@ o2.widget.Dialog = o2.DL = new Class({
 					"type": "button",
 					"value": bt.text,
 					"title": bt.title,
-					"class": "mainColor_bg",
+					"class": (bt.type!=="cancel") ? "mainColor_bg" : "",
 					"styles": styles,
 					"events": {
 						"click": function(e){bt.action.call(this, this, e)}.bind(this)

o2web/source/o2_core/o2/xDesktop/Dialog.js

@@ -120,7 +120,6 @@ o2.xDesktop.Dialog = o2.DDL = new Class({
                 }
             }).inject(this.button);
         }
-        debugger;
         if (this.options.buttonList){
             this.options.buttonList.each(function(bt){
                 var styles = this.css.button;
@@ -143,7 +142,7 @@ o2.xDesktop.Dialog = o2.DDL = new Class({
                     "value": bt.text,
                     "title": bt.title,
                     "styles": styles,
-                    "class": "mainColor_bg",
+                    "class": (bt.type!=="cancel") ? "mainColor_bg" : "",
                     "events": {
                         "click": function(e){bt.action.call(this, this, e)}.bind(this)
                     }
@@ -224,19 +223,6 @@ o2.xDesktop.Dialog = o2.DDL = new Class({
             }
         }
 
-        //this.options.top = 0;
-        //this.options.left = 0;
-        //this.options.fromTop = 0;
-        //this.options.fromLeft = 0;
-        //this.options.contentHeight = 0;
-        //this.options.contentWidth = 0;
-        //this.options.maxHeightPercent = null;
-        //this.options.maxHeight = null;
-        //this.options.maxWidth = null;
-
-        //this.height = null;
-        //this.width = null;
-
         var container = $(document.body);
         if (layout.desktop.currentApp){
             container = layout.desktop.currentApp.content;
@@ -263,27 +249,6 @@ o2.xDesktop.Dialog = o2.DDL = new Class({
         this.fireEvent("max");
     },
     restoreSize : function(){
-        //if( this.oldCoordinate){
-        //    this.options.height = this.oldCoordinate.height;
-        //    this.options.width = this.oldCoordinate.width;
-        //    this.options.top = this.oldCoordinate.top;
-        //    this.options.left = this.oldCoordinate.left;
-        //    this.options.fromTop = this.oldCoordinate.fromTop;
-        //    this.options.fromLeft = this.oldCoordinate.fromLeft;
-        //    this.options.contentHeight = this.oldCoordinate.contentHeight;
-        //    this.options.contentWidth = this.oldCoordinate.contentWidth;
-        //    this.options.maxHeightPercent = this.oldCoordinate.maxHeightPercent;
-        //    this.options.maxHeight = this.oldCoordinate.maxHeight;
-        //    this.options.maxWidth = this.oldCoordinate.maxWidth;
-        //}
-        //
-        //if( this.oldSize ){
-        //    this.width = this.oldSize.width;
-        //    this.height = this.oldSize.height;
-        //}
-
-        //this.setContentSize( this.oldNodeSize.height, this.oldNodeSize.width );
-        //this.node.setStyles( this.getNodeSize() );
 
         this.contentHeight = this.oldContentSize.height;
         this.contentWidth = this.oldContentSize.width;

o2web/source/x_component_process_FormDesigner/$Main/default/tools.json

@@ -167,6 +167,11 @@
     "text": "流程记录",
     "className": "Log"
   },
+  "readLog": {
+    "icon": "readLog.png",
+    "text": "阅读记录",
+    "className": "ReadLog"
+  },
   "monitor": {
     "icon": "monitor.png",
     "text": "流程监控",

o2web/source/x_component_process_ProcessDesigner/Process.js

@@ -551,7 +551,8 @@ MWF.xApplication.process.ProcessDesigner.Process = new Class({
 				"content": node,
 				"title": this.designer.lp.upgradeConfirm,
 				"offset": {"y": -100},
-				"height": 330,
+				"height": 340,
+				"width": 580,
 				"buttonList": [{
 					"type": "ok",
 					"text": this.designer.lp.ok,