af-mobile-client-vue3 1.2.16 → 1.2.17

package/package.json

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

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

@@ -42,6 +42,7 @@ const props = withDefaults(defineProps<{
   formName?: string
   mode?: string
   submitButton?: boolean
+  isHandleFormKey?: boolean
 }>(), {
   configName: undefined,
   groupFormItems: null,
@@ -50,6 +51,7 @@ const props = withDefaults(defineProps<{
   formName: 'default',
   mode: '查询',
   submitButton: true,
+  isHandleFormKey: true,
 })
 const emits = defineEmits(['onSubmit'])
 const userStore = useUserStore()
@@ -76,9 +78,6 @@ const realJsonData = computed(() => {
   })
 })
 
-// 是否处理表单Key值
-const isHandleFormKey = ref(true)
-
 // 过滤出用于静默新增场景的表单项
 const silenceAddJsonData = computed(() => {
   return myFormItems.value.filter((item) => {
@@ -263,7 +262,7 @@ function setForm(obj) {
 function getRealKey(key, mustHandleKey = false) {
   if (key === 'selected_id')
     return key
-  if (isHandleFormKey.value || mustHandleKey) {
+  if (props.isHandleFormKey || mustHandleKey) {
     return key.substring(key.indexOf('_') + 1)
   }
   else {
@@ -305,7 +304,7 @@ function handleFormKeys(form, mustHandleKey = false) {
       realForm[extraFormKey][realKey] = value
     }
     else {
-      const realKey = isHandleFormKey.value || mustHandleKey ? getRealKey(key, mustHandleKey) : key
+      const realKey = props.isHandleFormKey || mustHandleKey ? getRealKey(key, mustHandleKey) : key
       // 如果发生重名，不覆盖，把key的别名带上
       if (realForm[realKey]) {
         realForm[key] = value

package/src/utils/queryFormDefaultRangePicker.ts

@@ -1,57 +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 ['', '']
-}
+/**
+ * 根据类型获取日期区间字符串
+ * @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,26 +1,19 @@
 <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('orderCarInMobileCRUD')
-// const serviceName = ref('af-gaslink')
-// const configName = ref('lngPriceManageMobileCRUD')
-const configName = ref('测试2')
+const configName = ref('lngChargeAuditMobileCRUD')
 const serviceName = ref('af-gaslink')
-// const configName = ref('mobile_liushuiQueryCRUD')
-// const serviceName = ref('af-revenue')
 
 // 资源权限测试
 // const configName = ref('crud_sources_test')
@@ -56,11 +49,11 @@ const serviceName = ref('af-gaslink')
 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,
+    },
   })
 }
 
@@ -76,35 +69,19 @@ function toDetail(item) {
 //     },
 //   })
 // }
-function addOption() {
-  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) {
-  console.log('用户----', userInfo)
-  router.push({
-    name: 'XFormGroupView',
-    // params: { id: result.o_id, openid: result.o_id },
-    // query: {
-    //   configName: configName.value,
-    //   serviceName: serviceName.value,
-    //   mode: '修改',
-    // },
-  })
-}
+// 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 deleteRow(result) {
@@ -115,23 +92,11 @@ function deleteRow(result) {
 <template>
   <NormalDataLayout id="XCellListView" title="工作计划">
     <template #layout_content>
-      <!--      <XCellList -->
-      <!--        :config-name="configName" -->
-      <!--        :service-name="serviceName" -->
-      <!--        :custom-add="true" -->
-      <!--        :custom-edit="true" -->
-      <!--        :id-key="idKey" -->
-      <!--        @to-detail="toDetail" -->
-      <!--        @delete-row="deleteRow" -->
-      <!--        @update="updateRow" -->
-      <!--        @add="addOption" -->
-      <!--      /> -->
-
-      <!--      :fix-query-form="{ u_f_price_state: ['生效', '待生效'] }" -->
-
       <XCellList
-        config-name="小小测试CRUD"
-        service-name="af-apply"
+        :config-name="configName"
+        :service-name="serviceName"
+        :fix-query-form="{ o_f_oper_name: 'edu_test' }"
+        :id-key="idKey"
         @to-detail="toDetail"
         @delete-row="deleteRow"
       />

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

@@ -5,19 +5,16 @@ 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")
 
 // 表单组
-const configName = ref('lngChargeAuditMobileFormGroup')
-const serviceName = ref('af-gaslink')
+// const configName = ref('lngChargeAuditMobileFormGroup')
+// const serviceName = ref('af-gaslink')
 
 const formData = ref({})
 const formGroup = ref(null)