af-mobile-client-vue3 1.2.17 → 1.2.18

package/package.json

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

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/utils/queryFormDefaultRangePicker.ts

@@ -1,57 +1,57 @@
-/**
- * 根据类型获取日期区间字符串
- * @param type '当年' | 'curMonth' | '当日'
- * @param show 区分实际值还是显示值, true为实际值, false为显示值
- * @returns [start, end] 例：['2024-01-01 00:00:00', '2024-12-31 23:59:59']
- */
-export function getRangeByType(type: string, show: boolean): [string, string] {
-  const now = new Date()
-  const year = now.getFullYear()
-  const month = (now.getMonth() + 1).toString().padStart(2, '0')
-  const day = now.getDate().toString().padStart(2, '0')
-
-  if (!show) {
-    if (type === 'curYear') {
-      return [
-        `${year}-01-01 00:00:00`,
-        `${year}-12-31 23:59:59`,
-      ]
-    }
-    if (type === 'curMonth') {
-      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
-      return [
-        `${year}-${month}-01 00:00:00`,
-        `${year}-${month}-${lastDay.toString().padStart(2, '0')} 23:59:59`,
-      ]
-    }
-    if (type === 'curDay') {
-      return [
-        `${year}-${month}-${day} 00:00:00`,
-        `${year}-${month}-${day} 23:59:59`,
-      ]
-    }
-  }
-  if (show) {
-    if (type === 'curYear') {
-      return [
-        `${year}-01-01`,
-        `${year}-12-31`,
-      ]
-    }
-    if (type === 'curMonth') {
-      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
-      return [
-        `${year}-${month}-01`,
-        `${year}-${month}-${lastDay.toString().padStart(2, '0')}`,
-      ]
-    }
-    if (type === 'curDay') {
-      return [
-        `${year}-${month}-${day}`,
-        `${year}-${month}-${day}`,
-      ]
-    }
-  }
-  // 兜底返回空字符串数组
-  return ['', '']
-}
+/**
+ * 根据类型获取日期区间字符串
+ * @param type '当年' | 'curMonth' | '当日'
+ * @param show 区分实际值还是显示值, true为实际值, false为显示值
+ * @returns [start, end] 例：['2024-01-01 00:00:00', '2024-12-31 23:59:59']
+ */
+export function getRangeByType(type: string, show: boolean): [string, string] {
+  const now = new Date()
+  const year = now.getFullYear()
+  const month = (now.getMonth() + 1).toString().padStart(2, '0')
+  const day = now.getDate().toString().padStart(2, '0')
+
+  if (!show) {
+    if (type === 'curYear') {
+      return [
+        `${year}-01-01 00:00:00`,
+        `${year}-12-31 23:59:59`,
+      ]
+    }
+    if (type === 'curMonth') {
+      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
+      return [
+        `${year}-${month}-01 00:00:00`,
+        `${year}-${month}-${lastDay.toString().padStart(2, '0')} 23:59:59`,
+      ]
+    }
+    if (type === 'curDay') {
+      return [
+        `${year}-${month}-${day} 00:00:00`,
+        `${year}-${month}-${day} 23:59:59`,
+      ]
+    }
+  }
+  if (show) {
+    if (type === 'curYear') {
+      return [
+        `${year}-01-01`,
+        `${year}-12-31`,
+      ]
+    }
+    if (type === 'curMonth') {
+      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
+      return [
+        `${year}-${month}-01`,
+        `${year}-${month}-${lastDay.toString().padStart(2, '0')}`,
+      ]
+    }
+    if (type === 'curDay') {
+      return [
+        `${year}-${month}-${day}`,
+        `${year}-${month}-${day}`,
+      ]
+    }
+  }
+  // 兜底返回空字符串数组
+  return ['', '']
+}

package/src/views/component/XCellListView/index.vue

@@ -1,19 +1,26 @@
 <script setup lang="ts">
 import XCellList from '@af-mobile-client-vue3/components/data/XCellList/index.vue'
 import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
 import { defineEmits, ref } from 'vue'
 import { useRouter } from 'vue-router'
 
 // 定义事件
 const emit = defineEmits(['deleteRow'])
+const userInfo = useUserStore().getUserInfo()
 // 访问路由
 const router = useRouter()
 // 获取默认值
 const idKey = ref('o_id')
 
 // 简易crud表单测试
-const configName = ref('lngChargeAuditMobileCRUD')
+// const configName = ref('orderCarInMobileCRUD')
+// const serviceName = ref('af-gaslink')
+// const configName = ref('lngPriceManageMobileCRUD')
+const configName = ref('测试2')
 const serviceName = ref('af-gaslink')
+// const configName = ref('mobile_liushuiQueryCRUD')
+// const serviceName = ref('af-revenue')
 
 // 资源权限测试
 // const configName = ref('crud_sources_test')
@@ -49,11 +56,11 @@ const serviceName = ref('af-gaslink')
 function toDetail(item) {
   router.push({
     name: 'XFormGroupView',
-    query: {
-      id: item[idKey.value],
-      // id: item.rr_id,
-      // o_id: item.o_id,
-    },
+    // query: {
+    //   id: item[idKey.value],
+    // id: item.rr_id,
+    // o_id: item.o_id,
+    // },
   })
 }
 
@@ -69,19 +76,35 @@ function toDetail(item) {
 //     },
 //   })
 // }
+function addOption() {
+  router.push({
+    name: 'XFormGroupView',
+    // params: { id: totalCount.value },
+    // query: {
+    //   configName: configName.value,
+    //   serviceName: serviceName.value,
+    //   mode: '新增',
+    // },
+  })
+  // 如果存在回调函数，调用它并传递true表示已处理
+  // if (typeof callback === 'function') {
+  //   callback(true)
+  // }
+}
 
 // 修改功能
-// function updateRow(result) {
-//   router.push({
-//     name: 'XFormView',
-//     params: { id: result.o_id, openid: result.o_id },
-//     query: {
-//       configName: configName.value,
-//       serviceName: serviceName.value,
-//       mode: '修改',
-//     },
-//   })
-// }
+function updateRow(result) {
+  console.log('用户----', userInfo)
+  router.push({
+    name: 'XFormGroupView',
+    // params: { id: result.o_id, openid: result.o_id },
+    // query: {
+    //   configName: configName.value,
+    //   serviceName: serviceName.value,
+    //   mode: '修改',
+    // },
+  })
+}
 
 // 删除功能
 function deleteRow(result) {
@@ -92,11 +115,23 @@ function deleteRow(result) {
 <template>
   <NormalDataLayout id="XCellListView" title="工作计划">
     <template #layout_content>
+      <!--      <XCellList -->
+      <!--        :config-name="configName" -->
+      <!--        :service-name="serviceName" -->
+      <!--        :custom-add="true" -->
+      <!--        :custom-edit="true" -->
+      <!--        :id-key="idKey" -->
+      <!--        @to-detail="toDetail" -->
+      <!--        @delete-row="deleteRow" -->
+      <!--        @update="updateRow" -->
+      <!--        @add="addOption" -->
+      <!--      /> -->
+
+      <!--      :fix-query-form="{ u_f_price_state: ['生效', '待生效'] }" -->
+
       <XCellList
-        :config-name="configName"
-        :service-name="serviceName"
-        :fix-query-form="{ o_f_oper_name: 'edu_test' }"
-        :id-key="idKey"
+        config-name="小小测试CRUD"
+        service-name="af-apply"
         @to-detail="toDetail"
         @delete-row="deleteRow"
       />

package/src/views/component/XFormGroupView/index.vue

@@ -5,16 +5,19 @@ import { showDialog } from 'vant'
 import { ref } from 'vue'
 import { useRoute } from 'vue-router'
 
+// const configName = ref('reviewFormGroup')
+// const serviceName = ref('af-revenue')
+
 // 纯表单
-const configName = ref('form_check_test')
-const serviceName = ref('af-system')
+// const configName = ref('form_check_test')
+// const serviceName = ref('af-system')
 
 // const configName = ref("计划下发Form")
 // const serviceName = ref("af-linepatrol")
 
 // 表单组
-// const configName = ref('lngChargeAuditMobileFormGroup')
-// const serviceName = ref('af-gaslink')
+const configName = ref('lngChargeAuditMobileFormGroup')
+const serviceName = ref('af-gaslink')
 
 const formData = ref({})
 const formGroup = ref(null)

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\//, '/'),