From 19e356bd33917abe77ee4eabf3b4225f9553f459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=94=9C?= <759644414@qq.com> Date: Tue, 7 Jan 2025 11:22:04 +0800 Subject: [PATCH] update disable dropmenu delete button --- .../pages/Cluster/Detail/Overview/BasicInfo.tsx | 2 ++ ui/src/pages/Cluster/Detail/Overview/index.tsx | 15 ++++++++++----- ui/src/pages/Tenant/New/index.tsx | 1 - 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ui/src/pages/Cluster/Detail/Overview/BasicInfo.tsx b/ui/src/pages/Cluster/Detail/Overview/BasicInfo.tsx index f433b25e..78e16740 100644 --- a/ui/src/pages/Cluster/Detail/Overview/BasicInfo.tsx +++ b/ui/src/pages/Cluster/Detail/Overview/BasicInfo.tsx @@ -112,6 +112,7 @@ export default function BasicInfo({ clusterName, style, deletionProtection, + clusterDetailRefresh, ...props }: ResponseOBCluster & { style?: React.CSSProperties; extra?: boolean }) { const statusItem = findByValue(STATUS_LIST, status); @@ -170,6 +171,7 @@ export default function BasicInfo({ defaultMessage: '修改删除保护已成功', }), ); + clusterDetailRefresh(); } }, }, diff --git a/ui/src/pages/Cluster/Detail/Overview/index.tsx b/ui/src/pages/Cluster/Detail/Overview/index.tsx index f85bda57..aa35f79a 100644 --- a/ui/src/pages/Cluster/Detail/Overview/index.tsx +++ b/ui/src/pages/Cluster/Detail/Overview/index.tsx @@ -169,8 +169,11 @@ const ClusterOverview: React.FC = () => { setOperateModalVisible(true); }; + const { parameters, storage, resource, deletionProtection, backupVolume } = + clusterDetail?.info || {}; + // 不为空即为绑定了NFS - const removeNFS = !!clusterDetail?.info?.backupVolume; + const removeNFS = !!backupVolume; const menuChange = ({ key }) => { if (key === 'AddZone') { @@ -308,9 +311,6 @@ const ClusterOverview: React.FC = () => { }; }; - const { parameters, storage, resource, deletionProtection, pvcIndependent } = - clusterDetail?.info || {}; - const resourceinit = [ { key: intl.formatMessage({ @@ -567,7 +567,12 @@ const ClusterOverview: React.FC = () => { {clusterDetail && ( - + { + clusterDetailRefresh(); + }} + /> )} diff --git a/ui/src/pages/Tenant/New/index.tsx b/ui/src/pages/Tenant/New/index.tsx index 00f4c5e8..75faee77 100644 --- a/ui/src/pages/Tenant/New/index.tsx +++ b/ui/src/pages/Tenant/New/index.tsx @@ -24,7 +24,6 @@ export default function New() { const [passwordVal, setPasswordVal] = useState(''); const [selectClusterId, setSelectClusterId] = useState(); const [clusterList, setClusterList] = useState([]); - // 删除保护 默认勾选 const [deleteValue, setDeleteValue] = useState(false); useRequest(getSimpleClusterList, { onSuccess: ({ successful, data }) => {