liupeng 3 лет назад
Родитель
Сommit
4d9709c704
3 измененных файлов с 101 добавлено и 19 удалено
  1. 100 17
      dist/yvan-ext-mobile.css
  2. 0 1
      dist/yvan-ext-mobile.js
  3. 1 1
      dist/yvan-ext-mobile.js.map

+ 100 - 17
dist/yvan-ext-mobile.css

@@ -345,28 +345,51 @@
     padding: 0 12px 0 6px;
 }
 
+.x-field {
+    -webkit-box-align: center;
+        -ms-flex-align: center;
+            align-items: center;
+}
+
 /**修改表单内的样式*/
 .x-field.x-label-text-align-left > .x-label-el {
     font-size: 18px;
     text-align: right;
 }
 
+.x-field.x-label-align-left:first-child .x-label-el {
+    border-top-left-radius: 4px !important;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-align: center;
+        -ms-flex-align: center;
+            align-items: center;
+}
+
+.x-field.x-label-align-left:last-child .x-label-el {
+    border-bottom-left-radius: 4px;
+}
+
+
 .x-formpanel .x-field > .x-label-el {
     color: #666;
     font-size: 16px;
+    width: auto;
+    margin: 5px 0 5px 5px;
 }
 
 .x-field.x-no-label-wrap > .x-label-el {
     overflow: visible;
-}
-
-.x-field.x-no-label-wrap > .x-label-el {
-    overflow: visible;
+    text-align: center;
+    padding: 7px 0;
 }
 
 .x-field.x-required > .x-label-el:after {
+    color: red;
     font-size: 14px;
     vertical-align: middle;
+    margin-left: 3px;
 }
 
 .x-title.x-form-fieldset-title .x-innerhtml {
@@ -377,6 +400,15 @@
     font-size: 18px;
 }
 
+.x-field.x-label-align-left .x-label-el {
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-align: center;
+        -ms-flex-align: center;
+            align-items: center;
+}
+
 .x-textfield .x-input-el {
     font-size: 17px;
     placeholder-color: #ccc;
@@ -386,13 +418,16 @@
 .x-button {
     color: #fff;
     font-size: 15px;
+    --base-color: transparent;
+    --base-dark-color: transparent;
     background: #2196f3;
-    border-color: #2196f3;
+    border: 1px solid #2196f3;
     line-height: 19px;
     border-radius: 4px;
     font-family: normal;
 }
 
+
 .x-button.x-arrow-align-right .x-inner-el {
     border-radius: 4px;
     padding: 0;
@@ -409,17 +444,29 @@
 
 .x-button .x-icon-el {
     width: auto;
-    height: auto;
 }
 
-.x-field > .x-label-el {
-    width: auto;
-    margin: 5px 10px 5px 5px;
+.x-button .x-icon-el:before {
+    color: #fff;
+    height: 15px;
 }
 
-.x-field.x-required > .x-label-el:after {
-    color: red;
-    margin-left: 5px;
+.x-button .x-button-el {
+    color: #fff;
+    display: none !important;
+}
+
+.x-button .x-text-el {
+    color: #fff;
+}
+
+.x-button.btn-default .x-text-el {
+    color: #333;
+}
+
+.x-button.x-pressing .x-inner-el, .x-keyboard-mode .x-button.x-pressing .x-inner-el, .x-button.x-pressed .x-inner-el, .x-keyboard-mode .x-button.x-pressed .x-inner-el {
+    border-color: transparent;
+    background-color: transparent;
 }
 
 .x-textfield.x-invalid .x-underline-el:after {
@@ -431,16 +478,38 @@
     font-size: 16px;
 }
 
+.x-textfield .x-underline-el {
+    display: none;
+}
+
+.x-textfield .x-input-el {
+    padding: 0;
+}
+
+.scanCode {
+    z-index: 1;
+    position: relative;
+    overflow: visible;
+    background-color: #f5f5f5;
+    -webkit-box-shadow: 2px 2px 5px 0 rgba(0, 0, 0, .12), 2px 2px 5px 0 rgba(0, 0, 0, .08);
+            box-shadow: 2px 2px 5px 0 rgba(0, 0, 0, .12), 2px 2px 5px 0 rgba(0, 0, 0, .08);
+}
+
+.yvform .x-field:not(.x-field-solo).x-layout-auto-item,
+.yvform .x-field:not(.x-field-solo).x-layout-vbox-item {
+    margin: 0;
+    padding: 0;
+}
+
+.x-cleartrigger .x-icon-el:before {
+    content: '';
+}
+
 /*修改底部按钮样式*/
 .x-layout-hbox .x-button {
     margin: 0 10px;
 }
 
-.x-layout-hbox .x-button :hover {
-    background: #66biff;
-    border-color: #66biff;
-}
-
 .x-layout-hbox .x-button:first-child {
     margin-left: 0;
 }
@@ -526,6 +595,10 @@
     word-break: break-all;
 }
 
+.x-field.x-label-align-horizontal > .x-body-wrap-el {
+    min-height: 20px;
+}
+
 .x-field > .x-body-wrap-el {
     -webkit-box-align: center;
         -ms-flex-align: center;
@@ -572,6 +645,15 @@
     padding: 4px 0;
 }
 
+.x-tabbar .x-tab.x-component {
+    border-left: none;
+    border-right: none;
+}
+
+.x-tabbar .x-active-indicator-el {
+    bottom: -1px;
+}
+
 /*弹出框样调整*/
 .x-mask {
     opacity: 0.5;
@@ -614,6 +696,7 @@
 
 .x-dock .x-titlebar .x-button {
     background-color: #fff;
+    border: none;
 }
 
 .x-dock .x-titlebar .x-button .x-text-el {

+ 0 - 1
dist/yvan-ext-mobile.js

@@ -40138,7 +40138,6 @@ define(['exports'], function (exports) { 'use strict';
                               grid.store.firstRowNum = firstRowNum;
                               grid.store.lastRowNum = lastRowNum;
                               grid.store.total = total;
-                              console.log('set store.xx', grid.store.total, grid.store.firstRowNum, grid.store.lastRowNum, grid.store.pageCount);
                           }
                           return data;
                       }

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
dist/yvan-ext-mobile.js.map