af-mobile-client-vue3 1.6.42 → 1.6.43

package/.env

@@ -5,7 +5,7 @@ VITE_APP_OUT_DIR=dist_af-library-mobile-web
 VITE_APP_VCONSOLE=false
 # 自定义参数
 VITE_APP_WEB_CONFIG_KEY=admin.webconfig
-VITE_APP_SYSTEM_NAME=af-safecheck
+VITE_APP_SYSTEM_NAME=af-system
 # 最低兼容性 V4（最新产品）V3(V3产品) OA(公司OA)
 VITE_APP_COMPATIBLE=V4
 VITE_RSA_PRIVATE_KEY=MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAIRrmftLDHCQqREEJ132Onu+W3vmFbdF7QD751SrcDDGDTfzuz1zBuElvkHhuDBb7KZkXrCIe+MhvX2IvxcLObl3faX+evYlnfj2HRbF0hIpQLuIq22tL06ZcV5w7wqLxUZRpFElIFm8gZTkUvfKXVuHw89e4daDVhU5hK3GHNGTAgMBAAECgYABiINrFaE1E8pkBYx1JJA5yuhL73aUktfd2TeCU00vFg6kyrWCI85Sa2RKu/6CJNZWeOFgdubEUv7a22tRrNIZb3yUMaqtTwSso78mspIOJqjWXTkTH9WPElfTcdpdIse/lgZtPz6egxkuhadSvwrM9Y6NgusiW/5+x95Ct08iOQJBAN5aK+7uISURvGQj2EaRtgGEd8+d4oHl+BYvvTeG3qSgUikHQW3j0sp4gXPw2kxw6sjVgLFOc4FB6LGqwzOTzokCQQCYdYG8ty3Uo/ebUlNzeJFxHXjy/KvBSytAUzAXkRu3nZrkEaPQsi3dgOkZgk+F1fMDzfQ4EbDIU6xvqOoZXHg7AkATCW9XfoXR8anKfRMoP5Nwn9HOMbtR2cmaxK2TknV/bMZ8AsYETYwfj5+tuIJIJybC2RyykX/sIiN1CqS5xr7ZAkArj19rMRdaKyMi8MnBM1Cy9g3Jt2HHj5ejAGG8SgyWUOShh1y70z0BjcSMMkxQXAncK2s83ekZw7aADM4eQupjAkARRgTwwMOnn3IoKmQusKhZk0uxilZ4Zc2LH6Z4GiWnvteM0W8Zw4Z1lJUcjgQq3dGqL2RdmzeQZ+HgPIOXrZVK

package/package.json

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

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

@@ -6,6 +6,7 @@ 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 {
+  hasNativeFilePicker,
   openNativeFilePicker,
   triggerBrowserFileInput,
 } from '@af-mobile-client-vue3/utils/nativeFilePicker'
@@ -49,6 +50,7 @@ const imageList = ref<Array<any>>(props.imageList ?? [])
 const parentData: any = inject('provideParent')
 const imageInputRef = ref<HTMLInputElement | undefined>()
 const documentInputRef = ref<HTMLInputElement | undefined>()
+const showActionSheet = ref(false)
 
 const documentAccept = computed(() => buildInputAccept(props.attr?.accept))
 
@@ -56,9 +58,7 @@ function openImageFilePicker() {
   triggerBrowserFileInput(imageInputRef.value)
 }
 
-function openDocumentFilePicker() {
-  triggerBrowserFileInput(documentInputRef.value)
-}
+const useNativeDocumentPicker = computed(() => hasNativeFilePicker())
 
 function emitUpdatesAfterChange() {
   // 新增：对外抛出完整与ID列表
@@ -260,8 +260,16 @@ function handleNativeDocumentUpload(fileData: NativePickedFile) {
   })
 }
 
-function triggerDocumentPicker() {
-  const startedNative = openNativeFilePicker({
+function onDocumentInputChange(e: Event) {
+  const input = e.target as HTMLInputElement
+  handleBrowserDocumentFiles(input.files)
+  showActionSheet.value = false
+  input.value = ''
+}
+
+function onPickDocumentNative() {
+  showActionSheet.value = false
+  openNativeFilePicker({
     accept: documentAccept.value,
     multiple: true,
     onSuccess: files => files.forEach(handleNativeDocumentUpload),
@@ -270,11 +278,6 @@ function triggerDocumentPicker() {
         showFailToast(msg)
     },
   })
-  if (startedNative)
-    return
-
-  // 与「相册中选择」一致：ActionSheet 点击后立即调起系统文件选择器
-  openDocumentFilePicker()
 }
 
 // 触发拍照
@@ -562,47 +565,35 @@ function deleteFileFunction(file: any) {
   return false // 阻止van-uploader二次处理
 }
 
-const showActionSheet = ref(false)
 const uploaderRef = ref()
 
-const actionOptions = [
-  { name: '拍摄', key: 'camera' },
-  { name: '相册中选择', key: 'album' },
-  { name: '文件上传', key: 'document' },
-]
-
 function handleUploadAreaClick() {
   if (props.readonly)
     return
   showActionSheet.value = true
 }
 
-function handleActionSelect(option: any) {
-  if (option.key === 'document') {
-    triggerDocumentPicker()
-    showActionSheet.value = false
-    return
-  }
+function onPickCamera() {
   showActionSheet.value = false
-  if (option.key === 'camera') {
-    triggerCamera()
-  }
-  else if (option.key === 'album') {
-    mobileUtil.execute({
-      funcName: 'photoAlbum',
-      param: {},
-      callbackFunc: (result: any) => {
-        if (result.status === 'success') {
-          result.data?.photos.forEach((photo: any) => {
-            rePhotoCheck(photo)
-          })
-        }
-        else {
-          openImageFilePicker()
-        }
-      },
-    })
-  }
+  triggerCamera()
+}
+
+function onPickAlbum() {
+  showActionSheet.value = false
+  mobileUtil.execute({
+    funcName: 'photoAlbum',
+    param: {},
+    callbackFunc: (result: any) => {
+      if (result.status === 'success') {
+        result.data?.photos.forEach((photo: any) => {
+          rePhotoCheck(photo)
+        })
+      }
+      else {
+        openImageFilePicker()
+      }
+    },
+  })
 }
 
 function getUploadStatus() {
@@ -636,15 +627,6 @@ defineExpose({
       class="hidden-file-input"
       @change="(e:any) => handleBrowserImageFiles(e.target.files)"
     >
-    <!-- 通用文件选择（PDF / Word 等） -->
-    <input
-      ref="documentInputRef"
-      type="file"
-      multiple
-      :accept="documentAccept"
-      class="hidden-file-input"
-      @change="(e:any) => handleBrowserDocumentFiles(e.target.files)"
-    >
     <van-uploader
       ref="uploaderRef"
       v-model="imageList"
@@ -680,11 +662,37 @@ defineExpose({
     </van-uploader>
     <ActionSheet
       v-model:show="showActionSheet"
-      :actions="actionOptions"
       teleport="body"
       cancel-text="取消"
-      @select="handleActionSelect"
-    />
+    >
+      <div class="upload-source-sheet">
+        <button type="button" class="upload-source-sheet__item" @click="onPickCamera">
+          拍摄
+        </button>
+        <button type="button" class="upload-source-sheet__item" @click="onPickAlbum">
+          相册中选择
+        </button>
+        <button
+          v-if="useNativeDocumentPicker"
+          type="button"
+          class="upload-source-sheet__item"
+          @click="onPickDocumentNative"
+        >
+          文件上传
+        </button>
+        <label v-else class="upload-source-sheet__item upload-source-sheet__item--file">
+          文件上传
+          <input
+            ref="documentInputRef"
+            type="file"
+            multiple
+            :accept="documentAccept"
+            class="upload-source-sheet__file-input"
+            @change="onDocumentInputChange"
+          >
+        </label>
+      </div>
+    </ActionSheet>
   </div>
 </template>
 
@@ -749,6 +757,42 @@ defineExpose({
   }
 }
 
+.upload-source-sheet {
+  &__item {
+    display: block;
+    width: 100%;
+    padding: 14px 16px;
+    font-size: 16px;
+    line-height: 22px;
+    text-align: center;
+    background: #fff;
+    border: none;
+    color: #323233;
+    cursor: pointer;
+    position: relative;
+    box-sizing: border-box;
+
+    & + & {
+      border-top: 1px solid #ebedf0;
+    }
+  }
+
+  &__item--file {
+    margin: 0;
+  }
+
+  /* 用户手指直接点 input，WebView 才允许调起系统文件选择器（程序化 click 在 APK 内会被拦截） */
+  &__file-input {
+    position: absolute;
+    inset: 0;
+    width: 100%;
+    height: 100%;
+    opacity: 0;
+    cursor: pointer;
+    font-size: 0;
+  }
+}
+
 .file-type-tile {
   position: absolute;
   inset: 0;

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>