mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 07:38:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
nocobase[bot] 2024-10-22 02:59:59 +00:00
commit f0abab4ad0
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/plugins/@nocobase/plugin-field-formula/src/client/components/Formula/Result.tsx
View File

@ -61,6 +61,21 @@ function getValuesByPath(values, key, index?) {
}
}
function getValuesByFullPath(values, fieldPath) {
const fieldPaths = fieldPath.split('.');
let currentKeyIndex = 0;
let value = values;
//loop to get the last field
while (currentKeyIndex < fieldPaths.length) {
const fieldName = fieldPaths[currentKeyIndex];
const index = parseInt(fieldPaths?.[currentKeyIndex + 1]);
value = getValuesByPath(value, fieldName, index);
//have index means an array, then jump 2; else 1
currentKeyIndex = currentKeyIndex + (index >= 0 ? 2 : 1);
}
return value;
}
function areValuesEqual(value1, value2) {
if (_.isString(value1) && !isNaN(Date.parse(value1))) {
value1 = new Date(value1);
@ -87,8 +102,7 @@ export function Result(props) {
const field: any = useField();
const path: any = field.path.entire;
const fieldPath = path?.replace(`.${fieldSchema.name}`, '');
const fieldName = fieldPath.split('.')[0];
const index = parseInt(fieldPath.split('.')?.[1]);
useEffect(() => {
setEditingValue(value);
}, [value]);
@ -103,7 +117,9 @@ export function Result(props) {
) {
return;
}
const scope = toJS(getValuesByPath(form.values, fieldName, index));
//field name may be like todos.0.sub_todos.0.title
//scope should be the deepest one
const scope = toJS(getValuesByFullPath(form.values, fieldPath));
let v;
try {
v = evaluate(expression, scope);