Explorar o código

handle no input default set and initially omit unit from value if omitUnitFromValue is true

jusrhee %!s(int64=5) %!d(string=hai) anos
pai
achega
ad55d5e5d3
Modificáronse 1 ficheiros con 2 adicións e 2 borrados
  1. 2 2
      dashboard/src/components/values-form/FormWrapper.tsx

+ 2 - 2
dashboard/src/components/values-form/FormWrapper.tsx

@@ -85,7 +85,7 @@ export default class FormWrapper extends Component<PropsType, StateType> {
                 let key = item.name || item.variable;
                 let key = item.name || item.variable;
 
 
                 let def =
                 let def =
-                  item.settings && item.settings.unit
+                  item.settings && item.settings.unit && !item.settings.omitUnitFromValue
                     ? `${item.settings.default}${item.settings.unit}`
                     ? `${item.settings.default}${item.settings.unit}`
                     : item.settings?.default;
                     : item.settings?.default;
                 def = (item.value && item.value[0]) || def;
                 def = (item.value && item.value[0]) || def;
@@ -119,7 +119,7 @@ export default class FormWrapper extends Component<PropsType, StateType> {
                     value = def || {};
                     value = def || {};
                     break;
                     break;
                   case "number-input":
                   case "number-input":
-                    value = def.toString() ? def : "";
+                    value = def?.toString() ? def : "";
                     break;
                     break;
                   case "select":
                   case "select":
                     value = def || item.settings.options[0].value;
                     value = def || item.settings.options[0].value;