feat: 数据服务更新csrf token逻辑 (#2235)

Co-authored-by: brycewwang <[email protected]>
tkestack · Feb 17, 2023 · 44b0053 · 44b0053
1 parent 7f443a0
commit 44b0053
Show file tree

Hide file tree

Showing 4 changed files with 1,241 additions and 2,394 deletions.
diff --git a/web/console/src/modules/cluster/components/resource/nodeManage/ComputerActionPanel.tsx b/web/console/src/modules/cluster/components/resource/nodeManage/ComputerActionPanel.tsx
@@ -75,7 +75,7 @@ export class ComputerActionPanel extends React.Component<RootProps, State> {
         item.metadata.role,
         `cpu: ${item?.status?.capacity?.cpu ?? '-'} 核; 内存: ${item?.status?.capacity?.memory ?? '-'}`,
         this._reduceIp(item),
-        item.spec.podCIDR,
+        item?.metadata?.annotations?.['tke.cloud.tencent.com/pod-cidrs'],
         dateFormatter(new Date(item.metadata.creationTimestamp), 'YYYY-MM-DD HH:mm:ss')
       ];
       rows.push(row);

diff --git a/web/console/src/modules/cluster/components/resource/nodeManage/ComputerTablePanel.tsx b/web/console/src/modules/cluster/components/resource/nodeManage/ComputerTablePanel.tsx
@@ -333,7 +333,11 @@ export class ComputerTablePanel extends React.Component<RootProps, State> {
         key: 'podCIDR',
         header: t('PodCIDR'),
         width: '12%',
-        render: x => <Text>{x.spec.podCIDR}</Text>
+        render: x => (
+          <>
+            <Text>{x.metadata?.annotations?.['tke.cloud.tencent.com/pod-cidrs'] || '-'}</Text>
+          </>
+        )
       },
       {
         key: 'createTime',

diff --git a/...onsole/src/modules/cluster/components/resource/resourceDetail/ResourceNodeDetailPanel.tsx b/...onsole/src/modules/cluster/components/resource/resourceDetail/ResourceNodeDetailPanel.tsx
@@ -107,7 +107,9 @@ export class ResourceNodeDetailPanel extends React.Component<RootProps, {}> {
                 {this._renderAllocatableResource(resourceIns.status.allocatable)}
 
                 <ListItem label={t('podCIDR')}>
-                  <span className="text">{resourceIns.spec['podCIDR'] || '-'}</span>
+                  <span className="text">
+                    {resourceIns.metadata?.annotations?.['tke.cloud.tencent.com/pod-cidrs'] || '-'}
+                  </span>
                 </ListItem>
 
                 <ListItem label={t('容器运行时版本')}>