af-mobile-client-vue3 1.6.39 → 1.6.41

package/package.json

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

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

@@ -1,9 +1,14 @@
 <script setup lang="ts">
+import type { NativePickedFile } from '@af-mobile-client-vue3/utils/nativeFilePicker'
 // import cameraIcon from '@af-mobile-client-vue3/assets/img/component/camera.png'
 import { deleteFile, upload } from '@af-mobile-client-vue3/services/api/common'
 import { detectEnvironment } from '@af-mobile-client-vue3/utils/environment'
 import { buildInputAccept, getFileTypeMeta, getUploadFormType, isImageFileName } from '@af-mobile-client-vue3/utils/fileType'
 import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
+import {
+  openNativeFilePicker,
+  triggerBrowserFileInput,
+} from '@af-mobile-client-vue3/utils/nativeFilePicker'
 import { toDataUrl } from '@af-mobile-client-vue3/utils/resourceUrl'
 import { formatNow } from '@af-mobile-client-vue3/utils/timeUtil'
 import {
@@ -48,17 +53,11 @@ const documentInputRef = ref<HTMLInputElement | undefined>()
 const documentAccept = computed(() => buildInputAccept(props.attr?.accept))
 
 function openImageFilePicker() {
-  if (imageInputRef.value) {
-    imageInputRef.value.value = ''
-    imageInputRef.value.click()
-  }
+  triggerBrowserFileInput(imageInputRef.value)
 }
 
 function openDocumentFilePicker() {
-  if (documentInputRef.value) {
-    documentInputRef.value.value = ''
-    documentInputRef.value.click()
-  }
+  triggerBrowserFileInput(documentInputRef.value)
 }
 
 function emitUpdatesAfterChange() {
@@ -215,6 +214,69 @@ function handleBrowserDocumentFiles(files: FileList | null) {
   }
 }
 
+function handleNativeDocumentUpload(fileData: NativePickedFile) {
+  const filePath = fileData.filePath || fileData.path || ''
+  const fileName = fileData.name || filePath.split('/').pop() || 'file'
+  const tempFile = createTempUploadingItem(fileName, '', false)
+
+  const param = {
+    resUploadMode: props.uploadMode,
+    pathKey: 'Default',
+    formType: 'file' as const,
+    useType: props.attr?.useType || 'Default',
+    resUploadStock: '1',
+    filename: fileName,
+    filesize: fileData.size,
+    f_operator: 'server',
+    imgPath: filePath,
+    urlPath: `/api/${props.serviceName || import.meta.env.VITE_APP_SYSTEM_NAME}/resource/upload`,
+    commonId: parentData?.commonId?.value ?? '',
+  }
+
+  mobileUtil.execute({
+    funcName: 'uploadResource',
+    param,
+    callbackFunc: (result: any) => {
+      const index = imageList.value.findIndex(item => item.uid === tempFile.uid)
+      if (result.status === 'success') {
+        if (index !== -1) {
+          imageList.value[index].uid = result.data.id
+          imageList.value[index].id = result.data.id
+          imageList.value[index].f_downloadpath = result.data.f_downloadpath
+          imageList.value[index].photo_name = result.data.f_filename
+          imageList.value[index].isDocument = true
+          imageList.value[index].isImage = true
+          imageList.value[index].url = DOC_TILE_PLACEHOLDER
+          delete imageList.value[index].message
+          imageList.value[index].status = 'done'
+        }
+      }
+      else if (index !== -1) {
+        imageList.value[index].status = 'failed'
+        imageList.value[index].message = '上传失败'
+      }
+      emitUpdatesAfterChange()
+    },
+  })
+}
+
+function triggerDocumentPicker() {
+  const startedNative = openNativeFilePicker({
+    accept: documentAccept.value,
+    multiple: true,
+    onSuccess: files => files.forEach(handleNativeDocumentUpload),
+    onError: (msg) => {
+      if (msg)
+        showFailToast(msg)
+    },
+  })
+  if (startedNative)
+    return
+
+  // 与「相册中选择」一致：ActionSheet 点击后立即调起系统文件选择器
+  openDocumentFilePicker()
+}
+
 // 触发拍照
 function triggerCamera() {
   mobileUtil.execute({
@@ -512,6 +574,11 @@ function handleUploadAreaClick() {
 }
 
 function handleActionSelect(option: any) {
+  if (option.key === 'document') {
+    triggerDocumentPicker()
+    showActionSheet.value = false
+    return
+  }
   showActionSheet.value = false
   if (option.key === 'camera') {
     triggerCamera()
@@ -532,9 +599,6 @@ function handleActionSelect(option: any) {
       },
     })
   }
-  else if (option.key === 'document') {
-    openDocumentFilePicker()
-  }
 }
 
 function getUploadStatus() {
@@ -565,7 +629,7 @@ defineExpose({
       type="file"
       multiple
       accept="image/*"
-      style="display:none"
+      class="hidden-file-input"
       @change="(e:any) => handleBrowserImageFiles(e.target.files)"
     >
     <!-- 通用文件选择（PDF / Word 等） -->
@@ -574,7 +638,7 @@ defineExpose({
       type="file"
       multiple
       :accept="documentAccept"
-      style="display:none"
+      class="hidden-file-input"
       @change="(e:any) => handleBrowserDocumentFiles(e.target.files)"
     >
     <van-uploader
@@ -630,6 +694,19 @@ defineExpose({
   // 该属性会影响表单布局
   // gap: 16px;
 }
+
+/* WebView 内 display:none 会导致 file input 无法被程序化触发，改用视觉隐藏 */
+.hidden-file-input {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 1px;
+  height: 1px;
+  opacity: 0;
+  overflow: hidden;
+  pointer-events: none;
+  z-index: -1;
+}
 /* 让自定义上传按钮可点击：关闭 Vant 覆盖在上方的透明 input 的事件捕获 */
 :deep(.custom-trigger-uploader .van-uploader__input) {
   pointer-events: none;

package/src/components/core/Signature/AdaptiveSignatureField.vue

@@ -1,172 +1,172 @@
-<script setup lang="ts">
-import type { SignatureComponentExpose, SignatureComponentProps } from './signature'
-import XSignature from '@af-mobile-client-vue3/components/data/XSignature/index.vue'
-import { upload } from '@af-mobile-client-vue3/services/api/common'
-import { isNativeApp } from '@af-mobile-client-vue3/utils/environment'
-import { showFailToast, Field as VanField } from 'vant'
-import { onMounted, ref, watch } from 'vue'
-import SignatureComponent from './SignatureComponent.vue'
-
-const props = withDefaults(defineProps<SignatureComponentProps & {
-  serviceName?: string
-}>(), {
-  label: '用户签字',
-  required: false,
-  disabled: false,
-  uploadMode: 'server',
-  imageList: null,
-  formReadonly: false,
-  isAsyncUpload: false,
-  serviceName: undefined,
-})
-
-const emit = defineEmits<{
-  signatureComplete: [data: any]
-}>()
-
-// App / Flutter 壳走原生签字板；浏览器、微信等走 H5 签名
-const isApp = ref(isNativeApp())
-onMounted(() => {
-  // 部分 WebView 桥接注入略晚于首屏，挂载后再判一次
-  isApp.value = isNativeApp()
-})
-
-const nativeSignatureRef = ref<InstanceType<typeof SignatureComponent>>()
-const webSignatureImage = ref('')
-const webSignatureData = ref<any>(null)
-const webUploading = ref(false)
-
-const serviceName = props.serviceName || import.meta.env.VITE_APP_SYSTEM_NAME
-
-watch(
-  () => props.imageList,
-  (list) => {
-    if (isApp.value || !Array.isArray(list) || !list[0]?.url)
-      return
-    webSignatureImage.value = list[0].url
-  },
-  { immediate: true, deep: true },
-)
-
-async function uploadWebSignature(base64Image: string) {
-  const blob = await (await fetch(base64Image)).blob()
-  const filename = `signature_${Date.now()}.png`
-  const file = new File([blob], filename, { type: blob.type || 'image/png' })
-  const formData = new FormData()
-  formData.append('avatar', file)
-  formData.append('resUploadMode', props.uploadMode)
-  formData.append('pathKey', 'Default')
-  formData.append('formType', 'image')
-  formData.append('useType', 'Default')
-  formData.append('resUploadStock', '1')
-  formData.append('filename', filename)
-  formData.append('filesize', (file.size / 1024 / 1024).toFixed(4))
-  formData.append('f_operator', 'server')
-
-  return upload(formData, serviceName, { 'Content-Type': 'multipart/form-data' })
-}
-
-function resetWebSignature() {
-  webSignatureImage.value = ''
-  webSignatureData.value = null
-}
-
-async function handleWebSignatureSave(base64Image: string) {
-  if (props.disabled || props.formReadonly || webUploading.value)
-    return
-
-  webUploading.value = true
-  try {
-    const res: any = await uploadWebSignature(base64Image)
-    if (!res?.data?.id) {
-      showFailToast('签名上传失败')
-      resetWebSignature()
-      return
-    }
-    webSignatureData.value = res.data
-    emit('signatureComplete', { status: 'success', data: res.data })
-  }
-  catch (error) {
-    console.error('签名上传失败:', error)
-    showFailToast('签名上传失败')
-    resetWebSignature()
-  }
-  finally {
-    webUploading.value = false
-  }
-}
-
-function handleWebSignatureClear() {
-  resetWebSignature()
-  emit('signatureComplete', { base64: '', status: 'cleared' })
-}
-
-defineExpose<SignatureComponentExpose>({
-  clearSignature() {
-    if (isApp.value)
-      nativeSignatureRef.value?.clearSignature()
-    else
-      handleWebSignatureClear()
-  },
-  hasSignature() {
-    if (isApp.value)
-      return nativeSignatureRef.value?.hasSignature() ?? false
-    return !!webSignatureData.value?.id || !!webSignatureImage.value
-  },
-  getSignatureData() {
-    if (isApp.value)
-      return nativeSignatureRef.value?.getSignatureData() ?? ''
-    return webSignatureImage.value.replace(/^data:image\/\w+;base64,/, '')
-  },
-  previewSignature() {
-    nativeSignatureRef.value?.previewSignature()
-  },
-  getSignatureList() {
-    if (isApp.value)
-      return nativeSignatureRef.value?.getSignatureList() ?? []
-    if (!webSignatureData.value)
-      return []
-    return [{
-      photo_name: webSignatureData.value.f_filename,
-      id: webSignatureData.value.id,
-      f_downloadpath: webSignatureData.value.f_downloadpath,
-    }]
-  },
-})
-</script>
-
-<template>
-  <!-- App：原生签字板 -->
-  <SignatureComponent
-    v-if="isApp"
-    ref="nativeSignatureRef"
-    :label="label"
-    :required="required"
-    :disabled="disabled"
-    :upload-mode="uploadMode"
-    :image-list="imageList"
-    :form-readonly="formReadonly"
-    :is-async-upload="isAsyncUpload"
-    @signature-complete="emit('signatureComplete', $event)"
-  />
-  <!-- 非 App：H5 在线签名（浏览器、微信等） -->
-  <VanField
-    v-else
-    center
-    name="signature"
-    :label="label"
-    :required="required"
-  >
-    <template #input>
-      <XSignature
-        v-model="webSignatureImage"
-        button-text="点击签字"
-        :show-button-after-signed="true"
-        :show-sign-button="!formReadonly"
-        :show-preview="true"
-        @save="handleWebSignatureSave"
-        @clear="handleWebSignatureClear"
-      />
-    </template>
-  </VanField>
-</template>
+<script setup lang="ts">
+import type { SignatureComponentExpose, SignatureComponentProps } from './signature'
+import XSignature from '@af-mobile-client-vue3/components/data/XSignature/index.vue'
+import { upload } from '@af-mobile-client-vue3/services/api/common'
+import { isNativeApp } from '@af-mobile-client-vue3/utils/environment'
+import { showFailToast, Field as VanField } from 'vant'
+import { onMounted, ref, watch } from 'vue'
+import SignatureComponent from './SignatureComponent.vue'
+
+const props = withDefaults(defineProps<SignatureComponentProps & {
+  serviceName?: string
+}>(), {
+  label: '用户签字',
+  required: false,
+  disabled: false,
+  uploadMode: 'server',
+  imageList: null,
+  formReadonly: false,
+  isAsyncUpload: false,
+  serviceName: undefined,
+})
+
+const emit = defineEmits<{
+  signatureComplete: [data: any]
+}>()
+
+// App / Flutter 壳走原生签字板；浏览器、微信等走 H5 签名
+const isApp = ref(isNativeApp())
+onMounted(() => {
+  // 部分 WebView 桥接注入略晚于首屏，挂载后再判一次
+  isApp.value = isNativeApp()
+})
+
+const nativeSignatureRef = ref<InstanceType<typeof SignatureComponent>>()
+const webSignatureImage = ref('')
+const webSignatureData = ref<any>(null)
+const webUploading = ref(false)
+
+const serviceName = props.serviceName || import.meta.env.VITE_APP_SYSTEM_NAME
+
+watch(
+  () => props.imageList,
+  (list) => {
+    if (isApp.value || !Array.isArray(list) || !list[0]?.url)
+      return
+    webSignatureImage.value = list[0].url
+  },
+  { immediate: true, deep: true },
+)
+
+async function uploadWebSignature(base64Image: string) {
+  const blob = await (await fetch(base64Image)).blob()
+  const filename = `signature_${Date.now()}.png`
+  const file = new File([blob], filename, { type: blob.type || 'image/png' })
+  const formData = new FormData()
+  formData.append('avatar', file)
+  formData.append('resUploadMode', props.uploadMode)
+  formData.append('pathKey', 'Default')
+  formData.append('formType', 'image')
+  formData.append('useType', 'Default')
+  formData.append('resUploadStock', '1')
+  formData.append('filename', filename)
+  formData.append('filesize', (file.size / 1024 / 1024).toFixed(4))
+  formData.append('f_operator', 'server')
+
+  return upload(formData, serviceName, { 'Content-Type': 'multipart/form-data' })
+}
+
+function resetWebSignature() {
+  webSignatureImage.value = ''
+  webSignatureData.value = null
+}
+
+async function handleWebSignatureSave(base64Image: string) {
+  if (props.disabled || props.formReadonly || webUploading.value)
+    return
+
+  webUploading.value = true
+  try {
+    const res: any = await uploadWebSignature(base64Image)
+    if (!res?.data?.id) {
+      showFailToast('签名上传失败')
+      resetWebSignature()
+      return
+    }
+    webSignatureData.value = res.data
+    emit('signatureComplete', { status: 'success', data: res.data })
+  }
+  catch (error) {
+    console.error('签名上传失败:', error)
+    showFailToast('签名上传失败')
+    resetWebSignature()
+  }
+  finally {
+    webUploading.value = false
+  }
+}
+
+function handleWebSignatureClear() {
+  resetWebSignature()
+  emit('signatureComplete', { base64: '', status: 'cleared' })
+}
+
+defineExpose<SignatureComponentExpose>({
+  clearSignature() {
+    if (isApp.value)
+      nativeSignatureRef.value?.clearSignature()
+    else
+      handleWebSignatureClear()
+  },
+  hasSignature() {
+    if (isApp.value)
+      return nativeSignatureRef.value?.hasSignature() ?? false
+    return !!webSignatureData.value?.id || !!webSignatureImage.value
+  },
+  getSignatureData() {
+    if (isApp.value)
+      return nativeSignatureRef.value?.getSignatureData() ?? ''
+    return webSignatureImage.value.replace(/^data:image\/\w+;base64,/, '')
+  },
+  previewSignature() {
+    nativeSignatureRef.value?.previewSignature()
+  },
+  getSignatureList() {
+    if (isApp.value)
+      return nativeSignatureRef.value?.getSignatureList() ?? []
+    if (!webSignatureData.value)
+      return []
+    return [{
+      photo_name: webSignatureData.value.f_filename,
+      id: webSignatureData.value.id,
+      f_downloadpath: webSignatureData.value.f_downloadpath,
+    }]
+  },
+})
+</script>
+
+<template>
+  <!-- App：原生签字板 -->
+  <SignatureComponent
+    v-if="isApp"
+    ref="nativeSignatureRef"
+    :label="label"
+    :required="required"
+    :disabled="disabled"
+    :upload-mode="uploadMode"
+    :image-list="imageList"
+    :form-readonly="formReadonly"
+    :is-async-upload="isAsyncUpload"
+    @signature-complete="emit('signatureComplete', $event)"
+  />
+  <!-- 非 App：H5 在线签名（浏览器、微信等） -->
+  <VanField
+    v-else
+    center
+    name="signature"
+    :label="label"
+    :required="required"
+  >
+    <template #input>
+      <XSignature
+        v-model="webSignatureImage"
+        button-text="点击签字"
+        :show-button-after-signed="true"
+        :show-sign-button="!formReadonly"
+        :show-preview="true"
+        @save="handleWebSignatureSave"
+        @clear="handleWebSignatureClear"
+      />
+    </template>
+  </VanField>
+</template>