hy 7 лет назад
Родитель
Сommit
a10252f33b

+ 1 - 0
frontend/saas-web/app/view/core/form/DataMultiCombo.js

@@ -6,6 +6,7 @@ Ext.define('saas.view.core.form.DataMultiCombo', {
     alias: 'widget.datamulticombo',
     alias: 'widget.datamulticombo',
     editable : false,
     editable : false,
     matchFieldWidth: true,
     matchFieldWidth: true,
+    autoScroll:true,
     value: [],
     value: [],
     cachedConfig: {
     cachedConfig: {
         menuAlign: 'tl-bl?',
         menuAlign: 'tl-bl?',

+ 9 - 0
frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -224,6 +224,15 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'hidden',
                 xtype:'hidden',
                 name:'accountId',
                 name:'accountId',
                 hidden:true,
                 hidden:true,
+            },{
+                xtype:'textfield',
+                fieldLabel: '真实姓名',
+                name: 'realname',
+                readOnly:true,
+                editable:false,
+                allowBlank:true,
+                maxLength: 30,
+                beforeLabelTextTpl: "",
             },{
             },{
                 xtype:'datamulticombo',
                 xtype:'datamulticombo',
                 dataUrl:'/api/account/role/list',
                 dataUrl:'/api/account/role/list',

+ 3 - 2
frontend/saas-web/app/view/sys/manager/FormPanel.scss

@@ -56,12 +56,13 @@
         border:none !important;
         border:none !important;
     }
     }
     .x-keyboard-mode .x-grid-item-focused .x-grid-cell-inner:before{
     .x-keyboard-mode .x-grid-item-focused .x-grid-cell-inner:before{
-        border:0px solid #ffffff !important;
+        border:none !important;
     }
     }
     .x-keyboard-mode .x-grid-item-focused{
     .x-keyboard-mode .x-grid-item-focused{
         border:0px solid #ffffff !important;
         border:0px solid #ffffff !important;
     }
     }
     .x-grid-cell-inner .x-grid-cell-inner-action-col::before{
     .x-grid-cell-inner .x-grid-cell-inner-action-col::before{
-        border:0px solid #ffffff !important;
+        content: '';
+        border:none !important;
     }
     }
 }
 }

+ 1 - 2
frontend/saas-web/app/view/sys/power/GroupGrid.js

@@ -12,8 +12,7 @@ Ext.define('saas.view.sys.power.GroupGrid', {
         text:'保存',
         text:'保存',
         name:'savepower',
         name:'savepower',
         margin:'0 10 0 2',
         margin:'0 10 0 2',
-        cls:'x-formpanel-btn-orange',
-        style:'background:#da8282;border-color:#cccccc'
+        style:'background:#34baf6;border-color:#cccccc'
     }],
     }],
     features : [Ext.create('Ext.grid.feature.Grouping',{
     features : [Ext.create('Ext.grid.feature.Grouping',{
         collapseTip:null,
         collapseTip:null,