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

frontend/saas-web/app/view/core/report/ReportPanel.js

@@ -21,6 +21,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
     defaultCondition: null, // 默认查询条件
     searchItems: [], // 查询字段
     reportTitle: '报表',
+    autoLoad:true,
 
     initComponent: function() {
         var me = this;
@@ -43,7 +44,8 @@ Ext.define('saas.view.core.report.ReportPanel', {
                     items: [{
                         xtype: 'button',
                         text: '查询',
-                        handler: 'onQuery'
+                        handler: 'onQuery',
+                        formBind:true
                     },{
                         xtype:'button',
                         text:'打印',
@@ -180,7 +182,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
         var store = Ext.create('Ext.data.Store', {
             fields: me.getFields(),
             // model: me.reportModel,
-            autoLoad: true,
+            autoLoad: me.autoLoad,
             pageSize: 15,
             data: [],
             proxy: {
@@ -295,6 +297,11 @@ Ext.define('saas.view.core.report.ReportPanel', {
             ignore = item.ignore,
             defaultValue = item.defaultValue;
 
+            if(item.allowBlank==false){
+                // TODO 需要判断类型
+                item.beforeLabelTextTpl = "<font color=\"red\" style=\"position:relative; top:2px;right:2px; font-weight: bolder;\">*</font>";
+            }
+
             if(item.xtype == 'numberfield') {
                 Ext.applyIf(item, {
                     hideTrigger: true, // 隐藏trigger