Merge pull request #7508 from swordqiu/hotfix/qj-host-hide-topo-info

fix: host list ignore topo info
yunionio · Jan 14, 2025 · 2ad0416 · 2ad0416
2 parents 846a093 + 7e51145
commit 2ad0416
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/containers/Compute/views/host/components/List.vue b/containers/Compute/views/host/components/List.vue
@@ -524,6 +524,7 @@ export default {
       const ret = {
         ...(R.is(Function, this.getParams) ? this.getParams() : this.getParams),
       }
+      ret.hide_cpu_topo_info = true
       return ret
     },
     handleOpenSidepage (row, tab) {

diff --git a/src/utils/common/tableColumn.js b/src/utils/common/tableColumn.js
@@ -221,15 +221,22 @@ export const getStatusTableColumn = ({ vm = {}, field = 'status', title = i18n.t
   }
 }
 
-export const getEnabledTableColumn = ({ field = 'enabled', title = i18n.t('table.title.enable_status'), minWidth = 90, hidden } = {}) => {
+export const getEnabledTableColumn = ({
+  field = 'enabled',
+  title = i18n.t('table.title.enable_status'),
+  enableText = i18n.t('status.enabled.true'),
+  disableText = i18n.t('status.enabled.false'),
+  minWidth = 90,
+  hidden,
+} = {}) => {
   return getStatusTableColumn({
     field,
     title,
     statusModule: 'enabled',
     minWidth,
     hidden,
     formatter: ({ row }) => {
-      return row[field] ? i18n.t('status.enabled.true') : i18n.t('status.enabled.false')
+      return row[field] ? enableText : disableText
     },
   })
 }