af-mobile-client-vue3 1.3.61 → 1.3.64

package/package.json

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

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

@@ -17,6 +17,7 @@ const props = defineProps({
   mode: { default: '新增' }, // 预览
   // 整体只读：只允许预览，禁止拍照/上传/删除
   readonly: { type: Boolean, default: false },
+  isAsyncUpload: { type: Boolean, default: false },
 })
 const emit = defineEmits(['updateFileList', 'updateAllFileList'])
 
@@ -157,6 +158,8 @@ function handlePhotoUpload(photoData: any) {
     status: 'uploading',
     message: '上传中...',
     url: `data:${mimeType};base64,${photoData.content}`,
+    isImage: true,
+    type: mimeType,
   }
 
   if (!imageList.value) {
@@ -178,40 +181,80 @@ function handlePhotoUpload(photoData: any) {
     imgPath: photoData.filePath,
     urlPath: `/api/${import.meta.env.VITE_APP_SYSTEM_NAME}/resource/upload`,
   }
-  // 上传到服务器
-  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
-          delete imageList.value[index].message
-          imageList.value[index].status = 'done'
-          imageList.value[index].url = result.data.f_downloadpath
+  if (props.isAsyncUpload) {
+    // 添加上传队列
+    mobileUtil.execute({
+      funcName: 'queueUpload',
+      param,
+      callbackFunc: (res: any) => {
+        console.warn('上传结果', res)
+        // 成功
+        if (res.data && res.data.enqueued) {
+          const index = imageList.value.findIndex(item => item.uid === tempFile.uid)
+          console.log('index--------', index)
+          if (index !== -1) {
+            delete imageList.value[index].message
+            imageList.value[index].status = 'done'
+            imageList.value[index].pthotoName = photoData.name
+            imageList.value[index].type = mimeType
+          }
+          else {
+            if (index !== -1) {
+              imageList.value[index].status = 'failed'
+              imageList.value[index].message = '上传失败'
+            }
+          }
         }
-      }
-      else {
-        if (index !== -1) {
-          imageList.value[index].status = 'failed'
-          imageList.value[index].message = '上传失败'
+
+        emit('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.pthotoName)
+
+        if (props.outerIndex !== undefined)
+          emit('updateFileList', doneIds, props.outerIndex)
+        else
+          emit('updateFileList', doneIds)
+      },
+    })
+  }
+  else {
+    // 上传到服务器
+    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
+            delete imageList.value[index].message
+            imageList.value[index].status = 'done'
+            imageList.value[index].url = result.data.f_downloadpath
+          }
+        }
+        else {
+          if (index !== -1) {
+            imageList.value[index].status = 'failed'
+            imageList.value[index].message = '上传失败'
+          }
         }
-      }
 
-      emit('updateAllFileList', imageList.value.filter(item => item.status === 'done').map(item => item)) // 新增
+        emit('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)
+        const doneIds = Object.values(imageList.value)
+          .filter(item => item.status === 'done')
+          .map(item => item.id)
 
-      if (props.outerIndex !== undefined)
-        emit('updateFileList', doneIds, props.outerIndex)
-      else
-        emit('updateFileList', doneIds)
-    },
-  })
+        if (props.outerIndex !== undefined)
+          emit('updateFileList', doneIds, props.outerIndex)
+        else
+          emit('updateFileList', doneIds)
+      },
+    })
+  }
 }
 
 // 删除图片
@@ -226,13 +269,21 @@ function deleteFileFunction(file: any) {
 
         emit('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)
+        const doneIds = ref(null)
+        if (props.isAsyncUpload) {
+          doneIds.value = Object.values(imageList.value)
+            .filter(item => item.status === 'done')
+            .map(item => item.pthotoName)
+        }
+        else {
+          doneIds.value = Object.values(imageList.value)
+            .filter(item => item.status === 'done')
+            .map(item => item.id)
+        }
         if (props.outerIndex !== undefined)
-          emit('updateFileList', doneIds, props.outerIndex)
+          emit('updateFileList', doneIds.value, props.outerIndex)
         else
-          emit('updateFileList', doneIds)
+          emit('updateFileList', doneIds.value)
       }
     })
     return false // 已手动移除，阻止van-uploader再次移除
@@ -245,13 +296,21 @@ function deleteFileFunction(file: any) {
 
   emit('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)
+  const doneIds = ref(null)
+  if (props.isAsyncUpload) {
+    doneIds.value = Object.values(imageList.value)
+      .filter(item => item.status === 'done')
+      .map(item => item.pthotoName)
+  }
+  else {
+    doneIds.value = Object.values(imageList.value)
+      .filter(item => item.status === 'done')
+      .map(item => item.id)
+  }
   if (props.outerIndex !== undefined)
-    emit('updateFileList', doneIds, props.outerIndex)
+    emit('updateFileList', doneIds.value, props.outerIndex)
   else
-    emit('updateFileList', doneIds)
+    emit('updateFileList', doneIds.value)
 
   return false // 阻止van-uploader二次处理
 }
@@ -330,7 +389,7 @@ function handleActionSelect(option: any) {
         上传附件
       </div>
       <div v-if="props.attr?.acceptCount" class="upload-desc">
-        已上传 {{ imageList.length }} 个，最多可上传 {{ props.attr?.acceptCount }} 个
+        上传限制: {{ imageList.length }} / {{ props.attr?.acceptCount }}
       </div>
     </div>
     <van-uploader

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

@@ -62,6 +62,8 @@ const props = withDefaults(defineProps<{
   isGroupForm?: boolean
   // 整体表单只读：为 true 时，所有表单项不可交互
   formReadonly?: boolean
+  // 控制上传——异步/同步
+  isAsyncUpload?: boolean
 }>(), {
   configName: undefined,
   groupTitle: undefined,
@@ -75,6 +77,7 @@ const props = withDefaults(defineProps<{
   paramLogicNameParam: {},
   isGroupForm: false,
   formReadonly: false,
+  isAsyncUpload: false,
 })
 
 const emits = defineEmits(['onSubmit', 'xFormItemEmitFunc'])
@@ -138,7 +141,7 @@ const previewLonLatKey = computed(() => {
 
 const previewMapPoint = computed(() => {
   const val = form.value[previewLonLatKey.value]
-  if (val && typeof val === 'string' && val.includes(',')) {
+  if (previewMapRef.value && val && typeof val === 'string' && val.includes(',')) {
     const [lon, lat] = val.split(',').map(Number)
     if (!Number.isNaN(lon) && !Number.isNaN(lat)) {
       return [lon, lat]
@@ -612,6 +615,7 @@ defineExpose({ init, form, formGroupName, validate, asyncSubmit, setForm, getFor
           :service-name="myServiceName"
           :get-data-params="myGetDataParams"
           :form-readonly="props.formReadonly"
+          :is-async-upload="props.isAsyncUpload"
           @set-form="setForm"
           @x-form-item-emit-func="emitFunc"
         />
@@ -619,7 +623,7 @@ defineExpose({ init, form, formGroupName, validate, asyncSubmit, setForm, getFor
       </VanCellGroup>
       <slot name="extraCellGroup" />
       <!-- 地图预览，统一放在表单项下方，只在有经纬度时显示 -->
-      <div v-if="previewMapPoint" style="height: 200px; margin-top: 12px; position: relative;">
+      <div v-if="previewLonLatKey" v-show="previewMapPoint" style="height: 200px; margin-top: 12px; position: relative;">
         <XOlMap
           ref="previewMapRef"
           :center="previewMapPoint"

package/src/components/data/XFormGroup/doc/DeviceForm.vue

@@ -119,4 +119,4 @@ onUnmounted(() => {
     color: #ff976a;
   }
 }
-</style>
+</style>

package/src/components/data/XFormGroup/doc/UserForm.vue

@@ -99,4 +99,4 @@ onUnmounted(() => {
 .user-form {
   padding: 16px;
 }
-</style>
+</style>

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

@@ -94,6 +94,10 @@ const props = defineProps({
       return { text: 'label', value: 'value' }
     },
   },
+  isAsyncUpload: {
+    type: Boolean,
+    default: false,
+  },
 
 })
 
@@ -587,10 +591,7 @@ function init() {
 }
 
 function getDataCallback(res) {
-  option.value = res.map(item => ({
-    ...item,
-    value: item.label, // 将value设置为label的值
-  }))
+  option.value = res
   if (attr.type === 'radio')
     initRadioValue()
 }
@@ -988,6 +989,7 @@ function findOptionInTree(options, value) {
           :attr="attr"
           :mode="props.mode"
           :readonly="readonly"
+          :is-async-upload="isAsyncUpload"
           @update-file-list="updateFile"
         />
       </template>

package/src/components/data/XReportGrid/XReportDemo.vue

@@ -1,33 +1,33 @@
-<script setup lang="ts">
-import { onMounted, ref } from 'vue'
-import XReport from './XReport.vue'
-
-const mainRef = ref()
-
-onMounted(() => {
-  // 初始化逻辑
-})
-</script>
-
-<template>
-  <div id="test">
-    <van-card :bordered="false">
-      <XReport
-        ref="mainRef"
-        :use-oss-for-img="false"
-        config-name="nurseWorkstationCover"
-        server-name="af-his"
-        :show-img-in-cell="true"
-        :display-only="true"
-        :edit-mode="false"
-        :show-save-button="false"
-        :no-padding="true"
-        :dont-format="true"
-      />
-    </van-card>
-  </div>
-</template>
-
-<style scoped>
-
-</style>
+<script setup lang="ts">
+import { onMounted, ref } from 'vue'
+import XReport from './XReport.vue'
+
+const mainRef = ref()
+
+onMounted(() => {
+  // 初始化逻辑
+})
+</script>
+
+<template>
+  <div id="test">
+    <van-card :bordered="false">
+      <XReport
+        ref="mainRef"
+        :use-oss-for-img="false"
+        config-name="nurseWorkstationCover"
+        server-name="af-his"
+        :show-img-in-cell="true"
+        :display-only="true"
+        :edit-mode="false"
+        :show-save-button="false"
+        :no-padding="true"
+        :dont-format="true"
+      />
+    </van-card>
+  </div>
+</template>
+
+<style scoped>
+
+</style>