af-mobile-client-vue3 1.2.53 → 1.2.55

package/package.json

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

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

@@ -6,7 +6,7 @@ import {
   ActionSheet,
   Uploader as vanUploader,
 } from 'vant'
-import { ref, watch } from 'vue'
+import { ref } from 'vue'
 
 const props = defineProps({
   imageList: Array<any>,
@@ -19,11 +19,6 @@ const emit = defineEmits(['updateFileList'])
 
 const imageList = ref<Array<any>>(props.imageList ?? [])
 
-// 同步 props.imageList 到内部 imageList，保证每次变化都响应
-watch(() => props.imageList, (newVal) => {
-  imageList.value = Array.isArray(newVal) ? [...newVal] : []
-}, { immediate: true })
-
 // 触发拍照
 function triggerCamera() {
   mobileUtil.execute({
@@ -84,8 +79,8 @@ function handlePhotoUpload(photoData: any) {
     funcName: 'uploadResource',
     param,
     callbackFunc: (result: any) => {
+      const index = imageList.value.findIndex(item => item.uid === tempFile.uid)
       if (result.status === 'success') {
-        const index = imageList.value.findIndex(item => item.uid === tempFile.uid)
         if (index !== -1) {
           imageList.value[index].uid = result.data.id
           imageList.value[index].id = result.data.id
@@ -95,7 +90,6 @@ function handlePhotoUpload(photoData: any) {
         }
       }
       else {
-        const index = imageList.value.findIndex(item => item.uid === tempFile.uid)
         if (index !== -1) {
           imageList.value[index].status = 'failed'
           imageList.value[index].message = '上传失败'
@@ -105,7 +99,6 @@ function handlePhotoUpload(photoData: any) {
       const doneIds = Object.values(imageList.value)
         .filter(item => item.status === 'done')
         .map(item => item.id)
-      console.log('>>>> doneIds: ', JSON.stringify(doneIds))
 
       if (props.outerIndex !== undefined)
         emit('updateFileList', doneIds, props.outerIndex)
@@ -123,10 +116,13 @@ function deleteFileFunction(file: any) {
         const targetIndex = imageList.value.findIndex(item => item.id === file.id)
         if (targetIndex !== -1) {
           imageList.value.splice(targetIndex, 1)
+          const doneIds = Object.values(imageList.value)
+            .filter(item => item.status === 'done')
+            .map(item => item.id)
           if (props.outerIndex !== undefined)
-            emit('updateFileList', imageList.value.filter(item => item.status === 'done'), props.outerIndex)
+            emit('updateFileList', doneIds, props.outerIndex)
           else
-            emit('updateFileList', imageList.value.filter(item => item.status === 'done'))
+            emit('updateFileList', doneIds)
         }
       }
     })

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

@@ -339,7 +339,6 @@ watch(
 watch(
   () => modelData.value,
   (newVal, oldVal) => {
-    console.log('变更函数新旧值-----', newVal, oldVal)
     // 避免初始化时的调用
     if (newVal !== oldVal) {
       dataChangeFunc()
@@ -348,10 +347,20 @@ watch(
   { deep: true },
 )
 
+// 监听 option.value 的变化
+watch(
+  () => option.value,
+  (newOption) => {
+    if (attr.type === 'treeSelect' && newOption && newOption.length > 0) {
+      // 你可以在这里调用 findOptionInTree 函数来查找默认值对应的 label
+      const result = findOptionInTree(option.value, modelData.value)
+      if (attr.type === 'treeSelect' && result)
+        treeValue.value = result.label
+    }
+  },
+)
+
 function updateFile(files, _index) {
-  // 处理文件数据
-  // 更新本地值
-  console.log('>>>> 更新文件数据-----', JSON.stringify(files))
   modelData.value = files
 }
 
@@ -759,13 +768,36 @@ function cleanEmptyChildren(options, fieldNames = { text: 'label', value: 'value
 function onTreeSelectFinish({ selectedOptions }) {
   const index = selectedOptions.length - 1
   treeValue.value = selectedOptions[index].label
-  modelData.value = [selectedOptions[index].value]
+  if (mode === '查询') {
+    modelData.value = [selectedOptions[index].value]
+  }
+  else {
+    modelData.value = selectedOptions[index].value
+  }
   showTreeSelect.value = false
 }
 
 function emitFunc(func, data) {
   emits('xFormItemEmitFunc', func, data, data?.model ? form[data.model] : form)
 }
+
+function findOptionInTree(options, value) {
+  // 在当前层级查找
+  const foundItem = options.find(item => item[columnsField.value] === value)
+  if (foundItem) {
+    return foundItem
+  }
+  // 递归查找子级
+  for (const item of options) {
+    if (item.children?.length) {
+      const foundInChildren = findOptionInTree(item.children, value)
+      if (foundInChildren)
+        return foundInChildren
+    }
+  }
+
+  return null
+}
 </script>
 
 <template>