|
@@ -62048,9 +62048,14 @@ define(['exports'], function (exports) { 'use strict';
|
|
|
/**
|
|
|
* 合併 data 到當前的 ViewModel 對象
|
|
|
*/
|
|
|
- function mergeViewModel(viewModel, propertyName, data) {
|
|
|
+ function mergeViewModel(viewModel, propertyName, data, isFlat) {
|
|
|
var newRow = {};
|
|
|
- flatObject(newRow, '', data);
|
|
|
+ if (isFlat == false) {
|
|
|
+ newRow = data;
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ flatObject(newRow, '', data);
|
|
|
+ }
|
|
|
lodash.forOwn(newRow, function (value, key) {
|
|
|
viewModel.set(propertyName + "." + key, value);
|
|
|
});
|