From 7a057bda13e203e6242894b3d06482d07755e48d Mon Sep 17 00:00:00 2001
From: maggieyyy <61950669+maggieyyy@users.noreply.github.com>
Date: Fri, 1 Nov 2024 18:41:16 +0800
Subject: [PATCH] fix: Modify link access
---
.../common/src/components/aoplatform/WithPermission.tsx | 2 +-
frontend/packages/core/src/App.css | 7 ++++++-
.../core/src/pages/logsettings/LogSettingsInstruction.tsx | 3 ++-
.../pages/resourcesettings/ResourceSettingsInstruction.tsx | 3 ++-
.../packages/dashboard/src/pages/DashboardInstruction.tsx | 5 +++--
5 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/frontend/packages/common/src/components/aoplatform/WithPermission.tsx b/frontend/packages/common/src/components/aoplatform/WithPermission.tsx
index e092d411..2b1a37d7 100644
--- a/frontend/packages/common/src/components/aoplatform/WithPermission.tsx
+++ b/frontend/packages/common/src/components/aoplatform/WithPermission.tsx
@@ -39,7 +39,7 @@ const WithPermission = ({access, tooltip, children,disabled, showDisabled = true
{ cloneElement(children, {disabled:true})}
}
{!editAccess && (children?.type !== Button && children?.type !== Upload && showDisabled) &&
- { cloneElement(children, {disabled:true,okButtonProps:{disabled:true}})}
+ { cloneElement(children, {disabled:true, onClick:(e)=>e.preventDefault(),okButtonProps:{disabled:true}})}
}
diff --git a/frontend/packages/core/src/App.css b/frontend/packages/core/src/App.css
index 9afb2c31..dbc2b579 100644
--- a/frontend/packages/core/src/App.css
+++ b/frontend/packages/core/src/App.css
@@ -294,4 +294,9 @@ a{
.ant-select-selection-overflow-item:first-child {
max-width: calc(100% - 60px);
margin-right: 4px;
- }
\ No newline at end of file
+ }
+
+ a[disabled]:hover {
+ color: #BBB;
+ cursor: not-allowed;
+ }
\ No newline at end of file
diff --git a/frontend/packages/core/src/pages/logsettings/LogSettingsInstruction.tsx b/frontend/packages/core/src/pages/logsettings/LogSettingsInstruction.tsx
index b7f2d7e1..e545d1d0 100644
--- a/frontend/packages/core/src/pages/logsettings/LogSettingsInstruction.tsx
+++ b/frontend/packages/core/src/pages/logsettings/LogSettingsInstruction.tsx
@@ -1,4 +1,5 @@
+import WithPermission from "@common/components/aoplatform/WithPermission";
import { useBreadcrumb } from "@common/contexts/BreadcrumbContext";
import { $t } from "@common/locales";
import { useEffect } from "react";
@@ -24,7 +25,7 @@ export default function LogSettingsInstruction() {
环境配置
新增集群的地址、名称、描述和其他相关属性，以确保插件能够正确识别和连接到集群
-
添加集群地址
+
添加集群地址
diff --git a/frontend/packages/core/src/pages/resourcesettings/ResourceSettingsInstruction.tsx b/frontend/packages/core/src/pages/resourcesettings/ResourceSettingsInstruction.tsx
index b1cd0af1..6afff314 100644
--- a/frontend/packages/core/src/pages/resourcesettings/ResourceSettingsInstruction.tsx
+++ b/frontend/packages/core/src/pages/resourcesettings/ResourceSettingsInstruction.tsx
@@ -1,3 +1,4 @@
+import WithPermission from "@common/components/aoplatform/WithPermission";
import { useBreadcrumb } from "@common/contexts/BreadcrumbContext";
import { useEffect } from "react";
import { Link } from "react-router-dom";
@@ -24,7 +25,7 @@ export default function ResourceSettingsInstruction() {
集群配置
新增集群地址、描述和其他相关属性，以确保插件能够正确识别和连接到集群
-
配置集群地址
+
配置集群地址
diff --git a/frontend/packages/dashboard/src/pages/DashboardInstruction.tsx b/frontend/packages/dashboard/src/pages/DashboardInstruction.tsx
index f2a7c727..f3f577db 100644
--- a/frontend/packages/dashboard/src/pages/DashboardInstruction.tsx
+++ b/frontend/packages/dashboard/src/pages/DashboardInstruction.tsx
@@ -1,4 +1,5 @@
+import WithPermission from "@common/components/aoplatform/WithPermission";
import { $t } from "@common/locales";
import { Link } from "react-router-dom";
@@ -15,13 +16,13 @@ export default function DashboardInstruction({showClusterIns, showMonitorIns}:{s
{showClusterIns && }
{showMonitorIns &&
}