af-mobile-client-vue3 1.1.21 → 1.1.23

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.1.21",
+  "version": "1.1.23",
   "description": "Vue + Vite component lib",
   "license": "MIT",
   "engines": {

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

@@ -1,163 +1,163 @@
-<script setup lang="ts">
-import { deleteFile } from '@af-mobile-client-vue3/services/api/common'
-import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
-import {
-  Button as vanButton,
-  Uploader as vanUploader,
-} from 'vant'
-import { ref, watch } from 'vue'
-
-const props = defineProps({
-  imageList: Array<any>,
-  outerIndex: { default: undefined },
-  authority: { default: 'user' },
-  uploadMode: { default: 'server' },
-  attr: { type: Object as () => { addOrEdit?: string }, default: () => ({}) },
-})
-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() {
-  console.log('>>>> uploader 上传111')
-  mobileUtil.execute({
-    funcName: 'takePicture',
-    param: {},
-    callbackFunc: (result: any) => {
-      console.log('>>>> 拍照 后 上传', result)
-      if (result.status === 'success') {
-        handlePhotoUpload(result.data)
-      }
-    },
-  })
-}
-
-// 处理拍照后的上传
-function handlePhotoUpload(photoData: any) {
-  const formData = new FormData()
-  formData.append('resUploadMode', props.uploadMode)
-  formData.append('pathKey', 'Default')
-  formData.append('formType', 'image')
-  formData.append('useType', 'Default')
-  formData.append('resUploadStock', '1')
-  formData.append('filename', photoData.name)
-  formData.append('filesize', (photoData.size / 1024 / 1024).toFixed(4))
-  formData.append('f_operator', 'server')
-  formData.append('imgPath', photoData.filePath)
-  formData.append('urlPath', '/api/af-revenue/resource/upload')
-
-  // 添加临时预览
-  const tempFile = {
-    uid: Date.now() + Math.random().toString(36).substr(2, 5),
-    name: photoData.name,
-    status: 'uploading',
-    message: '上传中...',
-    url: `data:image/png;base64,${photoData.content}`,
-  }
-
-  if (!imageList.value) {
-    imageList.value = [tempFile]
-  }
-  else {
-    imageList.value.push(tempFile)
-  }
-
-  const param = {
-    resUploadMode: props.uploadMode,
-    pathKey: 'Default',
-    formType: 'image',
-    useType: 'Default',
-    resUploadStock: '1',
-    filename: photoData.name,
-    filesize: photoData.size,
-    f_operator: 'server',
-    imgPath: photoData.filePath,
-    urlPath: '/api/af-revenue/resource/upload',
-  }
-  console.log('>>>> 上传 param: ', JSON.stringify(param))
-  // 上传到服务器
-  mobileUtil.execute({
-    funcName: 'uploadResource',
-    param,
-    callbackFunc: (result: any) => {
-      console.log('>>>> 上传结果: ', result)
-      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
-          delete imageList.value[index].message
-          imageList.value[index].status = 'done'
-          imageList.value[index].url = result.data.f_downloadpath
-        }
-      }
-      else {
-        const index = imageList.value.findIndex(item => item.uid === tempFile.uid)
-        if (index !== -1) {
-          imageList.value[index].status = 'failed'
-          imageList.value[index].message = '上传失败'
-        }
-      }
-
-      if (props.outerIndex !== undefined)
-        emit('updateFileList', imageList.value.filter(item => item.status === 'done'), props.outerIndex)
-      else
-        emit('updateFileList', imageList.value.filter(item => item.status === 'done'))
-    },
-  })
-}
-
-// 删除图片
-function deleteFileFunction(file: any) {
-  if (file.id) {
-    deleteFile({ ids: [file.id], f_state: '删除' }).then((res: any) => {
-      if (res.msg !== undefined) {
-        const targetIndex = imageList.value.findIndex(item => item.id === file.id)
-        if (targetIndex !== -1) {
-          imageList.value.splice(targetIndex, 1)
-          if (props.outerIndex !== undefined)
-            emit('updateFileList', imageList.value.filter(item => item.status === 'done'), props.outerIndex)
-          else
-            emit('updateFileList', imageList.value.filter(item => item.status === 'done'))
-        }
-      }
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="uploader-container">
-    <van-button
-      v-if="props.attr?.addOrEdit !== 'readonly'"
-      icon="photograph"
-      type="primary"
-      @click="triggerCamera"
-    >
-      拍照
-    </van-button>
-
-    <van-uploader
-      v-model="imageList"
-      :show-upload="false"
-      :deletable="props.attr?.addOrEdit !== 'readonly' && props.authority === 'admin'"
-      :multiple="props.authority === 'admin'"
-      :preview-image="true"
-      :before-delete="props.attr?.addOrEdit !== 'readonly' && props.authority === 'admin' ? deleteFileFunction : undefined"
-    />
-  </div>
-</template>
-
-<style scoped lang="less">
-.uploader-container {
-  display: flex;
-  flex-direction: column;
-  gap: 16px;
-}
-</style>
+<script setup lang="ts">
+import { deleteFile } from '@af-mobile-client-vue3/services/api/common'
+import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
+import {
+  Button as vanButton,
+  Uploader as vanUploader,
+} from 'vant'
+import { ref, watch } from 'vue'
+
+const props = defineProps({
+  imageList: Array<any>,
+  outerIndex: { default: undefined },
+  authority: { default: 'user' },
+  uploadMode: { default: 'server' },
+  attr: { type: Object as () => { addOrEdit?: string }, default: () => ({}) },
+})
+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() {
+  console.log('>>>> uploader 上传111')
+  mobileUtil.execute({
+    funcName: 'takePicture',
+    param: {},
+    callbackFunc: (result: any) => {
+      console.log('>>>> 拍照 后 上传', result)
+      if (result.status === 'success') {
+        handlePhotoUpload(result.data)
+      }
+    },
+  })
+}
+
+// 处理拍照后的上传
+function handlePhotoUpload(photoData: any) {
+  const formData = new FormData()
+  formData.append('resUploadMode', props.uploadMode)
+  formData.append('pathKey', 'Default')
+  formData.append('formType', 'image')
+  formData.append('useType', 'Default')
+  formData.append('resUploadStock', '1')
+  formData.append('filename', photoData.name)
+  formData.append('filesize', (photoData.size / 1024 / 1024).toFixed(4))
+  formData.append('f_operator', 'server')
+  formData.append('imgPath', photoData.filePath)
+  formData.append('urlPath', '/api/af-revenue/resource/upload')
+
+  // 添加临时预览
+  const tempFile = {
+    uid: Date.now() + Math.random().toString(36).substr(2, 5),
+    name: photoData.name,
+    status: 'uploading',
+    message: '上传中...',
+    url: `data:image/png;base64,${photoData.content}`,
+  }
+
+  if (!imageList.value) {
+    imageList.value = [tempFile]
+  }
+  else {
+    imageList.value.push(tempFile)
+  }
+
+  const param = {
+    resUploadMode: props.uploadMode,
+    pathKey: 'Default',
+    formType: 'image',
+    useType: 'Default',
+    resUploadStock: '1',
+    filename: photoData.name,
+    filesize: photoData.size,
+    f_operator: 'server',
+    imgPath: photoData.filePath,
+    urlPath: '/api/af-revenue/resource/upload',
+  }
+  console.log('>>>> 上传 param: ', JSON.stringify(param))
+  // 上传到服务器
+  mobileUtil.execute({
+    funcName: 'uploadResource',
+    param,
+    callbackFunc: (result: any) => {
+      console.log('>>>> 上传结果: ', result)
+      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
+          delete imageList.value[index].message
+          imageList.value[index].status = 'done'
+          imageList.value[index].url = result.data.f_downloadpath
+        }
+      }
+      else {
+        const index = imageList.value.findIndex(item => item.uid === tempFile.uid)
+        if (index !== -1) {
+          imageList.value[index].status = 'failed'
+          imageList.value[index].message = '上传失败'
+        }
+      }
+
+      if (props.outerIndex !== undefined)
+        emit('updateFileList', imageList.value.filter(item => item.status === 'done'), props.outerIndex)
+      else
+        emit('updateFileList', imageList.value.filter(item => item.status === 'done'))
+    },
+  })
+}
+
+// 删除图片
+function deleteFileFunction(file: any) {
+  if (file.id) {
+    deleteFile({ ids: [file.id], f_state: '删除' }).then((res: any) => {
+      if (res.msg !== undefined) {
+        const targetIndex = imageList.value.findIndex(item => item.id === file.id)
+        if (targetIndex !== -1) {
+          imageList.value.splice(targetIndex, 1)
+          if (props.outerIndex !== undefined)
+            emit('updateFileList', imageList.value.filter(item => item.status === 'done'), props.outerIndex)
+          else
+            emit('updateFileList', imageList.value.filter(item => item.status === 'done'))
+        }
+      }
+    })
+  }
+}
+</script>
+
+<template>
+  <div class="uploader-container">
+    <van-button
+      v-if="props.attr?.addOrEdit !== 'readonly'"
+      icon="photograph"
+      type="primary"
+      @click="triggerCamera"
+    >
+      拍照
+    </van-button>
+
+    <van-uploader
+      v-model="imageList"
+      :show-upload="false"
+      :deletable="props.attr?.addOrEdit !== 'readonly' && props.authority === 'admin'"
+      :multiple="props.authority === 'admin'"
+      :preview-image="true"
+      :before-delete="props.attr?.addOrEdit !== 'readonly' && props.authority === 'admin' ? deleteFileFunction : undefined"
+    />
+  </div>
+</template>
+
+<style scoped lang="less">
+.uploader-container {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+</style>

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

@@ -2,6 +2,7 @@
 import XBadge from '@af-mobile-client-vue3/components/data/XBadge/index.vue'
 import XCellListFilter from '@af-mobile-client-vue3/components/data/XCellListFilter/index.vue'
 import { getConfigByName, query } from '@af-mobile-client-vue3/services/api/common'
+import { getRangeByType } from '@af-mobile-client-vue3/utils/queryFormDefaultRangePicker'
 import LoadError from '@af-mobile-client-vue3/views/common/LoadError.vue'
 import {
   showConfirmDialog,
@@ -108,8 +109,12 @@ const finishedText = ref('加载完成')
 // 避免查询多次
 const isLastPage = ref(false)
 
+// 条件参数(查询框)
 const conditionParams = ref(undefined)
 
+// 查询参数（配置自带的默认值）
+const queryDefaultParams = ref({})
+
 // 主要按钮的状态
 const buttonState = ref(undefined)
 
@@ -178,9 +183,47 @@ function initComponent() {
         allActions.value.push({ text: '删除', func: 'deleteRow' })
     }
     splitArrayAt(allActions.value, 3)
+
+    // 初始化条件参数（从表单默认值中获取）
+    initConditionParams(result.formJson)
   }, serviceName)
 }
 
+// 初始化条件参数
+function initConditionParams(formItems) {
+  if (!formItems || !Array.isArray(formItems) || formItems.length === 0)
+    return
+
+  const defaultParams = {}
+  let hasDefaults = false
+
+  // 从表单配置中获取所有默认值
+  formItems.forEach((item) => {
+    if (item.model) {
+      // 根据查询模式获取对应的默认值
+      if (item.queryFormDefault !== undefined && item.queryFormDefault !== null) {
+        if (item.type === 'rangePicker' && item.queryType === 'BETWEEN') {
+          defaultParams[item.model] = getRangeByType(item.queryFormDefault, false)
+        }
+        else {
+          defaultParams[item.model] = item.queryFormDefault
+        }
+        hasDefaults = true
+      }
+    }
+  })
+
+  // 如果有默认值，则设置到条件参数中并立即执行查询
+  if (hasDefaults) {
+    queryDefaultParams.value = defaultParams
+
+    // 延迟执行第一次查询，确保组件完全加载
+    setTimeout(() => {
+      onRefresh()
+    }, 100)
+  }
+}
+
 // 刷新数据
 function onRefresh() {
   isError.value = false
@@ -197,6 +240,8 @@ function onRefresh() {
 
 // 加载数据
 function onLoad() {
+  if (!refreshing.value)
+    return
   if (refreshing.value) {
     list.value = []
     pageNo.value = 1
@@ -206,6 +251,23 @@ function onLoad() {
     let searchVal = searchValue.value
     if (searchVal === '')
       searchVal = undefined
+
+    // 确保conditionParams不是undefined
+    if (conditionParams.value === undefined)
+      conditionParams.value = {}
+    const mergedParams = mergeParams(queryDefaultParams.value, conditionParams.value)
+
+    // 输出查询条件，便于调试
+    console.log('查询条件:', {
+      pageNo: pageNo.value,
+      pageSize,
+      conditionParams: {
+        $queryValue: searchVal,
+        ...fixQueryForm,
+        ...mergedParams,
+      },
+    })
+
     query({
       queryParamsName: configName,
       pageNo: pageNo.value,
@@ -213,7 +275,7 @@ function onLoad() {
       conditionParams: {
         $queryValue: searchVal,
         ...fixQueryForm,
-        ...conditionParams.value,
+        ...mergedParams,
       },
       sortField: orderVal?.value,
       sortOrder: sortordVal?.value,
@@ -240,6 +302,18 @@ function onLoad() {
   }
 }
 
+// 合并参数
+function mergeParams(defaultParams: object, overrideParams: object) {
+  const result = { ...defaultParams }
+  for (const [key, value] of Object.entries(overrideParams)) {
+    // 只有当overrideParams中的值不是undefined或空字符串时才覆盖
+    if (value !== undefined) {
+      result[key] = value
+    }
+  }
+  return result
+}
+
 // 区分主要操作列与其他操作列
 function splitArrayAt<T>(array: T[], index: number) {
   mainActions.value = array.slice(0, index)

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

@@ -11,6 +11,7 @@ import { runLogic } from '@af-mobile-client-vue3/services/api/common'
 import { searchToListOption, searchToOption } from '@af-mobile-client-vue3/services/v3Api'
 import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
 import { getDict } from '@af-mobile-client-vue3/utils/dictUtil'
+import { getRangeByType } from '@af-mobile-client-vue3/utils/queryFormDefaultRangePicker'
 import { executeStrFunctionByContext } from '@af-mobile-client-vue3/utils/runEvalFunction'
 import { areaList } from '@vant/area-data'
 import { debounce } from 'lodash-es'
@@ -187,7 +188,7 @@ function getDefaultValue() {
       if (props.modelValue && Array.isArray(props.modelValue) && props.modelValue.length > 1)
         return `${props.modelValue[0]} ~ ${props.modelValue[1]}`
       else
-        return props.modelValue
+        return props.modelValue !== undefined ? props.modelValue : querySelectDefaultValue.value
     case 'addressSearch':
       return props.modelValue
     default:
@@ -205,9 +206,14 @@ watch(() => props.modelValue, (newVal) => {
     localValue.value = Array.isArray(newVal) ? newVal : []
   }
   else {
-    localValue.value = newVal !== undefined ? newVal : getDefaultValue()
     if (attr.type === 'rangePicker') {
-      pickerValue.value = newVal !== undefined ? `${newVal[0]} ~ ${newVal[1]}` : ''
+      console.log('newVal', newVal)
+      pickerValue.value = newVal !== undefined ? `${newVal[0]} ~ ${newVal[1]}` : getDefaultValue()
+      console.log('11111111111', getDefaultValue())
+    }
+    else {
+      console.log('newVal', newVal)
+      localValue.value = newVal !== undefined ? newVal : getDefaultValue()
     }
   }
 })
@@ -459,6 +465,16 @@ function init() {
       // querySelectDefaultValue.value = attr.queryFormDefault
     }
   }
+
+  if (attr.type === 'rangePicker') {
+    if (attr.formDefault)
+      formSelectDefaultValue.value = attr.formDefault
+    if (attr.queryFormDefault) {
+      const dateArray = getRangeByType(attr.queryFormDefault, true)
+      pickerValue.value = `${dateArray[0]} ~ ${dateArray[1]}`
+      querySelectDefaultValue.value = pickerValue.value
+    }
+  }
 }
 
 function getDataCallback(res) {