From e70b93ea57b2b3d6626a01cf3ada2667fa2a0957 Mon Sep 17 00:00:00 2001
From: ln1778 <465410291@qq.com>
Date: Tue, 24 Sep 2024 18:10:29 +0800
Subject: [PATCH] 22

---
 package.json                    |  2 +-
 packages/agSelect/src/index.vue |  1 +
 packages/agUpload/src/index.vue | 45 +++++++++++++++------------------
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index fd8aeff..4670671 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ag-element-ui",
-  "version": "0.1.24", 
+  "version": "0.1.25", 
   "main": "packages/index.js",
   "scripts": {
     "dev": "vue-cli-service serve",
diff --git a/packages/agSelect/src/index.vue b/packages/agSelect/src/index.vue
index c36255b..23b1ed0 100644
--- a/packages/agSelect/src/index.vue
+++ b/packages/agSelect/src/index.vue
@@ -11,6 +11,7 @@
     <el-option
       v-for="(item, index) in options"
       :key="index"
+      :disabled="item.disabled"
       :label="item.label"
       :value="item.value"
     ></el-option>
diff --git a/packages/agUpload/src/index.vue b/packages/agUpload/src/index.vue
index 8f7859b..5b3fa4a 100644
--- a/packages/agUpload/src/index.vue
+++ b/packages/agUpload/src/index.vue
@@ -21,7 +21,6 @@
         @dragenter="onDragenter"
         @dragover="onDragover"
         @dragend="onDragend"
-        @dragleave="onMouseup"
       >
         <slot name="file" :file="img">
           <img
@@ -31,6 +30,7 @@
           />
           <div
             v-if="
+              index == 0 &&
               $attrs.masktext &&
               $attrs.masktext.ai == false &&
               $attrs.masktext.data[index]
@@ -293,6 +293,8 @@ export default {
       selectTop: false,
       drag: false,
       dragmoveclass: "imghover",
+      moveIndexs: [],
+      startIndex: null,
     };
   },
   methods: {
@@ -304,6 +306,7 @@ export default {
         return inkey !== index;
       });
       this.$emit("onRemove", file, this.imageList);
+      this.$emit("onUpload", this.fileList, this.imageList, "remove");
     },
     handlePictureCardPreview(file) {
       if (file.type.indexOf("image/") > -1) {
@@ -321,8 +324,6 @@ export default {
       let that = this;
       try {
         let uplist = [];
-        console.log(this.limit, " this.limit", this.limit - this.imageList.length);
-
         let files = [...e.target.files].slice(0, this.limit - this.imageList.length);
         const find = files.find((f, i) => {
           if (this.$attrs.accept) {
@@ -400,7 +401,7 @@ export default {
                   if (files.length == uplist.length) {
                     this.$refs.fileinputref.value = "";
                     if (this.$listeners.onUpload) {
-                      this.$emit("onUpload", this.fileList, uplist);
+                      this.$emit("onUpload", this.fileList, uplist, "upload");
                     } else {
                       this.imageList.push(...uplist);
                     }
@@ -465,6 +466,9 @@ export default {
         e.target.classList.add("moving");
       }, 1);
     },
+    onDragover(e) {
+      e.preventDefault();
+    },
     onDragenter(e) {
       e.preventDefault();
       if (this.disabled) {
@@ -486,19 +490,13 @@ export default {
       }
 
       const sourceIndex = childrens.indexOf(this.sourceNode);
+      if (!this.startIndex) {
+        this.startIndex = sourceIndex;
+      }
       const targetIndex = childrens.indexOf(thistarget);
-      if (sourceIndex < targetIndex) {
-        this.partNode.insertBefore(this.sourceNode, thistarget.nextElementSibling);
-      } else {
-        this.partNode.insertBefore(this.sourceNode, thistarget);
-      }
-    },
-    onDragover(e) {
-      e.preventDefault();
-      if (this.disabled) {
-        return;
-      }
+      this.moveIndexs = [sourceIndex, targetIndex];
     },
+
     onMouseup(e) {
       e.preventDefault();
       if (!this.dragmove) {
@@ -523,16 +521,15 @@ export default {
       e.target.classList.remove("moving");
       e.target.classList.remove("tabsbg");
       this.sourceNode.classList.remove("moving");
-      if (this.partNode === e.target || e.target === this.sourceNode) {
-        return;
-      }
-      const childrens = [...this.partNode.children];
-
-      const sourceIndex = childrens.indexOf(this.sourceNode);
-      const item = this.imageList.splice(sourceIndex, 1)[0];
-      this.imageList.splice(sourceIndex, 0, item);
-      this.sourceNode = null;
+      const [sourceIndex, targetIndex] = this.moveIndexs;
+      let newimage = Object.assign([], this.imageList);
+      let temp = Object.assign({}, newimage[sourceIndex]);
+      newimage[sourceIndex] = newimage[targetIndex];
+      newimage[targetIndex] = temp;
+      this.imageList = newimage;
       this.partNode = null;
+      this.sourceNode = null;
+      this.moveIndexs = [];
     },
     onUploadDrap(e) {
       e.preventDefault(); // 阻止默认行为（打开文件）