af-mobile-client-vue3 1.0.98 → 1.1.2

package/src/components/data/XOlMap/utils/wgs84ToGcj02.js

@@ -0,0 +1,154 @@
+// 导入proj控件
+import * as proj from 'ol/proj'
+
+function forEachPoint(func) {
+  return function (input, opt_output, opt_dimension) {
+    const len = input.length
+
+    const dimension = opt_dimension || 2
+    let output
+
+    if (opt_output) {
+      output = opt_output
+    }
+    else {
+      if (dimension !== 2) {
+        output = input.slice()
+      }
+      else {
+        output = [len]
+      }
+    }
+    for (let offset = 0; offset < len; offset += dimension) {
+      func(input, output, offset)
+    }
+    return output
+  }
+}
+
+const gcj02 = {}
+const PI = Math.PI
+const AXIS = 6378245.0
+// eslint-disable-next-line no-loss-of-precision
+const OFFSET = 0.00669342162296594323 // (a^2 - b^2) / a^2
+
+function delta(wgLon, wgLat) {
+  let dLat = transformLat(wgLon - 105.0, wgLat - 35.0)
+  let dLon = transformLon(wgLon - 105.0, wgLat - 35.0)
+  const radLat = (wgLat / 180.0) * PI
+  let magic = Math.sin(radLat)
+  magic = 1 - OFFSET * magic * magic
+  const sqrtMagic = Math.sqrt(magic)
+  dLat = (dLat * 180.0) / (((AXIS * (1 - OFFSET)) / (magic * sqrtMagic)) * PI)
+  dLon = (dLon * 180.0) / ((AXIS / sqrtMagic) * Math.cos(radLat) * PI)
+  return [dLon, dLat]
+}
+
+function outOfChina(lon, lat) {
+  if (lon < 72.004 || lon > 137.8347) {
+    return true
+  }
+  return lat < 0.8293 || lat > 55.8271
+}
+
+function transformLat(x, y) {
+  let ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x))
+  ret += ((20.0 * Math.sin(6.0 * x * PI) + 20.0 * Math.sin(2.0 * x * PI)) * 2.0) / 3.0
+  ret += ((20.0 * Math.sin(y * PI) + 40.0 * Math.sin((y / 3.0) * PI)) * 2.0) / 3.0
+  ret += ((160.0 * Math.sin((y / 12.0) * PI) + 320 * Math.sin((y * PI) / 30.0)) * 2.0) / 3.0
+  return ret
+}
+
+function transformLon(x, y) {
+  let ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x))
+  ret += ((20.0 * Math.sin(6.0 * x * PI) + 20.0 * Math.sin(2.0 * x * PI)) * 2.0) / 3.0
+  ret += ((20.0 * Math.sin(x * PI) + 40.0 * Math.sin((x / 3.0) * PI)) * 2.0) / 3.0
+  ret += ((150.0 * Math.sin((x / 12.0) * PI) + 300.0 * Math.sin((x / 30.0) * PI)) * 2.0) / 3.0
+  return ret
+}
+
+gcj02.toWGS84 = forEachPoint((input, output, offset) => {
+  let lng = input[offset]
+  let lat = input[offset + 1]
+  if (!outOfChina(lng, lat)) {
+    const deltaD = delta(lng, lat)
+    lng = lng - deltaD[0] // 改回减法
+    lat = lat - deltaD[1] // 改回减法
+  }
+  output[offset] = lng
+  output[offset + 1] = lat
+})
+
+gcj02.fromWGS84 = forEachPoint((input, output, offset) => {
+  let lng = input[offset]
+  let lat = input[offset + 1]
+  if (!outOfChina(lng, lat)) {
+    const deltaD = delta(lng, lat)
+    lng = lng + deltaD[0] // 改回加法
+    lat = lat + deltaD[1] // 改回加法
+  }
+  output[offset] = lng
+  output[offset + 1] = lat
+})
+
+const sphericalMercator = {}
+const RADIUS = 6378137
+const MAX_LATITUDE = 85.0511287798
+const RAD_PER_DEG = Math.PI / 180
+
+sphericalMercator.forward = forEachPoint((input, output, offset) => {
+  const lat = Math.max(Math.min(MAX_LATITUDE, input[offset + 1]), -MAX_LATITUDE)
+  const sin = Math.sin(lat * RAD_PER_DEG)
+  output[offset] = RADIUS * input[offset] * RAD_PER_DEG
+  output[offset + 1] = (RADIUS * Math.log((1 + sin) / (1 - sin))) / 2
+})
+
+sphericalMercator.inverse = forEachPoint((input, output, offset) => {
+  output[offset] = input[offset] / RADIUS / RAD_PER_DEG
+  output[offset + 1] = (2 * Math.atan(Math.exp(input[offset + 1] / RADIUS)) - Math.PI / 2) / RAD_PER_DEG
+})
+
+const projzh = {}
+
+projzh.ll2gmerc = function (input, opt_output, opt_dimension) {
+  const output = gcj02.toWGS84(input, opt_output, opt_dimension) // 改用 toWGS84
+  return projzh.ll2smerc(output, output, opt_dimension)
+}
+
+projzh.gmerc2ll = function (input, opt_output, opt_dimension) {
+  const output = projzh.smerc2ll(input, input, opt_dimension)
+  return gcj02.fromWGS84(output, opt_output, opt_dimension) // 改用 fromWGS84
+}
+
+// smerc2gmerc 需要修改
+
+projzh.smerc2gmerc = function (input, opt_output, opt_dimension) {
+  let output = projzh.smerc2ll(input, input, opt_dimension)
+  output = gcj02.toWGS84(output, output, opt_dimension) // 这里应该用 toWGS84
+  return projzh.ll2smerc(output, output, opt_dimension)
+}
+
+// gmerc2smerc 需要修改
+
+projzh.gmerc2smerc = function (input, opt_output, opt_dimension) {
+  let output = projzh.smerc2ll(input, input, opt_dimension)
+  output = gcj02.fromWGS84(output, output, opt_dimension) // 这里应该用 fromWGS84
+  return projzh.ll2smerc(output, output, opt_dimension)
+}
+
+projzh.ll2smerc = sphericalMercator.forward
+projzh.smerc2ll = sphericalMercator.inverse
+
+// 定义WGS84转GCJ02的投影
+const extent = [-20037508.342789244, -20037508.342789244, 20037508.342789244, 20037508.342789244]
+export const wgs84ToGcj02Projection = new proj.Projection({
+  code: 'WGS84-TO-GCJ02',
+  extent,
+  units: 'm',
+})
+
+// 添加投影和转换方法
+proj.addProjection(wgs84ToGcj02Projection)
+// 注意这里转换方法的顺序与原来相反
+proj.addCoordinateTransforms('EPSG:4326', wgs84ToGcj02Projection, projzh.ll2gmerc, projzh.gmerc2ll)
+proj.addCoordinateTransforms('EPSG:3857', wgs84ToGcj02Projection, projzh.smerc2gmerc, projzh.gmerc2smerc)

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

@@ -0,0 +1,16 @@
+import { post } from '@af-mobile-client-vue3/services/restTools'
+
+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/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,185 @@
+<script setup lang="ts">
+import { queryProse } from '@af-mobile-client-vue3/api/mock'
+import { post } from '@af-mobile-client-vue3/services/restTools'
+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()
+
+// 数据定义
+const requestTypes = ref('GET, POST, DELETE')
+const getResult = ref('')
+const postResult = 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('请求失败')
+  }
+}
+
+// 定义请求数据类型
+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="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

@@ -24,7 +24,11 @@ const list = ref([
   },
   {
     name: 'XForm 表单',
-    to: '/Component/XFormView/1/debug',
+    to: '/Component/XFormView/1/debug?configName=hiddenTroubleFollowForm&serviceName=af-linepatrol&mode=新增',
+  },
+  {
+    name: 'XFormGroup 表单组',
+    to: '/Component/XFormGroupView',
   },
   {
     name: '操作卡手机端',
@@ -46,6 +50,14 @@ const list = ref([
     name: 'XFormAppraise 表单',
     to: '/Component/XFormAppraiseView/2/debug',
   },
+  {
+    name: 'XOlmap 地图组件',
+    to: '/Component/XOlMapView',
+  },
+  {
+    name: '请求示例',
+    to: '/Component/XRequestView',
+  },
 ])
 
 function cleanConfigCache() {

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

@@ -3,12 +3,25 @@ import type { UserInfo } from '@af-mobile-client-vue3/stores/modules/user'
 import type { FormInstance } from 'vant'
 import { LoginStateEnum, useFormRules, useLoginState } from '@af-mobile-client-vue3/hooks/useLogin'
 import GetAppDataService from '@af-mobile-client-vue3/plugins/AppData'
+import { getUserPermissions } from '@af-mobile-client-vue3/services/api/search'
 import { useSettingStore } from '@af-mobile-client-vue3/stores/modules/setting'
 import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
 import { indexedDB } from '@af-mobile-client-vue3/utils/indexedDB'
 import { funcToRouter, loadRoutes } from '@af-mobile-client-vue3/utils/routerUtil'
 import { isWechat } from '@af-mobile-client-vue3/utils/wechatUtil'
-import { closeToast, showDialog, showFailToast, Switch, Button as VanButton, Col as VanCol, Field as VanField, Form as VanForm, Icon as VanIcon, Loading as VanLoading, Row as VanRow } from 'vant'
+import {
+  closeToast,
+  showDialog,
+  showFailToast,
+  Switch,
+  Button as VanButton,
+  Col as VanCol,
+  Field as VanField,
+  Form as VanForm,
+  Icon as VanIcon,
+  Loading as VanLoading,
+  Row as VanRow,
+} from 'vant'
 import { computed, inject, onBeforeMount, onMounted, reactive, ref, unref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import 'vant/lib/switch/index.css'
@@ -41,13 +54,12 @@ onBeforeMount(async () => {
       try {
         wxloading.value = true
         if (route.query.code && route.query.state) {
-          const res: any = await userState.loginUnified({
+          const data = await userState.loginUnified({
             unifiedCode: `${route.query.code}`,
             tenantName: `${route.query.state}`,
             loginMode: 'wechat',
             resourceName: setting.getSetting()?.routerName || '智慧手机',
           })
-          const data = res
           login.f = data
           await Promise.all([GetAppDataService.load()])
           const loginInfo = {
@@ -146,7 +158,7 @@ function closeWindows() {
   }
 }
 
-function afterGeneral(result) {
+async function afterGeneral(result) {
   const user: UserInfo = {
     id: result.id,
     username: result.ename,
@@ -157,7 +169,12 @@ function afterGeneral(result) {
     rolestr: result.rolestr,
   }
   userState.setUserInfo(user)
-  userState.setPermissions([{ id: 'queryForm', operation: ['add', 'edit'] }])
+  // 如果result中没有返回 权限 需要主动获取权限列表
+  if (!result.permissions) {
+    result.permissions = await getUserPermissions(result.id)
+    console.log(result.permissions, '====')
+  }
+  userState.setPermissions(result.permissions)
   userState.setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])
   // 加载路由
   loadRoutes(funcToRouter(user.functions))