导入目录

src/service/dataassetmanager.js

@@ -113,7 +113,7 @@ export function listAllTopics(payload) {
 }
 
 export function directoryImport(payload) {
-  return PostFile("/dataassetmanager/directoryApi/import", payload);
+  return PostFile("/dataassetmanager/directoryApi/importCheckRepeatPath", payload);
 }
 
 export function previewTreeByCustomElements(payload) {

src/view/Manage/AssetManage/Component/ImportDirectory.jsx

@@ -11,6 +11,7 @@ const ImportDirectory = (props) => {
   const [ fileList, setFileList ] = useState([]);
   const [ form ] = Form.useForm();
   const [ dir, setDir ] = useState(null);
+  const [modal, contextHolder] = Modal.useModal();
 
   useEffect(() => {
 
@@ -43,7 +44,7 @@ const ImportDirectory = (props) => {
     window.open("/data-govern/docs/AssetThemeModel.xlsx");
   }
 
-  const upload = async () => {
+  const upload = async (ignoreRepeatPath = false) => {
     try {
       const row = await form.validateFields();
       
@@ -52,11 +53,15 @@ const ImportDirectory = (props) => {
       let payload;
       if (row.type === 'root') {
         payload = { 
-          fileList: fileList 
+          params: {
+            ignoreRepeatPath
+          },
+          fileList: fileList,
         };
       } else {
         payload = { 
           params: {
+            ignoreRepeatPath,
             parentPath: dir.path
           },
           fileList: fileList
@@ -68,9 +73,26 @@ const ImportDirectory = (props) => {
         payload: payload,
         callback: data => {
           setUploading(false);
+
+          if (!ignoreRepeatPath) {
+            if (!data.existRepeatPath) {
+              onCancel && onCancel(true, (row.type==='root'? true : false));
+              const msg = (data.message||'').replace(RegExp(";", "g"),"<br />")
+              showNotifaction('导入提示', msg, 5);
+            } else {
+              modal.confirm({
+                title: '提示',
+                content: '存在重复路径，确定导入吗?',
+                onOk: () => {
+                  upload(true);
+                }
+              })
+            }
+          } else {
             onCancel && onCancel(true, (row.type==='root'? true : false));
-          const msg = (data||'').replace(RegExp(";", "g"),"<br />")
+            const msg = (data.message||'').replace(RegExp(";", "g"),"<br />")
             showNotifaction('导入提示', msg, 5);
+          }
         },
         error: () => {
           setUploading(false);
@@ -117,7 +139,7 @@ const ImportDirectory = (props) => {
       footer={
         <Space>
           <Button type="primary" onClick={ download } >模版下载</Button>
-          <Button type="primary" onClick={ upload } loading={uploading}>上传</Button>
+          <Button type="primary" onClick={() => { upload(false); } } loading={uploading}>上传</Button>
           <Button onClick={() => { onCancel && onCancel() }}>返回</Button>
         </Space>
       }
@@ -145,6 +167,7 @@ const ImportDirectory = (props) => {
           </Upload>
         </Form.Item>
       </Form>
+      {contextHolder}
     </Modal>
   );
 }