af-mobile-client-vue3 1.3.94 → 1.3.96

package/package.json

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

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

@@ -235,18 +235,18 @@ function initComponent() {
 
       if (item.mobileColumnType === 'mobile_header_column') {
         try {
-          // 只有在 item.btnIcon 是字符串时才尝试解析
           if (typeof item.btnIcon === 'string') {
-            const parsed = JSON.parse(item.btnIcon)
-            // 只有解析结果是数组才赋值
-            if (Array.isArray(parsed)) {
-              btnList.value = parsed
-            }
+            // 字符串 => 直接作为数组的一项
+            btnList.value = [item.btnIcon]
+          }
+          else if (Array.isArray(item.btnIcon)) {
+            // 已经是数组 => 直接赋值
+            btnList.value = item.btnIcon
           }
+          // 其他类型不处理
         }
         catch (e) {
-          // 解析失败，不做任何处理（保留原来的值）
-          console.error('btnIcon JSON 解析失败：', e)
+          console.error('btnIcon 处理异常：', e)
         }
       }
 
@@ -596,7 +596,7 @@ function filterButtonPermissions(btn) {
 
 // 处理按钮点击
 function handleButtonClick(btn, item) {
-  emit(`${btn.btnIcon}`, item)
+  emit(`${btn}`, item)
 }
 
 /**

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

@@ -11,11 +11,13 @@ import { post } from '@af-mobile-client-vue3/services/restTools'
 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 { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
 import { executeStrFunctionByContext } from '@af-mobile-client-vue3/utils/runEvalFunction'
 import { areaList } from '@vant/area-data'
 import dayjs from 'dayjs/esm/index'
 import { debounce } from 'lodash-es'
 import {
+  showToast,
   Area as VanArea,
   Button as VanButton,
   Calendar as VanCalendar,
@@ -914,6 +916,36 @@ function findOptionInTree(options, value) {
 
   return null
 }
+
+// 扫码/NFC
+function scanCodeOrNfc(attr) {
+  if (attr.type === 'scanCode') {
+    // 扫码逻辑
+    mobileUtil.execute({
+      funcName: 'scanBarcode',
+      param: {},
+      callbackFunc: (res: any) => {
+        console.log('让我看看你扫码结果:--', res)
+        if (res && res.status === 'success') {
+          if (res.data.status && res.data.status === 'cancelled') {
+            showToast(res.data?.message || '扫码已取消')
+            return
+          }
+          modelData.value = res.data?.rawValue
+          showToast('扫码成功')
+        }
+        else {
+          showToast('扫码失败')
+        }
+      },
+    })
+  }
+  else if (attr.type === 'nfc') {
+    // NFC逻辑
+    console.log('--------NFC功能即将开发--------')
+    showToast('NFC功能即将开发')
+  }
+}
 </script>
 
 <template>
@@ -1319,7 +1351,7 @@ function findOptionInTree(options, value) {
 
     <!-- 文本输入框 -->
     <VanField
-      v-if="(attr.type === 'input' || attr.type === 'intervalPicker') && showItem"
+      v-if="(attr.type === 'input' || attr.type === 'intervalPicker' || attr.type === 'scanCode' || attr.type === 'nfc') && showItem"
       v-model="(modelData as string)"
       style="align-items: center"
       :label="labelData"
@@ -1346,7 +1378,7 @@ function findOptionInTree(options, value) {
           @blur="() => formTypeCheck(attr, modelData as string)"
         >
         <VanButton
-          v-if="!props.formReadonly && attr.inputOnAfterName && attr.inputOnAfterFunc && !attr.inputOnAfterName.includes('|')"
+          v-if="(attr.type === 'input' || attr.type === 'intervalPicker') && !props.formReadonly && attr.inputOnAfterName && attr.inputOnAfterFunc && !attr.inputOnAfterName.includes('|')"
           class="action-btn"
           round
           type="primary"
@@ -1355,6 +1387,16 @@ function findOptionInTree(options, value) {
         >
           {{ attr.inputOnAfterName }}
         </VanButton>
+        <VanButton
+          v-if="(attr.type === 'scanCode' || attr.type === 'nfc') && !props.formReadonly"
+          class="action-btn"
+          round
+          type="primary"
+          size="small"
+          @click="scanCodeOrNfc(attr)"
+        >
+          {{ attr.type === 'scanCode' ? '扫码' : 'NFC' }}
+        </VanButton>
       </template>
     </VanField>
 

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

@@ -12,7 +12,7 @@ const router = useRouter()
 // const idKey = ref('o_id')
 
 // 简易crud表单测试
-const configName = ref('ceshiCRUD')
+const configName = ref('temporarySecurityCheckCRUD')
 const serviceName = ref('af-safecheck')
 
 // 资源权限测试
@@ -90,6 +90,14 @@ const serviceName = ref('af-safecheck')
 // const fixQueryForm = ref({
 //   f_operator_id: '487184754014158848',
 // })
+function phone(row: any) {
+  console.log('>>>> phone')
+}
+
+function mapView() {
+  // 进行地图查看
+  console.log('等待你处理地图查看事件')
+}
 </script>
 
 <template>
@@ -98,6 +106,8 @@ const serviceName = ref('af-safecheck')
       <XCellList
         :config-name="configName"
         :service-name="serviceName"
+        @phone="phone"
+        @map-marked="mapView"
       />
     </template>
   </NormalDataLayout>