前端修复节点label精准搜索及集群topo扩缩容 || Front-end repair node label accurate search and cluster topop size expansion (#788)

Author: TianWuwt

ui/src/components/TopoComponent/helper.ts

@@ -199,7 +199,16 @@ export const getServerNumber = (
   zoneName: string,
 ): number => {
   const zones = topoData.children || [];
-  for (const zone of zones) {
+  const newZones = zones?.map((item) => {
+    if (item.label.includes(':')) {
+      return {
+        ...item,
+        label: item.label.split(':')[0],
+      };
+    }
+    return item;
+  });
+  for (const zone of newZones) {
     if (zone.label === zoneName) {
       return zone.children?.length || 0;
     }

ui/src/components/customModal/AddZoneModal.tsx

@@ -102,15 +102,6 @@ export default function AddZoneModal({
             defaultMessage: 'K8s 集群',
           })}
           name={'k8sCluster'}
-          rules={[
-            {
-              required: true,
-              message: intl.formatMessage({
-                id: 'src.components.customModal.401CB296',
-                defaultMessage: '请选择 K8s 集群',
-              }),
-            },
-          ]}
         >
           <Select
             showSearch

ui/src/pages/Tenant/ZoneItem/index.tsx

@@ -58,6 +58,9 @@ export default function ZoneItem({
       : []),
   ];
 
+  const replica = REPLICA_TYPE_LIST?.find((item) =>
+    item.value?.toLowerCase().includes(obZoneResource['type']?.toLowerCase()),
+  );
   return (
     <div
       style={{
@@ -107,7 +110,7 @@ export default function ZoneItem({
             id: 'src.pages.Tenant.ZoneItem.93E193BC',
             defaultMessage: '副本类型',
           })}
-          initialValue={'Full'}
+          initialValue={isEdit ? replica?.value : 'Full'}
         >
           <Select options={REPLICA_TYPE_LIST} />
         </Form.Item>

ui/src/pages/Tenant/helper.ts

@@ -312,6 +312,7 @@ export const getOriginResourceUsages = (
         current.logDiskSize;
       originResourceUsages.obZoneResourceMap[key].availableMemory +=
         current.memorySize;
+      originResourceUsages.obZoneResourceMap[key].type = current.type;
     }
   });
   return originResourceUsages;

ui/src/utils/component.tsx

@@ -76,15 +76,21 @@ export const getColumnSearchProps = ({
     <SearchOutlined style={{ color: filtered ? '#1677ff' : undefined }} />
   ),
   onFilter: (value, record) => {
-    const safeValue = value ? value.split(symbol)[0] : '';
-    const realValue = trim(safeValue.toLowerCase());
+    const allvalue1 = trim(
+      (value ? value.split(symbol)[0] : '')?.toLowerCase(),
+    );
+    const allvalue2 = trim(
+      (value ? value.split(symbol)[1] : '')?.toLowerCase(),
+    );
 
     return arraySearch
       ? record[dataIndex] &&
-          record[dataIndex].some(
+          record[dataIndex]?.some(
             (item) =>
-              (item.key && item.key.toLowerCase().includes(realValue)) ||
-              (item.value && item.value.toLowerCase().includes(realValue)),
+              item.key &&
+              item.key.toLowerCase().includes(allvalue1) &&
+              item.value &&
+              item.value.toLowerCase().includes(allvalue2),
           )
       : record[dataIndex] &&
           record[dataIndex]