af-mobile-client-vue3 1.3.47 → 1.3.49

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.3.47",
+  "version": "1.3.49",
   "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,14 +104,14 @@ 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(',')
 })
 </script>
 
 <template>
-  <div class="dh-field">
+  <div class="x-multi-select">
     <VanField
       v-model="resultLabel"
       v-bind="$attrs"
@@ -131,7 +132,7 @@ const resultLabel = computed(() => {
           确认
         </button>
       </div>
-      <div style="max-height:264px; overflow-y:auto;">
+      <div class="x-multi-select-content">
         <VanSearch
           v-if="props.isSearch"
           v-model="searchVal"
@@ -139,44 +140,53 @@ const resultLabel = computed(() => {
           @update:model-value="search"
           @cancel="search"
         />
-        <VanCell title="全选">
-          <template #right-icon>
-            <VanCheckbox v-model="checkedAll" name="all" @click="toggleAll" />
-          </template>
-        </VanCell>
-        <VanCheckboxGroup ref="checkboxGroup" v-model="checkboxValue" @change="change">
-          <VanCellGroup>
-            <VanCell
-              v-for="(item, index) in columnsData"
-              :key="item[props.option.value]"
-              :title="item[props.option.text]"
-              clickable
-              @click="toggle(item, index)"
-            >
-              <template #right-icon>
-                <VanCheckbox ref="checkboxes" :name="item[props.option.value]" @click.stop />
-              </template>
-            </VanCell>
-          </VanCellGroup>
-        </VanCheckboxGroup>
+        <div class="x-multi-select-checkbox-group">
+          <VanCell title="全选">
+            <template #right-icon>
+              <VanCheckbox v-model="checkedAll" name="all" @click="toggleAll" />
+            </template>
+          </VanCell>
+          <VanCheckboxGroup ref="checkboxGroup" v-model="checkboxValue" @change="change">
+            <VanCellGroup>
+              <VanCell
+                v-for="(item, index) in columnsData"
+                :key="item[props.option.value]"
+                :title="item[props.option.text]"
+                clickable
+                @click="toggle(item, index)"
+              >
+                <template #right-icon>
+                  <VanCheckbox ref="checkboxes" :name="item[props.option.value]" @click.stop />
+                </template>
+              </VanCell>
+            </VanCellGroup>
+          </VanCheckboxGroup>
+        </div>
       </div>
     </VanPopup>
   </div>
 </template>
 
 <style lang="less" scoped>
-.dh-field {
+.x-multi-select {
   width: 100%;
   padding: 0;
   background: #fff;
   .dh-cell.van-cell {
-    padding: 10px 0;
+    padding: 10px 16px;
   }
   .dh-cell.van-cell--required::before {
     left: -8px;
   }
-  .van-popup {
-    border-radius: 20px 20px 0 0;
+  .x-multi-select-content {
+    max-height: 264px;
+    overflow-y: auto;
+    .x-multi-select-checkbox-group {
+      padding: 0 16px;
+    }
   }
+  //.van-popup {
+  //  border-radius: 20px 20px 0 0;
+  //}
 }
 </style>

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,25 @@ function handleSubmit() {
       try {
         loading.value = true
         showLoadingToast('登录中...')
+        let username = formData.username
+        let password = formData.password
+        debugger
+        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