af-mobile-client-vue3 1.3.30 → 1.3.31

package/scripts/verifyCommit.js

@@ -1,19 +1,19 @@
-import fs from 'node:fs'
-
-// import process from 'node:process'
-
-const msg = fs.readFileSync('.git/COMMIT_EDITMSG', 'utf-8').trim()
-
-const commitRE = /^(?:revert: )?(?:feat|fix|docs|dx|style|refactor|perf|test|workflow|build|ci|chore|types|wip|release)(?:\(.+\))?: .{1,50}/
-// const mergeRe = /^(Merge pull request|Merge branch)/
-
-if (!commitRE.test(msg)) {
-  // if (!mergeRe.test(msg)) {
-  // console.log('git commit unpass')
-  // console.error('git commit error, needs title(scope): desc')
-  // process.exit(1)
-  // }
-}
-else {
-  console.log('git commit pass')
-}
+import fs from 'node:fs'
+
+// import process from 'node:process'
+
+const msg = fs.readFileSync('.git/COMMIT_EDITMSG', 'utf-8').trim()
+
+const commitRE = /^(?:revert: )?(?:feat|fix|docs|dx|style|refactor|perf|test|workflow|build|ci|chore|types|wip|release)(?:\(.+\))?: .{1,50}/
+// const mergeRe = /^(Merge pull request|Merge branch)/
+
+if (!commitRE.test(msg)) {
+  // if (!mergeRe.test(msg)) {
+  // console.log('git commit unpass')
+  // console.error('git commit error, needs title(scope): desc')
+  // process.exit(1)
+  // }
+}
+else {
+  console.log('git commit pass')
+}

package/src/App.vue

@@ -1,79 +1,79 @@
-<script setup lang="ts">
-import type { ConfigProviderThemeVars } from 'vant'
-import NavBar from '@af-mobile-client-vue3/components/core/NavBar/index.vue'
-import Tabbar from '@af-mobile-client-vue3/components/core/Tabbar/index.vue'
-import { isDark, preferredDark } from '@af-mobile-client-vue3/composables/dark'
-import useRouteCacheStore from '@af-mobile-client-vue3/stores/modules/routeCache'
-import { useHead } from '@unhead/vue'
-import {
-  ConfigProvider as VanConfigProvider,
-} from 'vant/es'
-import { computed, reactive } from 'vue'
-import { appDescription, appName } from './constants'
-
-useHead({
-  title: appName,
-  meta: [
-    {
-      name: 'description',
-      content: appDescription,
-    },
-    {
-      name: 'theme-color',
-      content: () => isDark.value ? '#00aba9' : '#ffffff',
-    },
-  ],
-  link: [
-    {
-      rel: 'icon',
-      type: 'image/svg+xml',
-      href: () => preferredDark.value ? '/favicon-dark.svg' : '/favicon.svg',
-    },
-  ],
-})
-
-const routeCacheStore = useRouteCacheStore()
-
-const keepAliveRouteNames = computed(() => {
-  return routeCacheStore.routeCaches as string[]
-})
-
-const mode = computed(() => {
-  return isDark.value ? 'dark' : 'light'
-})
-
-const themeVars: ConfigProviderThemeVars = reactive({
-  baseFont: 'PingFangSC-Regular-woff2, serif',
-})
-</script>
-
-<template>
-  <VanConfigProvider :theme="mode" :theme-vars="themeVars" theme-vars-scope="global">
-    <NavBar />
-    <router-view v-slot="{ Component }">
-      <section class="app-wrapper">
-        <keep-alive :include="keepAliveRouteNames">
-          <component :is="Component" :key="$route.fullPath" />
-        </keep-alive>
-      </section>
-    </router-view>
-    <Tabbar />
-  </VanConfigProvider>
-</template>
-
-<style>
-@import './font-style/font.css';
-input[type='password']::-ms-reveal {
-  display: none;
-}
-input[type='password']::-ms-clear {
-  display: none;
-}
-</style>
-
-<style scoped>
-.app-wrapper {
-  width: 100%;
-  position: relative;
-}
-</style>
+<script setup lang="ts">
+import type { ConfigProviderThemeVars } from 'vant'
+import NavBar from '@af-mobile-client-vue3/components/core/NavBar/index.vue'
+import Tabbar from '@af-mobile-client-vue3/components/core/Tabbar/index.vue'
+import { isDark, preferredDark } from '@af-mobile-client-vue3/composables/dark'
+import useRouteCacheStore from '@af-mobile-client-vue3/stores/modules/routeCache'
+import { useHead } from '@unhead/vue'
+import {
+  ConfigProvider as VanConfigProvider,
+} from 'vant/es'
+import { computed, reactive } from 'vue'
+import { appDescription, appName } from './constants'
+
+useHead({
+  title: appName,
+  meta: [
+    {
+      name: 'description',
+      content: appDescription,
+    },
+    {
+      name: 'theme-color',
+      content: () => isDark.value ? '#00aba9' : '#ffffff',
+    },
+  ],
+  link: [
+    {
+      rel: 'icon',
+      type: 'image/svg+xml',
+      href: () => preferredDark.value ? '/favicon-dark.svg' : '/favicon.svg',
+    },
+  ],
+})
+
+const routeCacheStore = useRouteCacheStore()
+
+const keepAliveRouteNames = computed(() => {
+  return routeCacheStore.routeCaches as string[]
+})
+
+const mode = computed(() => {
+  return isDark.value ? 'dark' : 'light'
+})
+
+const themeVars: ConfigProviderThemeVars = reactive({
+  baseFont: 'PingFangSC-Regular-woff2, serif',
+})
+</script>
+
+<template>
+  <VanConfigProvider :theme="mode" :theme-vars="themeVars" theme-vars-scope="global">
+    <NavBar />
+    <router-view v-slot="{ Component }">
+      <section class="app-wrapper">
+        <keep-alive :include="keepAliveRouteNames">
+          <component :is="Component" :key="$route.fullPath" />
+        </keep-alive>
+      </section>
+    </router-view>
+    <Tabbar />
+  </VanConfigProvider>
+</template>
+
+<style>
+@import './font-style/font.css';
+input[type='password']::-ms-reveal {
+  display: none;
+}
+input[type='password']::-ms-clear {
+  display: none;
+}
+</style>
+
+<style scoped>
+.app-wrapper {
+  width: 100%;
+  position: relative;
+}
+</style>

package/src/api/auth/index.ts

@@ -0,0 +1,77 @@
+/**
+ * 统一认证API接口
+ */
+
+import type { LoginResponse, WechatOfficialLoginRequest } from '@af-mobile-client-vue3/types/auth'
+import type {
+  ExternalLoginParams,
+  LoginParams,
+  LoginResponseData,
+  UnifiedLoginParams,
+  UsernamePasswordLoginParams,
+} from './types'
+import { doLogout } from '@af-mobile-client-vue3/api/user'
+import { loginApi } from '@af-mobile-client-vue3/services/api/Login'
+
+/**
+ * 外部用户认证相关API
+ */
+
+import { post } from '@af-mobile-client-vue3/services/restTools'
+
+/**
+ * 统一登录接口
+ * 支持用户名密码、微信、第三方平台等多种登录方式
+ */
+export function unifiedLogin(params: LoginParams): Promise<LoginResponseData> {
+  return post(loginApi.Login, params)
+}
+
+/**
+ * 外部用户登录
+ */
+export function loginExternal(params: ExternalLoginParams): Promise<LoginResponseData> {
+  return post(loginApi.Login, params)
+}
+
+/**
+ * 传统用户名密码登录
+ */
+export function loginWithPassword(params: UsernamePasswordLoginParams): Promise<LoginResponseData> {
+  return post(loginApi.Login, params)
+}
+
+/**
+ * 统一认证登录
+ */
+export function loginUnified(params: UnifiedLoginParams): Promise<LoginResponseData> {
+  return post(loginApi.Login, params)
+}
+
+/**
+ * 微信公众号外部用户登录
+ * @param data 登录参数
+ * @returns 登录响应
+ */
+export function loginWithWechatOfficial(data: WechatOfficialLoginRequest): Promise<LoginResponse> {
+  return post(loginApi.Login, data)
+}
+
+/**
+ * 外部用户登录（通用）
+ * @param data 登录参数
+ * @returns 登录响应
+ */
+export function externalLogin(data: any): Promise<LoginResponse> {
+  return post(loginApi.Login, data)
+}
+
+/**
+ * 用户登出
+ */
+export function logout(): void {
+  doLogout()
+}
+
+// 重新导出类型定义
+export type * from './types'

package/src/api/auth/types.ts

@@ -0,0 +1,200 @@
+/**
+ * 认证API相关类型定义
+ */
+
+import type { UserType } from '@af-mobile-client-vue3/types/auth'
+
+/**
+ * 基础响应接口
+ */
+export interface ApiResponse<T = any> {
+  code: number
+  msg: string
+  data: T
+}
+
+/**
+ * 登录响应数据
+ */
+export interface LoginResponseData {
+  /** 访问令牌 */
+  access_token: string
+  /** 过期时间（分钟） */
+  expires_in: number
+  /** 会话密钥 */
+  session?: string
+  /** 资源权限 */
+  resources?: any
+  /** 用户信息 */
+  userInfo?: {
+    id: string | number
+    username: string
+    name: string
+    avatar?: string
+    userType?: UserType
+    openid?: string
+    platformType?: string
+    [key: string]: any
+  }
+}
+
+/**
+ * 微信公众号登录请求
+ */
+export interface WechatOfficialLoginParams {
+  /** 平台类型 */
+  platformType: 'WECHAT_OFFICIAL'
+  /** 微信授权码 */
+  platformUserId: string
+  /** 租户名称 */
+  tenantName: string
+  /** 资源名称，默认为system */
+  resourceName?: string
+  /** 是否移动端，默认为true */
+  isMobile?: boolean
+}
+
+/**
+ * 微信小程序登录请求
+ */
+export interface WechatMiniLoginParams {
+  /** 平台类型 */
+  platformType: 'WECHAT_MINI'
+  /** 微信授权码 */
+  platformUserId: string
+  /** 租户名称 */
+  tenantName: string
+  /** 资源名称，默认为system */
+  resourceName?: string
+  /** 是否移动端，默认为true */
+  isMobile?: boolean
+}
+
+/**
+ * 第三方应用登录请求
+ */
+export interface ThirdPartyAppLoginParams {
+  /** 平台类型 */
+  platformType: 'THIRD_PARTY_APP'
+  /** 第三方授权码 */
+  platformUserId: string
+  /** 租户名称 */
+  tenantName: string
+  /** 资源名称，默认为system */
+  resourceName?: string
+  /** 是否移动端，默认为false */
+  isMobile?: boolean
+}
+
+/**
+ * 外部用户登录参数联合类型
+ */
+export type ExternalLoginParams
+  = | WechatOfficialLoginParams
+    | WechatMiniLoginParams
+    | ThirdPartyAppLoginParams
+
+/**
+ * 传统用户名密码登录请求
+ */
+export interface UsernamePasswordLoginParams {
+  /** 用户名 */
+  username: string
+  /** 密码 */
+  password: string
+  /** 资源名称 */
+  resourceName: string
+  /** 是否移动端 */
+  isMobile?: boolean
+}
+
+/**
+ * 统一认证登录请求
+ */
+export interface UnifiedLoginParams {
+  /** 统一认证码 */
+  unifiedCode: string
+  /** 租户名称 */
+  tenantName: string
+  /** 登录模式 */
+  loginMode: string
+  /** 资源名称 */
+  resourceName: string
+  /** 是否移动端 */
+  isMobile?: boolean
+}
+
+/**
+ * 所有登录参数的联合类型
+ */
+export type LoginParams
+  = | UsernamePasswordLoginParams
+    | UnifiedLoginParams
+    | ExternalLoginParams
+
+/**
+ * 微信授权回调参数
+ */
+export interface WechatCallbackParams {
+  /** 授权码 */
+  code?: string
+  /** 状态参数，通常包含租户名称 */
+  state?: string
+  /** 租户名称 */
+  tenantName?: string
+  /** 错误信息 */
+  error?: string
+  /** 错误描述 */
+  error_description?: string
+}
+
+/**
+ * Token刷新请求
+ */
+export interface RefreshTokenParams {
+  /** 刷新令牌 */
+  refresh_token?: string
+}
+
+/**
+ * 登出请求（通常不需要参数）
+ */
+export interface LogoutParams {
+  // 预留
+}
+
+/**
+ * 用户信息获取响应
+ */
+export interface UserInfoResponse {
+  /** 用户ID */
+  id: string | number
+  /** 用户名 */
+  username: string
+  /** 显示名称 */
+  name: string
+  /** 头像URL */
+  avatar?: string
+  /** 用户类型 */
+  userType?: UserType
+  /** 权限列表 */
+  permissions?: string[]
+  /** 角色列表 */
+  roles?: Array<{ id: string, operation: string[] }>
+  /** 部门信息 */
+  department?: {
+    id: string
+    name: string
+  }
+  /** 组织信息 */
+  organization?: {
+    id: string
+    name: string
+  }
+  /** 外部用户特有字段 */
+  openid?: string
+  /** 平台类型 */
+  platformType?: string
+  /** 来源渠道 */
+  sourceChannel?: string
+}

package/src/api/mock/index.ts

@@ -1,30 +1,30 @@
-import { http } from '@af-mobile-client-vue3/utils/http'
-
-interface ListResult {
-  code: number
-  message: string
-  list: Array<any>
-}
-
-export function getListApi(params?: object): Promise<ListResult> {
-  return http.request({
-    url: '/list/get',
-    method: 'get',
-    params,
-  })
-}
-
-export function getListApiError(data?: object): Promise<ListResult> {
-  return http.request({
-    url: '/list/error',
-    method: 'post',
-    data,
-  })
-}
-
-export async function queryProse(): Promise<any> {
-  return http.request({
-    url: '/project/prose',
-    method: 'post',
-  })
-}
+import { http } from '@af-mobile-client-vue3/utils/http'
+
+interface ListResult {
+  code: number
+  message: string
+  list: Array<any>
+}
+
+export function getListApi(params?: object): Promise<ListResult> {
+  return http.request({
+    url: '/list/get',
+    method: 'get',
+    params,
+  })
+}
+
+export function getListApiError(data?: object): Promise<ListResult> {
+  return http.request({
+    url: '/list/error',
+    method: 'post',
+    data,
+  })
+}
+
+export async function queryProse(): Promise<any> {
+  return http.request({
+    url: '/project/prose',
+    method: 'post',
+  })
+}

package/src/api/user/index.ts

@@ -1,40 +1,40 @@
-import { loginApi } from '@af-mobile-client-vue3/services/api/Login'
-
-import { get, post } from '@af-mobile-client-vue3/services/restTools'
-import { http } from '@af-mobile-client-vue3/utils/http'
-
-export interface BasicResponseModel<T = any> {
-  code: number
-  msg: string
-  data: T
-}
-
-export function login(data: any) {
-  return post(
-    loginApi.Login,
-    data,
-  )
-}
-
-export function OALogin(data: any) {
-  return get(`/af-system/user/${data.username}/${data.password}/智慧OA`)
-}
-
-/**
- * @description: 获取用户信息
- */
-export function getUserInfo() {
-  return get(
-    '/getUserInfo',
-  )
-}
-
-/**
- * @description: 用户登出
- */
-export function doLogout() {
-  return http.request({
-    url: loginApi.Logout,
-    method: 'DELETE',
-  })
-}
+import { loginApi } from '@af-mobile-client-vue3/services/api/Login'
+
+import { get, post } from '@af-mobile-client-vue3/services/restTools'
+import { http } from '@af-mobile-client-vue3/utils/http'
+
+export interface BasicResponseModel<T = any> {
+  code: number
+  msg: string
+  data: T
+}
+
+export function login(data: any) {
+  return post(
+    loginApi.Login,
+    data,
+  )
+}
+
+export function OALogin(data: any) {
+  return get(`/af-system/user/${data.username}/${data.password}/智慧OA`)
+}
+
+/**
+ * @description: 获取用户信息
+ */
+export function getUserInfo() {
+  return get(
+    '/getUserInfo',
+  )
+}
+
+/**
+ * @description: 用户登出
+ */
+export function doLogout() {
+  return http.request({
+    url: loginApi.Logout,
+    method: 'DELETE',
+  })
+}

package/src/assets/img/user/login/background-shadow-1.svg

@@ -1,20 +1,20 @@
-<svg width="444.233154" height="203.122437" viewBox="0 0 444.233 203.122" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-	<desc>
-			Created with Pixso.
-	</desc>
-	<defs>
-		<filter id="filter_37_876_dd" x="0.529297" y="0.516296" width="443.178467" height="202.089844" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-			<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-			<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-			<feOffset dx="0" dy="-28"/>
-			<feGaussianBlur stdDeviation="11.3333"/>
-			<feComposite in2="hardAlpha" operator="out" k2="-1" k3="1"/>
-			<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.039 0"/>
-			<feBlend mode="normal" in2="BackgroundImageFix" result="effect_dropShadow_1"/>
-			<feBlend mode="normal" in="SourceGraphic" in2="effect_dropShadow_1" result="shape"/>
-		</filter>
-	</defs>
-	<g filter="url(#filter_37_876_dd)">
-		<path id="Path 2" d="M34.6331 62.5163C159.633 62.5163 156.204 115.98 222.133 115.98C288.062 115.98 290.281 62.5163 409.633 62.5163C409.801 62.5163 409.633 196.606 409.633 196.606L34.6331 196.606C34.6331 196.606 34.3997 62.5163 34.6331 62.5163Z" fill-rule="evenodd" fill="#FFFFFF"/>
-	</g>
-</svg>
+<svg width="444.233154" height="203.122437" viewBox="0 0 444.233 203.122" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<desc>
+			Created with Pixso.
+	</desc>
+	<defs>
+		<filter id="filter_37_876_dd" x="0.529297" y="0.516296" width="443.178467" height="202.089844" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+			<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+			<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+			<feOffset dx="0" dy="-28"/>
+			<feGaussianBlur stdDeviation="11.3333"/>
+			<feComposite in2="hardAlpha" operator="out" k2="-1" k3="1"/>
+			<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.039 0"/>
+			<feBlend mode="normal" in2="BackgroundImageFix" result="effect_dropShadow_1"/>
+			<feBlend mode="normal" in="SourceGraphic" in2="effect_dropShadow_1" result="shape"/>
+		</filter>
+	</defs>
+	<g filter="url(#filter_37_876_dd)">
+		<path id="Path 2" d="M34.6331 62.5163C159.633 62.5163 156.204 115.98 222.133 115.98C288.062 115.98 290.281 62.5163 409.633 62.5163C409.801 62.5163 409.633 196.606 409.633 196.606L34.6331 196.606C34.6331 196.606 34.3997 62.5163 34.6331 62.5163Z" fill-rule="evenodd" fill="#FFFFFF"/>
+	</g>
+</svg>