Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

frontend/saas-web/app/view/core/dbfind/AddMultiDbfindTrigger.js

@@ -191,7 +191,7 @@ Ext.define('saas.view.core.dbfind.AddMultiDbfindTrigger', {
         //         }
         //         dbCondition.push({
         //             type: 'condition',
-        //             value: searchField + " like '%"+me.value+"%'"
+        //             value: searchField + "='"+me.value+"'"
         //         });
         //         Ext.Ajax.request({
         //             url: me.dataUrl,

frontend/saas-web/app/view/core/dbfind/DbfindTrigger.js

@@ -209,7 +209,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
                 }
                 dbCondition.push({
                     type: 'condition',
-                    value: searchField + " like '%"+me.value+"%'"
+                    value: searchField + "='"+me.value+"'"
                 });
                 Ext.Ajax.request({
                     url: me.dataUrl,

frontend/saas-web/app/view/core/dbfind/MultiDbfindTrigger.js

@@ -192,7 +192,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindTrigger', {
                 }
                 dbCondition.push({
                     type: 'condition',
-                    value: searchField + " like '%"+me.value+"%'"
+                    value: searchField + "='"+me.value+"'"
                 });
                 Ext.Ajax.request({
                     url: me.dataUrl,

frontend/saas-web/app/view/home/HomeModel.js

@@ -82,7 +82,17 @@ Ext.define('saas.view.home.HomeModel', {
                     var p = Ext.getCmp('infocard');
                         p && p.setLoading(false);
                     var sum = Ext.util.Format.number(s.sum('y'), '0.00') || 0;
-                    Ext.getCmp('home').getViewModel().set('month_sale_amount', sum)
+                    Ext.getCmp('home').getViewModel().set('month_sale_amount', sum);
+
+                    s.each(function(r) {
+                        var z = r.get('z'),
+                        x = r.get('x');
+                        if(!z) {
+                            r.set('z', x.length > 3 ? (x.substr(0,3) + '...') : x);
+                        }else {
+                            r.set('z', z.length > 3 ? (z.substr(0,3) + '...') : z);
+                        }
+                    });
                 }
             }
         },
@@ -349,6 +359,16 @@ Ext.define('saas.view.home.HomeModel', {
                 load: function(s, d) {
                     var p = Ext.getCmp('profit_detail');
                         p && p.setLoading(false);
+
+                    s.each(function(r) {
+                        var z = r.get('z'),
+                        x = r.get('x');
+                        if(!z) {
+                            r.set('z', x.length > 3 ? (x.substr(0,3) + '...') : x);
+                        }else {
+                            r.set('z', z.length > 3 ? (z.substr(0,3) + '...') : z);
+                        }
+                    });
                 }
             } 
         },

frontend/saas-web/app/view/home/charts/MonthSale.js

@@ -64,7 +64,7 @@ Ext.define('saas.view.home.charts.MonthSale', {
                     angleField: 'y',
                     donut: 55,
                     label: {
-                        field: 'x',
+                        field: 'z',
                         display: 'inside',
                         renderer: me.onLabelRender,
                         color: '#fff',

frontend/saas-web/app/view/home/charts/ProfitDetail.js

@@ -23,7 +23,7 @@ Ext.define('saas.view.home.charts.ProfitDetail', {
                 },
                 axes: [{
                     type: 'category',
-                    fields: ['x'],
+                    fields: ['z'],
                     position: 'bottom',
                     label: {
                         fontSize: '12px',
@@ -60,7 +60,7 @@ Ext.define('saas.view.home.charts.ProfitDetail', {
                 }],
                 series: [{
                     type: 'bar',
-                    xField: 'x',
+                    xField: 'z',
                     yField: ['y'],
                     bind: {
                         style: {
@@ -81,7 +81,7 @@ Ext.define('saas.view.home.charts.ProfitDetail', {
     },
 
     onCategoryLabelRender: function(axis, label, layoutContent, lastLabel) {
-        return label.substr(0,2) + '...';
+        return label;
     },
 
     onBarTipRender: function (tooltip, record, item) {