af-mobile-client-vue3 1.1.22 → 1.1.23

package/package.json

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

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) {

package/src/utils/queryFormDefaultRangePicker.ts

@@ -0,0 +1,57 @@
+/**
+ * 根据类型获取日期区间字符串
+ * @param type '当年' | 'curMonth' | '当日'
+ * @param show 区分实际值还是显示值, true为实际值, false为显示值
+ * @returns [start, end] 例：['2024-01-01 00:00:00', '2024-12-31 23:59:59']
+ */
+export function getRangeByType(type: string, show: boolean): [string, string] {
+  const now = new Date()
+  const year = now.getFullYear()
+  const month = (now.getMonth() + 1).toString().padStart(2, '0')
+  const day = now.getDate().toString().padStart(2, '0')
+
+  if (!show) {
+    if (type === 'curYear') {
+      return [
+        `${year}-01-01 00:00:00`,
+        `${year}-12-31 23:59:59`,
+      ]
+    }
+    if (type === 'curMonth') {
+      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
+      return [
+        `${year}-${month}-01 00:00:00`,
+        `${year}-${month}-${lastDay.toString().padStart(2, '0')} 23:59:59`,
+      ]
+    }
+    if (type === 'curDay') {
+      return [
+        `${year}-${month}-${day} 00:00:00`,
+        `${year}-${month}-${day} 23:59:59`,
+      ]
+    }
+  }
+  if (show) {
+    if (type === 'curYear') {
+      return [
+        `${year}-01-01`,
+        `${year}-12-31`,
+      ]
+    }
+    if (type === 'curMonth') {
+      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
+      return [
+        `${year}-${month}-01`,
+        `${year}-${month}-${lastDay.toString().padStart(2, '0')}`,
+      ]
+    }
+    if (type === 'curDay') {
+      return [
+        `${year}-${month}-${day}`,
+        `${year}-${month}-${day}`,
+      ]
+    }
+  }
+  // 兜底返回空字符串数组
+  return ['', '']
+}

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

@@ -1,19 +1,24 @@
 <script setup lang="ts">
 import XCellList from '@af-mobile-client-vue3/components/data/XCellList/index.vue'
 import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
 import { defineEmits, ref } from 'vue'
 import { useRouter } from 'vue-router'
 
 // 定义事件
 const emit = defineEmits(['deleteRow'])
+const userInfo = useUserStore().getUserInfo()
 // 访问路由
 const router = useRouter()
 // 获取默认值
 const idKey = ref('o_id')
 
 // 简易crud表单测试
-const configName = ref('crud_oper_log_manage')
-const serviceName = ref('af-system')
+// const configName = ref('orderCarInMobileCRUD')
+// const serviceName = ref('af-gaslink')
+// const configName = ref('lngPriceManageMobileCRUD')
+const configName = ref('测试')
+const serviceName = ref('af-gaslink')
 
 // 资源权限测试
 // const configName = ref('crud_sources_test')
@@ -49,11 +54,11 @@ const serviceName = ref('af-system')
 function toDetail(item) {
   router.push({
     name: 'XFormGroupView',
-    query: {
-      id: item[idKey.value],
-      // id: item.rr_id,
-      // o_id: item.o_id,
-    },
+    // query: {
+    //   id: item[idKey.value],
+    // id: item.rr_id,
+    // o_id: item.o_id,
+    // },
   })
 }
 
@@ -69,19 +74,40 @@ function toDetail(item) {
 //     },
 //   })
 // }
+function addOption(callback) {
+  router.push({
+    name: 'XFormGroupView',
+    // params: { id: totalCount.value },
+    // query: {
+    //   configName: configName.value,
+    //   serviceName: serviceName.value,
+    //   mode: '新增',
+    // },
+  })
+  // 如果存在回调函数，调用它并传递true表示已处理
+  if (typeof callback === 'function') {
+    callback(true)
+  }
+}
 
 // 修改功能
-// function updateRow(result) {
-//   router.push({
-//     name: 'XFormView',
-//     params: { id: result.o_id, openid: result.o_id },
-//     query: {
-//       configName: configName.value,
-//       serviceName: serviceName.value,
-//       mode: '修改',
-//     },
-//   })
-// }
+function updateRow(result, callback) {
+  console.log('用户----', userInfo)
+  router.push({
+    name: 'XFormGroupView',
+    // params: { id: result.o_id, openid: result.o_id },
+    // query: {
+    //   configName: configName.value,
+    //   serviceName: serviceName.value,
+    //   mode: '修改',
+    // },
+  })
+
+  // 如果存在回调函数，调用它并传递true表示已处理
+  if (typeof callback === 'function') {
+    callback(true)
+  }
+}
 
 // 删除功能
 function deleteRow(result) {
@@ -95,11 +121,23 @@ 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"
+        @update="updateRow"
+        @add="addOption"
       />
+
+      <!--      :fix-query-form="{ u_f_price_state: ['生效', '待生效'] }" -->
+
+      <!--      <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" -->
+      <!--      /> -->
     </template>
   </NormalDataLayout>
 </template>

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

@@ -5,9 +5,12 @@ import { showDialog } from 'vant'
 import { ref } from 'vue'
 import { useRoute } from 'vue-router'
 
+const configName = ref('reviewFormGroup')
+const serviceName = ref('af-revenue')
+
 // 纯表单
-const configName = ref('form_check_test')
-const serviceName = ref('af-system')
+// const configName = ref('form_check_test')
+// const serviceName = ref('af-system')
 
 // const configName = ref("计划下发Form")
 // const serviceName = ref("af-linepatrol")