chore: merge master into develop after 2.0.dev316 version tagging

cloudforet-io · Feb 13, 2025 · fe8097b · fe8097b
2 parents 92c39da + eaec968
commit fe8097b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "web",
-  "version": "2.0.0-dev315",
+  "version": "2.0.0-dev316",
   "private": true,
   "description": "Cloudforet Console Web Application",
   "author": "Cloudforet",

diff --git a/apps/web/src/services/cost-explorer/components/CostAnalysisDataTable.vue b/apps/web/src/services/cost-explorer/components/CostAnalysisDataTable.vue
@@ -640,13 +640,13 @@ watch(
                 #tf-col-format="{field, colIndex, values}"
             >
                 <span v-if="colIndex === 0">Total</span>
-                <span v-else-if="tableState.showFormattedData
+                <span v-else-if="tableState.showFormattedData && field.name !== 'usage_unit'
                     && (!state.visibleGroupByItems.map(item => lowerCase(item.name)).includes(lowerCase(field.name))
                         && !state.visibleGroupByItems.map(item => lowerCase(item.label)).includes(lowerCase(field.name)))"
                 >
                     {{ Array.isArray(values) && values.length > 0 ? numberFormatter(reduce(values), {notation: 'compact'}) : 0 }}
                 </span>
-                <span v-else-if="!tableState.showFormattedData
+                <span v-else-if="!tableState.showFormattedData && field.name !== 'usage_unit'
                     && (!state.visibleGroupByItems.map(item => lowerCase(item.name)).includes(lowerCase(field.name))
                         && !state.visibleGroupByItems.map(item => lowerCase(item.label)).includes(lowerCase(field.name)))"
                 >

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cloudforet-console",
-  "version": "2.0.0-dev315",
+  "version": "2.0.0-dev316",
   "private": true,
   "workspaces": [
     "apps/*",