From b5e9854db2da3e9b381a0a9ca980d2c60925edd4 Mon Sep 17 00:00:00 2001
From: joinsang <dhkq92@icloud.com>
Date: Thu, 21 Feb 2019 22:18:44 +0900
Subject: [PATCH] =?utf8?q?=EC=9B=B9=20=ED=94=84=EB=A1=A0=ED=8A=B8=20zipexp?=
 =?utf8?q?lore=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

파일추가시 익스플로러 위쪽부터 붙임
폴더추가시 익스플로러 하단부터 붙임
---
 ZipProject/Controllers/WebZipController.cs |  3 --
 ZipProject/Views/WebZip/partial_zip.cshtml | 11 ++---
 ZipProject/wwwroot/js/Zip/partial_zip.js   | 52 +++++++++++++++-------
 3 files changed, 43 insertions(+), 23 deletions(-)

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