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

refactor: sub-table/sub-form support formula field (#2449)

Browse Source
This commit is contained in:
katherinehhh 2023-08-15 20:19:54 +08:00 committed by GitHub
parent d8d01befdc
commit 9b00aa9cc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/plugins/formula-field/src/client/components/Formula/Result.tsx
View File

@ -1,7 +1,7 @@
import React, { useState, useEffect } from 'react';
import { onFormInputChange } from '@formily/core';
import { toJS } from '@formily/reactive';
import { useFieldSchema, useFormEffects, useForm } from '@formily/react';
import { useFieldSchema, useFormEffects, useField } from '@formily/react';
import {
Checkbox,
DatePicker,
@ -39,6 +39,32 @@ function useTargetCollectionField() {
return getCollectionField(`${collection.name}.${paths[paths.length - 1]}`);
}
function getValuesByPath(data, path) {
const keys = path.split('.');
let current = data;
for (const key of keys) {
if (current && typeof current === 'object') {
if (Array.isArray(current) && !isNaN(key)) {
const index = parseInt(key);
if (index >= 0 && index < current.length) {
current = current[index];
} else {
return data;
}
} else if (key in current) {
current = current[key];
} else {
return data;
}
} else {
return data;
}
}
return current;
}
export function Result(props) {
const { value, ...others } = props;
const fieldSchema = useFieldSchema();
@ -46,6 +72,9 @@ export function Result(props) {
const [editingValue, setEditingValue] = useState(value);
const { evaluate } = (evaluators as Registry<Evaluator>).get(engine);
const formBlockContext = useFormBlockContext();
const field = useField();
const path: any = field.path.entire;
const fieldPath = path?.replace(`.${fieldSchema.name}`, '');
useEffect(() => {
setEditingValue(value);
@ -60,7 +89,8 @@ export function Result(props) {
) {
return;
}
const scope = toJS(form.values);
const scope = toJS(getValuesByPath(form.values, fieldPath));
let v;
try {
v = evaluate(expression, scope);