fix: backend framework options

2025-12-16 11:11:24 +08:00
parent fa42474612
commit 5225fd328d
23 changed files with 99 additions and 85 deletions
@@ -168,7 +168,7 @@ const VersionList: React.FC<{ versionConfigs: VersionListItem[] }> = ({
      <span>
        {option.label}
        {data.tips ? (
-          data.locale ? (
+          data.tipLocale ? (
            <span className="text-tertiary m-l-4">{` [${intl.formatMessage({ id: data.tips })}]`}</span>
          ) : (
            <span className="text-tertiary m-l-4">{` [${data.tips}]`}</span>
@@ -30,8 +30,8 @@ export default function useClusterList() {
      name: string;
    }[]
  >([]);
-  const [, setClusterListAtom] = useAtom(clusterListAtom);
-  const [, setWorkerListAtom] = useAtom(workerListAtom);
+  const [clustersAtom, setClusterListAtom] = useAtom(clusterListAtom);
+  const [workersAtom, setWorkerListAtom] = useAtom(workerListAtom);

  const fetchClusterList = async () => {
    try {
@@ -85,6 +85,8 @@ export default function useClusterList() {
  return {
    clusterList,
    workerList,
+    clustersAtom,
+    workersAtom,
    fetchAll,
    fetchWorkerList,
    fetchClusterList
@@ -4,7 +4,7 @@ import { modelCategoriesMap } from '@/pages/llmodels/config';
 import { convertFileSize } from '@/utils';
 import { useIntl } from '@umijs/max';
 import { Col, Row, Table } from 'antd';
-import { memo, useContext } from 'react';
+import { useContext } from 'react';
 import { DashboardContext } from '../config/dashboard-context';

 const NACategories = [
@@ -96,4 +96,4 @@ const ActiveTable = () => {
  );
 };

-export default memo(ActiveTable);
+export default ActiveTable;
@@ -74,4 +74,4 @@ const Overview: React.FC = () => {
  );
 };

-export default React.memo(Overview);
+export default Overview;
@@ -2,7 +2,7 @@ import LineChart from '@/components/echarts/line-chart';
 import { useIntl } from '@umijs/max';
 import dayjs from 'dayjs';
 import _ from 'lodash';
-import { memo, useMemo } from 'react';
+import { useMemo } from 'react';

 const TypeKeyMap = {
  cpu: {
@@ -106,4 +106,4 @@ const UtilizationOvertime: React.FC<{
  );
 };

-export default memo(UtilizationOvertime);
+export default UtilizationOvertime;
@@ -12,9 +12,13 @@ import { DashboardProps } from './config/types';

 const Dashboard: React.FC = () => {
  const intl = useIntl();
-  const [loading, setLoading] = useState(false);
+  const [loadingStatus, setLoadingStatus] = useState({
+    loading: false,
+    loadend: false
+  });
  const [data, setData] = useState<DashboardProps>({} as DashboardProps);
-  const { fetchAll, clusterList, workerList } = useClusterList();
+  const { fetchAll, clusterList, workerList, clustersAtom, workersAtom } =
+    useClusterList();

  const { noResourceResult } = useNoResourceResult({
    loadend: true,
@@ -47,16 +51,22 @@ const Dashboard: React.FC = () => {

  const initData = useMemoizedFn(async () => {
    try {
-      setLoading(true);
+      setLoadingStatus({
+        loading: true,
+        loadend: false
+      });
      const { hasClusters, hasWorkers } = await fetchAll();
      if (!hasClusters || !hasWorkers) {
-        setLoading(false);
        return;
      }
      await fetchDashboardData();
-      setLoading(false);
    } catch (error) {
-      setLoading(false);
+      // ignore
+    } finally {
+      setLoadingStatus({
+        loading: false,
+        loadend: true
+      });
    }
  });

@@ -69,11 +79,11 @@ const Dashboard: React.FC = () => {
      value={{ ...data, fetchData: fetchDashboardData, clusterList }}
    >
      <PageBox>
-        <Spin spinning={loading} style={{ minHeight: 300 }}>
-          {(!clusterList.length || !workerList.length) && !loading ? (
-            noResourceResult
-          ) : loading ? null : (
+        <Spin spinning={loadingStatus.loading} style={{ minHeight: 300 }}>
+          {workersAtom.length > 0 && clustersAtom.length > 0 ? (
            <DashboardInner />
+          ) : loadingStatus.loading || !loadingStatus.loadend ? null : (
+            noResourceResult
          )}
        </Spin>
      </PageBox>
@@ -372,4 +372,4 @@ const AudioInput: React.FC<AudioInputProps> = (props) => {
  );
 };

-export default React.memo(AudioInput);
+export default AudioInput;
@@ -48,4 +48,4 @@ const FileList: React.FC<FileListProps> = (props) => {
  );
 };

-export default React.memo(FileList);
+export default FileList;
@@ -4,7 +4,6 @@ import { Form } from 'antd';
 import _ from 'lodash';
 import React, {
  forwardRef,
-  memo,
  useCallback,
  useEffect,
  useId,
@@ -103,4 +102,4 @@ const ParamsSettings: React.FC<ParamsSettingsProps> = forwardRef(
  }
 );

-export default memo(ParamsSettings);
+export default ParamsSettings;
@@ -39,4 +39,4 @@ const ActiveModels: React.FC<ActiveModelsProps> = (props) => {
  );
 };

-export default React.memo(ActiveModels);
+export default ActiveModels;
@@ -244,4 +244,4 @@ const ContentItem: React.FC<MessageItemProps> = ({
  );
 };

-export default React.memo(ContentItem);
+export default ContentItem;
@@ -54,4 +54,4 @@ const MessageContent: React.FC<MessageContentProps> = ({
  );
 };

-export default React.memo(MessageContent);
+export default MessageContent;
@@ -366,4 +366,4 @@ const ModelItem: React.FC<ModelItemProps> = forwardRef((props, ref) => {
  );
 });

-export default React.memo(ModelItem);
+export default ModelItem;
@@ -144,4 +144,4 @@ const SystemMessage: React.FC<SystemMessageProps> = (props) => {
  );
 };

-export default React.memo(SystemMessage);
+export default SystemMessage;
@@ -81,4 +81,4 @@ const RerankMessage: React.FC<RerankMessageProps> = ({ header, dataList }) => {
  );
 };

-export default React.memo(RerankMessage);
+export default RerankMessage;
@@ -117,4 +117,4 @@ const UploadImg: React.FC<UploadImgProps> = ({
  );
 };

-export default React.memo(UploadImg);
+export default UploadImg;
@@ -161,7 +161,7 @@ const Playground: React.FC = () => {
            <Divider
              key="divider"
              type="vertical"
-              style={{ height: 24, marginInline: 16 }}
+              style={{ height: 16, marginInline: 16 }}
            />
          )}
        </div>,