Просмотр исходного кода

Merge branch 'fix/Process.mobile_blue_flat_style' into 'develop'

Merge of fix/Process.mobile_blue_flat_style to develop

See merge request o2oa/o2oa!143
蔡祥熠 5 лет назад
Родитель
Сommit
31d921e3d4

+ 1 - 1
o2web/source/o2_core/o2/widget/Combox.js

@@ -375,7 +375,7 @@ o2.widget.Combox.Value = new Class({
         this.node.hide();
         this.input.setInputPosition(where);
         this.combox.editItem = this;
-        this.combox.input.hide();
+        if(this.combox.input)this.combox.input.hide();
         this.input.searchItems();
     },
     commitInput: function(data){

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

@@ -272,8 +272,8 @@
     },
     "editStyles": {
       "background-color": "#ffffff",
-      "text-align": "right",
-      "height": "36px",
+      "text-align": "left",
+      "height": "auto",
       "border-top": "0px",
       "border-left": "0px",
       "border-right" : "1px solid #999999",
@@ -325,10 +325,12 @@
       "border-radius": "8px",
       "border-bottom": "1px solid #979797",
       "border": "1px solid #979797",
-      "height": "80px",
+      "height": "auto",
+      "min-height" : "78px",
+      "line-height": "78px",
       "color": "#000",
       "font-size": "30px",
-      "float": "left",
+      "float": "none",
       "text-align": "left"
     }
   },