From 5b836978d81ef8367d7fd2732bd159eaa8f5d792 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Tue, 24 May 2022 16:59:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=8B=96=E6=8B=BD=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                             |   1 +
 src/components/ElUploadImage.vue       | 125 ++++++++++++++++++++++---
 src/views/sales/product/form/step1.vue |   2 +-
 3 files changed, 114 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index bc542c2..7c44f97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 node_modules
 dist
 *.local
+.history
 src/.eslintrc.json
 src/components.d.ts
 src/auto-imports.d.ts
diff --git a/src/components/ElUploadImage.vue b/src/components/ElUploadImage.vue
index 8fae89e..3d7cf42 100644
--- a/src/components/ElUploadImage.vue
+++ b/src/components/ElUploadImage.vue
@@ -1,18 +1,30 @@
 <template>
     <div class="upload-box">
-        <el-upload
-            v-bind="props"
-            action=""
-            :before-upload="handleBeforeUpload"
-            :class="{ max: imgList.length === props.limit }"
-            :file-list="imgList"
-            :http-request="handleUpload"
-            list-type="picture-card"
-            :on-exceed="handleExceed"
-            :on-preview="handlePreview"
-        >
-            <el-icon name="Plus" />
-        </el-upload>
+        <div :class="sortable && 'upload-box__sortable'">
+            <ul class="sortable" ref="sortableRef" v-if="sortable">
+                <li class="sortable--item" v-for="(item, idx) in imgList" :key="item.uid">
+                    <img :src="item.url" />
+                    <span class="sortable--item-hover">
+                        <el-icon class="sortable--item-icon" name="ZoomIn" @click="handlePreview(item)"></el-icon>
+                        <el-icon class="sortable--item-icon" name="Delete" @click="handleRemove(idx)"></el-icon>
+                    </span>
+                </li>
+            </ul>
+            <el-upload
+                v-bind="props"
+                :before-upload="handleBeforeUpload"
+                :class="{ max: imgList.length === props.limit, 'sortable--submit': sortable }"
+                :file-list="imgList"
+                :show-file-list="!sortable"
+                :list-type="!sortable && 'picture-card'"
+                :http-request="handleUpload"
+                :on-exceed="handleExceed"
+                :on-preview="handlePreview"
+            >
+                <el-icon name="Plus" />
+            </el-upload>
+        </div>
+
         <el-image
             v-if="preview"
             ref="refsPreview"
@@ -29,11 +41,16 @@
     import { upload } from '@/api/file';
     import { ElMessage } from '@/plugins/element-plus';
     import 'element-plus/es/components/image/style/css';
+    import Sortable from 'sortablejs';
     const props = defineProps({
         configId: {
             type: String,
             required: true,
         },
+        sortable: {
+            type: Boolean,
+            default: false,
+        },
         serviceName: {
             type: String,
             default: 'mall-product',
@@ -105,6 +122,9 @@
         console.info('[upload] preview', file);
         preview.value = file.url;
     };
+    const handleRemove = (idx) => {
+        imgList.value.splice(idx, 1);
+    };
     const handleExceed = (list) => {
         console.info('[upload] exceed', list);
         ElMessage.error('超出最大上传数量');
@@ -136,6 +156,25 @@
         }
         return res + units[unit];
     });
+    const sortableRef = ref(null);
+    const sortableInit = () => {
+        new Sortable(sortableRef.value, {
+            animation: 150,
+            // swapThreshold: 1,
+            // fallbackOnBody: true,
+            onUpdate({ newIndex, oldIndex }) {
+                const newData = imgList.value[newIndex];
+                const oldData = imgList.value[oldIndex];
+                imgList.value[newIndex] = oldData;
+                imgList.value[oldIndex] = newData;
+            },
+        });
+    };
+    onMounted(() => {
+        if (props.sortable) {
+            sortableInit();
+        }
+    });
 </script>
 <style lang="less" scoped>
     .max {
@@ -143,4 +182,64 @@
             display: none;
         }
     }
+    .upload-box__sortable {
+        display: flex;
+    }
+    .sortable {
+        --img-size: 148px;
+        display: inline-flex;
+        flex-wrap: wrap;
+        margin: 0;
+        &--item {
+            overflow: hidden;
+            background-color: var(--el-fill-color-blank);
+            border: 1px solid #c0ccda;
+            border-radius: 6px;
+            box-sizing: border-box;
+            width: var(--img-size);
+            height: var(--img-size);
+            margin: 0 8px 8px 0;
+            padding: 0;
+            display: inline-flex;
+            position: relative;
+            img {
+                width: 100%;
+                height: 100%;
+                object-fit: contain;
+            }
+            &-icon {
+                margin: 0 10px;
+                font-size: 20px;
+            }
+            &-hover {
+                background: rgba(0, 0, 0, 0.5);
+                position: absolute;
+                left: 0;
+                top: 0;
+                right: 0;
+                bottom: 0;
+                color: #fff;
+                align-items: center;
+                justify-content: center;
+                opacity: 0;
+                display: flex;
+                cursor: pointer;
+            }
+            &:hover {
+                .sortable--item-hover {
+                    opacity: 1;
+                }
+            }
+        }
+    }
+
+    ::v-deep .el-upload {
+        width: 148px;
+        height: 148px;
+        border: 1px dashed #c0ccda;
+        &:hover {
+            border-color: var(--el-color-primary-light-1);
+            color: var(--el-color-primary-light-1);
+        }
+    }
 </style>
diff --git a/src/views/sales/product/form/step1.vue b/src/views/sales/product/form/step1.vue
index 4806708..9a98d1a 100644
--- a/src/views/sales/product/form/step1.vue
+++ b/src/views/sales/product/form/step1.vue
@@ -34,7 +34,7 @@
                     <el-input-number v-show="form.postage === 0" v-model="form.remoteAreaPostage" :min="0" />
                 </el-form-item>
                 <el-form-item label="商品图片" prop="pictureList">
-                    <el-upload-image v-model="form.pictureList" config-id="product" :limit="5" />
+                    <el-upload-image v-model="form.pictureList" config-id="product" :limit="5" sortable multiple />
                 </el-form-item>
                 <el-form-item label="商品详情" prop="detail">
                     <el-editor v-model="form.detail" />