Merge remote-tracking branch 'origin/dev' into dev

frontend/saas-web/app/view/core/form/RemoteCombo.js

@@ -37,7 +37,7 @@ Ext.define('saas.view.core.form.RemoteCombo', {
             picker;
         var count = this.store.getCount();
         var pickerCfg = Ext.apply({
-                height: count>5?150:30*count,
+                height: count>5?248:(33*count+50),
                 hiddenBtn:me.hiddenBtn,
                 xtype: 'boundlistadd',
                 id: me.id + '-picker',

frontend/saas-web/app/view/main/Main.scss

@@ -308,3 +308,9 @@ body > .x-mask {
     margin-top: -7.5px;
     margin-left: 55px;
 }
+
+.x-boundlist-item {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+}