af-mobile-client-vue3 1.6.2 → 1.6.4

package/package.json

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

package/src/views/SafeInspection/SecurityCertificate/index.vue

@@ -170,6 +170,8 @@ const elapsedSeconds = ref(0)
 const timerDisplay = ref('00:00')
 
 const signatureAllInfo = ref(null)
+// 是否显示保存按钮
+const hideSaveButton = ref(false)
 
 // 启动计时器
 function startTimer() {
@@ -446,6 +448,8 @@ onBeforeMount(() => {
   safeCheckPaperId.value = route.query.paperId as string
   // 临时保存类型
   draftType.value = route.query.draftType as string
+  // 是否隐藏保存按钮
+  hideSaveButton.value = route.query.hideSaveButton as string === 'true'
   // 将路由中的extData参数存储到安检单的f_data中
   try {
     const ext = JSON.parse(route.query.extData as string)
@@ -2724,7 +2728,7 @@ provide('provideParent', {
       <VanButton icon="passed" type="primary" class="submit-btn" @click="onSubmit">
         上传
       </VanButton>
-      <VanButton v-if="!safeCheckPaperId" icon="bookmark" type="warning" class="save-btn" @click="saveDraftData">
+      <VanButton v-if="(!hideSaveButton) && (!safeCheckPaperId)" icon="bookmark" type="warning" class="save-btn" @click="saveDraftData">
         保存
       </VanButton>
       <!--      测试 -->

package/src/views/SafeInspection/SecurityCertificate/photoAiRecognition/components/PhotoCaptureCard.vue

@@ -12,8 +12,8 @@
  */
 import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
 import { Icon } from '@iconify/vue'
-import { showFailToast, Button as VanButton, Icon as VanIcon } from 'vant'
-import { inject } from 'vue'
+import { ActionSheet, showFailToast, Button as VanButton, Icon as VanIcon } from 'vant'
+import { inject, ref } from 'vue'
 
 /**
  * 组件 Props 接口定义
@@ -23,6 +23,7 @@ const props = defineProps<{
   currentCount: number // 当前已拍摄的照片数量
   maxCount: number // 该步骤允许的最大拍照数量
   isLast: boolean // 是否为最后一个步骤
+  enableUpload?: boolean // 是否启用上传功能（true时点击拍照按钮先弹出选择）
 }>()
 
 /**
@@ -54,6 +55,73 @@ const parentData: any = inject('provideParent', null)
 // 核心业务方法
 // ========================================
 
+/** 操作选择菜单（拍照/上传） */
+const showActionSheet = ref(false)
+const uploadActionOptions = [
+  { name: '拍照', key: 'camera' },
+  { name: '上传', key: 'upload' },
+]
+
+/**
+ * 点击拍照按钮时的处理函数
+ *
+ * 功能说明：
+ * - 如果 enableUpload 为 true，则弹出选择菜单（拍照/上传）
+ * - 否则直接触发相机拍照（原有逻辑）
+ */
+function handleCaptureClick() {
+  if (props.maxCount > 0 && props.currentCount >= props.maxCount) {
+    showFailToast(`最多拍摄${props.maxCount}张`)
+    return
+  }
+
+  if (props.enableUpload) {
+    showActionSheet.value = true
+  }
+  else {
+    triggerCamera()
+  }
+}
+
+/**
+ * 操作选择菜单回调
+ * @param option - 选中的操作项
+ */
+function handleActionSelect(option: any) {
+  showActionSheet.value = false
+  if (option.key === 'camera') {
+    triggerCamera()
+  }
+  else if (option.key === 'upload') {
+    triggerAlbumUpload()
+  }
+}
+
+/**
+ * 从手机相册选择照片上传（仅限手机，不支持浏览器）
+ *
+ * 功能说明：
+ * 1. 调用Native方法打开手机相册
+ * 2. 选择照片后通过 queueUpload 上传到服务器
+ * 3. 选择失败时仅提示错误，不降级到浏览器上传
+ */
+function triggerAlbumUpload() {
+  mobileUtil.execute({
+    funcName: 'photoAlbum',
+    param: {},
+    callbackFunc: (result: any) => {
+      if (result.status === 'success') {
+        result.data?.photos?.forEach((photo: any) => {
+          queueUpload(photo)
+        })
+      }
+      else {
+        showFailToast(result?.message || '选择照片失败')
+      }
+    },
+  })
+}
+
 /**
  * 触发相机拍照
  *
@@ -193,7 +261,7 @@ function queueUpload(photoData: any) {
         class="icon-btn"
         round
         type="primary"
-        @click="triggerCamera"
+        @click="handleCaptureClick"
       >
         <VanIcon name="photograph" />
       </VanButton>
@@ -228,6 +296,14 @@ function queueUpload(photoData: any) {
         <VanIcon name="down" class="rotate-left" />
       </VanButton>
     </div>
+    <!-- 拍照/上传选择菜单 -->
+    <ActionSheet
+      v-model:show="showActionSheet"
+      :actions="uploadActionOptions"
+      cancel-text="取消"
+      teleport="body"
+      @select="handleActionSelect"
+    />
   </div>
 </template>
 

package/src/views/SafeInspection/SecurityCertificate/photoAiRecognition/index.vue

@@ -30,6 +30,7 @@ interface PhotoStep {
   minAcceptCount?: number // 该步骤最少要求的照片数量
   acceptCount?: number // 该步骤最多允许的照片数量
   params?: any // AI识别参数配置
+  enableUpload?: boolean // 是否启用上传功能（true时拍照按钮显示拍照/上传选择）
 }
 
 /**
@@ -192,6 +193,7 @@ function init() {
         minAcceptCount: 0,
         acceptCount: Number(item.picNum) || 0,
         params: item.params,
+        enableUpload: !!item.enableUpload,
       }))
       photoAiRecognitionConfig.value = { formJson }
       normalizeFormDataBySteps()
@@ -202,7 +204,13 @@ function init() {
     else {
       getConfigByName(fromConfig, (res: any) => {
         console.warn('>>>>res', res)
-        photoAiRecognitionConfig.value = res
+        photoAiRecognitionConfig.value = {
+          ...res,
+          formJson: (res?.formJson || []).map((item: any) => ({
+            ...item,
+            enableUpload: !!item.enableUpload,
+          })),
+        }
         console.warn('>>>>stepColumns', stepColumns)
         // 根据步骤配置初始化/重置表单数据
         normalizeFormDataBySteps()
@@ -733,6 +741,7 @@ defineExpose({
           :current-count="getStepPhotoCount(step.model)"
           :max-count="Number(step.acceptCount ?? 0)"
           :is-last="step.model === stepColumns[stepColumns.length - 1]?.model"
+          :enable-upload="step.enableUpload"
           @capture="(file) => handleCaptureSuccess(step, file)"
           @next="handleNextStep"
           @prev="handlePrevStep"