diff --git a/web-fe/src/pages/terminal/index.tsx b/web-fe/src/pages/terminal/index.tsx
index 7543ce1..a3737f1 100644
--- a/web-fe/src/pages/terminal/index.tsx
+++ b/web-fe/src/pages/terminal/index.tsx
@@ -159,7 +159,7 @@ const UserListPage: React.FC = () => {
try {
const { id } = device || {};
const payload = {
- ids: id ? id : selectedRowKeys,
+ id: id ? id : selectedRowKeys,
};
const res: any = await deleteDevice(payload);
const { code } = res || {};
@@ -390,6 +390,14 @@ const UserListPage: React.FC = () => {
getDataSource();
};
+ const onBindImageSave = () => {
+ setBindImageDta({
+ recordData: {},
+ visible: false,
+ });
+ getDataSource();
+ };
+
return (
@@ -552,7 +560,9 @@ const UserListPage: React.FC = () => {
visible: false,
});
}}
- onOk={() => {onBindUserSave()}}
+ onOk={() => {
+ onBindUserSave();
+ }}
/>
)}
{bindImageDta.visible && (
@@ -564,7 +574,9 @@ const UserListPage: React.FC = () => {
visible: false,
});
}}
- onOk={() => {}}
+ onOk={() => {
+ onBindImageSave();
+ }}
/>
)}
diff --git a/web-fe/src/pages/terminal/mod/ImageSelectedTable/index.tsx b/web-fe/src/pages/terminal/mod/ImageSelectedTable/index.tsx
index 4d6e839..fbbc90b 100644
--- a/web-fe/src/pages/terminal/mod/ImageSelectedTable/index.tsx
+++ b/web-fe/src/pages/terminal/mod/ImageSelectedTable/index.tsx
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/no-use-before-define */
import type { PopoverProps } from 'antd';
-import { Button, Popconfirm, Popover, Space } from 'antd';
+import { Button, Popconfirm, Popover, Space, Tooltip } from 'antd';
import type { ColumnsType } from 'antd/es/table';
import React, { useEffect, useState } from 'react';
import CustomTable from '../selectedTable/table';
@@ -50,14 +50,13 @@ const SelectedTable: React.FC
= (props) => {
const onHandleOk = () => {
const list: any[] = [];
- // 用户
+ // 镜像
(selectedRows || []).forEach((item) => {
list.push({
- id: item.image_id,
- name: item.image_name,
+ record_id: item.id,
+ image_name: item.image_name,
});
});
-
setTableData(list);
onBindImageChange(list);
onHnadleCancel();
@@ -75,13 +74,13 @@ const SelectedTable: React.FC = (props) => {
const handleDelete = (record?: any) => {
if (record) {
// 单个删除
- const { id } = record || {};
- const newData = tableData.filter((item) => item.id !== id);
+ const { record_id } = record || {};
+ const newData = tableData.filter((item) => item.record_id !== record_id);
setTableData(newData);
} else {
// 批量删除
const newData = tableData.filter(
- (item) => !bindTableKeys.includes(item.id),
+ (item) => !bindTableKeys.includes(item.record_id),
);
setTableData(newData);
setSelectedRowKeys([]);
@@ -129,12 +128,16 @@ const SelectedTable: React.FC = (props) => {
title: '镜像名称',
dataIndex: 'image_name',
key: 'image_name',
+ render: (text) => {
+ return {text || '--'};
+ },
},
{
title: '操作',
key: 'action',
+ width: 150,
render: (_, record) => (
-