fix: update method to calc numeric value

Author: Jenesius

examples/all-inputs/App.vue

@@ -77,7 +77,7 @@
 		<input-field name = "number" type = "number" label = "With Unit"  :pretty="prettyUnit('meters')" />
 		<input-field name = "number" type = "number" label = "With Suffix" suffix = "MHz"   />
 		<input-field name = "number" type = "number" disabled label = "With Suffix" suffix = "MHz"   />
-
+		<input-field name = "number" type = "number" label = "Without step" suffix = "MHz" hide-step  />
 		<h2>Input Radio</h2>
 
 		<input-field name = "radio" type = "radio" :options = "optionsCheckbox"/>
@@ -140,12 +140,12 @@ function prettyUnit(unit: string) {
 		if (typeof v !== "string" && typeof v !== "number") {
 			return v;
 		}
-		v = String(v);
-		v = v.replace(/[^0-9.]/g, '')
+		let strValue = String(v);
+		strValue = strValue.replace(/[^0-9.+-]/g, '')
 
-		v = k.format(Number(v));
+		strValue = k.format(Number(v));
 
-		return `${v} ${unit}`
+		return `${strValue} ${unit}`
 	}
 }
 

src/utils/parse-number.ts

@@ -1,12 +1,16 @@
+import STORE from "../config/store";
+
 /**
  * @description Попытка конвертации любой строки в число
  * */
-export function parseNumber(data: unknown, defaultValue: number = 0) {
+
+export function parseNumber(data: unknown, defaultValue: any = 0) {
+
     if (typeof data !== 'string') return defaultValue;
 
     const parsedResult = new RegExp(/^([-+]?)([^.,+-]*)(.*)/g).exec(data);
 
-    if (parsedResult === null) return 0;
+    if (parsedResult === null) return defaultValue;
 
     try {
         const parsedSting = [
@@ -20,14 +24,8 @@ export function parseNumber(data: unknown, defaultValue: number = 0) {
         if (parsedSting.length === 2) return defaultValue;
 
         const result = Number.parseFloat(parsedSting)
-        return  Number.isNaN(result) ? 0 : result
+        return  Number.isNaN(result) ? defaultValue : result
     } catch (e) {
-        return 0
+        return defaultValue;
     }
-
-
 }
-
-function test(str: string) {
-
-}

src/widgets/inputs/input-number/widget-input-number.vue

@@ -8,14 +8,14 @@
 		>
 			<widget-number-step
 				@step = "onStep"
-				v-if = "!disabled"
+				v-if = "!hideStep && !disabled "
 			/>
 			<input
 				ref = "refInput"
 				class = "input-number"
 				type = "text"
 				:value = "isFocused ? modelValue : useModify(() => props.pretty)(modelValue)"
-				@input = "handleInput($event.target.value)"
+				@input = "handleInput(($event.target as HTMLInputElement).value)"
 				:disabled = "disabled"
 				:autofocus="autofocus"
 
@@ -36,6 +36,7 @@ import {StringModify, ValidationError} from "../../../types";
 import useModify from "../../../local-hooks/use-modify";
 import FieldWrap from "../field-wrap.vue";
 import {parseNumber} from "../../../utils/parse-number";
+import STORE from "../../../config/store";
 interface Props{
 	step?: number | string,
 	label?: string,
@@ -46,7 +47,8 @@ interface Props{
 	name: string,
 	pretty?: StringModify | StringModify[],
 	suffix?: string,
-	decimal?: boolean
+	decimal?: boolean,
+	hideStep?: boolean
 }
 const props = withDefaults(defineProps<Props>(), {
 	step: 1
@@ -58,7 +60,7 @@ const emits = defineEmits<{
 }>()
 const refInput = ref<HTMLInputElement>()
 function handleInput(data: string | number) {
-	const value = (typeof data !== "number") ? parseNumber(data) : data
+	const value = (typeof data !== "number") ? parseNumber(data, STORE.cleanValue) : data
 
 	if (value !== props.modelValue) emits("update:modelValue", value);
 	if (refInput.value) refInput.value.value = String(data).replace(/[^0-9.,+-]|/g, '')

src/widgets/inputs/input-text/input-text.vue

@@ -16,7 +16,7 @@
 				:disabled="disabled"
 				:autofocus="autofocus"
 				:placeholder="placeholder"
-				@input="onInput($event.target.value)"
+				@input="onInput(($event.target as HTMLInputElement).value)"
 				@focusin = "isFocused = true"
 				@focusout = "isFocused = false"
 				:name = "name"
@@ -31,6 +31,7 @@ import useModify from "../../../local-hooks/use-modify";
 import {StringModify, ValidationError} from "../../../types";
 import FieldWrap from "../field-wrap.vue";
 import {parseNumber} from "../../../utils/parse-number";
+import STORE from "../../../config/store";
 
 const props = defineProps<{
 	label?: string,
@@ -60,7 +61,7 @@ const emit = defineEmits<{
 const executePretty = useModify(() => props.pretty);
 const executeModify = useModify(
 	() => [
-		props.numeric ? parseNumber : undefined,
+		props.numeric ? (s) => parseNumber(s, STORE.cleanValue) : undefined,
 		...(Array.isArray(props.modify) ? props.modify : [props.modify])
 	]
 )