fix: fix the window have scroller when it have hpa card (#4238)

* fix: fix the window have scroller when it have hpa card Signed-off-by: harrisonliu5 <[email protected]> * fix: fix horizontalpodautoscalers api version Signed-off-by: harrisonliu5 <[email protected]> --------- Signed-off-by: harrisonliu5 <[email protected]>
kubesphere · Oct 31, 2023 · fe8e59f · fe8e59f
1 parent bff4820
commit fe8e59f
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 15 deletions.
diff --git a/src/pages/projects/components/Cards/HPA/index.jsx b/src/pages/projects/components/Cards/HPA/index.jsx
@@ -28,6 +28,7 @@ import { Button, Icon, Dropdown, Menu, Notify } from '@kube-design/components'
 import { Card } from 'components/Base'
 
 import { getSuitableUnit, getValueByUnit } from 'utils/monitoring'
+import { coreUnitTS } from 'utils'
 
 import styles from './index.scss'
 
@@ -57,7 +58,8 @@ export default class HPACard extends React.Component {
   getValue = (data, unitType) => {
     const unit = getSuitableUnit(data, unitType)
     const result = getValueByUnit(data, unit)
-    return unit ? `${result} ${unit}` : result
+    const unitText = coreUnitTS(result, unit)
+    return `${result} ${unitText}`
   }
 
   getHPAData = () => {
@@ -125,28 +127,35 @@ export default class HPACard extends React.Component {
   handleCancel = () => {
     const { detail, onDeleted } = this.props
     this.store.delete(detail).then(() => {
-      Notify.success({ content: `${t('CANCELED_SUCCESSFULLY')}` })
+      Notify.success({ content: `${t('CANCEL_SUCCESSFUL')}` })
       onDeleted()
     })
   }
 
   renderOperations() {
     const menus = this.getOperations()
     const contenet = (
-      <Menu onClick={this.handleMoreClick}>
-        {menus.map(({ icon, text, show = true, ...rest }) => {
-          if (!show) return null
-          return (
-            <Menu.MenuItem key={text} {...rest}>
-              {icon && <Icon name={icon} type="light" />} {text}
-            </Menu.MenuItem>
-          )
-        })}
-      </Menu>
+      <div className={styles.menu}>
+        <Menu onClick={this.handleMoreClick}>
+          {menus.map(({ icon, text, show = true, ...rest }) => {
+            if (!show) return null
+            return (
+              <Menu.MenuItem key={text} {...rest}>
+                {icon && <Icon name={icon} type="light" />} {text}
+              </Menu.MenuItem>
+            )
+          })}
+        </Menu>
+      </div>
     )
 
     return (
-      <Dropdown theme="dark" content={contenet}>
+      <Dropdown
+        theme="dark"
+        content={contenet}
+        positionFixed
+        placement="bottomRight"
+      >
         <Button type="ghost" icon="more" />
       </Dropdown>
     )
@@ -178,14 +187,14 @@ export default class HPACard extends React.Component {
   }
 
   render() {
-    const { className, loading } = this.props
+    const { className, loading, enableCancaleHPA = true } = this.props
     const title = this.props.title || t('AUTOSCALING')
 
     return (
       <Card
         className={classnames(styles.main, className)}
         title={title}
-        operations={this.renderOperations()}
+        operations={enableCancaleHPA ? this.renderOperations() : null}
         empty={t('NOT_ENABLE', { resource: t('AUTOSCALING') })}
         loading={loading}
       >

diff --git a/src/pages/projects/components/Cards/HPA/index.scss b/src/pages/projects/components/Cards/HPA/index.scss
@@ -38,3 +38,9 @@
     line-height: 1.67;
   }
 }
+
+.menu {
+  :global(.menu) {
+    min-width: 100px;
+  }
+}
diff --git a/src/utils/index.js b/src/utils/index.js
@@ -835,3 +835,13 @@ export const getDomTitle = name => {
   }
   return <span title={name}>{name}</span>
 }
+
+export const coreUnitTS = (value, unit) => {
+  let unitTxt = unit || ''
+
+  if (unit === 'core') {
+    unitTxt = value !== 1 ? t('CORE_PL') : t('CORE')
+  }
+
+  return unitTxt
+}