feat: Update calculation formula

quanxiang-cloud · Jul 20, 2023 · 19376fc · 19376fc
1 parent 7be0515
commit 19376fc
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/clients/components/form-builder/linkages/calculation-formula.ts b/clients/components/form-builder/linkages/calculation-formula.ts
@@ -87,8 +87,7 @@ function executeFormula({ rawFormula, formActions, targetField }: ExecuteFormula
         ));
       };
       const condition = ifElse(
-        () => isUndefined(fieldValue) || isNull(fieldValue) ||
-          (isArray(fieldValue) && fieldValue.every(isEmpty)),
+        () =>(isArray(fieldValue) && fieldValue.every(isEmpty)), // isUndefined(fieldValue) || isNull(fieldValue) ||
         () => missingValueField = true,
         () => valuesAcc.values[fieldPath] = fieldValueFilter(fieldValue),
       );
@@ -127,7 +126,13 @@ function executeFormula({ rawFormula, formActions, targetField }: ExecuteFormula
     const subTableFieldKey = lineNumber ? undefined : Object.keys(values).find((key) => isArray(values[key]));
     function assignValue(values: Record<string, any>, path: string): void {
       try {
-        const resultValue = resolve(ast, values);
+        let hasEmpty = false;
+        for (const key in values) {
+          if (!hasEmpty) {
+            hasEmpty = isUndefined(values[key]) || isNull(values[key]);
+          }
+        }
+        const resultValue = hasEmpty ? null : resolve(ast, values);
         setFieldState(path, (state) => state.value = resultValue);
       } catch (err: any) {
         logger.debug('execute calculation formula on form field', 'todo');

diff --git a/clients/components/form-builder/registry/number-picker/number-picker.tsx b/clients/components/form-builder/registry/number-picker/number-picker.tsx
@@ -1,11 +1,24 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useRef } from 'react';
 import { InputNumber, InputNumberProps } from 'antd';
 
 type Props = Omit<InputNumberProps, 'onChange'> & {
   onChange: (val: any) => void;
 }
 
 function NumberPicker({ defaultValue, ...other }: Props): JSX.Element {
+  const InputNumberRef = useRef<any>();
+
+  useEffect(()=>{
+    InputNumberRef?.current?.addEventListener('input', (event: any) => {
+      const inputValue = event.target.value;
+      if (inputValue === '') {
+        setTimeout(()=>{
+          other.onChange?.(null);
+        });
+      }
+    });
+  }, [InputNumberRef?.current]);
+
   useEffect(() => {
     if (other.value || other.value === 0 || other.value === null || defaultValue === undefined) {
       return;
@@ -24,7 +37,7 @@ function NumberPicker({ defaultValue, ...other }: Props): JSX.Element {
     other.onChange?.(val);
   }
 
-  return <InputNumber {...other} onChange={handleChange} />;
+  return <InputNumber ref={InputNumberRef} {...other} onChange={handleChange} />;
 }
 
 export default NumberPicker;