af-mobile-client-vue3 1.3.69 → 1.3.71

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.3.69",
+  "version": "1.3.71",
   "packageManager": "pnpm@10.13.1",
   "description": "Vue + Vite component lib",
   "engines": {

package/src/components/core/ImageUploader/index.vue

@@ -1,9 +1,10 @@
 <script setup lang="ts">
-import cameraIcon from '@af-mobile-client-vue3/assets/img/component/camera.png'
+// import cameraIcon from '@af-mobile-client-vue3/assets/img/component/camera.png'
 import { deleteFile, upload } from '@af-mobile-client-vue3/services/api/common'
 import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
 import {
   ActionSheet,
+  Icon as VanIcon,
   Uploader as vanUploader,
 } from 'vant'
 import { ref } from 'vue'
@@ -209,7 +210,7 @@ function handlePhotoUpload(photoData: any) {
         emit('updateAllFileList', imageList.value.filter(item => item.status === 'done').map(item => item)) // 新增
 
         const doneIds = Object.values(imageList.value)
-          .filter(item => item.status === 'done')
+          .filter(item => !item.status || item.status === 'done')
           .map(item => item.photo_name)
 
         if (props.outerIndex !== undefined)
@@ -272,7 +273,7 @@ function deleteFileFunction(file: any) {
         const doneIds = ref(null)
         if (props.isAsyncUpload) {
           doneIds.value = Object.values(imageList.value)
-            .filter(item => item.status === 'done')
+            .filter(item => !item.status || item.status === 'done')
             .map(item => item.photo_name)
         }
         else {
@@ -299,7 +300,7 @@ function deleteFileFunction(file: any) {
   const doneIds = ref(null)
   if (props.isAsyncUpload) {
     doneIds.value = Object.values(imageList.value)
-      .filter(item => item.status === 'done')
+      .filter(item => !item.status || item.status === 'done')
       .map(item => item.photo_name)
   }
   else {
@@ -379,28 +380,30 @@ function handleActionSelect(option: any) {
       style="display:none"
       @change="(e:any) => handleBrowserFiles(e.target.files)"
     >
-    <div
-      v-if="!props.readonly && props.mode !== '预览' && (imageList.length < props.attr?.acceptCount && props.attr?.addOrEdit !== 'readonly')"
-      class="custom-upload-area"
-      @click="handleUploadAreaClick"
-    >
-      <img :src="cameraIcon" alt="camera" class="upload-camera-img">
-      <div class="upload-title">
-        上传附件
-      </div>
-      <div v-if="props.attr?.acceptCount" class="upload-desc">
-        上传限制: {{ imageList.length }} / {{ props.attr?.acceptCount }}
-      </div>
-    </div>
     <van-uploader
       ref="uploaderRef"
       v-model="imageList"
-      :show-upload="false"
+      class="custom-trigger-uploader"
+      :show-upload="true"
       :deletable="!props.readonly && (props.attr?.addOrEdit !== 'readonly' && props.authority === 'admin') && props.mode !== '预览'"
       :multiple="!props.readonly && props.authority === 'admin'"
       :preview-image="true"
       :before-delete="!props.readonly && props.attr?.addOrEdit !== 'readonly' && props.authority === 'admin' ? deleteFileFunction : undefined"
-    />
+      :before-read="() => false"
+    >
+      <template #default>
+        <div
+          v-if="!props.readonly && props.mode !== '预览' && (imageList.length < props.attr?.acceptCount && props.attr?.addOrEdit !== 'readonly')"
+          class="custom-upload-area"
+          @click="handleUploadAreaClick"
+        >
+          <VanIcon name="plus" size="35" color="#d9d9d9" />
+          <div v-if="props.attr?.acceptCount" class="upload-desc">
+            {{ imageList.length }} / {{ props.attr?.acceptCount }}
+          </div>
+        </div>
+      </template>
+    </van-uploader>
     <ActionSheet
       v-model:show="showActionSheet"
       :actions="actionOptions"
@@ -420,10 +423,13 @@ function handleActionSelect(option: any) {
   // 该属性会影响表单布局
   // gap: 16px;
 }
+/* 让自定义上传按钮可点击：关闭 Vant 覆盖在上方的透明 input 的事件捕获 */
+:deep(.custom-trigger-uploader .van-uploader__input) {
+  pointer-events: none;
+}
 .custom-upload-area {
-  width: 100%;
-  height: 100%;
-  min-height: 80px;
+  width: 82px;
+  height: 82px;
   box-sizing: border-box;
   border: 1px dashed #d9d9d9;
   border-radius: 10px;