misc: update numMax preCheck and multi-fired drag events issue

kaola-fed · Aug 29, 2017 · 2dd4751 · 2dd4751
1 parent b55b95a
commit 2dd4751
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/js/components/form/KLUpload/components/UploadBase/index.js b/src/js/components/form/KLUpload/components/UploadBase/index.js
@@ -70,6 +70,7 @@ const UploadBase = Component.extend({
     _.extend(data, {
       fileUnitList: [],
       dragover: false,
+      dragenterCount: 0,
     });
 
     this.initWatchers();
@@ -232,27 +233,30 @@ const UploadBase = Component.extend({
   },
 
   onDragEnter(e) {
+    const data = this.data;
     e.stopPropagation();
     e.preventDefault();
+    data.dragover = true;
+    data.dragenterCount += 1;
   },
 
   onDragOver(e) {
-    this.data.dragover = true;
-    console.log(`over ${this.data.dragover}`);
     e.stopPropagation();
     e.preventDefault();
   },
 
   onDragLeave(e) {
-    this.data.dragover = false;
-    console.log(`leave ${this.data.dragover}`);
+    const data = this.data;
     e.stopPropagation();
     e.preventDefault();
+    data.dragenterCount -= 1;
+    if (data.dragenterCount === 0) {
+      data.dragover = false;
+    }
   },
 
   onDrop(e) {
     this.data.dragover = false;
-    console.log(`drop ${this.data.dragover}`);
     e.stopPropagation();
     e.preventDefault();
 
@@ -279,7 +283,7 @@ const UploadBase = Component.extend({
         checker.then((preCheckInfo) => {
           data.preCheckInfo = preCheckInfo;
           self.$update();
-          if (!data.preCheckInfo) {
+          if (!data.preCheckInfo && data.fileUnitList.length < data.numMax) {
             const fileunit = {
               rawFile: file,
               name: file.name,

diff --git a/src/js/components/form/KLUpload/components/UploadCard/index.mcss b/src/js/components/form/KLUpload/components/UploadCard/index.mcss
@@ -215,11 +215,9 @@ $margin = 20;
                font-size: 12px;
                cursor: pointer;
                .u-input-content {
-                   position: relative;
                    display: inline-block;
                    width: 100%;
                    vertical-align: middle;
-                   z-index: -1;
                    .u-icon {
                        display: inline-block;
                        width: 100%;

diff --git a/src/js/components/form/KLUpload/components/UploadList/index.mcss b/src/js/components/form/KLUpload/components/UploadList/index.mcss
@@ -30,11 +30,9 @@ $margin = 25;
             font-size: 12px;
             cursor: pointer;
             .u-input-content {
-                position: relative;
                 display: inline-block;
                 width: 100%;
                 vertical-align: middle;
-                z-index: -1;
                 .u-icon {
                     display: inline-block;
                     width: 100%;