diff --git a/react-ui/src/global.less b/react-ui/src/global.less index 939a99c1..63715440 100644 --- a/react-ui/src/global.less +++ b/react-ui/src/global.less @@ -100,10 +100,10 @@ body { padding: 21px 16px; background-color: #fff; } -.ant-table-wrapper .ant-table { - height: 81vh; - overflow-y: auto; -} +// .ant-table-wrapper .ant-table { +// height: 81vh; +// // overflow-y: auto; +// } .ant-pro-global-header-logo img { height: 21px; } @@ -111,7 +111,7 @@ body { height: 94vh; } .ant-pro-layout .ant-pro-layout-container { - height: 98vh; + height: 100vh; } .ant-modal-confirm .ant-modal-confirm-paragraph { margin: 54px 0 auto; diff --git a/react-ui/src/pages/Dataset/datasetIntro.jsx b/react-ui/src/pages/Dataset/datasetIntro.jsx index d30632e8..4ce5615d 100644 --- a/react-ui/src/pages/Dataset/datasetIntro.jsx +++ b/react-ui/src/pages/Dataset/datasetIntro.jsx @@ -377,7 +377,7 @@ const Dataset = () => { }, ]} > - + @@ -424,7 +425,7 @@ const PublicData = (React.FC = () => { - + - ( -
- {experimentInList && experimentInList.length > 0 ? ( -
-
序号
-
可视化
-
-
运行时长
-
开始时间
+
+
( +
+ {experimentInList && experimentInList.length > 0 ? ( +
+
序号
+
可视化
+
+
运行时长
+
开始时间
+
+
状态
+
操作
-
状态
-
操作
-
- ) : ( - '' - )} + ) : ( + '' + )} - {experimentInList && experimentInList.length > 0 - ? experimentInList.map((item, index) => ( -
- routerToText(e, item, record)} + {experimentInList && experimentInList.length > 0 + ? experimentInList.map((item, index) => ( +
- {index + 1} - -
- {item.nodes_result?.tensorboard_log ? ( - handleTensorboard(item)} - > - ) : ( - '-' - )} -
-
-
- {item.finish_time - ? elapsedTime(new Date(item.create_time), new Date(item.finish_time)) - : elapsedTime(new Date(item.create_time), new Date())} + routerToText(e, item, record)} + > + {index + 1} + +
+ {item.nodes_result?.tensorboard_log ? ( + handleTensorboard(item)} + > + ) : ( + '-' + )}
-
- {momnet(item.create_time).format('YYYY-MM-DD HH:mm:ss')} +
+
+ {item.finish_time + ? elapsedTime(new Date(item.create_time), new Date(item.finish_time)) + : elapsedTime(new Date(item.create_time), new Date())} +
+
+ {momnet(item.create_time).format('YYYY-MM-DD HH:mm:ss')} +
-
-
- {' '} - - {experimentStatusInfo[item.status]?.label} - -
-
- - +
+ {' '} + + {experimentStatusInfo[item.status]?.label} + +
+
- + + + +
-
- )) - : ''} -
- ), - onExpand: (e, a) => { - expandChange(e, a); - }, - expandedRowKeys: [expandedRowKeys], - rowExpandable: (record) => true, - }} - /> + )) + : ''} +
+ ), + onExpand: (e, a) => { + expandChange(e, a); + }, + expandedRowKeys: [expandedRowKeys], + rowExpandable: (record) => true, + }} + /> +
+ {isModalOpen && ( >>>>>> 708a5facb090bd542e06a0356466fa159720a223 margin: 0 20px 25px 0; background: #ffffff; border: 1px solid; @@ -239,7 +230,7 @@ line-height: 0px; background: linear-gradient( to right, - rgba(22, 100, 255, 0.6) 0, + rgba(22, 100, 255, 0.3) 0, rgba(22, 100, 255, 0) 100% ); } diff --git a/react-ui/src/pages/Model/modelIntro.jsx b/react-ui/src/pages/Model/modelIntro.jsx index 7eb0f666..8a66ad17 100644 --- a/react-ui/src/pages/Model/modelIntro.jsx +++ b/react-ui/src/pages/Model/modelIntro.jsx @@ -375,7 +375,7 @@ const Dataset = () => { }, ]} > - + @@ -413,7 +414,7 @@ const PublicData = () => {
+
+
+ diff --git a/react-ui/src/pages/Pipeline/index.less b/react-ui/src/pages/Pipeline/index.less index c15bcfa1..bff7318c 100644 --- a/react-ui/src/pages/Pipeline/index.less +++ b/react-ui/src/pages/Pipeline/index.less @@ -8,6 +8,7 @@ padding-right: 30px; background-image: url(/assets/images/pipeline-back.png); background-size: 100% 100%; + } .modal { @@ -50,3 +51,17 @@ } } } +.PipelineBox{ + height: calc(100% - 20px); + .PipelineTable{ + height: calc(100% - 60px); + :global{ + .ant-table-wrapper .ant-table{ + // overflow-y: auto; + height: calc(100% - 48px); + } + } + } + +} + diff --git a/react-ui/src/services/session.ts b/react-ui/src/services/session.ts index fb77d867..44861d39 100644 --- a/react-ui/src/services/session.ts +++ b/react-ui/src/services/session.ts @@ -8,9 +8,7 @@ let remoteMenu: any = null; export function getRemoteMenu() { return remoteMenu; } -const IconFont = createFromIconfontCN({ - scriptUrl: '//at.alicdn.com/t/font_8d5l8fzk5b87iudi.js', // 在 iconfont.cn 上生成 -}); + export function setRemoteMenu(data: any) { remoteMenu = data; }