added precision for float number columns

raheeliftikhar5 · raheeliftikhar5 · commit 6fa43f1cfb93 · 2024-01-12T23:06:51.000+05:00
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/ColumnNumberComp.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/ColumnNumberComp.tsx
@@ -1,5 +1,5 @@
   import { default as InputNumber } from "antd/es/input-number";
-import { NumberControl, StringControl } from "comps/controls/codeControl";
+import { NumberControl, RangeControl, StringControl } from "comps/controls/codeControl";
 import { BoolControl } from "comps/controls/boolControl";
 import { trans } from "i18n";
 import { ColumnTypeCompBuilder, ColumnTypeViewFn } from "../columnTypeCompBuilder";
@@ -25,13 +25,16 @@ const InputNumberWrapper = styled.div`
 const childrenMap = {
   text: NumberControl,
   step: withDefault(NumberControl, 1),
+  precision: RangeControl.closed(0, 20, 0),
   float: BoolControl,
   prefix: StringControl,
   suffix: StringControl,
 };
 
 let float = false;
 let step = 1;
+let precision = 0;
+
 const getBaseValue: ColumnTypeViewFn<typeof childrenMap, number, number> = (
   props
 ) => {
@@ -44,8 +47,13 @@ export const ColumnNumberComp = (function () {
     (props, dispatch) => {
       float = props.float;
       step = props.step;
-      const value = !float ? Math.floor(props.changeValue ?? getBaseValue(props, dispatch)) : props.changeValue ?? getBaseValue(props, dispatch);
-      return props.prefix + value + props.suffix;
+      precision = props.precision;
+      const value = props.changeValue ?? getBaseValue(props, dispatch);
+      let formattedValue: string | number = !float ? Math.floor(value) : value;
+      if(float) {
+        formattedValue = formattedValue.toPrecision(precision + 1);
+      }
+      return props.prefix + formattedValue + props.suffix;
     },
     (nodeValue) => nodeValue.text.value,
     getBaseValue,
@@ -62,6 +70,7 @@ export const ColumnNumberComp = (function () {
             value = value ?? 0;
             props.onChange(!float ? Math.floor(value) : value);
           }}
+          precision={float ? precision : 0}
           onBlur={props.onChangeEnd}
           onPressEnter={props.onChangeEnd}
         />
@@ -86,6 +95,11 @@ export const ColumnNumberComp = (function () {
               }
             }
           })}
+          {float && (
+            children.precision.propertyView({
+              label: trans("table.precision"),
+            })
+          )}
           {children.prefix.propertyView({
             label: trans("table.prefix"),
           })}
diff --git a/client/packages/lowcoder/src/i18n/locales/de.ts b/client/packages/lowcoder/src/i18n/locales/de.ts
@@ -1137,6 +1137,7 @@ export const de = {
       "columnType": "Säule Typ",
       "numberStep": "Schritt",
       "numberStepTooltip": "Die Zahl, auf die der aktuelle Wert erhöht oder verringert wird. Es kann eine ganze Zahl oder eine Dezimalzahl sein",
+      "precision": "Präzision",
       "float": "Schwimmer",
       "prefix": "Präfix",
       "suffix": "Nachsilbe",
diff --git a/client/packages/lowcoder/src/i18n/locales/en.ts b/client/packages/lowcoder/src/i18n/locales/en.ts
@@ -1241,6 +1241,7 @@ export const en = {
     "columnType": "Column Type",
     "numberStep": "Step",
     "numberStepTooltip": "The number to which the current value is increased or decreased. It can be an integer or decimal",
+    "precision": "Precision",
     "float": "Float",
     "prefix": "Prefix",
     "suffix": "Suffix",
diff --git a/client/packages/lowcoder/src/i18n/locales/zh.ts b/client/packages/lowcoder/src/i18n/locales/zh.ts
@@ -1212,6 +1212,7 @@ table: {
     columnType: "列类型",
     numberStep: "步",
     numberStepTooltip: "当前值增加或减少的数量。它可以是整数或小数",
+    precision: "精度",
     float: "分数",
     prefix: "字首",
     suffix: "后缀",
