af-mobile-client-vue3 1.2.15 → 1.2.16

package/src/stores/modules/user.ts

@@ -1,235 +1,231 @@
-import type { RouteRecordRaw } from 'vue-router'
-import { doLogout, login, OALogin } from '@af-mobile-client-vue3/api/user'
-import router from '@af-mobile-client-vue3/router/index'
-import { useSettingStore } from '@af-mobile-client-vue3/stores/modules/setting'
-import {
-  ACCESS_TOKEN,
-  APP_LOGIN_KEY,
-  APP_PERMISSIONS_KEY,
-  APP_ROLES_KEY,
-  APP_ROUTES_KEY,
-  APP_WEB_CONFIG_KEY,
-  CURRENT_USER,
-} from '@af-mobile-client-vue3/stores/mutation-type'
-import crypto from '@af-mobile-client-vue3/utils/crypto'
-import { indexedDB } from '@af-mobile-client-vue3/utils/indexedDB'
-import { createStorage } from '@af-mobile-client-vue3/utils/Storage'
-import { defineStore } from 'pinia'
-import { ref } from 'vue'
-
-const Storage = createStorage({ storage: localStorage })
-
-export interface UserInfo {
-  id: number
-  username: string
-  password: string
-  name: string
-  avatar: string
-  functions: Array<any>
-  rolestr: string
-  f_operator: string
-  f_operatorid: string
-  f_orgid: string
-  f_orgname: string
-  f_depid: string
-  f_depname: string
-}
-
-interface IUserState {
-  token?: string
-  userInfo: UserInfo
-  lastUpdateTime: number
-  permissions: string[]
-  roles: [{ id: string, operation: string[] }]
-  routesConfig: Array<any>
-  single: Array<ExtraRouteRecordRaw>
-  login: any
-  tenantName: string
-}
-
-type ExtraRouteRecordRaw = RouteRecordRaw & {
-  delete: boolean
-  fullPath: string
-}
-
-interface LoginParams {
-  username: string
-  password: string
-  resourceName: string
-}
-
-interface WxParams {
-  unifiedCode: string
-  tenantName: string
-  loginMode: string
-  resourceName: string
-}
-
-export const useUserStore = defineStore('app-user', () => {
-  const userState = ref<IUserState>({
-    userInfo: null,
-    token: undefined,
-    lastUpdateTime: 0,
-    // 旧营收产品$login对象
-    login: undefined,
-    permissions: null,
-    roles: null,
-    routesConfig: null,
-    single: [],
-    tenantName: '',
-  } as IUserState)
-  const getUserInfo = () => {
-    return userState.value.userInfo || Storage.get(CURRENT_USER, {}) || {}
-  }
-  const getLogin = () => {
-    return userState.value.login || Storage.get(APP_LOGIN_KEY, []) || {}
-  }
-  const getPermissions = () => {
-    return userState.value.permissions || Storage.get(APP_PERMISSIONS_KEY, []) || []
-  }
-  const getRoles = () => {
-    return userState.value.roles || Storage.get(APP_ROLES_KEY, []) || []
-  }
-  const getRoutesConfig = () => {
-    return userState.value.routesConfig || Storage.get(APP_ROUTES_KEY, []) || []
-  }
-  const getToken = () => {
-    return userState.value.token || Storage.get(ACCESS_TOKEN, '') as string
-  }
-  const getLastUpdateTime = () => {
-    return userState.value.lastUpdateTime
-  }
-  const setToken = (token: string | undefined) => {
-    Storage.set(ACCESS_TOKEN, token)
-  }
-  const setUserInfo = (info: UserInfo | null) => {
-    userState.value.userInfo = info
-    userState.value.lastUpdateTime = new Date().getTime()
-    Storage.set(CURRENT_USER, info)
-  }
-  const setLogin = (login) => {
-    userState.value.login = login
-    Storage.set(APP_LOGIN_KEY, login)
-  }
-
-  const setTenantName = (setTenantName) => {
-    userState.value.tenantName = setTenantName
-  }
-  const getTenantName = () => {
-    return userState.value.tenantName
-  }
-  const setSingle = (page: ExtraRouteRecordRaw) => {
-    if (page.path && page.delete) {
-      // 删除
-      userState.value.single = userState.value.single.filter(item => item.fullPath !== page.path)
-    }
-    else if (userState.value.single.filter(item => item.meta.singlePage === page.meta.singlePage).length === 0) {
-      // 添加
-      userState.value.single.push(page)
-    }
-  }
-  const setPermissions = (permissions: []) => {
-    userState.value.permissions = permissions
-    Storage.set(APP_PERMISSIONS_KEY, permissions)
-  }
-  const setRoles = (roles: [{ id: string, operation: string[] }]) => {
-    userState.value.roles = roles
-    Storage.set(APP_ROLES_KEY, roles)
-  }
-  const setRoutesConfig = (routesConfig: Array<any>) => {
-    userState.value.routesConfig = routesConfig
-    Storage.set(APP_ROUTES_KEY, routesConfig)
-  }
-  const Login = async (params: LoginParams) => {
-    try {
-      let data: any
-      const compatible = import.meta.env.VITE_APP_COMPATIBLE
-      if (compatible === 'OA') {
-        data = await OALogin(params)
-        // save token
-        setToken(params.password)
-      }
-      else {
-        data = await login(params)
-        // save token
-        setToken(data.access_token)
-        // 第三方教培系统鉴权兼容
-        const LoginTicket = crypto.AESEncrypt(JSON.stringify(params), '3KMKqvgwR8ULbR8Z')
-        Storage.set('LoginTicket', LoginTicket)
-      }
-      return Promise.resolve(data)
-    }
-    catch (error) {
-      return Promise.reject(error)
-    }
-  }
-  const loginUnified = async (params: WxParams) => {
-    try {
-      const data: any = await login(params)
-      setToken(data.access_token)
-      const LoginTicket = crypto.AESEncrypt(JSON.stringify(params), '3KMKqvgwR8ULbR8Z')
-      Storage.set('LoginTicket', LoginTicket)
-      return Promise.resolve(data)
-    }
-    catch (error) {
-      return Promise.reject(error)
-    }
-  }
-  const logout = async () => {
-    if (getToken) {
-      try {
-        await doLogout()
-      }
-      catch {
-        console.error('注销Token失败')
-      }
-    }
-    setToken(undefined)
-    setUserInfo(null)
-    Storage.remove(CURRENT_USER)
-    Storage.remove(ACCESS_TOKEN)
-    Storage.remove(APP_LOGIN_KEY)
-    Storage.remove(APP_PERMISSIONS_KEY)
-    Storage.remove(APP_ROLES_KEY)
-    Storage.remove(APP_ROUTES_KEY)
-    Storage.remove(APP_WEB_CONFIG_KEY)
-    Storage.remove('LoginTicket')
-    await indexedDB.clearDB()
-    await useSettingStore().init()
-    try {
-      // 添加页面刷新
-      await router.replace('/login')
-      window.location.reload()
-    }
-    catch (e) {
-      console.error(e)
-    }
-  }
-  const getCode = (tenantName: string) => {
-    window.location.replace(`api/af-system/user/getcode?state=${tenantName}`)
-  }
-
-  return {
-    Login,
-    loginUnified,
-    getToken,
-    getLastUpdateTime,
-    logout,
-    setUserInfo,
-    getUserInfo,
-    getLogin,
-    getPermissions,
-    getRoles,
-    getRoutesConfig,
-    setLogin,
-    setSingle,
-    setPermissions,
-    setRoles,
-    setRoutesConfig,
-    setTenantName,
-    getTenantName,
-    getCode,
-  }
-})
-
-export default useUserStore
+import type { RouteRecordRaw } from 'vue-router'
+import { doLogout, login, OALogin } from '@af-mobile-client-vue3/api/user'
+import router from '@af-mobile-client-vue3/router/index'
+import { useSettingStore } from '@af-mobile-client-vue3/stores/modules/setting'
+import {
+  ACCESS_TOKEN,
+  APP_LOGIN_KEY,
+  APP_PERMISSIONS_KEY,
+  APP_ROLES_KEY,
+  APP_ROUTES_KEY,
+  APP_WEB_CONFIG_KEY,
+  CURRENT_USER,
+} from '@af-mobile-client-vue3/stores/mutation-type'
+import crypto from '@af-mobile-client-vue3/utils/crypto'
+import { indexedDB } from '@af-mobile-client-vue3/utils/indexedDB'
+import { createStorage } from '@af-mobile-client-vue3/utils/Storage'
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
+const Storage = createStorage({ storage: localStorage })
+
+export interface UserInfo {
+  id: number
+  username: string
+  password: string
+  name: string
+  avatar: string
+  functions: Array<any>
+  rolestr: string
+  f_operator: string
+  f_operatorid: string
+  f_orgid: string
+  f_orgname: string
+  f_depid: string
+  f_depname: string
+}
+
+interface IUserState {
+  token?: string
+  userInfo: UserInfo
+  lastUpdateTime: number
+  permissions: string[]
+  roles: [{ id: string, operation: string[] }]
+  routesConfig: Array<any>
+  single: Array<ExtraRouteRecordRaw>
+  login: any
+  tenantName: string
+}
+
+type ExtraRouteRecordRaw = RouteRecordRaw & {
+  delete: boolean
+  fullPath: string
+}
+
+interface LoginParams {
+  username: string
+  password: string
+  resourceName: string
+}
+
+interface WxParams {
+  unifiedCode: string
+  tenantName: string
+  loginMode: string
+  resourceName: string
+}
+
+export const useUserStore = defineStore('app-user', () => {
+  const userState = ref<IUserState>({
+    userInfo: null,
+    token: undefined,
+    lastUpdateTime: 0,
+    // 旧营收产品$login对象
+    login: undefined,
+    permissions: null,
+    roles: null,
+    routesConfig: null,
+    single: [],
+    tenantName: '',
+  } as IUserState)
+  const getUserInfo = () => {
+    return userState.value.userInfo || Storage.get(CURRENT_USER, {}) || {}
+  }
+  const getLogin = () => {
+    return userState.value.login || Storage.get(APP_LOGIN_KEY, []) || {}
+  }
+  const getPermissions = () => {
+    return userState.value.permissions || Storage.get(APP_PERMISSIONS_KEY, []) || []
+  }
+  const getRoles = () => {
+    return userState.value.roles || Storage.get(APP_ROLES_KEY, []) || []
+  }
+  const getRoutesConfig = () => {
+    return userState.value.routesConfig || Storage.get(APP_ROUTES_KEY, []) || []
+  }
+  const getToken = () => {
+    return userState.value.token || Storage.get(ACCESS_TOKEN, '') as string
+  }
+  const getLastUpdateTime = () => {
+    return userState.value.lastUpdateTime
+  }
+  const setToken = (token: string | undefined) => {
+    Storage.set(ACCESS_TOKEN, token)
+  }
+  const setUserInfo = (info: UserInfo | null) => {
+    userState.value.userInfo = info
+    userState.value.lastUpdateTime = new Date().getTime()
+    Storage.set(CURRENT_USER, info)
+  }
+  const setLogin = (login) => {
+    userState.value.login = login
+    Storage.set(APP_LOGIN_KEY, login)
+  }
+
+  const setTenantName = (setTenantName) => {
+    userState.value.tenantName = setTenantName
+  }
+  const getTenantName = () => {
+    return userState.value.tenantName
+  }
+  const setSingle = (page: ExtraRouteRecordRaw) => {
+    if (page.path && page.delete) {
+      // 删除
+      userState.value.single = userState.value.single.filter(item => item.fullPath !== page.path)
+    }
+    else if (userState.value.single.filter(item => item.meta.singlePage === page.meta.singlePage).length === 0) {
+      // 添加
+      userState.value.single.push(page)
+    }
+  }
+  const setPermissions = (permissions: []) => {
+    userState.value.permissions = permissions
+    Storage.set(APP_PERMISSIONS_KEY, permissions)
+  }
+  const setRoles = (roles: [{ id: string, operation: string[] }]) => {
+    userState.value.roles = roles
+    Storage.set(APP_ROLES_KEY, roles)
+  }
+  const setRoutesConfig = (routesConfig: Array<any>) => {
+    userState.value.routesConfig = routesConfig
+    Storage.set(APP_ROUTES_KEY, routesConfig)
+  }
+  const Login = async (params: LoginParams) => {
+    try {
+      let data: any
+      const compatible = import.meta.env.VITE_APP_COMPATIBLE
+      if (compatible === 'OA') {
+        data = await OALogin(params)
+        // save token
+        setToken(params.password)
+      }
+      else {
+        data = await login(params)
+        // save token
+        setToken(data.access_token)
+        // 第三方教培系统鉴权兼容
+        const LoginTicket = crypto.AESEncrypt(JSON.stringify(params), '3KMKqvgwR8ULbR8Z')
+        Storage.set('LoginTicket', LoginTicket)
+      }
+      return Promise.resolve(data)
+    }
+    catch (error) {
+      return Promise.reject(error)
+    }
+  }
+  const loginUnified = async (params: WxParams) => {
+    try {
+      const data: any = await login(params)
+      setToken(data.access_token)
+      const LoginTicket = crypto.AESEncrypt(JSON.stringify(params), '3KMKqvgwR8ULbR8Z')
+      Storage.set('LoginTicket', LoginTicket)
+      return Promise.resolve(data)
+    }
+    catch (error) {
+      return Promise.reject(error)
+    }
+  }
+  const logout = async () => {
+    if (getToken) {
+      try {
+        await doLogout()
+      }
+      catch {
+        console.error('注销Token失败')
+      }
+    }
+    setToken(undefined)
+    setUserInfo(null)
+    Storage.remove(CURRENT_USER)
+    Storage.remove(ACCESS_TOKEN)
+    Storage.remove(APP_LOGIN_KEY)
+    Storage.remove(APP_PERMISSIONS_KEY)
+    Storage.remove(APP_ROLES_KEY)
+    Storage.remove(APP_ROUTES_KEY)
+    Storage.remove(APP_WEB_CONFIG_KEY)
+    Storage.remove('LoginTicket')
+    await indexedDB.clearDB()
+    await useSettingStore().init()
+    try {
+      // 添加页面刷新
+      await router.replace('/login')
+      window.location.reload()
+    }
+    catch (e) {
+      console.error(e)
+    }
+  }
+
+  return {
+    Login,
+    loginUnified,
+    getToken,
+    getLastUpdateTime,
+    logout,
+    setUserInfo,
+    getUserInfo,
+    getLogin,
+    getPermissions,
+    getRoles,
+    getRoutesConfig,
+    setLogin,
+    setSingle,
+    setPermissions,
+    setRoles,
+    setRoutesConfig,
+    setTenantName,
+    getTenantName,
+  }
+})
+
+export default useUserStore

package/src/styles/login.less

@@ -1,112 +1,95 @@
-html:not(.dark) {
-  .form {
-    .form_field {
-      :deep(.van-field__label) {
-        color: rgb(88, 88, 88);
-      }
-      :deep(.van-field__body) {
-        background: rgb(251, 251, 251);
-        box-shadow: inset 0 0 1px 0 rgba(0, 0, 0, 0.1);
-        color: rgb(71, 71, 71);
-      }
-      :deep(.van-cell) {
-        background: #ffffff;
-      }
-    }
-    .extra_setting {
-      .extra_setting_for_remember_password {
-        color: rgb(88, 88, 88);
-      }
-    }
-  }
-}
-.form {
-  width: 100%;
-  padding: 0 40px;
-  .form_field {
-    padding-right: 0;
-    padding-left: 0;
-    :deep(.van-field__label) {
-      opacity: 0.7;
-      font-size: 16px;
-      font-weight: 400;
-      line-height: 23px;
-      text-transform: uppercase;
-      text-indent: 10px;
-    }
-    :deep(.van-field__body) {
-      height: 40px;
-      border-radius: 5px;
-      font-size: 16px;
-      font-weight: 400;
-      padding: 8px 10px;
-      opacity: 0.6;
-    }
-  }
-  .extra_setting {
-    font-size: 12px;
-    font-weight: 400;
-    line-height: 12px;
-    .extra_setting_for_remember_password {
-      opacity: 0.7;
-      span {
-        position: relative;
-        bottom: 3px;
-        left: 5px;
-      }
-    }
-    .extra_setting_for_reset_password {
-      position: relative;
-      top: 2px;
-      opacity: 0.7;
-      color: rgb(56, 149, 250);
-    }
-  }
-  .btn {
-    height: 50px;
-    :deep(.van-button__text) {
-      color: rgb(255, 255, 255);
-      font-size: 16px;
-      font-weight: 700;
-      line-height: 23px;
-    }
-  }
-  .login_btn {
-    background: rgb(56, 149, 250);
-    margin-top: 104px;
-  }
-  .reset_btn {
-    margin: 24px 0;
-  }
-  .back_btn {
-    :deep(.van-button__text) {
-      color: rgb(56, 149, 250);
-    }
-  }
-  :deep(.van-cell:after) {
-    border-bottom: none;
-  }
-}
-.login_form {
-  margin-top: 65px;
-}
-.forget_password_form {
-  margin-top: 15px;
-}
-
-/* 使图标垂直居中 */
-.wechat-login-btn .van-icon {
-  vertical-align: middle;
-}
-
-/* 悬停效果 */
-.wechat-login-btn:hover {
-  background-color: #06AD56 !important;
-  border-color: #06AD56 !important;
-}
-
-/* 点击效果 */
-.wechat-login-btn:active {
-  background-color: #05994C !important;
-  border-color: #05994C !important;
-}
+html:not(.dark) {
+  .form {
+    .form_field {
+      :deep(.van-field__label) {
+        color: rgb(88, 88, 88);
+      }
+      :deep(.van-field__body) {
+        background: rgb(251, 251, 251);
+        box-shadow: inset 0 0 1px 0 rgba(0, 0, 0, 0.1);
+        color: rgb(71, 71, 71);
+      }
+      :deep(.van-cell) {
+        background: #ffffff;
+      }
+    }
+    .extra_setting {
+      .extra_setting_for_remember_password {
+        color: rgb(88, 88, 88);
+      }
+    }
+  }
+}
+.form {
+  width: 100%;
+  padding: 0 40px;
+  .form_field {
+    padding-right: 0;
+    padding-left: 0;
+    :deep(.van-field__label) {
+      opacity: 0.7;
+      font-size: 16px;
+      font-weight: 400;
+      line-height: 23px;
+      text-transform: uppercase;
+      text-indent: 10px;
+    }
+    :deep(.van-field__body) {
+      height: 40px;
+      border-radius: 5px;
+      font-size: 16px;
+      font-weight: 400;
+      padding: 8px 10px;
+      opacity: 0.6;
+    }
+  }
+  .extra_setting {
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 12px;
+    .extra_setting_for_remember_password {
+      opacity: 0.7;
+      span {
+        position: relative;
+        bottom: 3px;
+        left: 5px;
+      }
+    }
+    .extra_setting_for_reset_password {
+      position: relative;
+      top: 2px;
+      opacity: 0.7;
+      color: rgb(56, 149, 250);
+    }
+  }
+  .btn {
+    height: 50px;
+    :deep(.van-button__text) {
+      color: rgb(255, 255, 255);
+      font-size: 16px;
+      font-weight: 700;
+      line-height: 23px;
+    }
+  }
+  .login_btn {
+    background: rgb(56, 149, 250);
+    margin-top: 104px;
+  }
+  .reset_btn {
+    margin: 24px 0;
+  }
+  .back_btn {
+    :deep(.van-button__text) {
+      color: rgb(56, 149, 250);
+    }
+  }
+  :deep(.van-cell:after) {
+    border-bottom: none;
+  }
+}
+.login_form {
+  margin-top: 65px;
+}
+.forget_password_form {
+  margin-top: 15px;
+}