fix: 修复批量编辑node key 参数传递错误 || fix: Fix error in batch editing node key parameter passing error (#783)

Author: TianWuwt

ui/src/pages/Cluster/Detail/Parameters/index.tsx

@@ -81,13 +81,8 @@ export default function Parameters() {
           })}
         </Tag>
       ),
-
       value: 'notMatched',
     },
-    {
-      label: '/',
-      value: '',
-    },
   ];
 
   const columns = [
@@ -196,13 +191,31 @@ export default function Parameters() {
         text: label,
         value,
       })),
-      onFilter: (value: any, record) => {
-        return record?.status === value;
+      onFilter: (value, record) => {
+        return value === 'matched'
+          ? record.status === value
+          : record.status !== 'matched';
       },
+
       render: (text) => {
-        const content = statusList?.find((item) => item.value === text)?.label;
+        const content =
+          text === 'matched' ? (
+            <Tag color={'green'}>
+              {intl.formatMessage({
+                id: 'src.pages.Cluster.Detail.Overview.D5CCD27D',
+                defaultMessage: '已匹配',
+              })}
+            </Tag>
+          ) : (
+            <Tag color={'gold'}>
+              {intl.formatMessage({
+                id: 'src.pages.Cluster.Detail.Overview.DF83C06D',
+                defaultMessage: '不匹配',
+              })}
+            </Tag>
+          );
 
-        return !text ? '/' : <span>{content}</span>;
+        return <span>{content}</span>;
       },
     },
     {

ui/src/pages/K8sCluster/K8sClusterList.tsx

@@ -5,15 +5,15 @@ import { K8sClusterApi } from '@/api';
 import showDeleteConfirm from '@/components/customModal/showDeleteConfirm';
 import { getK8sObclusterListReq } from '@/services';
 import { formatTime, isNullValue } from '@oceanbase/util';
-import { Link, useAccess } from '@umijs/max';
+import { Link, useModel } from '@umijs/max';
 import { useRequest } from 'ahooks';
 import { ColumnsType } from 'antd/es/table';
 import { useState } from 'react';
 import Createk8sClusterModal from './Createk8sClusterModal';
 
 const { Text } = Typography;
 export default function K8sClusterList() {
-  const access = useAccess();
+  const { initialState } = useModel('@@initialState');
   const [visible, setVisible] = useState<boolean>(false);
   const [editData, setEditData] = useState<string>({});
   const { data, refresh, loading } = useRequest(getK8sObclusterListReq);
@@ -38,6 +38,16 @@ export default function K8sClusterList() {
     },
   );
 
+  const allPolicies = initialState?.policies?.filter(
+    (policy) => policy.domain === 'k8s-cluster',
+  );
+  const k8sClusterAccess = allPolicies?.map(
+    (item) => `k8sCluster${item.action}`,
+  );
+
+  const k8sClusterwrite = k8sClusterAccess?.includes('k8sClusterwrite');
+  const k8sClusterread = k8sClusterAccess?.includes('k8sClusterread');
+
   const columns: ColumnsType<API.TenantDetail> = [
     {
       title: intl.formatMessage({
@@ -47,7 +57,7 @@ export default function K8sClusterList() {
       dataIndex: 'name',
       render: (text) => (
         <Text ellipsis={{ tooltip: text }}>
-          <Link to={`${text}`}>{text}</Link>
+          {k8sClusterread ? <Link to={`${text}`}>{text}</Link> : text}
         </Text>
       ),
     },
@@ -78,7 +88,7 @@ export default function K8sClusterList() {
       dataIndex: 'operation',
 
       render: (_, record) => {
-        return (
+        return k8sClusterwrite ? (
           <Space>
             <a
               onClick={() => {
@@ -109,7 +119,7 @@ export default function K8sClusterList() {
               })}
             </Button>
           </Space>
-        );
+        ) : null;
       },
     },
   ];
@@ -128,7 +138,7 @@ export default function K8sClusterList() {
         </div>
       }
       extra={
-        access.obclusterwrite ? (
+        k8sClusterwrite ? (
           <Button
             type="primary"
             onClick={() => {

ui/src/pages/Overview/BatchEditNodeDrawer.tsx

@@ -316,9 +316,13 @@ const BatchEditNodeDrawer: React.FC<BatchEditNodeDrawerProps> = ({
             onClick={() => {
               validateFields().then((values) => {
                 const { labels, taints } = values;
-                const labelOperations = labels;
+                const labelOperations = labels?.map((item) => ({
+                  key: item.key.join(),
+                  value: item.value,
+                  operation: item.operation,
+                }));
                 const taintOperations = taints?.map((item) => ({
-                  key: item.key,
+                  key: item.key.join(),
                   value: item.operator === 'Equal' ? item.value : undefined,
                   effect: item.effect,
                   operation: item.operation,

ui/src/pages/Tenant/Detail/Overview/index.tsx

@@ -140,8 +140,9 @@ export default function TenantOverview() {
           {
             label: intl.formatMessage({
               id: 'src.pages.Tenant.Detail.Overview.98BA8E85',
-              defaultMessage: '创建租户恢复策略',
+              defaultMessage: '恢复租户',
             }),
+
             key: 'createBackupPolicy',
           },
         ]

ui/src/utils/component.tsx

@@ -42,12 +42,10 @@ export const getColumnSearchProps = ({
                   item.value.toLowerCase().includes(realValue),
               )
             : record[dataIndex] &&
-                trim(
-                  record[dataIndex]
-                    .toString()
-                    .toLowerCase()
-                    .includes(value && value.toLowerCase()),
-                );
+                record[dataIndex]
+                  .toString()
+                  .toLowerCase()
+                  .includes(trim(value && value.toLowerCase()));
         },
       }
     : {}),