From 3ff55fda22f3d17dec3cc20b87d0d1439b2cbae3 Mon Sep 17 00:00:00 2001 From: zhuyue Date: Wed, 29 Sep 2021 16:40:21 +0800 Subject: [PATCH] fix: Fix flavor show for which ram < 1 GB fix flavor show for which ram < 1GB Change-Id: I6cbf151e4b17241a71864fb3736e9276113aa895 --- src/pages/compute/containers/Flavor/Detail/index.jsx | 3 ++- src/resources/flavor.js | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/compute/containers/Flavor/Detail/index.jsx b/src/pages/compute/containers/Flavor/Detail/index.jsx index ca174d58..8bbd37f6 100644 --- a/src/pages/compute/containers/Flavor/Detail/index.jsx +++ b/src/pages/compute/containers/Flavor/Detail/index.jsx @@ -18,6 +18,7 @@ import Base from 'containers/TabDetail'; import { flavorCategoryList, flavorArchitectures } from 'resources/flavor'; import Members from 'pages/compute/containers/Instance'; import { emptyActionConfig } from 'utils/constants'; +import { formatSize } from 'utils'; import actionConfigs from '../actions'; import BaseDetail from './BaseDetail'; @@ -63,7 +64,7 @@ export class Detail extends Base { title: t('Memory'), dataIndex: 'ram', isHideable: true, - render: (ram) => `${Number.parseInt(ram / 1024, 10)}G`, + render: (ram) => formatSize(ram, 2), }, { title: t('Public'), diff --git a/src/resources/flavor.js b/src/resources/flavor.js index 7ecd2d94..23c6ac66 100644 --- a/src/resources/flavor.js +++ b/src/resources/flavor.js @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import { formatSize } from 'utils'; + export const cpuPolicyList = { dedicated: t('Dedicated'), shared: t('Shared'), @@ -151,7 +153,7 @@ export const getBaseColumns = (self) => [ title: t('Memory'), dataIndex: 'ram', isHideable: true, - render: (ram) => `${Number.parseInt(ram / 1024, 10)}G`, + render: (ram) => formatSize(ram, 2), }, { title: t('Internal Network Bandwidth(Gbps)'),