ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #508 from nocobase/fix-formula-bug

Browse Source 
fix: formula bug
This commit is contained in:
金昶 2022-06-15 21:47:20 +08:00 committed by GitHub
commit e044d389f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/core/client/src/schema-component/antd/formula-input/Compute.tsx
View File

@ -3,18 +3,16 @@ import { connect, mapReadPretty, useFieldSchema, useFormEffects } from '@formily
import { InputNumber } from 'antd'; import { InputNumber } from 'antd';
import _ from 'lodash'; import _ from 'lodash';
import * as math from 'mathjs'; import * as math from 'mathjs';
import React, { useState } from 'react'; import React from 'react';
import { useCollection } from '../../../collection-manager/hooks'; import { useCollection } from '../../../collection-manager/hooks';
import { ReadPretty } from '../input-number/ReadPretty'; import { ReadPretty } from '../input-number/ReadPretty';
const AntdCompute = (props) => { const AntdCompute = (props) => {
const { value, onChange, step } = props; const { onChange, ...others } = props;
// const { expression } = useCollectionField();
const { getField } = useCollection(); const { getField } = useCollection();
const fieldSchema = useFieldSchema(); const fieldSchema = useFieldSchema();
const options = getField(fieldSchema.name); const options = getField(fieldSchema.name);
const { expression } = options; const { expression } = options;
const [computeValue, setComputeValue] = useState(value);
useFormEffects(() => { useFormEffects(() => {
onFormValuesChange((form) => { onFormValuesChange((form) => {
@ -24,17 +22,14 @@ const AntdCompute = (props) => {
result = math.evaluate(expression, scope); result = math.evaluate(expression, scope);
result = math.round(result, 9); result = math.round(result, 9);
} catch {} } catch {}
if (result) { if (onChange) {
setComputeValue(result); onChange(result);
if (onChange) {
onChange(result);
}
} }
}) })
}) })
return ( return (
<InputNumber readOnly value={computeValue} stringMode={true} step={step} /> <InputNumber {...others} readOnly stringMode={true} />
); );
} }