Merge pull request '解决：#2678，#2563，及删除多余的注释代码。' (#2679) from zouap into V20220815

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2679
Reviewed-by: lewis <747342561@qq.com>

modules/storage/minio_ext.go

@@ -214,47 +214,6 @@ func GetOneLevelAllObjectUnderDirMinio(bucket string, prefixRootPath string, rel
 				ParenDir: ParenDir,
 			}
 			fileInfos = append(fileInfos, fileInfo)
-
-			// log.Info("val key=" + val.Key)
-			// var isDir bool
-			// var fileName string
-			// if val.Key == Prefix {
-			// 	continue
-			// }
-
-			// fileName = val.Key[prefixLen:]
-			// log.Info("fileName =" + fileName)
-			// files := strings.Split(fileName, "/")
-			// if fileMap[files[0]] {
-			// 	continue
-			// } else {
-			// 	fileMap[files[0]] = true
-			// }
-			// ParenDir := relativePath
-			// fileName = files[0]
-			// if len(files) > 1 {
-			// 	isDir = true
-			// 	ParenDir += fileName + "/"
-			// } else {
-			// 	isDir = false
-			// }
-
-			// // if strings.HasSuffix(val.Key, "/") {
-			// // 	isDir = true
-			// // 	fileName = val.Key[prefixLen : len(val.Key)-1]
-			// // 	relativePath += val.Key[prefixLen:]
-			// // } else {
-			// // 	isDir = false
-			// // 	fileName = val.Key[prefixLen:]
-			// // }
-			// fileInfo := FileInfo{
-			// 	ModTime:  val.LastModified.Local().Format("2006-01-02 15:04:05"),
-			// 	FileName: fileName,
-			// 	Size:     val.Size,
-			// 	IsDir:    isDir,
-			// 	ParenDir: relativePath,
-			// }
-			// fileInfos = append(fileInfos, fileInfo)
 		}
 		return fileInfos, err
 	} else {

templates/repo/grampus/trainjob/show.tmpl

@@ -773,7 +773,7 @@
                              }
                               if (srcEngine == 'mindspore') {
                                 $('#choice_Engine .default.text').text("MindSpore");
-                                $('#choice_Engine input[name="Engine"]').val(1)
+                                $('#choice_Engine input[name="Engine"]').val(2)
                               }
                         }
                    }else{

templates/repo/modelmanage/index.tmpl

@@ -325,6 +325,7 @@
             $('#name').val(modelName)
             $('#version').val("0.0.1")
         }
+        let dirKey="isOnlyDir--:&";
         function showcreate(obj) {
             $('.ui.modal.second')
                 .modal({
@@ -460,7 +461,7 @@
                     var zNodes=[];
                     var nodesMap={};
                     for (let i=0;i<n_length;i++){
-                        parentNodeMap = nodesMap;
+                        var parentNodeMap = nodesMap;
                         var fileSplits = data[i].FileName.split("/");
                         for(let j=0;j < fileSplits.length;j++){
                             if(fileSplits[j] == ""){
@@ -469,7 +470,22 @@
                             if(parentNodeMap[fileSplits[j]] == null){
                                 parentNodeMap[fileSplits[j]] = {};
                             }
-                            parentNodeMap = parentNodeMap[fileSplits[j]]
+                            parentNodeMap = parentNodeMap[fileSplits[j]];
+                        }
+                    }
+                    for (let i=0;i<n_length;i++){
+                        var parentNodeMap = nodesMap;
+                        var fileSplits = data[i].FileName.split("/");
+                        for(let j=0;j < fileSplits.length;j++){
+                            if(fileSplits[j] == ""){
+                                if(data[i].FileName[data[i].FileName.length -1] =="/"){
+                                    if(Object.keys(parentNodeMap).length ==0){
+                                        parentNodeMap[dirKey]="true";
+                                    }
+                                }
+                                break;
+                            }
+                            parentNodeMap = parentNodeMap[fileSplits[j]];
                         }
                     }
                     convertToNode(zNodes,nodesMap);
@@ -488,12 +504,18 @@
                 node["name"] = keyList[i];
                 nodeList.push(node);
                 if(nodesMap[keyList[i]] != null && Object.keys(nodesMap[keyList[i]]).length >0){
-                    node["children"]=[];
-                    if(isFirst){
-                        node["open"] = true;
-                        isFirst= false;
+                    if(nodesMap[keyList[i]][dirKey] != null){
+                        node["open"] = false;
+                        node["isParent"] = true;
+                    }else{
+                        node["children"]=[];
+                        if(isFirst){
+                            node["open"] = true;
+                            isFirst= false;
+                        }
+                        convertToNode(node["children"],nodesMap[keyList[i]]);
                     }
-                    convertToNode(node["children"],nodesMap[keyList[i]]);
+                    
                 }
             }
         }