merge

react-ui/src/pages/Dataset/datasetIntro.jsx

@@ -39,9 +39,9 @@ const Dataset = () => {
             return {
               ...form.getFieldsValue(),
               dataset_id: locationParams.id,
-              file_name: item.response.data[0].fileName,
-              file_size: item.response.data[0].fileSize,
-              url: item.response.data[0].url,
+              file_name: item.response.code === 200 ? item.response.data[0].fileName : null,
+              file_size: item.response.code === 200 ? item.response.data[0].fileSize : null,
+              url: item.response.code === 200 ? item.response.data[0].url : null,
             };
           }),
         );
@@ -59,18 +59,16 @@ const Dataset = () => {
   const locationParams = useParams(); //新版本获取路由参数接口
   const [wordList, setWordList] = useState([]);
   const [activeTabKey, setActiveTabKey] = useState('1');
-  const [uuid, setUuid] = useState(Date.now());
   const getDatasetByDetail = () => {
     getDatasetById(locationParams.id).then((ret) => {
       console.log(ret);
       setDatasetDetailObj(ret.data);
     });
   };
-  // 获取数据集版本
   const getDatasetVersionList = () => {
     getDatasetVersionsById(locationParams.id).then((ret) => {
       console.log(ret);
-      if (ret && ret.data && ret.data.length > 0) {
+      if (ret.data && ret.data.length > 0) {
         setVersionList(
           ret.data.map((item) => {
             return {
@@ -79,8 +77,6 @@ const Dataset = () => {
             };
           }),
         );
-        setVersion(ret.data[0]);
-        getDatasetVersions({ version: ret.data[0], dataset_id: locationParams.id });
       }
     });
   };
@@ -94,7 +90,6 @@ const Dataset = () => {
     form.setFieldsValue({ name: datasetDetailObj.name });
 
     setDialogTitle('创建新版本');
-    setUuid(Date.now());
     setIsModalOpen(true);
   };
   const handleCancel = () => {
@@ -114,7 +109,9 @@ const Dataset = () => {
 
       onOk: () => {
         deleteDatasetVersion({ dataset_id: locationParams.id, version }).then((ret) => {
+          setVersion(null);
           getDatasetVersionList();
+          getDatasetVersions({ version, dataset_id: locationParams.id });
           message.success('删除成功');
         });
       },
@@ -127,7 +124,6 @@ const Dataset = () => {
       message.success('创建成功');
     });
   };
-  // 获取版本下的文件列表
   const getDatasetVersions = (params) => {
     getDatasetVersionIdList(params).then((res) => {
       setWordList(res?.data?.content ?? []);
@@ -372,7 +368,7 @@ const Dataset = () => {
               },
             ]}
           >
-            <Upload {...props} data={{ uuid: uuid }}>
+            <Upload {...props}>
               <Button
                 style={{
                   fontSize: '14px',

react-ui/src/pages/Model/modelIntro.jsx

@@ -39,9 +39,9 @@ const Dataset = () => {
             return {
               ...form.getFieldsValue(),
               models_id: locationParams.id,
-              file_name: item.response.data[0].fileName,
-              file_size: item.response.data[0].fileSize,
-              url: item.response.data[0].url,
+              file_name: item.response.code === 200 ? item.response.data[0].fileName : null,
+              file_size: item.response.code === 200 ? item.response.data[0].fileSize : null,
+              url: item.response.code === 200 ? item.response.data[0].url : null,
             };
           }),
         );

react-ui/src/pages/Pipeline/editPipeline/modelMenus.jsx

@@ -42,6 +42,7 @@ const modelMenus = ({ onParDragEnd }) => {
   const { Panel } = Collapse;
   return (
     <div style={{ width: '250px', height: '99%' }} className={Styles.collapse}>
+      <div className={Styles.modelMenusTitle}>组件库</div>
       <Collapse collapsible="header" defaultActiveKey={['1']} expandIconPosition="end">
         {modelMenusList && modelMenusList.length > 0
           ? modelMenusList.map((item) => (

react-ui/src/pages/Pipeline/editPipeline/modelMenus.less

@@ -12,6 +12,7 @@
 }
 .collapseItem:hover {
   background: rgba(22, 100, 255, 0.08);
+  color:#1664ff;
 }
 .collapse {
   :global {
@@ -23,10 +24,12 @@
       margin-bottom: 5px;
       background-color: #fff;
       border-color: transparent;
+      padding: 20px 16px 15px 16px;
     }
+
     .ant-collapse > .ant-collapse-item {
       margin: 0 10px;
-      border-color: rgba(20, 49, 179, 0.12);
+      border-bottom:0.5px dashed rgba(20, 49, 179, 0.12);
       border-radius: 0px;
     }
     .ant-collapse .ant-collapse-content {
@@ -38,3 +41,10 @@
     }
   }
 }
+.modelMenusTitle{
+  padding: 12px 25px;
+  margin-bottom: 10px;
+  color:#111111;
+font-size:16px;
+font-family: 'Alibaba';
+}