af-mobile-client-vue3 1.2.24 → 1.2.26

package/package.json

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

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

@@ -37,6 +37,7 @@ interface GroupFormItems {
   showSubmitBtn?: boolean
   groupName?: string
   tableName?: string
+  paramLogicName?: string
 }
 
 interface InitParams {
@@ -64,7 +65,7 @@ const props = withDefaults(defineProps<{
   mode: '查询',
   submitButton: true,
   isHandleFormKey: true,
-  paramLogicNameParam: undefined,
+  paramLogicNameParam: {},
 })
 
 const emits = defineEmits(['onSubmit', 'xFormItemEmitFunc'])
@@ -170,29 +171,6 @@ async function loadFormConfig(): Promise<void> {
   return new Promise((resolve, reject) => {
     getConfigByName(props.configName!, (result) => {
       if (result) {
-        // 如果有 paramLogicName，自动请求并赋值
-        if (result.paramLogicName && (!props.formData || (props.formData && Object.keys(props.formData).length === 0))) {
-          let logicParam = props.paramLogicNameParam
-          if (typeof logicParam === 'string') {
-            try {
-              logicParam = JSON.parse(logicParam)
-            }
-            catch {
-              logicParam = { value: logicParam }
-            }
-          }
-          logicParam = {
-            ...logicParam,
-            currUserName: userStore.getUserInfo().name,
-            currUserId: userStore.getUserInfo().id,
-            orgId: userStore.getUserInfo().orgid,
-          }
-          runLogic(result.paramLogicName, logicParam || {}, props.serviceName).then((data: any) => {
-            if (data) {
-              form.value = data
-            }
-          })
-        }
         setupFormConfig(result)
         resolve()
       }
@@ -220,6 +198,7 @@ async function initWithGroupFormItems() {
 
 // 设置表单配置
 function setupFormConfig(config: GroupFormItems) {
+  loadParamLogicNameData(config.paramLogicName)
   formConfig.value = config
   myServiceName.value = props.serviceName || ''
   formGroupName.value = config.groupName || 'default'
@@ -351,6 +330,32 @@ function init(params: InitParams) {
   }
 }
 
+function loadParamLogicNameData(paramLogicName) {
+  // 如果有 paramLogicName，自动请求并赋值
+  if (paramLogicName && (!props.formData || (props.formData && Object.keys(props.formData).length === 0))) {
+    let logicParam = props?.paramLogicNameParam || {}
+    if (typeof logicParam === 'string') {
+      try {
+        logicParam = JSON.parse(logicParam)
+      }
+      catch {
+        logicParam = { value: logicParam }
+      }
+    }
+    logicParam = {
+      ...logicParam,
+      currUserName: userStore.getUserInfo().name,
+      currUserId: userStore.getUserInfo().id,
+      orgId: userStore.getUserInfo().orgid,
+    }
+    runLogic(paramLogicName, logicParam || {}, props.serviceName).then((data: any) => {
+      if (data) {
+        form.value = data
+      }
+    })
+  }
+}
+
 function setForm(obj: object) {
   Object.assign(form.value, obj)
 }

package/src/stores/modules/user.ts

@@ -37,7 +37,7 @@ export interface UserInfo {
 
 interface IUserState {
   token?: string
-  userInfo: UserInfo
+  userInfo: any
   lastUpdateTime: number
   permissions: string[]
   roles: [{ id: string, operation: string[] }]
@@ -102,7 +102,7 @@ export const useUserStore = defineStore('app-user', () => {
   const setToken = (token: string | undefined) => {
     Storage.set(ACCESS_TOKEN, token)
   }
-  const setUserInfo = (info: UserInfo | null) => {
+  const setUserInfo = (info: any | null) => {
     userState.value.userInfo = info
     userState.value.lastUpdateTime = new Date().getTime()
     Storage.set(CURRENT_USER, info)

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

@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import type { UserInfo } from '@af-mobile-client-vue3/stores/modules/user'
 import type { FormInstance } from 'vant'
 import { LoginStateEnum, useFormRules, useLoginState } from '@af-mobile-client-vue3/hooks/useLogin'
 import GetAppDataService from '@af-mobile-client-vue3/plugins/AppData'
@@ -159,21 +158,10 @@ function closeWindows() {
 }
 
 async function afterGeneral(result) {
-  console.log('用户根本---', result)
-  const user: UserInfo = {
-    id: result.id,
+  const user: any = {
+    ...result,
     username: result.ename,
-    password: formData.password,
-    name: result.name,
     avatar: result.avatar ? result.avatar : setting.getSetting()?.defaultAvatarUrl,
-    functions: result.functions,
-    rolestr: result.rolestr,
-    f_operator: result.name,
-    f_operatorid: result.id,
-    f_orgid: result.orgid,
-    f_orgname: result.orgs,
-    f_depid: result.f_department_id,
-    f_depname: result.f_department_name,
   }
   userState.setUserInfo(user)
   // 如果result中没有返回 权限 需要主动获取权限列表