af-mobile-client-vue3 1.3.50 → 1.3.52

package/package.json

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

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

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import cameraIcon from '@af-mobile-client-vue3/assets/img/component/camera.png'
-import { deleteFile } from '@af-mobile-client-vue3/services/api/common'
+import { deleteFile, upload } from '@af-mobile-client-vue3/services/api/common'
 import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
 import {
   ActionSheet,
@@ -20,6 +20,103 @@ const emit = defineEmits(['updateFileList', 'updateAllFileList'])
 
 const imageList = ref<Array<any>>(props.imageList ?? [])
 
+// 浏览器模式：隐藏的文件输入（选择 / 拍照）
+const fileInputRef = ref<HTMLInputElement | undefined>()
+const cameraInputRef = ref<HTMLInputElement | undefined>()
+
+function openBrowserFilePicker() {
+  if (fileInputRef.value) {
+    fileInputRef.value.value = ''
+    fileInputRef.value.click()
+  }
+}
+
+function openBrowserCameraPicker() {
+  if (cameraInputRef.value) {
+    cameraInputRef.value.value = ''
+    cameraInputRef.value.click()
+  }
+}
+
+function emitUpdatesAfterChange() {
+  // 新增：对外抛出完整与ID列表
+  (emit as any)('updateAllFileList', imageList.value.filter(item => item.status === 'done').map(item => item))
+  const doneIds = Object.values(imageList.value)
+    .filter(item => item.status === 'done')
+    .map(item => item.id)
+  if (props.outerIndex !== undefined) {
+    (emit as any)('updateFileList', doneIds, props.outerIndex)
+  }
+  else {
+    (emit as any)('updateFileList', doneIds)
+  }
+}
+
+function createTempUploadingItem(name: string, previewUrl: string) {
+  const temp = {
+    uid: Date.now() + Math.random().toString(36).substr(2, 5),
+    name,
+    status: 'uploading',
+    message: '上传中...',
+    url: previewUrl,
+  }
+  if (!imageList.value)
+    imageList.value = [temp]
+  else imageList.value.push(temp)
+  return temp
+}
+
+function uploadFileViaHttp(file: File, previewUrl: string, temp: any) {
+  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', file.name)
+  formData.append('filesize', (file.size / 1024 / 1024).toFixed(4))
+  formData.append('f_operator', 'server')
+
+  upload(formData, import.meta.env.VITE_APP_SYSTEM_NAME, { 'Content-Type': 'multipart/form-data' }).then((res: any) => {
+    const index = imageList.value.findIndex(item => item.uid === temp.uid)
+    if (res?.data?.id) {
+      if (index !== -1) {
+        imageList.value[index].uid = res.data.id
+        imageList.value[index].id = res.data.id
+        delete imageList.value[index].message
+        imageList.value[index].status = 'done'
+        imageList.value[index].url = res.data.f_downloadpath
+      }
+    }
+    else {
+      if (index !== -1) {
+        imageList.value[index].status = 'failed'
+        imageList.value[index].message = '上传失败'
+      }
+    }
+    emitUpdatesAfterChange()
+  })
+}
+
+function handleBrowserFiles(files: FileList | null) {
+  if (!files || files.length === 0)
+    return
+  const max = props.attr?.acceptCount ?? Number.POSITIVE_INFINITY
+  for (let i = 0; i < files.length; i++) {
+    if (imageList.value.length >= max)
+      break
+    const file = files[i]
+    const reader = new FileReader()
+    reader.onload = (e: any) => {
+      const previewUrl = e.target?.result as string
+      const temp = createTempUploadingItem(file.name, previewUrl)
+      uploadFileViaHttp(file, previewUrl, temp)
+    }
+    reader.readAsDataURL(file)
+  }
+}
+
 // 触发拍照
 function triggerCamera() {
   mobileUtil.execute({
@@ -29,6 +126,10 @@ function triggerCamera() {
       if (result.status === 'success') {
         handlePhotoUpload(result.data)
       }
+      else {
+        // 浏览器模式：调起相机输入
+        openBrowserCameraPicker()
+      }
     },
   })
 }
@@ -185,6 +286,10 @@ function handleActionSelect(option: any) {
             handlePhotoUpload(photo)
           })
         }
+        else {
+          // 浏览器模式：打开文件选择
+          openBrowserFilePicker()
+        }
       },
     })
   }
@@ -193,6 +298,24 @@ function handleActionSelect(option: any) {
 
 <template>
   <div class="uploader-container">
+    <!-- 浏览器模式隐藏输入：文件选择 -->
+    <input
+      ref="fileInputRef"
+      type="file"
+      multiple
+      accept="image/*"
+      style="display:none"
+      @change="(e:any) => handleBrowserFiles(e.target.files)"
+    >
+    <!-- 浏览器模式隐藏输入：拍照（相机） -->
+    <input
+      ref="cameraInputRef"
+      type="file"
+      accept="image/*"
+      capture="environment"
+      style="display:none"
+      @change="(e:any) => handleBrowserFiles(e.target.files)"
+    >
     <div
       v-if="props.mode !== '预览' && (imageList.length < props.attr?.acceptCount && props.attr?.addOrEdit !== 'readonly')"
       class="custom-upload-area"

package/src/components/data/XFormItem/index.vue

@@ -729,7 +729,7 @@ function handleAddressConfirm(location) {
 
 // 重置方法，供父组件调用
 function reset() {
-  modelData.value = null
+  modelData.value = getDefaultValue()
   errorMessage.value = ''
   treeValue.value = null
   area.value = null

package/src/views/component/XCellListView/index.vue

@@ -12,8 +12,8 @@ const router = useRouter()
 const idKey = ref('o_id')
 
 // 简易crud表单测试
-const configName = ref('lngChargeAuditMobileCRUD')
-const serviceName = ref('af-gaslink')
+const configName = ref('crud_patroltask_managePhoneCRUD')
+const serviceName = ref('af-linepatrol')
 
 // 资源权限测试
 // const configName = ref('crud_sources_test')
@@ -95,8 +95,6 @@ function deleteRow(result) {
       <XCellList
         :config-name="configName"
         :service-name="serviceName"
-        :fix-query-form="{ o_f_oper_name: 'edu_test' }"
-        :id-key="idKey"
         @to-detail="toDetail"
         @delete-row="deleteRow"
       />

package/src/views/component/XFormView/index.vue

@@ -3,10 +3,13 @@ import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
 import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
 import { ref } from 'vue'
 
-const configName = ref('AddConstructionForm')
-const serviceName = ref('af-linepatrol')
+const configName = ref('sealCheckInForm')
+const serviceName = ref('af-safecheck')
 
 const formGroupAddConstruction = ref(null)
+function submit(s) {
+  console.log('>>>> ss: ', JSON.stringify(s))
+}
 </script>
 
 <template>
@@ -17,6 +20,7 @@ const formGroupAddConstruction = ref(null)
         mode="新增"
         :config-name="configName"
         :service-name="serviceName"
+        @on-submit="submit"
       />
     </template>
   </NormalDataLayout>

package/src/views/user/my/index.vue

@@ -18,7 +18,7 @@ const showModifyPassword = ref(false)
 // 退出登录确认弹窗显示状态
 const showLogoutConfirm = ref(false)
 // 在setup函数中
-let intervalId = null
+let intervalId: number | null = null
 
 // 定义一个变量来存储上一次的上传结果
 const lastUploadResult = ref(null)
@@ -51,102 +51,73 @@ interface UploadResult {
 }
 
 // 兼容 lastUploadResult 可能为字符串或对象
-const lastUploadResultObj = computed<UploadResult | null>(() => {
-  if (!lastUploadResult.value)
-    return null
-  if (typeof lastUploadResult.value === 'string') {
-    try {
-      return JSON.parse(lastUploadResult.value)
-    }
-    catch {
-      return null
-    }
-  }
-  return lastUploadResult.value
-})
+interface LocationStatusTag { text: string, color: 'red' | 'green' | 'yellow' }
+interface LocationStatusInfo { uploadTime: string, latitude: number, longitude: number }
 
-const uploadDisplayInfo = computed(() => {
-  const result = lastUploadResultObj.value
-  if (!result)
-    return { error: null, info: null }
-  // response.code 不为 200
-  if (result.response && result.response.code !== 200) {
-    return { error: result.response.msg || '未知错误', info: null }
+const locationStatus = computed(() => {
+  console.warn('上次定位信息:', lastUploadResult.value)
+  if (lastUploadResult.value === null) {
+    return { error: null, statusTag: { text: '正在获取上次上传定位信息', color: 'yellow' } }
+  }
+  if (lastUploadResult.value.status === 'error') {
+    console.warn('上次定位信息解析失败:', lastUploadResult.value)
+    return { error: null, statusTag: { text: lastUploadResult.value.msg, color: 'yellow' } }
   }
 
-  // location.errorCode 存在且 isError 为 true
-  if (result.location && result.location.isError && result.location.errorCode) {
-    return { error: result.location.errorCode, info: null }
+  if (lastUploadResult.value.data.location && lastUploadResult.value.data.location.isError) {
+    const error = lastUploadResult.value.data.location.errorCode
+    return { error, info: null, statusTag: { text: '获取定位失败', color: 'red' } }
   }
 
-  // 正常展示
-  if (result.location) {
-    return {
-      error: null,
-      info: {
-        uploadTime: result.uploadTime,
-        latitude: result.location.f_latitude,
-        longitude: result.location.f_longitude,
-      },
+  if (lastUploadResult.value.data.location) {
+    const info: LocationStatusInfo = {
+      uploadTime: lastUploadResult.value.data.uploadTime,
+      latitude: lastUploadResult.value.data.location.f_latitude,
+      longitude: lastUploadResult.value.data.location.f_longitude,
     }
+    return { error: null, info, statusTag: { text: '正在上传定位', color: 'green' } }
   }
 
-  return { error: null, info: null }
+  return { error: null, info: null, statusTag: null }
 })
 
-const uploadStatusTag = computed(() => {
-  const result = uploadDisplayInfo.value
-  if (result.error) {
-    return { text: '上传定位失败', color: 'red' }
+// 安全获取上次实时上传结果（封装 try/catch，避免初始化失败）
+function fetchLastRealtimeUploadResult(): void {
+  try {
+    mobileUtil.execute({
+      param: {},
+      funcName: 'getLastRealtimeUploadResult',
+      callbackFunc: (res: PhoneLocationStatus) => {
+        try {
+          console.warn('获取到的上次定位信息:', res)
+          if (res && res.status === 'success') {
+            lastUploadResult.value = res
+          }
+          else {
+            // 失败也不抛错，保留可能的返回内容用于显示错误状态
+            lastUploadResult.value = res ?? null
+          }
+        }
+        catch (err) {
+          console.error('处理定位回调异常:', err)
+        }
+      },
+    })
   }
-  if (result.info) {
-    return { text: '正在上传定位', color: 'green' }
+  catch (err) {
+    console.error('获取定位信息异常:', err)
   }
-  return null
-})
+}
 
 onMounted(() => {
   if (roleName?.includes('需要定位人员')) {
-    try {
-      mobileUtil.execute({
-        param: {},
-        funcName: 'getLastRealtimeUploadResult',
-        callbackFunc: (result: PhoneLocationStatus) => {
-          try {
-            if (result.status === 'success') {
-              lastUploadResult.value = result.data
-
-              // 首次成功才启动定时器
-              intervalId = setInterval(() => {
-                try {
-                  mobileUtil.execute({
-                    param: {},
-                    funcName: 'getLastRealtimeUploadResult',
-                    callbackFunc: (res: PhoneLocationStatus) => {
-                      if (res.status === 'success') {
-                        lastUploadResult.value = res.data
-                      }
-                    },
-                  })
-                }
-                catch (err) {
-                  console.error('定时获取定位信息异常:', err)
-                }
-              }, 10000)
-            }
-            else {
-              console.warn('首次定位获取失败，不启动定时器:', result)
-            }
-          }
-          catch (err) {
-            console.error('处理首次定位结果异常:', err)
-          }
-        },
-      })
-    }
-    catch (err) {
-      console.error('首次获取定位信息异常:', err)
-    }
+    // 立即尝试获取一次（失败也不会阻断初始化）
+    fetchLastRealtimeUploadResult()
+
+    // 无论首次结果如何，都启动定时器持续获取
+    intervalId = window.setInterval(() => {
+      fetchLastRealtimeUploadResult()
+    }, 10000)
   }
 })
 
@@ -208,10 +179,10 @@ const webMobileConfig = useSettingStore().getSetting()
             <h2 class="username">
               {{ username }}
               <span
-                v-if="uploadStatusTag"
-                class="upload-status-tag" :class="[uploadStatusTag.color]"
+                v-if="locationStatus.statusTag"
+                class="upload-status-tag" :class="[locationStatus.statusTag.color]"
               >
-                {{ uploadStatusTag.text }}
+                {{ locationStatus.statusTag.text }}
               </span>
             </h2>
             <p class="user-role">
@@ -403,6 +374,11 @@ const webMobileConfig = useSettingStore().getSetting()
               background: #fdeaea;
               border: 1px solid #ef4444;
             }
+            &.yellow {
+              color: #f59e0b;
+              background: #fffbeb;
+              border: 1px solid #f59e0b;
+            }
           }
 
           .user-role {