Merge branch 'master' of http://111.229.35.227:3000/gitadmin/wms-elevue

src/components/Upload/Image.vue

@@ -216,7 +216,7 @@
         mime: fileChild.type
       });
       emit('update:imageUrl',res.res.requestUrls[0]);
-      emit('changeFileName',filterFileName)
+      emit('changeFileName',fileChild.name)
       // 调用 el-form 内部的校验方法（可自动校验）
       formItemContext?.prop && formContext?.validateField([formItemContext.prop as string]);
     } catch (error) {

src/components/Upload/Images.vue

@@ -223,22 +223,22 @@
         if (editIndex !== '') {
           list.splice(editIndex, 1, {
             url:res.res.requestUrls[0],
-            name: fileName,
+            name: options.file.name,
             filePath: res.res.requestUrls[0],
-            fileName: fileName
+            fileName: options.file.name
           })
           editIndex = ''
         } else {
           list.push({
             url: res.res.requestUrls[0],
-            name: fileName,
+            name: options.file.name,
             filePath: res.res.requestUrls[0],
-            fileName: fileName
+            fileName: options.file.name
           })
         }
         emit('upload', list,props.zIndex)
       } else {
-        emit("upload", res.res.requestUrls[0], fileName, props.zIndex);
+        emit("upload", res.res.requestUrls[0], options.file.name, props.zIndex);
       }
     } catch (error) {
       ElNotification({