|
@@ -261,9 +261,10 @@ const stageIm = (function () {
|
|
im.org[f] = im[f];
|
|
im.org[f] = im[f];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ im.custom_define_exist = im.custom_define !== null;
|
|
im.custom_define = detail.custom_define ? detail.custom_define.split(',') : [];
|
|
im.custom_define = detail.custom_define ? detail.custom_define.split(',') : [];
|
|
_.assignInWith(im, detail, function (oV, sV, key) {
|
|
_.assignInWith(im, detail, function (oV, sV, key) {
|
|
- return im.custom_define.length > 0
|
|
|
|
|
|
+ return im.custom_define_exist
|
|
? (im.custom_define.indexOf(key) > -1 ? sV : ((resetFields.indexOf(key) > -1) ? im.org[key] : oV))
|
|
? (im.custom_define.indexOf(key) > -1 ? sV : ((resetFields.indexOf(key) > -1) ? im.org[key] : oV))
|
|
: (imFields.indexOf(key) > -1 ? sV : ((resetFields.indexOf(key) > -1) ? im.org[key] : oV));
|
|
: (imFields.indexOf(key) > -1 ? sV : ((resetFields.indexOf(key) > -1) ? im.org[key] : oV));
|
|
});
|
|
});
|