af-mobile-client-vue3 1.6.22 → 1.6.24

package/package.json

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

package/src/views/SafeInspection/SecurityCertificate/index.vue

@@ -1022,7 +1022,7 @@ async function validateAllForms() {
 }
 
 // 组织提交数据
-function organizeSubmitData() {
+async function organizeSubmitData() {
   // 获取用户信息组件数据
   const userInfoData = userInfoRef.value?.getData()
   // 获取用气设备组件数据
@@ -1299,25 +1299,31 @@ function organizeSubmitData() {
   let location = ''
   // 获取安检单上传时的人员定位
   if (safeConfig.value?.needLocation) {
-    mobileUtil.execute({
-      param: {},
-      funcName: 'getLocationResult',
-      callbackFunc: (res: any) => {
-        if (res?.status === 'success') {
-          try {
-            const locationResult = JSON.parse(res.data.location)
-            if (
-              typeof locationResult.longitude === 'number'
-              && typeof locationResult.latitude === 'number'
-            ) {
-              location = `${locationResult.longitude},${locationResult.latitude}`
+    // 使用 Promise 包装回调
+    location = await new Promise((resolve) => {
+      mobileUtil.execute({
+        param: {},
+        funcName: 'getLocationResult',
+        callbackFunc: (res: any) => {
+          console.log('获取位置结果:', res)
+          if (res?.status === 'success') {
+            try {
+              const locationResult = JSON.parse(res.data.location)
+              if (
+                typeof locationResult.longitude === 'number'
+                && typeof locationResult.latitude === 'number'
+              ) {
+                resolve(`${locationResult.longitude},${locationResult.latitude}`)
+                return
+              }
+            }
+            catch (err) {
+              console.error('定位数据解析失败:', err)
             }
           }
-          catch (err) {
-            console.error('定位数据解析失败:', err)
-          }
-        }
-      },
+          resolve('') // 获取失败返回空字符串
+        },
+      })
     })
   }
   return {
@@ -1522,7 +1528,7 @@ async function saveDraftData() {
       const param = {
         id: checkId.value,
         draftType: draftType.value,
-        f_temporary_storage: organizeSubmitData(),
+        f_temporary_storage: await organizeSubmitData(),
         f_temporary_date: formatNow(),
       }
       await runLogic('saveDraft', param, 'af-safecheck')
@@ -1576,7 +1582,7 @@ async function onSubmit() {
     }
 
     // 用户确认提交，组织提交数据
-    const submitData = organizeSubmitData()
+    const submitData = await organizeSubmitData()
     console.log('提交数据:', submitData)
 
     // 自定义校验

package/src/views/SafeInspection/SecurityFormItem/FormItem.vue

@@ -98,6 +98,8 @@ const formType = {
   text: 'text', // 表单项类型
   number: 'number',
   date: 'date',
+  year: 'year',
+  yearMonth: 'yearMonth',
   radio: 'radio',
   checkbox: 'checkbox',
   multipleSelect: 'multipleSelect',
@@ -117,11 +119,27 @@ const debouncedCustomFunc = ref<((ctx: any, cfg: any, userDetail: any, safeConfi
 // 拍照/上传相关信息
 const cameraData = ref(undefined)
 // 日期选择器默认值
-const datePickerDefault = ref([
-  dayjs().format('YYYY'),
-  dayjs().format('MM'),
-  dayjs().format('DD'),
-])
+const datePickerDefault = ref<string[]>([])
+
+watch(() => currentVal[dataStructure.fieldType], (type) => {
+  if (type === formType.year)
+    datePickerDefault.value = [dayjs().format('YYYY')]
+  else if (type === formType.yearMonth)
+    datePickerDefault.value = [dayjs().format('YYYY'), dayjs().format('MM')]
+  else if (type === formType.date)
+    datePickerDefault.value = [dayjs().format('YYYY'), dayjs().format('MM'), dayjs().format('DD')]
+  else
+    datePickerDefault.value = []
+}, { immediate: true })
+
+const columnsType = computed(() => {
+  const type = currentVal[dataStructure.fieldType]
+  if (type === formType.year)
+    return ['year'] as any
+  if (type === formType.yearMonth)
+    return ['year', 'month'] as any
+  return ['year', 'month', 'day'] as any
+})
 
 function safeParseJson(jsonStr: any): any {
   if (typeof jsonStr !== 'string')
@@ -141,6 +159,8 @@ function confirm(selVal, selObj) {
 
   switch (currentVal[dataStructure.fieldType]) {
     case formType.date:
+    case formType.year:
+    case formType.yearMonth:
       currentVal.value = selVal.selectedValues.join('-')
       selVal = currentVal.value
       showPicker.value = false
@@ -249,7 +269,7 @@ const datePickerMaxDate = computed(() => {
     @blur="confirm"
   />
   <VanField
-    v-else-if="currentVal[dataStructure.fieldType] === formType.date"
+    v-else-if="currentVal[dataStructure.fieldType] === formType.date || currentVal[dataStructure.fieldType] === formType.year || currentVal[dataStructure.fieldType] === formType.yearMonth"
     v-model="currentVal[dataStructure.fieldValue]"
     center
     is-link
@@ -392,7 +412,7 @@ const datePickerMaxDate = computed(() => {
   </VanField>
   <!--  {{ currentVal }} -->
   <VanPopup v-model:show="showPicker" position="bottom">
-    <VanDatePicker v-model="datePickerDefault" :min-date="datePickerMinDate" :max-date="datePickerMaxDate" @confirm="confirm" @cancel="showPicker = false" />
+    <VanDatePicker v-model="datePickerDefault" :columns-type="columnsType" :min-date="datePickerMinDate" :max-date="datePickerMaxDate" @confirm="confirm" @cancel="showPicker = false" />
   </VanPopup>
   <slot :item="currentVal" />
 </template>