test/amis2
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-12-02 03:58:07 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

调整 diff函数

Browse Source
This commit is contained in:
2betop 2020-09-23 11:28:46 +08:00
parent 46ca467911
commit 6cca0a3a70
1 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/utils/helper.ts
View File

@ -534,49 +534,51 @@ export function difference<
keepProps?: Array<string>,
strict: boolean = false
): {[propName: string]: any} {
function changes(object: T, base: U, strict: boolean = false) {
const keys: Array<keyof T & keyof U> = uniq(
Object.keys(object).concat(Object.keys(base))
);
let result: any = {};
function changes(object: T, base: U) {
if (lodashIsObject(object) && lodashIsObject(base)) {
const keys: Array<keyof T & keyof U> = uniq(
Object.keys(object).concat(Object.keys(base))
);
let result: any = {};
keys.forEach(key => {
const a: any = object[key as keyof T];
const b: any = base[key as keyof U];
keys.forEach(key => {
const a: any = object[key as keyof T];
const b: any = base[key as keyof U];
if (keepProps && ~keepProps.indexOf(key as string)) {
result[key] = a;
}
if (isEqual(a, b)) {
return;
}
if (!object.hasOwnProperty(key)) {
result[key] = undefined;
} else if (Array.isArray(a) && Array.isArray(b)) {
if (strict) {
result[key] = a.map((item, index) => {
return changes(item, b[index], strict);
});
let len = b.length - a.length;
while (len--) {
result[key].push(undefined);
}
} else {
if (keepProps && ~keepProps.indexOf(key as string)) {
result[key] = a;
}
} else if (lodashIsObject(a) && lodashIsObject(b)) {
result[key] = changes(a as any, b as any);
} else {
result[key] = a;
}
});
return result;
if (isEqual(a, b)) {
return;
}
if (!object.hasOwnProperty(key)) {
result[key] = undefined;
} else if (Array.isArray(a) && Array.isArray(b)) {
if (strict) {
result[key] = a.map((item, index) => {
return changes(item, b[index]);
});
let len = b.length - a.length;
while (len--) {
result[key].push(undefined);
}
} else {
result[key] = a;
}
} else {
result[key] = changes(a as any, b as any);
}
});
return result;
} else {
return object;
}
}
return changes(object, base, strict);
return changes(object, base);
}
export const padArr = (arr: Array<any>, size = 4): Array<Array<any>> => {