|
@@ -107,6 +107,10 @@ export function fromBase64(data) {
|
|
));
|
|
));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+export function hasProp(obj, prop) {
|
|
|
|
+ return Object.prototype.hasOwnProperty.call(obj, prop);
|
|
|
|
+}
|
|
|
|
+
|
|
export function getObjDiff(oldObj, newObj, opts = {}) {
|
|
export function getObjDiff(oldObj, newObj, opts = {}) {
|
|
const {
|
|
const {
|
|
exclude = [],
|
|
exclude = [],
|
|
@@ -126,7 +130,7 @@ export function getObjDiff(oldObj, newObj, opts = {}) {
|
|
for (const key of Object.keys(oldObj)) {
|
|
for (const key of Object.keys(oldObj)) {
|
|
const kp = `${keyPath}${key}`;
|
|
const kp = `${keyPath}${key}`;
|
|
|
|
|
|
- if (newObj.hasOwnProperty(key)) {
|
|
|
|
|
|
+ if (Object.prototype.hasOwnProperty.call(newObj, key)) {
|
|
if (ex.has(kp))
|
|
if (ex.has(kp))
|
|
continue;
|
|
continue;
|
|
|
|
|
|
@@ -149,7 +153,7 @@ export function getObjDiff(oldObj, newObj, opts = {}) {
|
|
if (exAdd.has(kp))
|
|
if (exAdd.has(kp))
|
|
continue;
|
|
continue;
|
|
|
|
|
|
- if (!oldObj.hasOwnProperty(key)) {
|
|
|
|
|
|
+ if (!Object.prototype.hasOwnProperty.call(oldObj, key)) {
|
|
result.add[key] = _.cloneDeep(newObj[key]);
|
|
result.add[key] = _.cloneDeep(newObj[key]);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -213,7 +217,7 @@ export function applyObjDiff(obj, diff, opts = {}) {
|
|
|
|
|
|
const change = diff.change;
|
|
const change = diff.change;
|
|
for (const key of Object.keys(change)) {
|
|
for (const key of Object.keys(change)) {
|
|
- if (result.hasOwnProperty(key)) {
|
|
|
|
|
|
+ if (Object.prototype.hasOwnProperty.call(result, key)) {
|
|
if (_.isObject(change[key])) {
|
|
if (_.isObject(change[key])) {
|
|
result[key] = applyObjDiff(result[key], change[key], opts);
|
|
result[key] = applyObjDiff(result[key], change[key], opts);
|
|
} else {
|
|
} else {
|