웹 프론트 zipexplore 변경

파일추가시 익스플로러 위쪽부터 붙임
폴더추가시 익스플로러 하단부터 붙임

diff --git a/ZipProject/Controllers/WebZipController.cs b/ZipProject/Controllers/WebZipController.cs
index fe8fa1b463de2d95cbb2a1d1e11731c1b1e0032c..84d4b2a3c6d3a592bfcf14616d396f1f77393272 100644 (file)
--- a/ZipProject/Controllers/WebZipController.cs
+++ b/ZipProject/Controllers/WebZipController.cs
@@ -19,9 +19,6 @@ namespace ZipProject.Controllers {
 
     // GET: /<controller>/
     public IActionResult Index (string partial_name) {
-      ZipModel zmodel = new ZipModel ();
-      zmodel.MakeZip ("test");
-
       if (string.IsNullOrEmpty (HttpContext.Session.GetString ("lang"))) {
         session.SetString ("lang", "kr");
       }

diff --git a/ZipProject/Views/WebZip/partial_zip.cshtml b/ZipProject/Views/WebZip/partial_zip.cshtml
index b47eee7350df129df7c776350c5b3248c34d4957..6c2714294fb0ad6a35db6a38508a137d1964be3a 100644 (file)
--- a/ZipProject/Views/WebZip/partial_zip.cshtml
+++ b/ZipProject/Views/WebZip/partial_zip.cshtml
@@ -18,7 +18,7 @@
   }\r
 \r
   .webzip-explore-placeholder {\r
-    border: 1px solid red;\r
+    border: 0.5px solid red;\r
   }\r
 \r
   .webzip-explore-liEmpty {\r
@@ -62,8 +62,8 @@
         <label class="btn btn-danger webzip-btn-choosefile" for="btn_newDirectory">\r
           @LanguagePack.GetText(lang, "newFolder")\r
         </label>\r
-        <input type="file" id="btn_chooseDirectory" name="chooseDirectory" style="display: none;" multiple webkitdirectory directory />\r
-        <input type="file" id="btn_chooseFiles" name="chooseFiles" style="display: none;" multiple onchange="AddFile($(this))" />\r
+        <input type="file" id="btn_chooseDirectory" name="chooseDirectory" style="display: none;" multiple webkitdirectory directory onclick="alert('준비중입니다.'); return false;" />\r
+        <input type="file" id="btn_chooseFiles" name="chooseFiles" style="display: none;" multiple onchange="AddFile($(this))" onclick="$(this).val(null)" />\r
         <input type="button" class="btn-danger" onclick="AddFolder()" style="display: none;" id="btn_newDirectory" />\r
       </td>\r
     </tr>\r
@@ -83,10 +83,11 @@
     <label onmousedown="Clicked($(this))" key="0" id="zip_default">\r
       example\r
     </label>\r
-    <ul><li class="webzip-explore-liEmpty">&nbsp;</li></ul>\r
+    <ul class="sort-disabled">\r
+      <li class="webzip-explore-liEmpty">&nbsp;</li>\r
+    </ul>\r
   </directory>\r
 </div>\r
-<div id="hiddenFileSection"></div>\r
 \r
 <script>\r
   var folder_open= "▼";\r

diff --git a/ZipProject/wwwroot/js/Zip/partial_zip.js b/ZipProject/wwwroot/js/Zip/partial_zip.js
index a6d35e263adccf3c31a8dc9ad152b9245c535c7b..abfc2f3253a00e2415fdd80c2f0e81e190e1576c 100644 (file)
--- a/ZipProject/wwwroot/js/Zip/partial_zip.js
+++ b/ZipProject/wwwroot/js/Zip/partial_zip.js
@@ -28,7 +28,7 @@ function AddFolder() {
       <label ondblclick="AddDbclickEvent($(this))" onmousedown="Clicked($(this))" key="' +
     num +
     '")>new</label>\
-      <ul class="sort-directory"><li class="webzip-explore-liEmpty">&nbsp;</li></ul>\
+      <ul class="sort-directory sort-disabled"><li class="webzip-explore-liEmpty">&nbsp;</li></ul>\
     </directory>\
   </li>';
   selected.append(directory);
@@ -46,7 +46,6 @@ function ResetDirectoryKeys($elem, dirNum) {
 function ResetFileKeys($elem, dirNum, fileNum) {}
 
 function AddFile($elem) {
-  console.log($elem);
   var frontfiles = $elem.get(0).files;
   var size = $elem.get(0).files.length;
 
@@ -69,7 +68,7 @@ function AddFile($elem) {
       "</label>\
     </li>\
     ";
-    selected.append(lab);
+    selected.children("li:first").after(lab);
     files.put(files.keys() == "" ? "0" : files.keys().length + "", hash);
   }
   SetBulletIcon();
@@ -90,23 +89,46 @@ function SetSortable() {
           .prev()
           .text()
           .trim();
-        var directory_infiles = $(this)
+        var directory_infiles = new Array();
+        $(this)
+          .children(".sort-file")
           .find("label")
-          .text()
-          .trim();
+          .each(function() {
+            directory_infiles.push(
+              $(this)
+                .text()
+                .trim()
+            );
+          });
 
-        if (directory_name != directories.get(0)) {
-          console.log(
-            "directory: " + directory_name + ", file name: " + directory_infiles
-          );
-        } else {
-          "directory: " + directory_name + ", file name: " + directory_infiles;
-        }
+        console.log(directory_key+","+directory_infiles);
+        // if (true) {
+        //   console.log(
+        //     "directory: " + directory_name + ", file name: " + directory_infiles + ", key: " + directory_key
+        //   );
+        // }
+
+        // MoveFile(directory_key, directory_name, directory_infiles);
       }
     })
     .disableSelection();
 }
 
+function MoveFile(dir_key, dir_name, file_name) {
+  for (var i = 0; i < file_name.length; i++) {
+    for (var o = 0; o < files.keys().length; o++) {
+      if (file_name[i] == files.get(o).get("file").name) {
+        files.get(o).put("directory", dir_key);
+        var file = files.get(o);
+        file.put("directory", dir_key);
+
+        files.put(o, file);
+        console.log(files);
+      }
+    }
+  }
+}
+
 function Clicked($elem) {
   folder_bg_white();
   $elem.css("background-color", "lightgray");
@@ -165,7 +187,7 @@ function SetBulletIcon() {
 }
 
 function isDuplicateFile(frontfiles) {
-       for (var i = 0; i < frontfiles.length; i++) {
+  for (var i = 0; i < frontfiles.length; i++) {
     for (var o = 0; o < files.keys().length; o++) {
       if (frontfiles[i].name == files.get(o).get("file").name) {
         return true;
@@ -245,5 +267,5 @@ function isTooLongFileName(val) {
 SetBulletIcon();
 SetSortable();
 
-directories.put("0", "example");
+directories.put(0, "example");
 $("#zip_default").trigger("click");