Merge branch 'fix/imageClipper_buttonStyle' into 'develop'

Merge of fix/imageClipper_buttonStyle 表单图片剪切组件工具增加按钮样式 to develop

See merge request o2oa/o2oa!1297

o2web/source/x_component_process_FormDesigner/Module/ImageClipper.js

@@ -53,6 +53,31 @@ MWF.xApplication.process.FormDesigner.Module.ImageClipper = MWF.FCImageClipper =
 	_loadNodeStyles: function(){
 		var button = this.node.getFirst("button");
 		button.setStyles(this.css.buttonIcon);
+		button.setStyles(this.json.buttonStyles);
+	},
+
+
+	setAllStyles: function(){
+		this.setPropertiesOrStyles("styles");
+		this.setPropertiesOrStyles("buttonStyles");
+		this.setPropertiesOrStyles("imageStyles");
+		this.setPropertiesOrStyles("properties");
+		this.reloadMaplist();
+	},
+	_initModule: function(){
+		if (!this.json.isSaved) this.setStyleTemplate();
+
+		this._resetModuleDomNode();
+
+		this.setPropertiesOrStyles("styles");
+		this.setPropertiesOrStyles("buttonStyles");
+		this.setPropertiesOrStyles("imageStyles");
+		this.setPropertiesOrStyles("properties");
+
+		this._setNodeProperty();
+		if (!this.form.isSubform) this._createIconAction();
+		this._setNodeEvent();
+		this.json.isSaved = true;
 	},
 
 	unSelected: function(){
@@ -83,6 +108,27 @@ MWF.xApplication.process.FormDesigner.Module.ImageClipper = MWF.FCImageClipper =
 		return this.copyNode;
 	},
 
+	setPropertiesOrStyles: function(name){
+		if (name=="styles"){
+			try{
+				this.setCustomStyles();
+			}catch(e){}
+		}
+		if (name=="properties"){
+			try{
+				this.setCustomProperties();
+			}catch(e){}
+		}
+		if (name=="buttonStyles"){
+			if (this.json.buttonStyles){
+				var button = this.node.getElement("button");
+				button.clearStyles();
+				button.setStyles(this.css.buttonIcon);
+				button.setStyles(this.json.buttonStyles);
+			}
+		}
+	},
+
 	_setEditStyle_custom: function(name){
 		if (name=="name"){
 			if (this.json.name){

o2web/source/x_component_process_FormDesigner/Module/ImageClipper/imageclipper.html

@@ -60,6 +60,7 @@
 
         <div class="MWFMaplist" name="styles" title="{{$.lp.style}}"></div>
         <div class="MWFMaplist" name="properties" title="{{$.lp.attribute}}"></div>
+        <div class="MWFMaplist" name="buttonStyles" title="{{$.lp.buttonStyle}}"></div>
         <div class="MWFMaplist" name="imageStyles" title="{{$.lp.imageStyle}}"></div>
 
         <div class="MWFValidation" name="validationConfig"></div>

o2web/source/x_component_process_Xform/ImageClipper.js

@@ -64,6 +64,9 @@ MWF.xApplication.process.Xform.ImageClipper = MWF.APPImageClipper =  new Class(
 			"styles": this.form.json.buttonStyle || this.form.css.buttonStyles,
 			"MWFType": this.json.type
         });
+        if(this.json.buttonStyles){
+            button.setStyles( this.json.buttonStyles );
+        }
         button.addEvent("click", function(){
             this.validationMode();
             var d = this._getBusinessData();