@@ -171,6 +187,7 @@ const VersionList: React.FC<{ versionConfigs: VersionListItem[] }> = ({
placeholder={intl.formatMessage({ id: 'backend.filter.framework' })}
options={frameworks}
style={{ width: '100%' }}
+ optionRender={optionRender}
onChange={handleChange}
/>
diff --git a/src/pages/cluster-management/cluster-create.tsx b/src/pages/cluster-management/cluster-create.tsx
index 58d604d1..d074aa5c 100644
--- a/src/pages/cluster-management/cluster-create.tsx
+++ b/src/pages/cluster-management/cluster-create.tsx
@@ -243,7 +243,9 @@ const ClusterCreate = () => {
const info = await queryClusterToken({ id: res.id });
setRegistrationInfo({
...info,
- image: info.container_registry,
+ image: info.container_registry
+ ? `${info.container_registry}/${info.image}`
+ : info.image,
cluster_id: res.id
});
return true;
diff --git a/src/pages/cluster-management/components/add-worker/index.tsx b/src/pages/cluster-management/components/add-worker/index.tsx
index 2175b45b..940446d4 100644
--- a/src/pages/cluster-management/components/add-worker/index.tsx
+++ b/src/pages/cluster-management/components/add-worker/index.tsx
@@ -68,7 +68,9 @@ const AddWorker: React.FC
= (props) => {
firstLoad.current = false;
setRegistrationInfo({
...data,
- image: data.container_registry,
+ image: data.container_registry
+ ? `${data.container_registry}/${data.image}`
+ : data.image,
cluster_id: value
});
} catch (error) {
diff --git a/src/pages/cluster-management/components/provider-catalog.tsx b/src/pages/cluster-management/components/provider-catalog.tsx
index 2cb76c96..cef96d07 100644
--- a/src/pages/cluster-management/components/provider-catalog.tsx
+++ b/src/pages/cluster-management/components/provider-catalog.tsx
@@ -33,6 +33,18 @@ const Title = styled.span`
margin-block: 20px 16px;
`;
+const Header = styled.div`
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ gap: 4px;
+ .description {
+ font-size: 13px;
+ font-weight: 400;
+ color: var(--ant-color-text-tertiary);
+ }
+`;
+
interface ProviderCatalogProps {
onSelect?: (provider: string, item: any) => void;
cols?: number;
@@ -71,6 +83,21 @@ const ProviderCatalog: React.FC = ({
);
}, [dataList]);
+ const renderTitle = (item: any) => {
+ return (
+
+
+ {item.locale ? intl.formatMessage({ id: item.label }) : item.label}
+
+ {item.description && (
+
+ {intl.formatMessage({ id: item.description })}
+
+ )}
+
+ );
+ };
+
return (
{Object.entries(groupList).map(([groupName, items]) => (
@@ -87,16 +114,9 @@ const ProviderCatalog: React.FC = ({
active={current === action.key}
disabled={action.disabled}
clickable={clickable}
- header={
- action.locale
- ? intl.formatMessage({ id: action.label })
- : action.label
- }
+ header={renderTitle(action)}
icon={action.icon}
- >
- {action.description &&
- intl.formatMessage({ id: action.description })}
-
+ >
))}
diff --git a/src/pages/llmodels/components/access-control-modal/form.tsx b/src/pages/llmodels/components/access-control-modal/form.tsx
index 47351841..d98eaddd 100644
--- a/src/pages/llmodels/components/access-control-modal/form.tsx
+++ b/src/pages/llmodels/components/access-control-modal/form.tsx
@@ -198,7 +198,7 @@ const AccessControlForm = forwardRef((props: AccessControlFormProps, ref) => {
checked={filterInUsers.has('inactive')}
onChange={(e: any) => handleCheck(e, 'inactive')}
>
- {intl.formatMessage({ id: 'users.status.deactivate' })}
+ {intl.formatMessage({ id: 'users.status.inactiveAccount' })}
),
key: '1'
diff --git a/src/pages/llmodels/components/access-control-modal/index.tsx b/src/pages/llmodels/components/access-control-modal/index.tsx
index 4e2054a9..db3bb922 100644
--- a/src/pages/llmodels/components/access-control-modal/index.tsx
+++ b/src/pages/llmodels/components/access-control-modal/index.tsx
@@ -1,5 +1,6 @@
import ModalFooter from '@/components/modal-footer';
import ScrollerModal from '@/components/scroller-modal';
+import { PageActionType } from '@/config/types';
import { useIntl } from '@umijs/max';
import { message } from 'antd';
import { useRef } from 'react';
@@ -53,7 +54,7 @@ const AccessControlModal: React.FC<