|
@@ -37849,7 +37849,7 @@ define(['exports'], function (exports) { 'use strict';
|
|
this._dataOption = dataOption;
|
|
this._dataOption = dataOption;
|
|
var vmodel = lodash.defaultsDeep({
|
|
var vmodel = lodash.defaultsDeep({
|
|
data: {}
|
|
data: {}
|
|
- }, that.model, dataOption);
|
|
|
|
|
|
+ }, dataOption, that.model);
|
|
//this.viewModel = new Ext.app.ViewModel(vmodel);
|
|
//this.viewModel = new Ext.app.ViewModel(vmodel);
|
|
//this.viewModel.yvanScope = this
|
|
//this.viewModel.yvanScope = this
|
|
var config = lodash.defaultsDeep({
|
|
var config = lodash.defaultsDeep({
|
|
@@ -37861,9 +37861,9 @@ define(['exports'], function (exports) { 'use strict';
|
|
xtype: 'panel',
|
|
xtype: 'panel',
|
|
});
|
|
});
|
|
if (allowBack) {
|
|
if (allowBack) {
|
|
- config = lodash.defaultsDeep({
|
|
|
|
|
|
+ var configNew = lodash.defaultsDeep({
|
|
iconCls: 'x-fa fa-angle-left',
|
|
iconCls: 'x-fa fa-angle-left',
|
|
- cls: 'navbar',
|
|
|
|
|
|
+ cls: ['navbar'],
|
|
tools: [
|
|
tools: [
|
|
{
|
|
{
|
|
iconCls: 'x-fa fa-home',
|
|
iconCls: 'x-fa fa-home',
|
|
@@ -37873,6 +37873,15 @@ define(['exports'], function (exports) { 'use strict';
|
|
},
|
|
},
|
|
],
|
|
],
|
|
}, config);
|
|
}, config);
|
|
|
|
+ if (lodash.isArray(config.cls)) {
|
|
|
|
+ configNew.cls = __spread(configNew.cls, config.cls);
|
|
|
|
+ }
|
|
|
|
+ else if (typeof config.cls === 'string') {
|
|
|
|
+ configNew.cls = __spread(configNew.cls, [
|
|
|
|
+ config.cls
|
|
|
|
+ ]);
|
|
|
|
+ }
|
|
|
|
+ config = configNew;
|
|
}
|
|
}
|
|
that._handle = Ext.create(config);
|
|
that._handle = Ext.create(config);
|
|
this.viewModel = that._handle.getViewModel();
|
|
this.viewModel = that._handle.getViewModel();
|
|
@@ -38111,7 +38120,6 @@ define(['exports'], function (exports) { 'use strict';
|
|
Scope.SHOW_PAGE_STACK = [];
|
|
Scope.SHOW_PAGE_STACK = [];
|
|
return Scope;
|
|
return Scope;
|
|
}());
|
|
}());
|
|
- //# sourceMappingURL=Scope.js.map
|
|
|
|
|
|
|
|
var column = {
|
|
var column = {
|
|
menuDisabled: true
|
|
menuDisabled: true
|