浏览代码

样式调整

liupeng 3 年之前
父节点
当前提交
df5dc6507a
共有 3 个文件被更改,包括 23 次插入6 次删除
  1. 10 1
      dist/yvan-ext-mobile.css
  2. 12 4
      dist/yvan-ext-mobile.js
  3. 1 1
      dist/yvan-ext-mobile.js.map

+ 10 - 1
dist/yvan-ext-mobile.css

@@ -379,6 +379,10 @@
     margin: 5px 0 5px 5px;
     margin: 5px 0 5px 5px;
 }
 }
 
 
+.x-formpanel .x-field.borderLeftNone > .x-label-el {
+    border-left: none;
+}
+
 .x-field.x-no-label-wrap > .x-label-el {
 .x-field.x-no-label-wrap > .x-label-el {
     overflow: visible;
     overflow: visible;
     text-align: center;
     text-align: center;
@@ -495,12 +499,17 @@
             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-auto-item, /*yvform紧凑型表单*/
 .yvform .x-field:not(.x-field-solo).x-layout-vbox-item {
 .yvform .x-field:not(.x-field-solo).x-layout-vbox-item {
     margin: 0;
     margin: 0;
     padding: 0;
     padding: 0;
 }
 }
 
 
+.yvform.x-textfield.x-field .x-label-el {
+    margin: 0;
+    padding: 0;
+}
+
 .x-cleartrigger .x-icon-el:before {
 .x-cleartrigger .x-icon-el:before {
     content: '';
     content: '';
 }
 }

+ 12 - 4
dist/yvan-ext-mobile.js

@@ -37849,7 +37849,7 @@ define(['exports'], function (exports) { 'use strict';
               this._dataOption = dataOption;
               this._dataOption = dataOption;
               var vmodel = lodash.defaultsDeep({
               var vmodel = lodash.defaultsDeep({
                   data: {}
                   data: {}
-              }, that.model, dataOption);
+              }, dataOption, that.model);
               //this.viewModel = new Ext.app.ViewModel(vmodel);
               //this.viewModel = new Ext.app.ViewModel(vmodel);
               //this.viewModel.yvanScope = this
               //this.viewModel.yvanScope = this
               var config = lodash.defaultsDeep({
               var config = lodash.defaultsDeep({
@@ -37861,9 +37861,9 @@ define(['exports'], function (exports) { 'use strict';
                   xtype: 'panel',
                   xtype: 'panel',
               });
               });
               if (allowBack) {
               if (allowBack) {
-                  config = lodash.defaultsDeep({
+                  var configNew = lodash.defaultsDeep({
                       iconCls: 'x-fa fa-angle-left',
                       iconCls: 'x-fa fa-angle-left',
-                      cls: 'navbar',
+                      cls: ['navbar'],
                       tools: [
                       tools: [
                           {
                           {
                               iconCls: 'x-fa fa-home',
                               iconCls: 'x-fa fa-home',
@@ -37873,6 +37873,15 @@ define(['exports'], function (exports) { 'use strict';
                           },
                           },
                       ],
                       ],
                   }, config);
                   }, config);
+                  if (lodash.isArray(config.cls)) {
+                      configNew.cls = __spread(configNew.cls, config.cls);
+                  }
+                  else if (typeof config.cls === 'string') {
+                      configNew.cls = __spread(configNew.cls, [
+                          config.cls
+                      ]);
+                  }
+                  config = configNew;
               }
               }
               that._handle = Ext.create(config);
               that._handle = Ext.create(config);
               this.viewModel = that._handle.getViewModel();
               this.viewModel = that._handle.getViewModel();
@@ -38111,7 +38120,6 @@ define(['exports'], function (exports) { 'use strict';
       Scope.SHOW_PAGE_STACK = [];
       Scope.SHOW_PAGE_STACK = [];
       return Scope;
       return Scope;
   }());
   }());
-  //# sourceMappingURL=Scope.js.map
 
 
   var column = {
   var column = {
       menuDisabled: true
       menuDisabled: true

文件差异内容过多而无法显示
+ 1 - 1
dist/yvan-ext-mobile.js.map