From 72f541c7a340f43cd09f36e4d02476783e74aa2e Mon Sep 17 00:00:00 2001 From: ShareVB Date: Sun, 17 Aug 2025 15:15:44 +0200 Subject: [PATCH] fix(Input Number): handle dot and comma (and other format) Handles 1,000.9 ; $ 100 ; 1.000,12 etc Fix #164 --- .../ai-prompt-splitter/ai-prompt-splitter.vue | 2 +- .../ascii-text-drawer/ascii-text-drawer.vue | 2 +- .../aspect-ratio-calculator.vue | 10 ++--- .../barcode-generator/barcode-generator.vue | 6 +-- .../base64-hex-converter.vue | 4 +- src/tools/bcrypt/bcrypt.vue | 2 +- src/tools/bmi-calculator/bmi-calculator.vue | 4 +- src/tools/card-picker/card-picker.vue | 4 +- .../citation-generator/citation-generator.vue | 2 +- src/tools/color-converter/color-converter.vue | 4 +- src/tools/countdown/countdown.vue | 16 ++++---- .../currency-converter/currency-converter.vue | 2 +- src/tools/data-faker/data-faker.vue | 2 +- .../data-storage-unit-converter.vue | 2 +- .../data-transfer-rate-converter.vue | 12 +++--- src/tools/days-calculator/days-calculator.vue | 4 +- .../dmarc-dns-generator.vue | 6 +-- .../docker-compose-converter.vue | 2 +- ...docker-run-to-docker-compose-converter.vue | 2 +- src/tools/emoji-picker/emoji-picker.vue | 2 +- src/tools/energy-computer/energy-computer.vue | 6 +-- src/tools/eta-calculator/eta-calculator.vue | 6 +-- src/tools/fortune-wheel/fortune-wheel.vue | 2 +- .../geo-distance-calculator.vue | 8 ++-- src/tools/hdd-calculator/hdd-calculator.vue | 2 +- src/tools/hex-converter/hex-converter.vue | 10 ++--- .../htaccess-generator/htaccess-generator.vue | 2 +- .../htpasswd-generator/htpasswd-generator.vue | 2 +- src/tools/image-converter/image-converter.vue | 4 +- .../image-to-ascii-art/image-to-ascii-art.vue | 2 +- .../integer-base-converter.vue | 4 +- .../iptables-generator/iptables-generator.vue | 6 +-- .../iso-3166-searcher/iso-3166-searcher.vue | 2 +- .../javascript-to-json/javascript-to-json.vue | 2 +- .../json-size-analyzer/json-size-analyzer.vue | 2 +- .../json-to-javascript/json-to-javascript.vue | 2 +- src/tools/json-viewer/json-viewer.vue | 2 +- .../mac-address-generator.vue | 2 +- .../nanoid-generator/nanoid-generator.vue | 4 +- .../passphrase-generator.vue | 8 ++-- .../percentage-calculator.vue | 12 +++--- src/tools/pgp-keygen/pgp-keygen.vue | 2 +- .../pin-code-generator/pin-code-generator.vue | 4 +- src/tools/port-numbers/port-numbers.vue | 2 +- .../qr-code-generator/qr-code-generator.vue | 8 ++-- src/tools/raid-calculator/raid-calculator.vue | 6 +-- .../rem-px-converter/rem-px-converter.vue | 4 +- src/tools/rmb-numbers/rmb-numbers.vue | 2 +- .../roman-numeral-converter.vue | 2 +- .../rsa-key-pair-generator.vue | 2 +- src/tools/sla-calculator/sla-calculator.vue | 16 ++++---- .../smart-text-replacer.vue | 2 +- src/tools/sql-prettify/sql-prettify.vue | 2 +- .../string-obfuscator/string-obfuscator.vue | 4 +- .../svg-placeholder-generator.vue | 6 +-- .../token-generator/token-generator.tool.vue | 4 +- .../traefik-compose-maker.vue | 2 +- src/tools/ttl-calculator/ttl-calculator.vue | 10 ++--- src/tools/ulid-generator/ulid-generator.vue | 2 +- src/tools/unicode-search/unicode-search.vue | 2 +- src/tools/uuid-generator/uuid-generator.vue | 2 +- src/tools/watermarker/watermarker.vue | 10 ++--- .../week-number-converter.vue | 10 ++--- src/tools/xml-formatter/xml-formatter.vue | 2 +- src/tools/yaml-viewer/yaml-viewer.vue | 2 +- .../n-input-number-i18n.demo.vue | 10 +++++ .../n-input-number-i18n.test.ts | 41 +++++++++++++++++++ .../n-input-number-i18n.utils.ts | 37 +++++++++++++++++ .../n-input-number-i18n.vue | 14 +++++++ 69 files changed, 246 insertions(+), 144 deletions(-) create mode 100644 src/ui/n-input-number-i18n/n-input-number-i18n.demo.vue create mode 100644 src/ui/n-input-number-i18n/n-input-number-i18n.test.ts create mode 100644 src/ui/n-input-number-i18n/n-input-number-i18n.utils.ts create mode 100644 src/ui/n-input-number-i18n/n-input-number-i18n.vue diff --git a/src/tools/ai-prompt-splitter/ai-prompt-splitter.vue b/src/tools/ai-prompt-splitter/ai-prompt-splitter.vue index 6176ac41..6dbde267 100644 --- a/src/tools/ai-prompt-splitter/ai-prompt-splitter.vue +++ b/src/tools/ai-prompt-splitter/ai-prompt-splitter.vue @@ -45,7 +45,7 @@ const promptValidation = useValidation({ mb-2 /> - + diff --git a/src/tools/ascii-text-drawer/ascii-text-drawer.vue b/src/tools/ascii-text-drawer/ascii-text-drawer.vue index bba3de85..5445c1f1 100644 --- a/src/tools/ascii-text-drawer/ascii-text-drawer.vue +++ b/src/tools/ascii-text-drawer/ascii-text-drawer.vue @@ -80,7 +80,7 @@ const fonts = ['1Row', '3-D', '3D Diagonal', '3D-ASCII', '3x5', '4Max', '5 Line - + diff --git a/src/tools/aspect-ratio-calculator/aspect-ratio-calculator.vue b/src/tools/aspect-ratio-calculator/aspect-ratio-calculator.vue index 5f508da3..f10fc781 100644 --- a/src/tools/aspect-ratio-calculator/aspect-ratio-calculator.vue +++ b/src/tools/aspect-ratio-calculator/aspect-ratio-calculator.vue @@ -2,7 +2,7 @@ + + diff --git a/src/ui/n-input-number-i18n/n-input-number-i18n.test.ts b/src/ui/n-input-number-i18n/n-input-number-i18n.test.ts new file mode 100644 index 00000000..54a61980 --- /dev/null +++ b/src/ui/n-input-number-i18n/n-input-number-i18n.test.ts @@ -0,0 +1,41 @@ +import { beforeEach, describe, expect, it } from 'vitest'; +import { mount } from '@vue/test-utils'; +import { createPinia, setActivePinia } from 'pinia'; +import CInputNumberI18N from './n-input-number-i18n.vue'; +import { formatNumber, parseNumber } from './n-input-number-i18n.utils'; + +describe('CInputNumberI18N', () => { + beforeEach(() => { + setActivePinia(createPinia()); + }); + + it('Should render', async () => { + const wrapper = mount(CInputNumberI18N); + + expect(wrapper.html()).toBeDefined(); + }); + + it('Format value', () => { + expect(formatNumber(1.3)).to.equal('1.3'); + }); + + it('Parse a dot value', () => { + expect(parseNumber('1.3')).to.equal(1.3); + }); + + it('Parse a comma value', () => { + expect(parseNumber('1,3')).to.equal(1.3); + }); + + it('Parse a other values', () => { + expect(parseNumber('$1,225.12')).to.equal(1225.12); + expect(parseNumber('1,225.12')).to.equal(1225.12); + expect(parseNumber('1.225,12')).to.equal(1225.12); + expect(parseNumber('1225,12')).to.equal(1225.12); + expect(parseNumber('1225.12')).to.equal(1225.12); + expect(parseNumber('1,111,1225.12')).to.equal(11111225.12); + expect(parseNumber('1.111.1225,12')).to.equal(11111225.12); + expect(parseNumber('1.111.1225,12')).to.equal(11111225.12); + expect(parseNumber('1.111.122')).to.equal(1111122); + }); +}); diff --git a/src/ui/n-input-number-i18n/n-input-number-i18n.utils.ts b/src/ui/n-input-number-i18n/n-input-number-i18n.utils.ts new file mode 100644 index 00000000..5b3e5d9d --- /dev/null +++ b/src/ui/n-input-number-i18n/n-input-number-i18n.utils.ts @@ -0,0 +1,37 @@ +export function countChar(str: string, char: string) { + let result = 0; + for (let i = 0; i < str.length; i++) { + if (str[i] === char) { + result++; + } + } + return result; +}; +export function parseNumber(value: string) { + if ( + value === undefined + || value === null + || (typeof value === 'string' && value.trim() === '') + ) { + return null; + } + let cleanedValue = value.replace(/[^,\.\d-]/g, ''); + if (countChar(cleanedValue, ',') > 1) { + cleanedValue = cleanedValue.replace(/,/g, ''); + } + if (countChar(cleanedValue, '.') > 1) { + cleanedValue = cleanedValue.replace(/\./g, ''); + } + const parts = cleanedValue.split(/[,\.]/); + if (parts.length === 1) { + return Number(cleanedValue); + } + return Number(`${parts.slice(0, -1).join('')}.${parts.slice(-1)[0]}`); +} + +export function formatNumber(n: number | null) { + if (n === null) { + return ''; + } + return n.toString(); +} diff --git a/src/ui/n-input-number-i18n/n-input-number-i18n.vue b/src/ui/n-input-number-i18n/n-input-number-i18n.vue new file mode 100644 index 00000000..1a9dc528 --- /dev/null +++ b/src/ui/n-input-number-i18n/n-input-number-i18n.vue @@ -0,0 +1,14 @@ + + +