af-mobile-client-vue3 1.2.16 → 1.2.18

package/package.json

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

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

@@ -42,6 +42,7 @@ const props = withDefaults(defineProps<{
   formName?: string
   mode?: string
   submitButton?: boolean
+  isHandleFormKey?: boolean
 }>(), {
   configName: undefined,
   groupFormItems: null,
@@ -50,6 +51,7 @@ const props = withDefaults(defineProps<{
   formName: 'default',
   mode: '查询',
   submitButton: true,
+  isHandleFormKey: true,
 })
 const emits = defineEmits(['onSubmit'])
 const userStore = useUserStore()
@@ -76,9 +78,6 @@ const realJsonData = computed(() => {
   })
 })
 
-// 是否处理表单Key值
-const isHandleFormKey = ref(true)
-
 // 过滤出用于静默新增场景的表单项
 const silenceAddJsonData = computed(() => {
   return myFormItems.value.filter((item) => {
@@ -263,7 +262,7 @@ function setForm(obj) {
 function getRealKey(key, mustHandleKey = false) {
   if (key === 'selected_id')
     return key
-  if (isHandleFormKey.value || mustHandleKey) {
+  if (props.isHandleFormKey || mustHandleKey) {
     return key.substring(key.indexOf('_') + 1)
   }
   else {
@@ -305,7 +304,7 @@ function handleFormKeys(form, mustHandleKey = false) {
       realForm[extraFormKey][realKey] = value
     }
     else {
-      const realKey = isHandleFormKey.value || mustHandleKey ? getRealKey(key, mustHandleKey) : key
+      const realKey = props.isHandleFormKey || mustHandleKey ? getRealKey(key, mustHandleKey) : key
       // 如果发生重名，不覆盖，把key的别名带上
       if (realForm[realKey]) {
         realForm[key] = value

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

@@ -301,6 +301,18 @@ watch(localValue, (newVal) => {
   dataChangeFunc()
 })
 
+// 监听 props.form 的变化
+watch(
+  () => props.form,
+  (newVal, oldVal) => {
+    // 如果是从函数获取 options
+    if (props.attr.keyName && (props.attr.keyName.toString().includes('async ') || props.attr.keyName.toString().includes('function'))) {
+      debouncedUpdateOptions()
+    }
+  },
+  { deep: true },
+)
+
 function updateFile(files, _index) {
   // 处理文件数据
   // 更新本地值

package/src/stores/modules/setting.ts

@@ -11,6 +11,9 @@ export interface WebConfig {
   homePage: string
   defaultAvatarUrl: string
   wechatLogin: boolean
+  wxLoginAge: boolean
+  wxAutoLogin: string
+  tenantName: string
 }
 
 //  存放 webConfig 中的 setting 配置
@@ -33,13 +36,14 @@ export const useSettingStore = defineStore('setting', () => {
 
     const useStore = createStorage()
     const catchWebConfig = useStore.get(APP_WEB_CONFIG_KEY)
-    if (catchWebConfig) {
-      setSetting(catchWebConfig)
+    if (catchWebConfig?.setting) {
+      setSetting(catchWebConfig?.setting)
     }
     else {
       const res = await getConfigByNameAsync('webMobileConfig')
       if (res.setting) {
         useStore.set(APP_WEB_CONFIG_KEY, res)
+        console.log('res.setting', res.setting)
         setSetting(res.setting)
       }
     }

package/src/stores/modules/user.ts

@@ -205,6 +205,9 @@ export const useUserStore = defineStore('app-user', () => {
       console.error(e)
     }
   }
+  const getCode = (tenantName: string) => {
+    window.location.replace(`api/af-system/user/getcode?state=${tenantName}`)
+  }
 
   return {
     Login,
@@ -225,6 +228,7 @@ export const useUserStore = defineStore('app-user', () => {
     setRoutesConfig,
     setTenantName,
     getTenantName,
+    getCode,
   }
 })
 

package/src/styles/login.less

@@ -93,3 +93,17 @@ html:not(.dark) {
 .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;
+}

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

@@ -48,7 +48,7 @@ const getShow = computed(() => (unref(getLoginState) === LoginStateEnum.LOGIN))
 
 const login: any = inject('$login')
 onBeforeMount(async () => {
-  if (isWechat()) {
+  if (isWechat() && setting.getSetting()?.wxAutoLogin) {
     // 检测是否要开放微信登录
     if (setting.getSetting()?.wechatLogin) {
       try {
@@ -187,8 +187,53 @@ async function afterGeneral(result) {
   // 每次重新登录时，清除indexedDB缓存
   indexedDB.clear()
 }
-
-onMounted(() => {})
+async function wxLoginFun() {
+  await localStorage.setItem('wechatLoginPending', 'true')
+  userState.getCode(setting.getSetting()?.tenantName)
+}
+async function wxLoginFunContinue(code, state) {
+  try {
+    wxloading.value = true
+    const data = await userState.loginUnified({
+      unifiedCode: `${code}`,
+      tenantName: `${state}`,
+      loginMode: 'wechat',
+      resourceName: setting.getSetting()?.routerName || '智慧手机',
+    })
+    login.f = data
+    await Promise.all([GetAppDataService.load()])
+    const loginInfo = {
+      f: login.f,
+      jwt: login.f.id,
+      r: login.r,
+    }
+    userState.setLogin(loginInfo)
+    userState.setTenantName(route.query.state)
+    await afterGeneral(data.resources)
+    const toPath = decodeURIComponent((route.query?.redirect || '/') as string)
+    closeToast()
+    if (route.name === '/login')
+      await router.replace('/')
+    else await router.replace(toPath)
+  }
+  finally {
+    wxloading.value = false
+  }
+}
+function getQueryParam(param: string): string | null {
+  const search = window.location.search || window.location.hash.split('?')[1] || ''
+  const params = new URLSearchParams(search)
+  return params.get(param)
+}
+onMounted(() => {
+  const pending = localStorage.getItem('wechatLoginPending')
+  const code = getQueryParam('code')
+  const state = getQueryParam('state')
+  if (pending && code && state) {
+    localStorage.removeItem('wechatLoginPending')
+    wxLoginFunContinue(code, state)
+  }
+})
 </script>
 
 <template>
@@ -241,6 +286,19 @@ onMounted(() => {})
       <VanButton class="login_btn btn" type="primary" block native-type="submit" :loading="loading">
         登 录
       </VanButton>
+      <VanButton
+        v-show="setting.getSetting()?.wxLoginAge && isWechat()"
+        class="wechat-login-btn btn"
+        type="primary"
+        block
+        native-type="button"
+        :loading="wxloading"
+        style="background-color: #07C160; border-color: #07C160; margin-top: 15px"
+        @click="wxLoginFun"
+      >
+        <VanIcon name="wechat" size="20px" />
+        微信登录
+      </VanButton>
     </VanForm>
   </div>
 </template>

package/vite.config.ts

@@ -24,12 +24,22 @@ export default ({ mode }: ConfigEnv): UserConfig => {
     server: {
       host: true,
       port: 7190,
+      allowedHosts: [
+        'www.aofengcloud.com',
+        '.aofengcloud.com',
+      ],
       proxy: Object.assign({
         '/api/af-system/resource': {
           target: v4Server,
           ws: false,
           changeOrigin: true,
         },
+        '/api/af-system/user': {
+          target: 'http://127.0.0.1:9002/',
+          rewrite: (path: string) => path.replace(/^\/api\/af-system\//, '/'),
+          ws: false,
+          changeOrigin: true,
+        },
         '/api/invoice': {
           target: 'http://219.153.176.6:8400/',
           rewrite: (path: string) => path.replace(/^\/api\//, '/'),