|
|
@@ -38071,7 +38071,7 @@ define(['exports'], function (exports) { 'use strict';
|
|
|
this._dataOption = dataOption;
|
|
|
var vmodel = lodash.defaultsDeep({
|
|
|
data: {}
|
|
|
- }, that.model, dataOption);
|
|
|
+ }, dataOption, that.model);
|
|
|
var config = lodash.defaultsDeep({
|
|
|
// viewModel: this.viewModel,
|
|
|
viewModel: vmodel,
|
|
|
@@ -38100,7 +38100,8 @@ define(['exports'], function (exports) { 'use strict';
|
|
|
window['cw'] = that;
|
|
|
// 调用onLoad回调
|
|
|
try {
|
|
|
- that._onLoad();
|
|
|
+ //@ts-ignore
|
|
|
+ that.onLoad();
|
|
|
}
|
|
|
catch (e) {
|
|
|
console.error('errorAt onLoad', e);
|
