af-mobile-client-vue3 1.2.54 → 1.2.56

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.2.54",
+  "version": "1.2.56",
   "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,17 +90,20 @@ 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 = '上传失败'
         }
       }
 
+      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)
     },
   })
 }
@@ -118,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

@@ -361,18 +361,7 @@ watch(
 )
 
 function updateFile(files, _index) {
-  // 处理文件数据
-  // 更新本地值
-  modelData.value = files.map((file) => {
-    const newFile = { ...file }
-    if (newFile.content)
-      delete newFile.content
-    if (newFile.file)
-      delete newFile.file
-    if (newFile.objectUrl)
-      delete newFile.objectUrl
-    return newFile
-  })
+  modelData.value = files
 }
 
 // 表单校验的类型校验
@@ -384,7 +373,7 @@ function formTypeCheck(attr, value) {
   switch (attr.rule.type) {
     case 'string':
       if (value.length === 0) {
-        errorMessage.value = `${attr.name}必须为有效的字符串`
+        errorMessage.value = `请输入${attr.name}`
         return
       }
       break
@@ -529,7 +518,7 @@ const readonly = computed(() => {
 // 提示内容
 const placeholder = computed(() => {
   if (attr.addOrEdit === 'readonly')
-    return ' 暂无内容 ~ '
+    return '暂无内容 ~ '
   else
     return attr.placeholder ? attr.placeholder : `请选择${attr.name}`
 })
@@ -1229,6 +1218,7 @@ function findOptionInTree(options, value) {
     <VanField
       v-if="(attr.type === 'input' || attr.type === 'intervalPicker') && showItem"
       v-model="(modelData as string)"
+      style="align-items: center"
       :label="labelData"
       :label-align="labelAlign"
       :input-align="attr.inputAlign ? attr.inputAlign : 'left'"

package/src/views/component/XFormGroupView/xformgroup222.vue

@@ -1,97 +1,97 @@
-<script setup lang="ts">
-import XFormGroup from '@af-mobile-client-vue3/components/data/XFormGroup/index.vue'
-import { runLogic } from '@af-mobile-client-vue3/services/api/common'
-import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
-import dayjs from 'dayjs/esm/index'
-import { showToast } from 'vant'
-import { onMounted, ref } from 'vue'
-import { useRoute } from 'vue-router'
-
-const configName = ref('appapplyuserinfoFormGroup')
-const serviceName = ref('af-apply')
-const route = useRoute()
-const userInfo = useUserStore().getUserInfo()
-const workflowId = ref('2909')
-const userinfoid = ref('93015')
-const model = ref('编辑')
-const groupFormData = ref({})
-
-function submit(res) {
-  if (model.value === '新增') {
-    res.t_userinfo.f_operate_date = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    res.t_userinfo.f_orgid = userInfo.f_orgid
-    res.t_userinfo.f_orgname = userInfo.f_orgname
-    res.t_userinfo.f_depid = userInfo.f_depid
-    res.t_userinfo.f_depname = userInfo.f_depname
-    res.t_userinfo.f_operatorid = userInfo.f_operatorid
-    res.t_userinfo.f_operator = userInfo.f_operator
-    res.t_userinfo.f_workflow_id = this.f_workflow_id
-    res.t_userinfo.f_user_state = '预备'
-
-    res.t_userfiles.f_operate_date = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    res.t_userfiles.f_orgid = userInfo.f_orgid
-    res.t_userfiles.f_orgname = userInfo.f_orgname
-    res.t_userfiles.f_depid = userInfo.f_depid
-    res.t_userfiles.f_depname = userInfo.f_depname
-    res.t_userfiles.f_operatorid = userInfo.f_operatorid
-    res.t_userfiles.f_operator = userInfo.f_operator
-    res.t_userfiles.f_workflow_id = this.f_workflow_id
-    res.t_userfiles.f_table_state = '待开通'
-  }
-  let saveData = res
-  if (saveData.t_userfiles.f_gasbrand_id.length > 0) {
-    saveData.t_userfiles.f_gasbrand_id = saveData.t_userfiles.f_gasbrand_id[0]
-  }
-  if (saveData.t_userfiles.f_price_id.length > 0) {
-    saveData.t_userfiles.f_price_id = saveData.t_userfiles.f_price_id[0]
-  }
-  if (model.value === '编辑') {
-    saveData = Object.assign(saveData, {
-      f_operator_record: userInfo.f_operator,
-      f_operatorid_record: userInfo.f_operatorid,
-      f_orgid_record: userInfo.f_orgid,
-      f_orgname_record: userInfo.f_orgname,
-      f_depid_record: userInfo.f_depid,
-      f_depname_record: userInfo.f_depname,
-    })
-  }
-  runLogic('userFIleSaveLogic', saveData, 'af-revenue').then((res) => {
-    showToast('操作成功！')
-    history.back()
-  })
-}
-const isInit = ref(false)
-function init() {
-  if (model.value === '编辑') {
-    runLogic('getFileDetailForEdit', { f_userinfo_id: userinfoid.value }, 'af-revenue').then((res) => {
-      if (res.t_userfiles.f_gasmodel_id) {
-        res.t_userfiles.f_gasmodel_id = 76
-      }
-      // if (res.t_userfiles.f_price_id) {
-      //   res.t_userfiles.f_price_id = [res.t_userfiles.f_price_id]
-      // }
-      console.log('1111111----,', res)
-      groupFormData.value = res
-      isInit.value = true
-    })
-  }
-}
-onMounted(() => {
-  init()
-})
-</script>
-
-<template>
-  <XFormGroup
-    v-if="isInit"
-    mode="修改"
-    :config-name="configName"
-    :service-name="serviceName"
-    :group-form-data="groupFormData"
-    @submit="submit"
-  />
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script setup lang="ts">
+import XFormGroup from '@af-mobile-client-vue3/components/data/XFormGroup/index.vue'
+import { runLogic } from '@af-mobile-client-vue3/services/api/common'
+import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
+import dayjs from 'dayjs/esm/index'
+import { showToast } from 'vant'
+import { onMounted, ref } from 'vue'
+import { useRoute } from 'vue-router'
+
+const configName = ref('appapplyuserinfoFormGroup')
+const serviceName = ref('af-apply')
+const route = useRoute()
+const userInfo = useUserStore().getUserInfo()
+const workflowId = ref('3045')
+const userinfoid = ref('93116')
+const model = ref('编辑')
+const groupFormData = ref({})
+
+function submit(res) {
+  if (model.value === '新增') {
+    res.t_userinfo.f_operate_date = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    res.t_userinfo.f_orgid = userInfo.f_orgid
+    res.t_userinfo.f_orgname = userInfo.f_orgname
+    res.t_userinfo.f_depid = userInfo.f_depid
+    res.t_userinfo.f_depname = userInfo.f_depname
+    res.t_userinfo.f_operatorid = userInfo.f_operatorid
+    res.t_userinfo.f_operator = userInfo.f_operator
+    res.t_userinfo.f_workflow_id = this.f_workflow_id
+    res.t_userinfo.f_user_state = '预备'
+
+    res.t_userfiles.f_operate_date = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    res.t_userfiles.f_orgid = userInfo.f_orgid
+    res.t_userfiles.f_orgname = userInfo.f_orgname
+    res.t_userfiles.f_depid = userInfo.f_depid
+    res.t_userfiles.f_depname = userInfo.f_depname
+    res.t_userfiles.f_operatorid = userInfo.f_operatorid
+    res.t_userfiles.f_operator = userInfo.f_operator
+    res.t_userfiles.f_workflow_id = this.f_workflow_id
+    res.t_userfiles.f_table_state = '待开通'
+  }
+  let saveData = res
+  if (saveData.t_userfiles.f_gasbrand_id.length > 0) {
+    saveData.t_userfiles.f_gasbrand_id = saveData.t_userfiles.f_gasbrand_id[0]
+  }
+  if (saveData.t_userfiles.f_price_id.length > 0) {
+    saveData.t_userfiles.f_price_id = saveData.t_userfiles.f_price_id[0]
+  }
+  if (model.value === '编辑') {
+    saveData = Object.assign(saveData, {
+      f_operator_record: userInfo.f_operator,
+      f_operatorid_record: userInfo.f_operatorid,
+      f_orgid_record: userInfo.f_orgid,
+      f_orgname_record: userInfo.f_orgname,
+      f_depid_record: userInfo.f_depid,
+      f_depname_record: userInfo.f_depname,
+    })
+  }
+  runLogic('userFIleSaveLogic', saveData, 'af-revenue').then((res) => {
+    showToast('操作成功！')
+    history.back()
+  })
+}
+const isInit = ref(false)
+function init() {
+  if (model.value === '编辑') {
+    runLogic('getFileDetailForEdit', { f_userinfo_id: userinfoid.value }, 'af-revenue').then((res) => {
+      // if (res.t_userfiles.f_gasmodel_id) {
+      //   res.t_userfiles.f_gasmodel_id = 76
+      // }
+      // if (res.t_userfiles.f_price_id) {
+      //   res.t_userfiles.f_price_id = [res.t_userfiles.f_price_id]
+      // }
+      console.log('1111111----,', res)
+      groupFormData.value = res
+      isInit.value = true
+    })
+  }
+}
+onMounted(() => {
+  init()
+})
+</script>
+
+<template>
+  <XFormGroup
+    v-if="isInit"
+    mode="修改"
+    :config-name="configName"
+    :service-name="serviceName"
+    :group-form-data="groupFormData"
+    @submit="submit"
+  />
+</template>
+
+<style scoped lang="less">
+
+</style>