Browse Source

一些可能会报错的代码修改

zhuth 7 years ago
parent
commit
6eef48f3a8

+ 1 - 1
frontend/saas-web/app/util/BaseUtil.js

@@ -133,7 +133,7 @@ Ext.define('saas.util.BaseUtil', {
         },
 
         getCurrentUser: function () {
-            return saas.util.State.get('session') ? saas.util.State.get('session').account : {};
+            return saas.util.State.get('session') ? (saas.util.State.get('session').account || {}) : {};
         },
 
         /**

+ 1 - 1
frontend/saas-web/app/view/core/base/GridPanel.js

@@ -55,7 +55,7 @@ Ext.define('saas.view.core.base.GridPanel', {
                                 }
                             }else {
                                 console.error('exception: ', response);
-                                saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
+                                saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                             }
                         }
                     }

+ 1 - 1
frontend/saas-web/app/view/core/dbfind/AddMultiDbfindGridPanel.js

@@ -95,7 +95,7 @@ Ext.define('saas.view.core.dbfind.AddMultiDbfindGridPanel', {
                                 }
                             }else {
                                 console.error('exception: ', response);
-                                saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
+                                saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                             }
                         }
                     }

+ 1 - 1
frontend/saas-web/app/view/core/dbfind/DbfindGridPanel.js

@@ -36,7 +36,7 @@ Ext.define('saas.view.core.dbfind.DbfindGridPanel', {
                                 }
                             }else {
                                 console.error('exception: ', response);
-                                saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
+                                saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                             }
                         }
                     }

+ 1 - 1
frontend/saas-web/app/view/core/dbfind/MultiDbfindGridPanel.js

@@ -95,7 +95,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
                                 }
                             }else {
                                 console.error('exception: ', response);
-                                saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
+                                saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                             }
                         }
                     }

+ 1 - 1
frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -92,7 +92,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                                 if(response.timedout) {
                                     saas.util.BaseUtil.showErrorToast('请求超时');
                                 }else{
-                                    saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
+                                    saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                                 }
                             }
                         }

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

@@ -226,7 +226,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
                             if (response.timedout) {
                                 saas.util.BaseUtil.showErrorToast('请求超时');
                             } else {
-                                saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
+                                saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                             }
                         }
                     }

+ 1 - 1
frontend/saas-web/app/view/document/address/DataListModel.js

@@ -29,7 +29,7 @@ Ext.define('saas.view.document.address.DataListModel', {
                             }
                         }else {
                             console.error('exception: ', response);
-                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
+                            saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                         }
                     }
                 }

+ 1 - 1
frontend/saas-web/app/view/document/bankinformation/DataListModel.js

@@ -34,7 +34,7 @@ Ext.define('saas.view.document.bankinformation.DataListModel', {
                             }
                         }else {
                             console.error('exception: ', response);
-                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
+                            saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                         }
                     }
                 }

+ 1 - 1
frontend/saas-web/app/view/document/employee/DataListModel.js

@@ -31,7 +31,7 @@ Ext.define('saas.view.document.employee.DataListModel', {
                             }
                         }else {
                             console.error('exception: ', response);
-                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
+                            saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                         }
                     }
                 }

+ 4 - 4
frontend/saas-web/app/view/document/kind/KindModel.js

@@ -31,7 +31,7 @@ Ext.define('saas.view.document.kind.KindModel', {
                             }
                         }else {
                             console.error('exception: ', response);
-                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
+                            saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                         }
                     }
                 }
@@ -70,7 +70,7 @@ Ext.define('saas.view.document.kind.KindModel', {
                             }
                         }else {
                             console.error('exception: ', response);
-                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
+                            saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                         }
                     }
                 }
@@ -109,7 +109,7 @@ Ext.define('saas.view.document.kind.KindModel', {
                             }
                         }else {
                             console.error('exception: ', response);
-                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
+                            saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                         }
                     }
                 }
@@ -149,7 +149,7 @@ Ext.define('saas.view.document.kind.KindModel', {
                             }
                         }else {
                             console.error('exception: ', response);
-                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
+                            saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                         }
                     }
                 }

+ 1 - 1
frontend/saas-web/app/view/document/productbrand/DataListModel.js

@@ -28,7 +28,7 @@ Ext.define('saas.view.document.productbrand.DataListModel', {
                             }
                         }else {
                             console.error('exception: ', response);
-                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
+                            saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                         }
                     }
                 }

+ 1 - 1
frontend/saas-web/app/view/document/productunit/DataListModel.js

@@ -28,7 +28,7 @@ Ext.define('saas.view.document.productunit.DataListModel', {
                             }
                         }else {
                             console.error('exception: ', response);
-                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
+                            saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                         }
                     }
                 }

+ 1 - 1
frontend/saas-web/app/view/document/warehouse/DataListModel.js

@@ -32,7 +32,7 @@ Ext.define('saas.view.document.warehouse.DataListModel', {
                             }
                         }else {
                             console.error('exception: ', response);
-                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
+                            saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                         }
                     }
                 }

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

@@ -38,7 +38,7 @@ Ext.define('saas.view.home.HomeModel', {
                         p && p.setLoading(false);
 
                     if(!d) return;
-                    var res = d[0].data.data || {};
+                    var res = d[0] ? (d[0].data ? (d[0].data.data || {}) : {}) : {};
 
                     Ext.getCmp('infocard').addCardItems(res);
                 }

+ 2 - 1
frontend/saas-web/app/view/home/infoCardList/InfoList.js

@@ -60,6 +60,7 @@ Ext.define('saas.view.home.infoCardList.InfoList', {
                     },
                     reader: {
                         type: 'json',
+                        readRecordsOnFailure: false,
                         rootProperty: 'data.list',
                         totalProperty: 'data.total',
                     },
@@ -73,7 +74,7 @@ Ext.define('saas.view.home.infoCardList.InfoList', {
                                 if(response.timedout) {
                                     saas.util.BaseUtil.showErrorToast('请求超时');
                                 }else{
-                                    saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
+                                    saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                                 }
                             }
                         }

+ 1 - 1
frontend/saas-web/app/view/sys/account/DataList.js

@@ -200,7 +200,7 @@ Ext.define('saas.view.sys.account.DataList', {
                                     saas.util.BaseUtil.showErrorToast('请求超时');
                                 }else{
                                     if(proxy.showPowerMessage){
-                                        saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
+                                        saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                                     }
                                 }
                             }

+ 1 - 1
frontend/saas-web/app/view/sys/invitation/DataList.js

@@ -210,7 +210,7 @@ Ext.define('saas.view.sys.invitation.DataList', {
                                     saas.util.BaseUtil.showErrorToast('请求超时');
                                 }else{
                                     if(proxy.showPowerMessage){
-                                        saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
+                                        saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                                     }
                                 }
                             }

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

@@ -209,7 +209,7 @@ Ext.define('saas.view.sys.power.GroupGrid', {
                             if(response.timedout) {
                                 saas.util.BaseUtil.showErrorToast('请求超时');
                             }else{
-                                saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
+                                saas.util.BaseUtil.showErrorToast('查询失败:' + (response.responseJson?response.responseJson.message:'请求超时'));
                             }
                         }
                     }