af-mobile-client-vue3 1.1.1 → 1.1.3

package/mock/modules/demo.mock.ts

@@ -0,0 +1,20 @@
+// https://github.com/pengzhanbo/vite-plugin-mock-dev-server
+import { defineMock } from 'vite-plugin-mock-dev-server'
+
+export default defineMock([
+  {
+    url: '/api/demo/post',
+    method: 'POST',
+    body: (params) => {
+      return {
+        code: 200,
+        msg: '操作成功',
+        data: {
+          ...params,
+          id: Math.floor(Math.random() * 1000),
+          timestamp: new Date().toISOString(),
+        },
+      }
+    },
+  },
+])

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Vue + Vite component lib",
   "license": "MIT",
   "engines": {

package/src/router/routes.ts

@@ -16,6 +16,7 @@ import XFormView from '@af-mobile-client-vue3/views/component/XFormView/index.vu
 import XReportFormIframeView from '@af-mobile-client-vue3/views/component/XReportFormIframeView/index.vue'
 import XReportFormView from '@af-mobile-client-vue3/views/component/XReportFormView/index.vue'
 import XReportGridView from '@af-mobile-client-vue3/views/component/XReportGridView/index.vue'
+import XRequestView from '@af-mobile-client-vue3/views/component/XRequestView/index.vue'
 import XSignatureView from '@af-mobile-client-vue3/views/component/XSignatureView/index.vue'
 import login from '@af-mobile-client-vue3/views/user/login/index.vue'
 
@@ -128,6 +129,11 @@ const routes: Array<RouteRecordRaw> = [
         name: 'GridView',
         component: GridView,
       },
+      {
+        path: '/Component/XRequestView',
+        name: 'XRequestView',
+        component: XRequestView,
+      },
     ],
   },
   {

package/src/services/api/common.ts

@@ -33,7 +33,7 @@ export function getConfigByName(configName: string, callback: Function, serviceN
 
 export async function getConfigByNameAsync(configName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): Promise<any> {
   return new Promise((resolve, reject) => {
-    indexedDB.getByWeb(configName, `/${serviceName}/${commonApi.getConfig}`, { configName }, resolve, reject)
+    indexedDB.getByWeb(configName, `/${serviceName}/${commonApi.getConfig}`, { configName }, resolve, null)
   })
 }
 

package/src/services/api/search.ts

@@ -1,8 +1,16 @@
 import { post } from '@af-mobile-client-vue3/services/restTools'
 
-export function getUserPermissions(userid: string) {
-  return post(`/af-system/search`, {
+export async function getUserPermissions(userid: string) {
+  interface permissions {
+    name: string
+  }
+
+  const res = await post<permissions[]>(`/af-system/search`, {
     source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($功能权限$) != -1)',
     userid,
   })
+
+  return res.map((row) => {
+    return row.name
+  })
 }

package/src/services/restTools.ts

@@ -1,4 +1,3 @@
-import type { BasicResponseModel } from '@af-mobile-client-vue3/api/user'
 import { http } from '@af-mobile-client-vue3/utils/http'
 
 /**
@@ -6,8 +5,8 @@ import { http } from '@af-mobile-client-vue3/utils/http'
  * @param url 请求地址
  * @param params 路径参数
  */
-export function get(url: string, params?: any) {
-  return http.request<BasicResponseModel>({
+export function get<T = any>(url: string, params?: any): Promise<T> {
+  return http.request<T>({
     url,
     method: 'GET',
     params,
@@ -19,16 +18,21 @@ export function get(url: string, params?: any) {
  * @param url 请求地址
  * @param data 请求参数
  */
-export function post(url: string, data: any) {
-  return http.request<BasicResponseModel>({
+/**
+ * POST请求
+ * @param url 请求地址
+ * @param data 请求参数
+ */
+export function post<T = any>(url: string, data: any): Promise<T> {
+  return http.request <T>({
     url,
     method: 'POST',
     data,
   })
 }
 
-export function postWithConfig(url: string, data: any, config: any) {
-  return http.request<BasicResponseModel>({
+export function postWithConfig<T = any>(url: string, data: any, config: any): Promise<T> {
+  return http.request<T>({
     url,
     method: 'POST',
     data,
@@ -42,8 +46,8 @@ export function postWithConfig(url: string, data: any, config: any) {
  * @param data 查询参数
  * @param config 额外的配置项（如自定义头信息等）
  */
-export function del(url: string, data?: any, config?: any) {
-  return http.request<BasicResponseModel>({
+export function del<T = any>(url: string, data?: any, config?: any): Promise<T> {
+  return http.request<T>({
     url,
     method: 'DELETE',
     data,

package/src/stores/modules/user.ts

@@ -30,7 +30,7 @@ interface IUserState {
   token?: string
   userInfo: UserInfo
   lastUpdateTime: number
-  permissions: [{ id: string, operation: string[] }]
+  permissions: string[]
   roles: [{ id: string, operation: string[] }]
   routesConfig: Array<any>
   single: Array<ExtraRouteRecordRaw>
@@ -119,13 +119,13 @@ export const useUserStore = defineStore('app-user', () => {
       userState.value.single.push(page)
     }
   }
-  const setPermissions = (permissions: [{ id: string, operation: string[] }]) => {
+  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_PERMISSIONS_KEY, roles)
+    Storage.set(APP_ROLES_KEY, roles)
   }
   const setRoutesConfig = (routesConfig: Array<any>) => {
     userState.value.routesConfig = routesConfig

package/src/utils/http/index.ts

@@ -49,16 +49,17 @@ class Http {
     Http.axiosInstance.interceptors.response.use(
       async (response: AxiosResponse) => {
         const compatible = import.meta.env.VITE_APP_COMPATIBLE
-        if (compatible !== 'V4')
+        if (compatible !== 'V4') {
           return response.data
+        }
         // 与后端协定的返回字段
         const { code, msg, data } = response.data
         // 临时向v3请求上传服务，因为没有code，未来会改
-        if (code === undefined && response.data.id !== undefined)
+        if (code === undefined) {
           return response.data
+        }
         // 判断请求是否成功
-        const isSuccess
-          = code === ResultEnum.SUCCESS
+        const isSuccess = code === ResultEnum.SUCCESS
         if (isSuccess) {
           return data
         }

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

@@ -0,0 +1,234 @@
+<script setup lang="ts">
+import { queryProse } from '@af-mobile-client-vue3/api/mock'
+import { getUserPermissions } from '@af-mobile-client-vue3/services/api/search'
+import { post } from '@af-mobile-client-vue3/services/restTools'
+import useUserStore from '@af-mobile-client-vue3/stores/modules/user'
+import { showToast, Button as VanButton, Cell as VanCell, CellGroup as VanCellGroup } from 'vant'
+import { reactive, ref } from 'vue'
+import { useRouter } from 'vue-router'
+
+// 路由
+const router = useRouter()
+// 用户store
+const userStore = useUserStore()
+
+// 数据定义
+const requestTypes = ref('GET, POST, DELETE')
+const getResult = ref('')
+const postResult = ref('')
+const permissionsResult = ref('')
+const storePermissionsResult = ref('')
+const postData = reactive({
+  name: '',
+  value: '',
+})
+
+// 返回上一页
+function onClickLeft() {
+  router.back()
+}
+
+// 发送GET请求示例
+async function handleGetRequest() {
+  try {
+    // 这里使用项目中的模拟API
+    const result = await queryProse()
+    getResult.value = JSON.stringify(result, null, 2)
+    showToast('请求成功')
+  }
+  catch (error) {
+    console.error('GET请求失败:', error)
+    showToast('请求失败')
+  }
+}
+
+// 获取用户权限
+async function handleGetPermissions() {
+  try {
+    const userInfo = userStore.getUserInfo()
+    if (!userInfo || !userInfo.id) {
+      showToast('请先登录')
+      return
+    }
+
+    // 从API获取权限
+    const permissions = await getUserPermissions(userInfo.id.toString())
+    permissionsResult.value = JSON.stringify(permissions, null, 2)
+
+    // 从Store获取权限
+    const storePermissions = userStore.getPermissions()
+    storePermissionsResult.value = JSON.stringify(storePermissions, null, 2)
+
+    showToast('获取权限成功')
+  }
+  catch (error) {
+    console.error('获取权限失败:', error)
+    showToast('获取权限失败')
+  }
+}
+
+// 定义请求数据类型
+interface RequestData {
+  name: string
+  value: string
+}
+
+// 定义返回结果类型
+interface ResponseData {
+  code: number
+  msg: string
+  data: any
+}
+
+// 发送POST请求示例
+async function handlePostRequest() {
+  try {
+    // 这里演示使用通用post方法发送请求
+    // 使用泛型指定返回类型
+    const result = await post<ResponseData>('/api/demo/post', {
+      name: '测试',
+      value: '测试',
+    })
+    postResult.value = JSON.stringify(result, null, 2)
+    showToast('请求成功')
+  }
+  catch (error) {
+    console.error('POST请求失败:', error)
+    showToast('请求失败')
+  }
+}
+
+// 类型定义展示
+const typeDefinitions = `
+
+// 使用泛型扩展特定业务数据类型
+import { get } from '@af-mobile-client-vue3/services/restTools'
+
+interface UserInfo {
+  id: string
+  name: string
+  roles: string[]
+}
+
+// 调用示例
+const userInfo = await get<UserInfo>('/api/user/info')
+// userInfo 类型为 UserInfo，而非 BasicResponseModel<UserInfo>
+// 不用使用 userInfo.data 获取数据
+// 直接使用 userInfo 即可
+`.trim()
+</script>
+
+<template>
+  <div class="request-view">
+    <div class="container">
+      <VanCellGroup title="API请求演示">
+        <VanCell title="基本请求类型" :value="requestTypes" />
+
+        <!-- GET请求部分 -->
+        <div class="request-section">
+          <h3>GET请求示例</h3>
+          <VanButton type="primary" size="small" @click="handleGetRequest">
+            发送GET请求
+          </VanButton>
+          <div v-if="getResult" class="result-box">
+            <h4>响应结果：</h4>
+            <pre>{{ getResult }}</pre>
+          </div>
+        </div>
+
+        <!-- POST请求部分 -->
+        <div class="request-section">
+          <h3>POST请求示例</h3>
+
+          <VanButton type="primary" size="small" @click="handlePostRequest">
+            发送POST请求
+          </VanButton>
+          <div v-if="postResult" class="result-box">
+            <h4>响应结果：</h4>
+            <pre>{{ postResult }}</pre>
+          </div>
+        </div>
+
+        <!-- 用户权限部分 -->
+        <div class="request-section">
+          <h3>用户权限获取</h3>
+          <VanButton type="primary" size="small" @click="handleGetPermissions">
+            获取用户权限
+          </VanButton>
+
+          <div v-if="permissionsResult" class="result-box">
+            <h4>API请求权限结果：</h4>
+            <pre>{{ permissionsResult }}</pre>
+          </div>
+
+          <div v-if="storePermissionsResult" class="result-box">
+            <h4>Store缓存权限结果：</h4>
+            <pre>{{ storePermissionsResult }}</pre>
+          </div>
+        </div>
+
+        <!-- 类型定义说明 -->
+        <div class="code-section">
+          <h3>类型定义</h3>
+          <pre>{{ typeDefinitions }}</pre>
+        </div>
+      </VanCellGroup>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+.request-view {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+.container {
+  flex: 1;
+  padding: 16px;
+  overflow-y: auto;
+}
+
+.request-section {
+  margin: 16px 0;
+  padding: 16px;
+  background-color: #f7f8fa;
+  border-radius: 8px;
+}
+
+.result-box {
+  margin-top: 16px;
+  padding: 12px;
+  background-color: #ffffff;
+  border-radius: 4px;
+  border: 1px solid #ebedf0;
+}
+
+pre {
+  white-space: pre-wrap;
+  word-break: break-all;
+  font-size: 12px;
+  font-family: Consolas, Monaco, monospace;
+  background-color: #f5f7fa;
+  padding: 8px;
+  border-radius: 4px;
+  overflow-x: auto;
+}
+
+.code-section {
+  margin: 16px 0;
+}
+
+h3 {
+  margin: 0 0 12px;
+  font-size: 15px;
+  color: #323233;
+}
+
+h4 {
+  margin: 0 0 8px;
+  font-size: 14px;
+  color: #323233;
+}
+</style>

package/src/views/component/index.vue

@@ -54,6 +54,10 @@ const list = ref([
     name: 'XOlmap 地图组件',
     to: '/Component/XOlMapView',
   },
+  {
+    name: '请求示例',
+    to: '/Component/XRequestView',
+  },
 ])
 
 function cleanConfigCache() {

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

@@ -158,7 +158,7 @@ function closeWindows() {
   }
 }
 
-function afterGeneral(result) {
+async function afterGeneral(result) {
   const user: UserInfo = {
     id: result.id,
     username: result.ename,
@@ -171,7 +171,7 @@ function afterGeneral(result) {
   userState.setUserInfo(user)
   // 如果result中没有返回 权限 需要主动获取权限列表
   if (!result.permissions) {
-    result.permissions = getUserPermissions(result.id)
+    result.permissions = await getUserPermissions(result.id)
   }
   userState.setPermissions(result.permissions)
   userState.setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])