af-mobile-client-vue3 1.4.9 → 1.4.11

package/src/utils/timeUtil.ts

@@ -1,27 +1,27 @@
-// 时间工具：提供简单的日期时间格式化
-
-export function pad2(num: number): string {
-  return num < 10 ? `0${num}` : `${num}`
-}
-
-/**
- * 按照简单占位符格式化当前时间
- * 支持占位：YYYY MM DD HH mm ss
- * @param format 默认 'YYYY-MM-DD HH:mm:ss'
- */
-export function formatNow(format: string = 'YYYY-MM-DD HH:mm:ss'): string {
-  const d = new Date()
-  const map: Record<string, string> = {
-    YYYY: `${d.getFullYear()}`,
-    MM: pad2(d.getMonth() + 1),
-    DD: pad2(d.getDate()),
-    HH: pad2(d.getHours()),
-    mm: pad2(d.getMinutes()),
-    ss: pad2(d.getSeconds()),
-  }
-  let out = format
-  Object.keys(map).forEach((k) => {
-    out = out.replace(new RegExp(k, 'g'), map[k])
-  })
-  return out
-}
+// 时间工具：提供简单的日期时间格式化
+
+export function pad2(num: number): string {
+  return num < 10 ? `0${num}` : `${num}`
+}
+
+/**
+ * 按照简单占位符格式化当前时间
+ * 支持占位：YYYY MM DD HH mm ss
+ * @param format 默认 'YYYY-MM-DD HH:mm:ss'
+ */
+export function formatNow(format: string = 'YYYY-MM-DD HH:mm:ss'): string {
+  const d = new Date()
+  const map: Record<string, string> = {
+    YYYY: `${d.getFullYear()}`,
+    MM: pad2(d.getMonth() + 1),
+    DD: pad2(d.getDate()),
+    HH: pad2(d.getHours()),
+    mm: pad2(d.getMinutes()),
+    ss: pad2(d.getSeconds()),
+  }
+  let out = format
+  Object.keys(map).forEach((k) => {
+    out = out.replace(new RegExp(k, 'g'), map[k])
+  })
+  return out
+}

package/src/utils/wechat.ts

@@ -5,10 +5,10 @@ import wx from 'weixin-js-sdk'
 export interface WechatConfig {
   debug: boolean
   appId: string
-  timestamp: string
+  timestamp: number
   nonceStr: string
   signature: string
-  jsApiList: string[]
+  jsApiList: any[]
 }
 
 // 微信扫码配置
@@ -63,36 +63,10 @@ export function configWechatSDK(config: WechatConfig): Promise<void> {
   })
 }
 
-// 微信扫码
-export function scanQRCode(config: WechatScanConfig): Promise<WechatScanResult> {
-  return new Promise((resolve, reject) => {
-    if (!isWechatBrowser()) {
-      reject(new Error('非微信环境，无法使用微信扫码'))
-      return
-    }
-
-    wx.scanQRCode({
-      needResult: config.needResult,
-      scanType: config.scanType,
-      success: (res: WechatScanResult) => {
-        console.log('微信扫码成功:', res)
-        resolve(res)
-      },
-      fail: (res: any) => {
-        console.error('微信扫码失败:', res)
-        reject(new Error(`微信扫码失败: ${res.errMsg}`))
-      },
-      cancel: () => {
-        reject(new Error('用户取消扫码'))
-      },
-    })
-  })
-}
-
 // 获取微信签名（模拟）
 export async function getWechatSignature(url: string): Promise<{
   appId: string
-  timestamp: string
+  timestamp: number
   nonceStr: string
   signature: string
 }> {

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

@@ -1,138 +1,107 @@
-<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 multiSelectActions = ref([
-  { name: '批量审核', key: 'batchAudit', color: '#000000', icon: 'passed' },
-])
-
-const userInfo = useUserStore().getUserInfo()
-// 访问路由
-const router = useRouter()
-// 获取默认值
-const idKey = ref('o_id')
-
-// 简易crud表单测试
-const configName = ref('lngChargeAuditMobileCRUD')
-const serviceName = ref('af-gaslink')
-
-// 资源权限测试
-// const configName = ref('crud_sources_test')
-// const serviceName = ref('af-system')
-
-// 实际业务测试
-// const configName = ref('lngChargeAuditMobileCRUD')
-// const serviceName = ref('af-gaslink')
-
-// 跳转到详情页面
-// function toDetail(item) {
-//   router.push({
-//     name: 'XCellDetailView',
-//     params: { id: item[idKey.value] }, // 如果使用命名路由，推荐使用路由参数而不是直接构建 URL
-//     query: {
-//       operName: item[operNameKey.value],
-//       method:item[methodKey.value],
-//       requestMethod:item[requestMethodKey.value],
-//       operatorType:item[operatorTypeKey.value],
-//       operUrl:item[operUrlKey.value],
-//       operIp:item[operIpKey.value],
-//       costTime:item[costTimeKey.value],
-//       operTime:item[operTimeKey.value],
-//
-//       title: item[titleKey.value],
-//       businessType: item[businessTypeKey.value],
-//       status:item[statusKey.value]
-//     }
-//   })
-// }
-
-// 跳转到表单——以表单组来渲染纯表单
-function toDetail(item) {
-  router.push({
-    name: 'XFormView',
-    query: {
-      id: item[idKey.value],
-      // id: item.rr_id,
-      // o_id: item.o_id,
-    },
-  })
-}
-
-// 新增功能
-// function addOption(totalCount) {
-//   router.push({
-//     name: 'XFormView',
-//     params: { id: totalCount, openid: totalCount },
-//     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) {
-  emit('deleteRow', result.o_id)
-}
-
-// 多选操作处理
-function handleMultiSelectAction(action: string, selectedItems: any[], selectedItemsArray: any[]) {
-  console.log('多选操作:', action, selectedItems, selectedItemsArray)
-}
-
-// 选择变化处理
-function handleSelectionChange(selectedItems: any[]) {
-  console.log('选择变化，当前选中:', selectedItems.length, '个项目')
-  // 可以在这里更新UI状态，比如显示选中数量等
-}
-
-// 数据加载完成后处理 @after-load
-function afterLoad(result) {
-  console.log('afterLoad:', result)
-}
-function emitFunc(func, data) {
-  console.log('emitFunc:', func, data)
-}
-</script>
-
-<template>
-  <NormalDataLayout id="XCellListView" title="工作计划">
-    <template #layout_content>
-      <XCellList
-        config-name="scanCodeAndNFCRUD"
-        service-name="af-safecheck"
-        :enable-multi-select="true"
-        id-key="t_id"
-        :multi-select-actions="multiSelectActions"
-        @to-detail="toDetail"
-        @multi-select-action="handleMultiSelectAction"
-        @selection-change="handleSelectionChange"
-        @x-form-item-emit-func="emitFunc"
-      />
-    </template>
-  </NormalDataLayout>
-</template>
-
-<style scoped lang="less">
-</style>
+<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 { defineEmits, ref } from 'vue'
+import { useRouter } from 'vue-router'
+
+// 定义事件
+const emit = defineEmits(['deleteRow'])
+// 访问路由
+const router = useRouter()
+// 获取默认值
+// const idKey = ref('o_id')
+
+// 简易crud表单测试
+const configName = ref('ceshiCRUD')
+const serviceName = ref('af-safecheck')
+
+// 资源权限测试
+// const configName = ref('crud_sources_test')
+// const serviceName = ref('af-system')
+
+// 实际业务测试
+// const configName = ref('lngChargeAuditMobileCRUD')
+// const serviceName = ref('af-gaslink')
+
+// 跳转到详情页面
+// function toDetail(item) {
+//   router.push({
+//     name: 'XCellDetailView',
+//     params: { id: item[idKey.value] }, // 如果使用命名路由，推荐使用路由参数而不是直接构建 URL
+//     query: {
+//       operName: item[operNameKey.value],
+//       method:item[methodKey.value],
+//       requestMethod:item[requestMethodKey.value],
+//       operatorType:item[operatorTypeKey.value],
+//       operUrl:item[operUrlKey.value],
+//       operIp:item[operIpKey.value],
+//       costTime:item[costTimeKey.value],
+//       operTime:item[operTimeKey.value],
+//
+//       title: item[titleKey.value],
+//       businessType: item[businessTypeKey.value],
+//       status:item[statusKey.value]
+//     }
+//   })
+// }
+
+// 跳转到表单——以表单组来渲染纯表单
+// function toDetail(item) {
+//   router.push({
+//     name: 'XFormGroupView',
+//     query: {
+//       id: item[idKey.value],
+//       // id: item.rr_id,
+//       // o_id: item.o_id,
+//     },
+//   })
+// }
+
+// 新增功能
+// function addOption(totalCount) {
+//   router.push({
+//     name: 'XFormView',
+//     params: { id: totalCount, openid: totalCount },
+//     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) {
+//   emit('deleteRow', result.o_id)
+// }
+// const fixQueryForm = ref({
+//   f_operator_id: '487184754014158848',
+// })
+</script>
+
+<template>
+  <NormalDataLayout id="XCellListView" title="工作计划">
+    <template #layout_content>
+      <XCellList
+        :config-name="configName"
+        :service-name="serviceName"
+      />
+    </template>
+  </NormalDataLayout>
+</template>
+
+<style scoped lang="less">
+</style>

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

@@ -1,82 +1,91 @@
-<script setup lang="ts">
-import XFormGroup from '@af-mobile-client-vue3/components/data/XFormGroup/index.vue'
-import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
-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")
-// const serviceName = ref("af-linepatrol")
-
-// 表单组
-const configName = ref('lngChargeAuditMobileFormGroup')
-const serviceName = ref('af-gaslink')
-
-const formData = ref({})
-const formGroup = ref(null)
-const route = useRoute()
-const isInit = ref(false)
-function submit(_result) {
-  showDialog({ message: '提交成功' }).then(() => {
-    console.log('12121')
-    // history.back()
-  })
-}
-
-// 表单组——数据
-// function initComponents () {
-//   runLogic('getlngChargeAuditMobileFormGroupData', {id: 29}, 'af-gaslink').then((res) => {
-//     formData.value = {...res}
-//   })
-// }
-
-// 纯表单——数据
-// function initComponents() {
-//   formData.value = { plan_name: 'af-llllll', plan_point: '1号点位', plan_single: '1号点位', plan_range: '2024-12-12' }
-// }
-
-// function initComponents() {
-//   runLogic('getlngChargeAuditMobileFormGroupData', { id: route.query?.id, o_id: route.query?.o_id }, 'af-gaslink').then((res) => {
-//     console.log('res------', res)
-//     formData.value = { ...res }
-// formGroup.value.init({
-//   configName: configName.value,
-//   serviceName: serviceName.value,
-//   groupFormData: { ...res },
-//   mode: "新增"
-// })
-//     isInit.value = true
-//   })
-// }
-
-// onBeforeMount(() => {
-//   initComponents()
-// })
-</script>
-
-<template>
-  <NormalDataLayout id="XFormGroupView" title="纯表单">
-    <template #layout_content>
-      <!--      v-if="isInit" -->
-      <XFormGroup
-        ref="formGroup"
-        config-name="ApplyAddContractFormGroup"
-        service-name="af-apply"
-        :group-form-data="formData"
-        mode="新增"
-        @submit="submit"
-      />
-    </template>
-  </NormalDataLayout>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script setup lang="ts">
+import XFormGroup from '@af-mobile-client-vue3/components/data/XFormGroup/index.vue'
+import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { showDialog } from 'vant'
+import { ref } from 'vue'
+import { useRoute } from 'vue-router'
+
+// 纯表单
+const configName = ref('appapplyuserinfoFormGroup')
+const serviceName = ref('af-apply')
+
+// const configName = ref("计划下发Form")
+// const serviceName = ref("af-linepatrol")
+
+// 表单组
+// const configName = ref('lngChargeAuditMobileFormGroup')
+// const serviceName = ref('af-gaslink')
+
+const formData = ref({ t_userinfo: { f_user_name: 111 } })
+const formGroup = ref(null)
+const route = useRoute()
+const isInit = ref(false)
+function submit(_result) {
+  showDialog({ message: '提交成功' })
+  history.back()
+}
+const myXForm = ref([])
+function setRef(value: any) {
+  console.log('myXForm', myXForm)
+  formGroup.value.setRef(myXForm.value)
+  console.log(formGroup)
+}
+// 表单组——数据
+// function initComponents () {
+//   runLogic('getlngChargeAuditMobileFormGroupData', {id: 29}, 'af-gaslink').then((res) => {
+//     formData.value = {...res}
+//   })
+// }
+
+// 纯表单——数据
+// function initComponents() {
+//   formData.value = { plan_name: 'af-llllll', plan_point: '1号点位', plan_single: '1号点位', plan_range: '2024-12-12' }
+// }
+
+// function initComponents() {
+//   runLogic('getlngChargeAuditMobileFormGroupData', { id: route.query?.id, o_id: route.query?.o_id }, 'af-gaslink').then((res) => {
+//     console.log('res------', res)
+//     formData.value = { ...res }
+// formGroup.value.init({
+//   configName: configName.value,
+//   serviceName: serviceName.value,
+//   groupFormData: { ...res },
+//   mode: "新增"
+// })
+//     isInit.value = true
+//   })
+// }
+
+// onBeforeMount(() => {
+//   initComponents()
+// })
+function a() {
+}
+</script>
+
+<template>
+  <NormalDataLayout id="XFormGroupView" title="纯表单">
+    <template #layout_content>
+      <button @click="a">
+        修改
+      </button>
+      <!--      v-if="isInit" -->
+      <XFormGroup
+        ref="formGroup"
+        :config-name="configName"
+        :service-name="serviceName"
+        :group-form-data="formData"
+        mode="新增"
+        @submit="submit"
+      >
+        <!--        <template #device="{ setRef, removeRef, item, formData }">
+          <XFormView :setRef="setRef" :formGroupName="'myXForm'"/>
+        </template> -->
+      </XFormGroup>
+    </template>
+  </NormalDataLayout>
+</template>
+
+<style scoped lang="less">
+
+</style>

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

@@ -1,46 +1,61 @@
-<script setup lang="ts">
-import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
-import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
-import { ref } from 'vue'
-import {
-  Button as VanButton,
-} from 'vant'
-
-const configName = ref('测试Form')
-const serviceName = ref('af-safecheck')
-const formGroupAddConstruction = ref()
-
-// 提交测试
-function onSubmit(form) {
-  console.log('事件触发提交表单----', form)
-}
-async function onAsyncSubmit() {
-  const res = await formGroupAddConstruction.value.asyncSubmit()
-  console.log('异步提交表单----', res)
-}
-function emitFunc(func, data) {
-  console.log('emitFunc:', func, data)
-}
-</script>
-
-<template>
-  <NormalDataLayout id="XFormGroupView" title="纯表单">
-    <template #layout_content>
-      <XForm
-        ref="formGroupAddConstruction"
-        mode="新增"
-        :config-name="configName"
-        :show-tab-header="false"
-        service-name="af-safecheck"
-        :is-group-form="true"
-        @on-submit="onSubmit"
-        @x-form-item-emit-func="emitFunc"
-      />
-    </template>
-  </NormalDataLayout>
-  <van-button type="primary" @click="onAsyncSubmit">提交</van-button>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script setup lang="ts">
+import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
+import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
+import { ref } from 'vue'
+import {
+  showFailToast,
+  showSuccessToast,
+  Button as VanButton,
+  CellGroup as VanCellGroup,
+  Form as VanForm,
+} from 'vant'
+
+const configName = ref('lngSecurityChecktestForm')
+const serviceName = ref('af-safecheck')
+function aaa() {
+  mobileUtil.execute({
+    funcName: 'startNfcScan',
+    param: { a: 1 },
+    callbackFunc: (result) => {
+      console.log('回调了test111', JSON.stringify(result))
+      return 222
+    },
+  })
+}
+function bbb() {
+  mobileUtil.execute({
+    funcName: 'scanBarcode',
+    param: { a: 1 },
+    callbackFunc: (result) => {
+      console.log('回调了test111', JSON.stringify(result))
+      return 222
+    },
+  })
+}
+const formGroupAddConstruction = ref(null)
+</script>
+
+<template>
+  <NormalDataLayout id="XFormGroupView" title="纯表单">
+    <template #layout_content>
+      <VanButton @click="aaa">
+        测试nfc
+      </VanButton>
+      <VanButton @click="bbb">
+        扫码
+      </VanButton>
+      <XForm
+        ref="formGroupAddConstruction"
+        mode="新增"
+        :config-name="configName"
+        :service-name="serviceName"
+        :form-readonly="false"
+      />
+    </template>
+  </NormalDataLayout>
+</template>
+
+<style scoped lang="less">
+
+</style>

package/src/views/user/login/LoginForm.vue

@@ -10,6 +10,7 @@ import { UserType } from '@af-mobile-client-vue3/types/auth'
 import { isWechat } from '@af-mobile-client-vue3/utils/platform-auth'
 import { funcToRouter, loadRoutes } from '@af-mobile-client-vue3/utils/routerUtil'
 import { secureStorageBatchWrite, secureStorageRead } from '@af-mobile-client-vue3/utils/secureStorage'
+import bcrypt from 'bcryptjs'
 import {
   closeToast,
   showDialog,
@@ -123,7 +124,7 @@ function handleSubmit() {
         console.warn(setting)
         const data: any = await userState.Login({
           username,
-          password,
+          password: bcrypt.hashSync(password, 10),
           resourceName: setting.getSetting()?.routerName || '智慧手机',
         })
         login.f = data