af-mobile-client-vue3 1.2.56 → 1.2.59

package/package.json

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

package/src/stores/modules/setting.ts

@@ -1,10 +1,12 @@
 import { getConfigByNameAsync } from '@af-mobile-client-vue3/services/api/common'
 import { APP_WEB_CONFIG_KEY } from '@af-mobile-client-vue3/stores/mutation-type'
+import { secureStorageBatchWrite } from '@af-mobile-client-vue3/utils/secureStorage'
 import { createStorage } from '@af-mobile-client-vue3/utils/Storage'
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
 
 export interface WebConfig {
+  isAttendance: boolean | false
   systemName: string
   routerName: string
   systemDesc: string
@@ -14,6 +16,9 @@ export interface WebConfig {
   wxLoginAge: boolean
   wxAutoLogin: string
   tenantName: string
+  systemLogo: string
+  homeAppList: Array<any>
+  slideshowList: Array<any>
 }
 
 //  存放 webConfig 中的 setting 配置
@@ -45,6 +50,15 @@ export const useSettingStore = defineStore('setting', () => {
         useStore.set(APP_WEB_CONFIG_KEY, res)
         console.log('res.setting', res.setting)
         setSetting(res.setting)
+        // 如果有pos相关的配置存储到app安全存储中
+        if (res.setting.posConfig) {
+          secureStorageBatchWrite([
+            {
+              key: 'posConfig',
+              value: res.setting.posConfig,
+            },
+          ])
+        }
       }
     }
 

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

@@ -1,97 +1,97 @@
-<script setup lang="ts">
-import XFormGroup from '@af-mobile-client-vue3/components/data/XFormGroup/index.vue'
-import { runLogic } from '@af-mobile-client-vue3/services/api/common'
-import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
-import dayjs from 'dayjs/esm/index'
-import { showToast } from 'vant'
-import { onMounted, ref } from 'vue'
-import { useRoute } from 'vue-router'
-
-const configName = ref('appapplyuserinfoFormGroup')
-const serviceName = ref('af-apply')
-const route = useRoute()
-const userInfo = useUserStore().getUserInfo()
-const workflowId = ref('3045')
-const userinfoid = ref('93116')
-const model = ref('编辑')
-const groupFormData = ref({})
-
-function submit(res) {
-  if (model.value === '新增') {
-    res.t_userinfo.f_operate_date = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    res.t_userinfo.f_orgid = userInfo.f_orgid
-    res.t_userinfo.f_orgname = userInfo.f_orgname
-    res.t_userinfo.f_depid = userInfo.f_depid
-    res.t_userinfo.f_depname = userInfo.f_depname
-    res.t_userinfo.f_operatorid = userInfo.f_operatorid
-    res.t_userinfo.f_operator = userInfo.f_operator
-    res.t_userinfo.f_workflow_id = this.f_workflow_id
-    res.t_userinfo.f_user_state = '预备'
-
-    res.t_userfiles.f_operate_date = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    res.t_userfiles.f_orgid = userInfo.f_orgid
-    res.t_userfiles.f_orgname = userInfo.f_orgname
-    res.t_userfiles.f_depid = userInfo.f_depid
-    res.t_userfiles.f_depname = userInfo.f_depname
-    res.t_userfiles.f_operatorid = userInfo.f_operatorid
-    res.t_userfiles.f_operator = userInfo.f_operator
-    res.t_userfiles.f_workflow_id = this.f_workflow_id
-    res.t_userfiles.f_table_state = '待开通'
-  }
-  let saveData = res
-  if (saveData.t_userfiles.f_gasbrand_id.length > 0) {
-    saveData.t_userfiles.f_gasbrand_id = saveData.t_userfiles.f_gasbrand_id[0]
-  }
-  if (saveData.t_userfiles.f_price_id.length > 0) {
-    saveData.t_userfiles.f_price_id = saveData.t_userfiles.f_price_id[0]
-  }
-  if (model.value === '编辑') {
-    saveData = Object.assign(saveData, {
-      f_operator_record: userInfo.f_operator,
-      f_operatorid_record: userInfo.f_operatorid,
-      f_orgid_record: userInfo.f_orgid,
-      f_orgname_record: userInfo.f_orgname,
-      f_depid_record: userInfo.f_depid,
-      f_depname_record: userInfo.f_depname,
-    })
-  }
-  runLogic('userFIleSaveLogic', saveData, 'af-revenue').then((res) => {
-    showToast('操作成功！')
-    history.back()
-  })
-}
-const isInit = ref(false)
-function init() {
-  if (model.value === '编辑') {
-    runLogic('getFileDetailForEdit', { f_userinfo_id: userinfoid.value }, 'af-revenue').then((res) => {
-      // if (res.t_userfiles.f_gasmodel_id) {
-      //   res.t_userfiles.f_gasmodel_id = 76
-      // }
-      // if (res.t_userfiles.f_price_id) {
-      //   res.t_userfiles.f_price_id = [res.t_userfiles.f_price_id]
-      // }
-      console.log('1111111----,', res)
-      groupFormData.value = res
-      isInit.value = true
-    })
-  }
-}
-onMounted(() => {
-  init()
-})
-</script>
-
-<template>
-  <XFormGroup
-    v-if="isInit"
-    mode="修改"
-    :config-name="configName"
-    :service-name="serviceName"
-    :group-form-data="groupFormData"
-    @submit="submit"
-  />
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script setup lang="ts">
+import XFormGroup from '@af-mobile-client-vue3/components/data/XFormGroup/index.vue'
+import { runLogic } from '@af-mobile-client-vue3/services/api/common'
+import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
+import dayjs from 'dayjs/esm/index'
+import { showToast } from 'vant'
+import { onMounted, ref } from 'vue'
+import { useRoute } from 'vue-router'
+
+const configName = ref('appapplyuserinfoFormGroup')
+const serviceName = ref('af-apply')
+const route = useRoute()
+const userInfo = useUserStore().getUserInfo()
+const workflowId = ref('3045')
+const userinfoid = ref('93116')
+const model = ref('编辑')
+const groupFormData = ref({})
+
+function submit(res) {
+  if (model.value === '新增') {
+    res.t_userinfo.f_operate_date = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    res.t_userinfo.f_orgid = userInfo.f_orgid
+    res.t_userinfo.f_orgname = userInfo.f_orgname
+    res.t_userinfo.f_depid = userInfo.f_depid
+    res.t_userinfo.f_depname = userInfo.f_depname
+    res.t_userinfo.f_operatorid = userInfo.f_operatorid
+    res.t_userinfo.f_operator = userInfo.f_operator
+    res.t_userinfo.f_workflow_id = this.f_workflow_id
+    res.t_userinfo.f_user_state = '预备'
+
+    res.t_userfiles.f_operate_date = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    res.t_userfiles.f_orgid = userInfo.f_orgid
+    res.t_userfiles.f_orgname = userInfo.f_orgname
+    res.t_userfiles.f_depid = userInfo.f_depid
+    res.t_userfiles.f_depname = userInfo.f_depname
+    res.t_userfiles.f_operatorid = userInfo.f_operatorid
+    res.t_userfiles.f_operator = userInfo.f_operator
+    res.t_userfiles.f_workflow_id = this.f_workflow_id
+    res.t_userfiles.f_table_state = '待开通'
+  }
+  let saveData = res
+  if (saveData.t_userfiles.f_gasbrand_id.length > 0) {
+    saveData.t_userfiles.f_gasbrand_id = saveData.t_userfiles.f_gasbrand_id[0]
+  }
+  if (saveData.t_userfiles.f_price_id.length > 0) {
+    saveData.t_userfiles.f_price_id = saveData.t_userfiles.f_price_id[0]
+  }
+  if (model.value === '编辑') {
+    saveData = Object.assign(saveData, {
+      f_operator_record: userInfo.f_operator,
+      f_operatorid_record: userInfo.f_operatorid,
+      f_orgid_record: userInfo.f_orgid,
+      f_orgname_record: userInfo.f_orgname,
+      f_depid_record: userInfo.f_depid,
+      f_depname_record: userInfo.f_depname,
+    })
+  }
+  runLogic('userFIleSaveLogic', saveData, 'af-revenue').then((res) => {
+    showToast('操作成功！')
+    history.back()
+  })
+}
+const isInit = ref(false)
+function init() {
+  if (model.value === '编辑') {
+    runLogic('getFileDetailForEdit', { f_userinfo_id: userinfoid.value }, 'af-revenue').then((res) => {
+      // if (res.t_userfiles.f_gasmodel_id) {
+      //   res.t_userfiles.f_gasmodel_id = 76
+      // }
+      // if (res.t_userfiles.f_price_id) {
+      //   res.t_userfiles.f_price_id = [res.t_userfiles.f_price_id]
+      // }
+      console.log('1111111----,', res)
+      groupFormData.value = res
+      isInit.value = true
+    })
+  }
+}
+onMounted(() => {
+  init()
+})
+</script>
+
+<template>
+  <XFormGroup
+    v-if="isInit"
+    mode="修改"
+    :config-name="configName"
+    :service-name="serviceName"
+    :group-form-data="groupFormData"
+    @submit="submit"
+  />
+</template>
+
+<style scoped lang="less">
+
+</style>

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

@@ -5,13 +5,14 @@ import GetAppDataService from '@af-mobile-client-vue3/plugins/AppData'
 import { getUserPermissions } from '@af-mobile-client-vue3/services/api/search'
 import { useSettingStore } from '@af-mobile-client-vue3/stores/modules/setting'
 import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
-import { indexedDB } from '@af-mobile-client-vue3/utils/indexedDB'
 import { funcToRouter, loadRoutes } from '@af-mobile-client-vue3/utils/routerUtil'
+import { secureStorageBatchWrite, secureStorageRead } from '@af-mobile-client-vue3/utils/secureStorage'
 import { isWechat } from '@af-mobile-client-vue3/utils/wechatUtil'
 import {
   closeToast,
   showDialog,
   showFailToast,
+  showLoadingToast,
   Switch,
   Button as VanButton,
   Col as VanCol,
@@ -102,6 +103,8 @@ function handleSubmit() {
     .then(async () => {
       try {
         loading.value = true
+        showLoadingToast('登录中...')
+        console.warn(setting)
         const data: any = await userState.Login({
           username: formData.username,
           password: formData.password,
@@ -158,6 +161,19 @@ function closeWindows() {
 }
 
 async function afterGeneral(result) {
+  // 排序 functions 及其嵌套的 children
+  if (result.functions && Array.isArray(result.functions)) {
+    // 对顶层菜单进行排序
+    result.functions.sort((a, b) => (a.position || 0) - (b.position || 0))
+
+    // 对每个菜单的子项进行排序
+    for (const item of result.functions) {
+      if (item.children && Array.isArray(item.children)) {
+        item.children.sort((a, b) => (a.position || 0) - (b.position || 0))
+      }
+    }
+  }
+
   const user: any = {
     ...result,
     username: result.ename,
@@ -172,8 +188,25 @@ async function afterGeneral(result) {
   userState.setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])
   // 加载路由
   loadRoutes(funcToRouter(user.functions))
+
+  // 存储登录数据到本地缓存
+  secureStorageBatchWrite([
+    {
+      key: 'loginData',
+      value: {
+        username: formData.username,
+        password: formData.password,
+        rememberMe: rememberMe.value,
+      },
+    },
+    {
+      key: 'userData',
+      value: result,
+    },
+  ])
+
   // 每次重新登录时，清除indexedDB缓存
-  indexedDB.clear()
+  // indexedDB.clear()
 }
 async function wxLoginFun() {
   await localStorage.setItem('wechatLoginPending', 'true')
@@ -221,6 +254,23 @@ onMounted(() => {
     localStorage.removeItem('wechatLoginPending')
     wxLoginFunContinue(code, state)
   }
+  try {
+    // 手机登录获取本地缓存的登录数据
+    secureStorageRead('loginData', (result: any) => {
+      if (result.status === 'success') {
+        const res = JSON.parse(result.data.value)
+        if (res.rememberMe) {
+          formData.username = res.username
+          formData.password = res.password
+          rememberMe.value = res.rememberMe
+        }
+      }
+    })
+  }
+  catch (e) {
+    console.warn('读取本地缓存失败', e)
+    // 未拿到跳过
+  }
 })
 </script>
 
@@ -267,9 +317,9 @@ onMounted(() => {
             <span>记住密码</span>
           </div>
         </VanCol>
-        <VanCol>
+        <!--        <VanCol>
           <a class="extra_setting_for_reset_password" @click="setLoginState(LoginStateEnum.RESET_PASSWORD)">忘记密码?</a>
-        </VanCol>
+        </VanCol> -->
       </VanRow>
       <VanButton class="login_btn btn" type="primary" block native-type="submit" :loading="loading">
         登 录