@blueking/bkui-form 0.0.42-beta.5 → 0.0.42-beta.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -642,16 +642,25 @@
642
642
  }
643
643
  if (!sources.length) return target;
644
644
  var source = sources.shift();
645
- if (isObj(target) && isObj(source)) {
646
- for (var key in source) {
647
- if (isObj(source[key])) {
648
- if (!target[key]) Object.assign(target, _defineProperty({}, key, {}));
649
- mergeDeep(target[key], source[key]);
650
- } else {
651
- Object.assign(target, _defineProperty({}, key, source[key]));
645
+ if (source === undefined) {
646
+ return target;
647
+ }
648
+ Object.entries(source).forEach(function (_ref) {
649
+ var _ref2 = _slicedToArray(_ref, 2),
650
+ key = _ref2[0],
651
+ value = _ref2[1];
652
+ var targetValue = target[key];
653
+ if (isObj(value)) {
654
+ if (!(key in target)) {
655
+ target[key] = {};
656
+ } else if (!isObj(targetValue)) {
657
+ target[key] = {};
652
658
  }
659
+ mergeDeep(target[key], value);
660
+ } else {
661
+ target[key] = value;
653
662
  }
654
- }
663
+ });
655
664
  return mergeDeep.apply(void 0, [target].concat(sources));
656
665
  }
657
666
  function isArguments(object) {