af-mobile-client-vue3 1.3.48 → 1.3.50

package/package.json

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

package/src/components/core/XMultiSelect/index.vue

@@ -56,7 +56,7 @@ function search(val) {
 }
 function getData(val) {
   const res = props.columns.filter((item) => {
-    return val.includes(item[props.option.value])
+    return val?.includes(item[props.option.value])
   })
   return res
 }
@@ -90,6 +90,7 @@ function toggleAll() {
 }
 function showPopu(disabled) {
   columnsData.value = JSON.parse(JSON.stringify(props.columns))
+  checkboxValue.value = JSON.parse(JSON.stringify(props.selectValue))
   if (disabled !== undefined && disabled !== false)
     return false
   else
@@ -103,7 +104,7 @@ watch(() => checkboxValue.value.length, (newVal, _oldVal) => {
 })
 const resultLabel = computed(() => {
   const res = props.columns.filter((item) => {
-    return (resultValue.value as unknown as string[]).includes(item[props.option.value])
+    return (resultValue.value as unknown as string[])?.includes(item[props.option.value])
   }).map(item => item[props.option.text])
   return res.join(',')
 })

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

@@ -872,6 +872,7 @@ function findOptionInTree(options, value) {
         :readonly="readonly"
         :placeholder="placeholder"
         :columns="option"
+        :select-value="Array.isArray(modelData) ? modelData : []"
         :option="attr.option ? attr.option : columnsField"
         :rules="[{ required: attr.rule.required === 'true', message: `请选择${attr.name}` }]"
         :required="attr.rule.required === 'true'"

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

@@ -2,6 +2,7 @@
 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'
+import { getConfigByNameAsync, runLogic } from '@af-mobile-client-vue3/services/api/common'
 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'
@@ -105,10 +106,24 @@ function handleSubmit() {
       try {
         loading.value = true
         showLoadingToast('登录中...')
+        let username = formData.username
+        let password = formData.password
+        const webConfig = await getConfigByNameAsync('webConfig')
+        const verification = webConfig.setting?.phoneLoginVerification || false
+        if (verification) {
+          try {
+            const res = await runLogic('openapi/loginVerification', { username, password }) as any
+            username = res.username
+            password = res.password
+          }
+          catch (e) {
+            console.error('验证登录失败: ', e)
+          }
+        }
         console.warn(setting)
         const data: any = await userState.Login({
-          username: formData.username,
-          password: formData.password,
+          username,
+          password,
           resourceName: setting.getSetting()?.routerName || '智慧手机',
         })
         login.f = data