- {image &&
}
+
+ {image &&
}
{title}
);
diff --git a/react-ui/src/components/ParameterSelect/config.tsx b/react-ui/src/components/ParameterSelect/config.tsx
index 84c99914..eae63ec2 100644
--- a/react-ui/src/components/ParameterSelect/config.tsx
+++ b/react-ui/src/components/ParameterSelect/config.tsx
@@ -17,10 +17,10 @@ const filterResourceStandard: SelectProps
['filterOpti
const convertId = (item: any) => ({ ...item, id: String(item.id) });
export type SelectPropsConfig = {
- getOptions: () => Promise;
- fieldNames?: SelectProps['fieldNames'];
- optionFilterProp?: SelectProps['optionFilterProp'];
- filterOption?: SelectProps['filterOption'];
+ getOptions: () => Promise; // 获取下拉数据
+ fieldNames?: SelectProps['fieldNames']; // 下拉数据字段
+ optionFilterProp?: SelectProps['optionFilterProp']; // 过滤字段名
+ filterOption?: SelectProps['filterOption']; // 过滤函数
};
export const paramSelectConfig: Record = {
diff --git a/react-ui/src/hooks/sessionStorage.ts b/react-ui/src/hooks/sessionStorage.ts
index 5c765370..e2996a5d 100644
--- a/react-ui/src/hooks/sessionStorage.ts
+++ b/react-ui/src/hooks/sessionStorage.ts
@@ -1,7 +1,7 @@
import { getSessionStorageItem, removeSessionStorageItem } from '@/utils/sessionStorage';
import { useEffect, useState } from 'react';
-// 获取缓存数据
+// 读取缓存数据，组件卸载时清除缓存
export function useSessionStorage(key: string, isObject: boolean, initialValue: T) {
const [storage, setStorage] = useState(initialValue);
diff --git a/react-ui/src/iconfont/iconfont.js b/react-ui/src/iconfont/iconfont.js
index e135846d..1ec213e7 100644
--- a/react-ui/src/iconfont/iconfont.js
+++ b/react-ui/src/iconfont/iconfont.js
@@ -1 +1 @@
-window._iconfont_svg_string_4511447='',function(t){var a=(a=document.getElementsByTagName("script"))[a.length-1],h=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var l,v,z,i,o,m=function(a,h){h.parentNode.insertBefore(a,h)};if(h&&!t.__iconfont__svg__cssinject__){t.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}l=function(){var a,h=document.createElement("div");h.innerHTML=t._iconfont_svg_string_4511447,(h=h.getElementsByTagName("svg")[0])&&(h.setAttribute("aria-hidden","true"),h.style.position="absolute",h.style.width=0,h.style.height=0,h.style.overflow="hidden",h=h,(a=document.body).firstChild?m(h,a.firstChild):a.appendChild(h))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(v=function(){document.removeEventListener("DOMContentLoaded",v,!1),l()},document.addEventListener("DOMContentLoaded",v,!1)):document.attachEvent&&(z=l,i=t.document,o=!1,d(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,p())})}function p(){o||(o=!0,z())}function d(){try{i.documentElement.doScroll("left")}catch(a){return void setTimeout(d,50)}p()}}(window);
\ No newline at end of file
+window._iconfont_svg_string_4511447='',function(t){var a=(a=document.getElementsByTagName("script"))[a.length-1],h=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var l,v,z,i,o,m=function(a,h){h.parentNode.insertBefore(a,h)};if(h&&!t.__iconfont__svg__cssinject__){t.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}l=function(){var a,h=document.createElement("div");h.innerHTML=t._iconfont_svg_string_4511447,(h=h.getElementsByTagName("svg")[0])&&(h.setAttribute("aria-hidden","true"),h.style.position="absolute",h.style.width=0,h.style.height=0,h.style.overflow="hidden",h=h,(a=document.body).firstChild?m(h,a.firstChild):a.appendChild(h))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(v=function(){document.removeEventListener("DOMContentLoaded",v,!1),l()},document.addEventListener("DOMContentLoaded",v,!1)):document.attachEvent&&(z=l,i=t.document,o=!1,d(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,p())})}function p(){o||(o=!0,z())}function d(){try{i.documentElement.doScroll("left")}catch(a){return void setTimeout(d,50)}p()}}(window);
\ No newline at end of file
diff --git a/react-ui/src/pages/Dataset/components/ResourceIntro/index.tsx b/react-ui/src/pages/Dataset/components/ResourceIntro/index.tsx
index c057a64a..caa5a539 100644
--- a/react-ui/src/pages/Dataset/components/ResourceIntro/index.tsx
+++ b/react-ui/src/pages/Dataset/components/ResourceIntro/index.tsx
@@ -1,3 +1,4 @@
+import KFIcon from '@/components/KFIcon';
import ModelEvolution from '@/pages/Model/components/ModelEvolution';
import { to } from '@/utils/promise';
import { useParams, useSearchParams } from '@umijs/max';
@@ -7,21 +8,21 @@ import { ResourceData, ResourceType, resourceConfig } from '../../config';
import ResourceVersion from '../ResourceVersion';
import styles from './index.less';
+export enum ResourceInfoTabKeys {
+ Introduction = 'introduction',
+ Version = 'version',
+ Evolution = 'evolution',
+}
+
type ResourceIntroProps = {
resourceType: ResourceType;
};
-enum TabKeys {
- Introduction = '1',
- Version = '2',
- Evolution = '3',
-}
-
const ResourceIntro = ({ resourceType }: ResourceIntroProps) => {
const [info, setInfo] = useState({} as ResourceData);
const locationParams = useParams();
const [searchParams] = useSearchParams();
- const defaultTab = searchParams.get('tab') || '1';
+ const defaultTab = searchParams.get('tab') || ResourceInfoTabKeys.Introduction;
let versionParam = searchParams.get('version');
const [versionList, setVersionList] = useState([]);
const [version, setVersion] = useState(undefined);
@@ -74,8 +75,9 @@ const ResourceIntro = ({ resourceType }: ResourceIntroProps) => {
const items = [
{
- key: TabKeys.Introduction,
+ key: ResourceInfoTabKeys.Introduction,
label: `${typeName}简介`,
+ icon: ,
children: (
<>
简介
@@ -84,8 +86,9 @@ const ResourceIntro = ({ resourceType }: ResourceIntroProps) => {
),
},
{
- key: TabKeys.Version,
+ key: ResourceInfoTabKeys.Version,
label: `${typeName}文件/版本`,
+ icon: ,
children: (
{
isPublic={info.available_range === 1}
versionList={versionList}
version={version}
- isActive={activeTab === TabKeys.Version}
+ isActive={activeTab === ResourceInfoTabKeys.Version}
getVersionList={getVersionList}
onVersionChange={handleVersionChange}
>
@@ -104,15 +107,16 @@ const ResourceIntro = ({ resourceType }: ResourceIntroProps) => {
if (resourceType === ResourceType.Model) {
items.push({
- key: TabKeys.Evolution,
+ key: ResourceInfoTabKeys.Evolution,
label: `模型演化`,
+ icon: ,
children: (
),
diff --git a/react-ui/src/pages/Dataset/config.tsx b/react-ui/src/pages/Dataset/config.tsx
index be31f697..822b7bfe 100644
--- a/react-ui/src/pages/Dataset/config.tsx
+++ b/react-ui/src/pages/Dataset/config.tsx
@@ -24,32 +24,32 @@ export enum ResourceType {
}
type ResourceTypeInfo = {
- getList: (params: any) => Promise;
- getVersions: (params: any) => Promise;
- getFiles: (params: any) => Promise;
- deleteRecord: (params: any) => Promise;
- addVersion: (params: any) => Promise;
- deleteVersion: (params: any) => Promise;
- getInfo: (params: any) => Promise;
- name: string;
- typeParamKey: string;
- tagParamKey: string;
- fileReqParamKey: 'models_id' | 'dataset_id';
- tabItems: TabsProps['items'];
- typeTitle: string;
- tagTitle: string;
+ getList: (params: any) => Promise; // 获取资源列表
+ getVersions: (params: any) => Promise; // 获取版本列表
+ getFiles: (params: any) => Promise; // 获取版本下的文件列表
+ deleteRecord: (params: any) => Promise; // 删除
+ addVersion: (params: any) => Promise; // 新增版本
+ deleteVersion: (params: any) => Promise; // 删除版本
+ getInfo: (params: any) => Promise; // 获取详情
+ name: string; // 名称
+ typeParamKey: string; // 类型参数名称，获取资源列表接口使用
+ tagParamKey: string; // 标签参数名称，获取资源列表接口使用
+ fileReqParamKey: 'models_id' | 'dataset_id'; // 文件请求参数名称，获取文件列表接口使用
+ tabItems: TabsProps['items']; // tab 列表
+ typeTitle: string; // 类型标题
+ tagTitle: string; // 标签标题
typeValue: number; // 从 getAssetIcon 接口获取特定值的数据为 type 分类 （category_id === typeValue）
tagValue: number; // 从 getAssetIcon 接口获取特定值的数据为 tag 分类（category_id === tagValue）
- prefix: string; // 前缀
+ prefix: string; // 图片资源、详情 url 的前缀
deleteModalTitle: string; // 删除弹框的title
addBtnTitle: string; // 新增按钮的title
- idParamKey: 'models_id' | 'dataset_id';
- uploadAction: string;
- uploadAccept?: string;
- downloadAllAction: string;
- downloadSingleAction: string;
- infoTypePropertyName: string;
- infoTagPropertyName: string;
+ idParamKey: 'models_id' | 'dataset_id'; // 新建版本、删除版本接口，版本 id 的参数名称
+ uploadAction: string; // 上传接口 url
+ uploadAccept?: string; // 上传文件类型
+ downloadAllAction: string; // 批量下载接口 url
+ downloadSingleAction: string; // 单个下载接口 url
+ infoTypePropertyName: string; // 详情数据中，类型属性名称
+ infoTagPropertyName: string; // 详情数据中，标签属性名称
};
export const resourceConfig: Record = {
diff --git a/react-ui/src/pages/Experiment/components/LogGroup/index.tsx b/react-ui/src/pages/Experiment/components/LogGroup/index.tsx
index 244b9c78..a3da3044 100644
--- a/react-ui/src/pages/Experiment/components/LogGroup/index.tsx
+++ b/react-ui/src/pages/Experiment/components/LogGroup/index.tsx
@@ -27,14 +27,12 @@ type Log = {
const scrollToBottom = (smooth: boolean = true) => {
const element = document.getElementsByClassName('ant-tabs-content-holder')?.[0];
if (element) {
- if (smooth) {
- element.scrollTo({
- top: element.scrollHeight,
- behavior: 'smooth',
- });
- } else {
- element.scrollTo({ top: element.scrollHeight });
- }
+ const optons: ScrollToOptions = {
+ top: element.scrollHeight,
+ behavior: smooth ? 'smooth' : 'instant',
+ };
+
+ element.scrollTo(optons);
}
};
@@ -153,13 +151,9 @@ function LogGroup({
)}
{showMoreBtn && (
- }
- onClick={loadMore}
- >
+
)}
diff --git a/react-ui/src/pages/Model/components/GraphLegand/index.less b/react-ui/src/pages/Model/components/GraphLegend/index.less
similarity index 100%
rename from react-ui/src/pages/Model/components/GraphLegand/index.less
rename to react-ui/src/pages/Model/components/GraphLegend/index.less
diff --git a/react-ui/src/pages/Model/components/GraphLegand/index.tsx b/react-ui/src/pages/Model/components/GraphLegend/index.tsx
similarity index 53%
rename from react-ui/src/pages/Model/components/GraphLegand/index.tsx
rename to react-ui/src/pages/Model/components/GraphLegend/index.tsx
index a70c994c..5bf5076b 100644
--- a/react-ui/src/pages/Model/components/GraphLegand/index.tsx
+++ b/react-ui/src/pages/Model/components/GraphLegend/index.tsx
@@ -1,37 +1,55 @@
import { Flex } from 'antd';
import styles from './index.less';
-type GraphLegandData = {
+type GraphLegendData = {
name: string;
color: string;
- radius: number;
+ radius: number | string;
fill: boolean;
};
-type GraphLegandProps = {
+type GraphLegendProps = {
style?: React.CSSProperties;
};
-function GraphLegand({ style }: GraphLegandProps) {
- const legends: GraphLegandData[] = [
+function GraphLegend({ style }: GraphLegendProps) {
+ const legends: GraphLegendData[] = [
{
name: '父模型',
- color: '#76b1ff',
+ color: 'linear-gradient(305deg,#43c9b1 0%,#93dfd1 100%)',
radius: 2,
fill: true,
},
{
name: '当前模型',
- color: '#1664ff',
+ color: 'linear-gradient(139.97deg,#72a1ff 0%,#1664ff 100%)',
radius: 2,
fill: true,
},
{
name: '衍生模型',
- color: '#b7cfff',
+ color: 'linear-gradient(139.97deg,#72b4ff 0%,#169aff 100%)',
radius: 2,
fill: true,
},
+ {
+ name: '训练数据集',
+ color: '#a5d878',
+ radius: '50%',
+ fill: true,
+ },
+ {
+ name: '测试数据集',
+ color: '#d8b578',
+ radius: '50%',
+ fill: true,
+ },
+ {
+ name: '项目',
+ color: 'linear-gradient(305deg,#8981ff 0%,#b3a9ff 100%)',
+ radius: 6,
+ fill: true,
+ },
];
return (
@@ -42,7 +60,7 @@ function GraphLegand({ style }: GraphLegandProps) {
width: '16px',
height: '12px',
borderRadius: item.radius,
- backgroundColor: item.color,
+ background: item.color,
}}
>