u

code/file-preview/g3-file/index.js

@@ -547,9 +547,7 @@
           <label class="g3-checkbox-label"></label>
           <div class="g3-file-preview">${content}</div>
           ${statusBadge}
-          <div class="g3-file-delete-btn ${deleteDisabled ? "is-disabled" : ""}">
-            ${G3FileIcons.action.delete}
-          </div>
+          ${deleteDisabled ? "" : `<div class="g3-file-delete-btn">${G3FileIcons.action.delete}</div>`}
 
           <div class="g3-file-info">
             <span class="g3-file-name">${file.name}</span>
@@ -647,9 +645,6 @@
           .find(".g3-action-download")
           .toggleClass("is-disabled", !canDownload);
         $item.find(".g3-action-preview").toggleClass("is-disabled", !canView);
-        $item
-          .find(".g3-file-delete-btn")
-          .toggleClass("is-disabled", !canDelete);
       });
     },
 
@@ -684,12 +679,10 @@
 
       var canDownload = this.hasPermission(file, "download");
       var canView = this.hasPermission(file, "view");
-      var canDelete = this.hasPermission(file, "delete");
       $item
         .find(".g3-action-download")
         .toggleClass("is-disabled", !canDownload);
       $item.find(".g3-action-preview").toggleClass("is-disabled", !canView);
-      $item.find(".g3-file-delete-btn").toggleClass("is-disabled", !canDelete);
     },
 
     /**
@@ -1005,12 +998,16 @@
         .on("dragenter", function (e) {
           e.preventDefault();
           e.stopPropagation();
-          $container.addClass("drag-over");
+          if (self.hasPermission(null, "upload")) {
+            $container.addClass("drag-over");
+          }
         })
         .on("dragover", function (e) {
           e.preventDefault();
           e.stopPropagation();
-          $container.addClass("drag-over");
+          if (self.hasPermission(null, "upload")) {
+            $container.addClass("drag-over");
+          }
         })
         .on("dragleave", function (e) {
           e.preventDefault();
@@ -1024,6 +1021,8 @@
           e.stopPropagation();
           $container.removeClass("drag-over");
 
+          if (!self.hasPermission(null, "upload")) return;
+
           var files = e.originalEvent.dataTransfer.files;
           if (files && files.length > 0) {
             self.handleFileSelect(files);
@@ -1037,6 +1036,7 @@
           var clipboardData = e.originalEvent.clipboardData;
           var files = clipboardData.files;
           if (files && files.length > 0) {
+            if (!self.hasPermission(null, "upload")) return;
             e.preventDefault();
             self.handleFileSelect(files);
           }
@@ -1640,7 +1640,7 @@
         self.updateFileStatus(file._id, "uploading");
 
         return new Promise(function (resolve) {
-          function handleResult(error, uploadedFile) {
+          async function handleResult(error, uploadedFile) {
             completedCount++;
 
             if (error) {
@@ -1653,7 +1653,10 @@
               successCount++;
               self.updateFileStatus(file._id, "uploaded", uploadedFile);
               if (typeof self.options.onUploadSuccess === "function") {
-                self.options.onUploadSuccess(uploadedFile);
+                var result = self.options.onUploadSuccess(uploadedFile);
+                if (result && typeof result.then === "function") {
+                  await result;
+                }
               }
             }