@bizdoc/core 1.14.0-next.4 → 1.14.0-next.5

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.
@@ -695,16 +695,16 @@ function playAudio(name) {
695
695
  * @param o1
696
696
  * @param o2
697
697
  */
698
- Object.deepAssign = function (o1, o2) {
698
+ function deepAssign(o1, o2) {
699
699
  o2 && Object.keys(o2).forEach(p => {
700
700
  const val2 = o2[p], val1 = o1[p];
701
- if (val1 === undefined || val1 === null || isPrimitive(val2))
701
+ if (val1 === undefined || val1 === null || isPrimitive(val2)) // val !== 'object' && !Array.isArray(val)
702
702
  o1[p] = val2;
703
- else if (isArray(val2)) {
703
+ else if (Array.isArray(val2)) {
704
704
  if (val2.length && !isPrimitive(val2[0])) {
705
705
  for (let i = 0; i < val2.length; i++) {
706
706
  if (val1[i] !== undefined)
707
- Object.deepAssign(val1[i], val2[i]);
707
+ deepAssign(val1[i], val2[i]);
708
708
  else
709
709
  val1.push(val2[i]);
710
710
  }
@@ -715,10 +715,10 @@ Object.deepAssign = function (o1, o2) {
715
715
  o1[p] = val2;
716
716
  }
717
717
  else //if (isObject(val2))
718
- Object.deepAssign(val1, val2);
718
+ deepAssign(val1, val2);
719
719
  });
720
720
  return o1;
721
- };
721
+ }
722
722
  function generateEncryptionMap() {
723
723
  const values = {};
724
724
  for (let i = 65; i < 91; i++) {
@@ -7870,8 +7870,8 @@ class BrowseItemsComponent {
7870
7870
  this.refresh();
7871
7871
  }
7872
7872
  _assign(model1, model2) {
7873
- Object.assign(model1, { actions: null }, model2, {
7874
- model: Object.deepAssign(model1.model, model1.model)
7873
+ Object.assign(model1, model2, {
7874
+ model: model1.model
7875
7875
  });
7876
7876
  }
7877
7877
  get folder() {
@@ -8857,7 +8857,7 @@ class ComposeFormComponent {
8857
8857
  }
8858
8858
  }
8859
8859
  _applyChanges() {
8860
- Object.deepAssign(this.model.model, this._instance.form.value);
8860
+ deepAssign(this.model.model, this._instance.form.value);
8861
8861
  }
8862
8862
  navigate(page) {
8863
8863
  const pagen = parseInt(page);
@@ -9124,7 +9124,7 @@ class ComposeFormComponent {
9124
9124
  }
9125
9125
  _assign(model, emitEvent) {
9126
9126
  Object.assign(this.model, model, {
9127
- model: Object.deepAssign(this.model.model, model.model)
9127
+ model: deepAssign(this.model.model, model.model)
9128
9128
  });
9129
9129
  this.modelChange.emit(this.model);
9130
9130
  emitEvent !== false && this._formRef._modelChange.next(this.model);