test/amis2
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-11-29 18:48:45 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

chore: 调整 dataMapping 中 '&' 特殊 key 的逻辑 始终优先处理 Close: #7247 (#7264)

Browse Source
This commit is contained in:
liaoxuezhi 2023-06-28 19:27:46 +08:00 committed by GitHub
parent bc43375b81
commit 8aacd4361e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packages/amis-core/src/utils/dataMapping.ts
View File

@ -99,19 +99,21 @@ export function dataMapping(
);
}
} else {
Object.keys(to).forEach(key => {
const value = to[key];
let keys: Array<string>;
const objectKeys = Object.keys(to);
// 如果存在 '&' 作为 key，则特殊处理
// 就是无论这个 key 的位置在什么地方始终都是当放在最前面
const idx = objectKeys.indexOf('&');
if (~idx) {
const value = to['&'];
objectKeys.splice(idx, 1);
if (typeof ignoreFunction === 'function' && ignoreFunction(key, value)) {
// 如果被ignore，不做数据映射处理。
setVariable(ret, key, value, convertKeyToPath);
} else if (key === '&' && value === '$$') {
if (value === '$$') {
ret = {
...ret,
...from
};
} else if (key === '&') {
} else {
let keys: Array<string>;
const v =
isPlainObject(value) &&
(keys = Object.keys(value)) &&
@ -142,6 +144,15 @@ export function dataMapping(
...v
};
}
}
}
objectKeys.forEach(key => {
const value = to[key];
if (typeof ignoreFunction === 'function' && ignoreFunction(key, value)) {
// 如果被ignore，不做数据映射处理。
setVariable(ret, key, value, convertKeyToPath);
} else if (value === '$$') {
setVariable(ret, key, from, convertKeyToPath);
} else if (value && value[0] === '$') {