af-mobile-client-vue3 1.4.96 → 1.4.98

package/package.json

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

package/src/App.vue

@@ -108,8 +108,8 @@ input[type='password']::-ms-clear {
 .app-container {
   display: flex;
   flex-direction: column;
-  height: 100vh; /* 使用 vh 确保在移动端浏览器中也能撑满 */
-  height: 100dvh; /* 使用动态视口高度，处理移动端工具栏遮挡 */
+  /*noinspection CssUnresolvedCustomProperty*/
+  height: calc(100vh - var(--system-header-height, 0px)); /* 使用 vh 确保在移动端浏览器中也能撑满 */
   width: 100%;
 }
 

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

@@ -1114,7 +1114,7 @@ function emitFunc(func: any, data: any, value: any) {
 
 <style scoped lang="less">
 #XCellList {
-  height: calc(100vh - var(--van-nav-bar-height) - 20px);
+  height: 100%;
   display: flex;
   flex-direction: column;
   --van-search-padding: 3px;

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

@@ -739,7 +739,7 @@ defineExpose({ init, form, formGroupName, validate, asyncSubmit, setForm, getFor
 
 <style scoped>
 .use-full-height {
-  height: calc(100vh - var(--van-nav-bar-height) - 20px);
+  height: 100%;
 }
 
 .x-form-container {

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

@@ -184,7 +184,7 @@ defineExpose({ init, removeRef, xFormListRef, getGroupFormData })
   display: flex;
   flex-direction: column;
   background-color: rgb(247, 248, 250);
-  height: calc(100vh - var(--van-nav-bar-height) - 20px);
+  height: 100%;
   flex: 1;
   overflow-y: auto;
   // 让 Tabs 区域自适应剩余空间

package/src/router/routes.ts

@@ -362,6 +362,15 @@ const routes: Array<RouteRecordRaw> = [
       keepAlive: false,
     },
   },
+  {
+    path: '/XCellListView',
+    name: 'ComponentView',
+    component: ComponentView,
+    meta: {
+      title: '组件工具列表',
+      keepAlive: false,
+    },
+  },
   {
     path: '/login',
     name: 'login',

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

@@ -11,6 +11,7 @@ import { checkAndInitDrivingConfig } from '@af-mobile-client-vue3/utils/driving/
 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 ModifyPassword from '@af-mobile-client-vue3/views/user/my/comm/ModifyPassword.vue'
 import bcrypt from 'bcryptjs'
 import {
   closeToast,
@@ -51,6 +52,8 @@ const setting = useSettingStore()
 const getShow = computed(() => (unref(getLoginState) === LoginStateEnum.LOGIN))
 
 const login: any = inject('$login')
+const showModifyPwdModal = ref(false)
+
 onBeforeMount(async () => {
   if (isWechat() && setting.getSetting()?.wxAutoLogin) {
     // 检测是否要开放微信登录
@@ -101,6 +104,11 @@ onBeforeMount(async () => {
     }
   }
 })
+
+function openModifyPwdModal() {
+  showModifyPwdModal.value = true
+}
+
 function handleSubmit() {
   formRef.value
     ?.validate()
@@ -124,28 +132,34 @@ function handleSubmit() {
           password: bcrypt.hashSync(password, 10),
           resourceName: setting.getSetting()?.routerName || '智慧手机',
         })
-        login.f = data
-        await Promise.all([GetAppDataService.load()])
-        const loginInfo = {
-          f: login.f,
-          jwt: login.f.id,
-          r: login.r,
+        if (password === '000000') {
+          openModifyPwdModal()
+          loading.value = false
         }
-        userState.setLogin(loginInfo)
-        const compatible = import.meta.env.VITE_APP_COMPATIBLE
-        if (compatible === 'OA')
-          await afterGeneral(data)
-        else
-          if (data.resources.data)
-            await afterGeneral(data.resources.data, data.access_token)
+        else {
+          login.f = data
+          await Promise.all([GetAppDataService.load()])
+          const loginInfo = {
+            f: login.f,
+            jwt: login.f.id,
+            r: login.r,
+          }
+          userState.setLogin(loginInfo)
+          const compatible = import.meta.env.VITE_APP_COMPATIBLE
+          if (compatible === 'OA')
+            await afterGeneral(data)
           else
-            await afterGeneral(data.resources, data.access_token)
+            if (data.resources.data)
+              await afterGeneral(data.resources.data, data.access_token)
+            else
+              await afterGeneral(data.resources, data.access_token)
 
-        const toPath = decodeURIComponent((route.query?.redirect || '/') as string)
-        closeToast()
-        if (route.name === '/login')
-          await router.replace('/')
-        else await router.replace(toPath)
+          const toPath = decodeURIComponent((route.query?.redirect || '/') as string)
+          closeToast()
+          if (route.name === '/login')
+            await router.replace('/')
+          else await router.replace(toPath)
+        }
       }
       finally {
         loading.value = false
@@ -357,6 +371,12 @@ onMounted(() => {
         微信登录
       </VanButton>
     </VanForm>
+    <!-- 修改密码弹窗 -->
+    <ModifyPassword
+      v-model:visible="showModifyPwdModal"
+      :ename="formData.username"
+      :password="formData.password"
+    />
   </div>
 </template>
 

package/src/views/user/my/comm/ModifyPassword.vue

@@ -24,7 +24,7 @@ const formRef = ref()
 
 // 表单数据
 const formData = reactive({
-  oldPassword: '',
+  oldPassword: props.password || '',
   newPassword: '',
   confirmPassword: '',
 })
@@ -53,7 +53,7 @@ function validateConfirmPassword(value: string): boolean {
 // 表单验证规则
 const rules = {
   oldPassword: [
-    { required: true, message: '请输入旧密码' },
+    { required: !props.password, message: '请输入旧密码' },
   ],
   newPassword: [
     { required: true, message: '请输入新密码' },
@@ -83,14 +83,12 @@ const rules = {
 async function handleSubmit() {
   try {
     loading.value = true
-
     // 验证表单
     await formRef.value?.validate()
-
     // 调用修改密码API
     const result = await handleModifyPassword({ data: {
-      ename: userStore.getUserInfo().username,
-      password: formData.oldPassword,
+      ename: props.ename || userStore.getUserInfo().username,
+      password: props.password || formData.oldPassword,
       newpassword: formData.newPassword,
       affirmpassword: formData.confirmPassword,
     } })
@@ -185,6 +183,7 @@ watch(() => props.visible, (newVal) => {
       <van-form ref="formRef" class="password-form" @submit="handleSubmit">
         <!-- 旧密码 -->
         <van-field
+          v-if="!props.password"
           v-model="formData.oldPassword"
           name="oldPassword"
           label="旧密码"