From 91100974c37d5e8a210e2cd969d8ce71b458566e Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Tue, 15 Feb 2022 11:50:27 +0200 Subject: [PATCH] ref --- client/src/views/fields/currency.js | 2 +- client/src/views/fields/float.js | 16 ++++++++++------ client/src/views/fields/int.js | 16 ++++++++++------ 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/client/src/views/fields/currency.js b/client/src/views/fields/currency.js index 44cf7f0ad6..92c508fb84 100644 --- a/client/src/views/fields/currency.js +++ b/client/src/views/fields/currency.js @@ -117,7 +117,7 @@ define('views/fields/currency', 'views/fields/float', function (Dep) { }, formatNumber: function (value) { - if (this.mode === 'list' || this.mode === 'detail' || this.mode === 'listLink') { + if (this.isReadMode()) { return this.formatNumberDetail(value); } diff --git a/client/src/views/fields/float.js b/client/src/views/fields/float.js index bf241b68af..6b9180517c 100644 --- a/client/src/views/fields/float.js +++ b/client/src/views/fields/float.js @@ -66,15 +66,19 @@ define('views/fields/float', 'views/fields/int', function (Dep) { return this.formatNumberDetail(value); } - if (value !== null) { - var parts = value.toString().split("."); + return this.formatNumberEdit(value); + }, - parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, this.thousandSeparator); - - return parts.join(this.decimalMark); + formatNumberEdit: function (value) { + if (value === null) { + return ''; } - return ''; + let parts = value.toString().split("."); + + parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, this.thousandSeparator); + + return parts.join(this.decimalMark); }, formatNumberDetail: function (value) { diff --git a/client/src/views/fields/int.js b/client/src/views/fields/int.js index 8bde58e967..605f5ef22a 100644 --- a/client/src/views/fields/int.js +++ b/client/src/views/fields/int.js @@ -129,15 +129,19 @@ define('views/fields/int', 'views/fields/base', function (Dep) { return value; } - if (value !== null) { - var stringValue = value.toString(); + return this.formatNumberEdit(value); + }, - stringValue = stringValue.replace(/\B(?=(\d{3})+(?!\d))/g, this.thousandSeparator); - - return stringValue; + formatNumberEdit: function (value) { + if (value === null) { + return ''; } - return ''; + let stringValue = value.toString(); + + stringValue = stringValue.replace(/\B(?=(\d{3})+(?!\d))/g, this.thousandSeparator); + + return stringValue; }, setupSearch: function () {