列表跳转到主从表bug

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

@@ -24,7 +24,14 @@ Ext.define('saas.util.BaseUtil', {
                     "Content-Type": 'application/json;charset=UTF-8' 
                 },
                 success: function (response, opts) {
-                    resolve(response);
+                    var res = Ext.decode(response.responseText);
+                    if(res.success) {
+                        return resolve(response);
+                    }else {
+                        console.error('server request failure with code ' + res.code + '.');
+                        console.error('failure message: ' + res.message);
+                        return reject(response);
+                    }
                 },
                 failure: function (response, opts) {
                     console.error('server-side failure with status code ' + response.status);

frontend/saas-web/app/util/FormUtil.js

@@ -96,12 +96,12 @@ Ext.define('saas.util.FormUtil', {
                     var o = {
                         main: d.main
                     };
-                    if(d.items) {
+                    if(d.hasOwnProperty('items')) {
                         o.detail0 = d.items;
                     }else {
                         var idx = 1;
-                        while(d['item' + idx]) {
-                            o['detail' + (idx - 1)] = d['item' + idx];
+                        while(d.hasOwnProperty('items' + idx)) {
+                            o['detail' + (idx - 1)] = d['items' + idx];
                             idx++;
                         }
                     }

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

@@ -35,7 +35,6 @@ Ext.define('saas.view.core.form.FormPanel', {
     toolBtns: [], // 自定义按钮
 
     initComponent: function() {
-
         var me = this;
         me.initViewModel();
         me.FormUtil.setItems(me);
@@ -148,7 +147,7 @@ Ext.define('saas.view.core.form.FormPanel', {
         viewModel.set('form', main);
 
         for(var i = 0; i < detailCount; i++) {
-            var detailData = formData['detail' + i],
+            var detailData = formData['detail' + i] || [],
             detail = viewData['detail' + i],
             store = detail.detailStore;
 
@@ -178,21 +177,18 @@ Ext.define('saas.view.core.form.FormPanel', {
             if(!ignore) {
                 if(bind) {
                     if(!Ext.isString(bind)) {
-                        bind = name;
                         Ext.apply(bind, {
-                            value: '{form.' + bind + '}'
+                            value: '{form.' + name + '}'
                         });
                     }else {
-                        bind = bind.replace(/[{|}]/g, '');
-                        item.bind = '{form.' + bind + '}';
+                        item.bind = '{form.' + name + '}';
                     }
                 }else {
-                    bind = name;
-                    item.bind = '{form.' + bind + '}';
+                    item.bind = '{form.' + name + '}';
                 }
                 // 设置默认值
                 if(defaultValue) {
-                    viewModel.set('form.' + bind, defaultValue);
+                    viewModel.set('form.' + name, defaultValue);
                 }
             }
 

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

@@ -97,7 +97,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
                     dirtyGridData.push(d);
                 }
             });
-            params['item' + ( i + 1)] = dirtyGridData;
+            params['items' + ( i + 1)] = dirtyGridData;
         }
 
         // 只有一个从表时从表字段改为items
@@ -167,7 +167,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
                     dirtyGridData.push(d);
                 }
             });
-            params['item' + ( i + 1)] = dirtyGridData;
+            params['items' + ( i + 1)] = dirtyGridData;
         }
 
         // 只有一个从表时从表字段改为items

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

@@ -176,9 +176,9 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                 displayInfo: true,
                 emptyMsg: "暂无数据",
                 store: me.store,
-                displayMsg: '当前显示第{0}到{1}条数据,一共有{2}条',
-                beforePageText: "当前第",
-                afterPageText: "页,共{0}页"
+                displayMsg: '显示{0}-{1}条，共{2}条',
+                beforePageText: "第",
+                afterPageText: "页，共{0}页"
             }]
         });
         me.callParent(arguments);