|
|
@@ -52,6 +52,12 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
|
|
|
|
|
|
initComponent: function () {
|
|
|
var me = this;
|
|
|
+
|
|
|
+ console.log(me.idField);
|
|
|
+ if(me.idField == 'id') {
|
|
|
+ me.idField = '_id';
|
|
|
+ }
|
|
|
+
|
|
|
Ext.apply(me, {
|
|
|
columns: me.initColumns(),
|
|
|
store: Ext.create('Ext.data.Store', {
|
|
|
@@ -115,12 +121,16 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
|
|
|
},
|
|
|
load: function(store, records, successful, operation, eOpts) {
|
|
|
var queryPanel = me.up('core-query-querypanel'),
|
|
|
- mode = queryPanel.getQueryMode();
|
|
|
+ mode = queryPanel.getQueryMode(),
|
|
|
+ datas = [];
|
|
|
|
|
|
- store.each(function(d, i) {
|
|
|
- d.set('id', d.get('id') + '-' + i);
|
|
|
+ Ext.Array.each(records, function(r, i) {
|
|
|
+ var d = Object.assign({}, r.data, { _id: r.data.id, id: Ext.id() });
|
|
|
+ datas.push(d);
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
+ store.loadData(datas, false);
|
|
|
+
|
|
|
if(mode=="MAIN"){
|
|
|
me.reconfigure(store, me.initColumns(me.baseColumn));
|
|
|
}else{
|
|
|
@@ -270,11 +280,11 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
|
|
|
if(e.target.parentElement.classList.contains('x-querygrid-code-column')) {
|
|
|
var grid = tableView.up('grid'),
|
|
|
idValue = record.get(grid.idField),
|
|
|
- initId = typeof idValue.split == 'function' ? idValue.split('-')[0] : idValue;
|
|
|
+ // initId = typeof idValue.split == 'function' ? idValue.split('-')[0] : idValue;
|
|
|
codeValue = record.get(grid.codeField),
|
|
|
id = grid.addXtype + '-' + idValue;
|
|
|
saas.util.BaseUtil.openTab(grid.addXtype, grid.addTitle+"("+codeValue+")", id, {
|
|
|
- initId: initId
|
|
|
+ initId: idValue
|
|
|
});
|
|
|
}
|
|
|
},
|