diff --git a/o2web/source/o2_core/o2/widget/$Dialog/mobile_blue_flat/dialog.html b/o2web/source/o2_core/o2/widget/$Dialog/mobile_blue_flat/dialog.html
index 4d65b9b209556a30248c8808e5337d4ce801ef5c..fdcfa63dfc2ed9235e920e21c948bca4b416deb3 100644
--- a/o2web/source/o2_core/o2/widget/$Dialog/mobile_blue_flat/dialog.html
+++ b/o2web/source/o2_core/o2/widget/$Dialog/mobile_blue_flat/dialog.html
@@ -4,7 +4,7 @@
-
+
diff --git a/o2web/source/x_component_Selector/$Selector/blue_flat_mobile/css.wcss b/o2web/source/x_component_Selector/$Selector/blue_flat_mobile/css.wcss
index df8cb8b356d30818f9a4951ebc9799d749d7986b..aa4ede91b19ce820cafb765010f624af83e3bfb5 100644
--- a/o2web/source/x_component_Selector/$Selector/blue_flat_mobile/css.wcss
+++ b/o2web/source/x_component_Selector/$Selector/blue_flat_mobile/css.wcss
@@ -143,7 +143,8 @@
},
"actionNode": {
"height": "64px",
- "overflowe" : "hidden"
+ "overflowe" : "hidden",
+ "border-top" : "1px solid #F0F0F0"
},
"okActionNode": {
"height": "44px",
diff --git a/o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_mobile-blue-flat.json b/o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_mobile-blue-flat.json
index b7121b1d7d0f377ced6dbaa08c009d7f4286ecf3..88ac9ff809897d4d87ad8bed809133f6c79c6454 100644
--- a/o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_mobile-blue-flat.json
+++ b/o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_mobile-blue-flat.json
@@ -273,7 +273,7 @@
},
"editStyles": {
"background-color": "#ffffff",
- "text-align": "left",
+ "text-align": "right",
"height": "auto",
"border-top": "0px",
"border-left": "0px",
@@ -288,7 +288,7 @@
"border-left": "0px",
"border-right" : "0px",
"border-bottom" : "1px solid #cfd9df",
- "text-align": "left"
+ "text-align": "right"
},
"itemTitleStyles": {
"height": "16px",
diff --git a/o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_mobile-blue-flat_extend.json b/o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_mobile-blue-flat_extend.json
index 512ff5b397eb01eee3c9d6256cf31df36094aadc..5016d605c7a5b42f2d81b05a60d43806ae014ef8 100644
--- a/o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_mobile-blue-flat_extend.json
+++ b/o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_mobile-blue-flat_extend.json
@@ -53,6 +53,9 @@
"margin-left": "0px"
}
},
+ "errorStyle" : {
+ "type" : "notice"
+ },
"selectorStyle" : {
"style" : "blue_flat_mobile",
"width" : "700",
diff --git a/o2web/source/x_component_process_Xform/$Input.js b/o2web/source/x_component_process_Xform/$Input.js
index d9a6d6ab7af24e30237664c782b4a5a20f6b9f1e..9fc08547ad9329fc500c8d58c7bf5323c8acd462 100644
--- a/o2web/source/x_component_process_Xform/$Input.js
+++ b/o2web/source/x_component_process_Xform/$Input.js
@@ -259,19 +259,31 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input = new Class({
//});
var node;
if( this.form.json.errorStyle ){
- node = new Element("div",{
- "styles" : this.form.json.errorStyle.node,
- "text": text
- });
- if( this.form.json.errorStyle.close ){
- var closeNode = new Element("div",{
- "styles" : this.form.json.errorStyle.close ,
- "events": {
- "click" : function(){
- this.destroy();
- }.bind(node)
- }
- }).inject(node);
+ if( this.form.json.errorStyle.type === "notice" ){
+ if( !this.form.errorNoticing ){ //如果是弹出
+ this.form.errorNoticing = true;
+ this.form.notice(text, "error", this.node, null, null, {
+ onClose : function () {
+ alert(1);
+ this.form.errorNoticing = false;
+ }.bind(this)
+ });
+ }
+ }else{
+ node = new Element("div",{
+ "styles" : this.form.json.errorStyle.node,
+ "text": text
+ });
+ if( this.form.json.errorStyle.close ){
+ var closeNode = new Element("div",{
+ "styles" : this.form.json.errorStyle.close ,
+ "events": {
+ "click" : function(){
+ this.destroy();
+ }.bind(node)
+ }
+ }).inject(node);
+ }
}
}else{
node = new Element("div");