Pre Merge pull request !405 from 柳翼/master

ruoyi-ui/src/components/FileUpload/index.vue

@@ -43,7 +43,6 @@
 
 <script>
 import { getToken } from "@/utils/auth"
-import Sortable from 'sortablejs'
 
 export default {
   name: "FileUpload",
@@ -83,11 +82,6 @@ export default {
     disabled: {
       type: Boolean,
       default: false
-    },
-      // 拖动排序
-    drag: {
-      type: Boolean,
-      default: true
     }
   },
   data() {
@@ -98,22 +92,7 @@ export default {
       headers: {
         Authorization: "Bearer " + getToken(),
       },
-      fileList: []
+      fileList: [],
-    }
-  },
-  mounted() {
-    if (this.drag) {
-      this.$nextTick(() => {
-        const element = document.querySelector('.upload-file-list')
-        Sortable.create(element, {
-          ghostClass: 'file-upload-darg',
-          onEnd: (evt) => {
-            const movedItem = this.fileList.splice(evt.oldIndex, 1)[0]
-            this.fileList.splice(evt.newIndex, 0, movedItem)
-            this.$emit("input", this.listToString(this.fileList))
-          }
-        })
-      })
     }
   },
   watch: {
@@ -236,10 +215,6 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.file-upload-darg {
-  opacity: 0.5;
-  background: #c8ebfb;
-}
 .upload-file-uploader {
   margin-bottom: 5px;
 }

ruoyi-ui/src/components/ImageUpload/index.vue

@@ -45,7 +45,6 @@
 
 <script>
 import { getToken } from "@/utils/auth"
-import Sortable from 'sortablejs'
 
 export default {
   props: {
@@ -62,27 +61,22 @@ export default {
     // 图片数量限制
     limit: {
       type: Number,
-      default: 5
+      default: 5,
     },
     // 大小限制(MB)
     fileSize: {
        type: Number,
-      default: 5
+      default: 5,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["png", "jpg", "jpeg"]
+      default: () => ["png", "jpg", "jpeg"],
     },
     // 是否显示提示
     isShowTip: {
       type: Boolean,
       default: true
-    },
-      // 拖动排序
-    drag: {
-      type: Boolean,
-      default: true
     }
   },
   data() {
@@ -99,20 +93,6 @@ export default {
       fileList: []
     }
   },
-  mounted() {
-    if (this.drag) {
-      this.$nextTick(() => {
-        const element = document.querySelector('.el-upload-list')
-        Sortable.create(element, {
-          onEnd: (evt) => {
-            const movedItem = this.fileList.splice(evt.oldIndex, 1)[0]
-            this.fileList.splice(evt.newIndex, 0, movedItem)
-            this.$emit("input", this.listToString(this.fileList))
-          }
-        })
-      })
-    }
-  },
   watch: {
     value: {
       handler(val) {