fix CR

oceanbase · Jan 10, 2025 · 578191a · 578191a
1 parent 66c9408
commit 578191a
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 33 deletions.
diff --git a/ui/src/i18n/strings/en-US.json b/ui/src/i18n/strings/en-US.json
@@ -1252,8 +1252,8 @@
   "src.pages.Cluster.Detail.Overview.FF85D01F": "Unmanaged Successfully",
   "src.pages.Cluster.New.AE7F8E70": "Please select {topologyConfiguration} Key",
   "src.pages.Cluster.New.5344AD47": "Please select {topologyConfiguration} Operator",
-  "src.pages.Cluster.New.870724D5": "Please Enter {topologyConfiguration} Value",
+  "src.pages.Cluster.New.870724D5": "Please enter {topologyConfiguration} Value",
   "src.pages.Cluster.New.AC56EBD8": "Please select PodAffinity Type",
   "src.pages.Cluster.New.9DDB4176": "Please select the Tolerations Effect",
-  "src.pages.Cluster.New.DB6FD585": "Enter and press Enter to add"
+  "src.pages.Cluster.New.DB6FD585": "Input content and press Enter to add"
 }
diff --git a/ui/src/pages/Cluster/New/Topo.tsx b/ui/src/pages/Cluster/New/Topo.tsx
@@ -32,6 +32,34 @@ export default function Topo({ form }) {
 
   const access = useAccess();
 
+  const affinitiesOperatorList = [
+    {
+      value: 'In',
+      label: 'In',
+    },
+    {
+      value: 'NotIn',
+      label: 'NotIn',
+    },
+    {
+      value: 'Exists',
+      label: 'Exists',
+    },
+    {
+      value: 'DoesNoExist',
+      label: 'DoesNoExist',
+    },
+  ];
+  const tolerationsOperatorList = [
+    {
+      value: 'Equal',
+      label: 'Equal',
+    },
+    {
+      value: 'Exists',
+      label: 'Exists',
+    },
+  ];
   const basicFrom = (topologyConfiguration, name) => (
     <>
       <Col
@@ -99,42 +127,17 @@ export default function Topo({ form }) {
               id: 'OBDashboard.components.NodeSelector.PleaseSelect',
               defaultMessage: '请选择',
             })}
-            options={[
-              ...(topologyConfiguration === 'Tolerations'
-                ? [
-                    {
-                      value: 'Equal',
-                      label: 'Equal',
-                    },
-                  ]
-                : []),
-              ...(topologyConfiguration !== 'Tolerations'
-                ? [
-                    {
-                      value: 'In',
-                      label: 'In',
-                    },
-                    {
-                      value: 'NotIn',
-                      label: 'NotIn',
-                    },
-                    {
-                      value: 'Exists',
-                      label: 'Exists',
-                    },
-                  ]
-                : []),
-              {
-                value: 'DoesNoExist',
-                label: 'DoesNoExist',
-              },
-            ]}
+            options={
+              topologyConfiguration === 'Tolerations'
+                ? tolerationsOperatorList
+                : affinitiesOperatorList
+            }
           />
         </Form.Item>
       </Col>
       <Col span={topologyConfiguration === 'NodeSelector' ? 8 : 6}>
         <Form.Item
-          label={'Value'}
+          label={topologyConfiguration === 'Tolerations' ? 'Value' : 'Values'}
           name={
             topologyConfiguration === 'Tolerations'
               ? [name, 'value']