af-mobile-client-vue3 1.1.2 → 1.1.4

package/src/components/data/XOlMap/types.ts

@@ -0,0 +1,138 @@
+/** 地址选择结果接口 */
+export interface LocationResult {
+  /** 经度 */
+  longitude: number
+  /** 纬度 */
+  latitude: number
+  /** 地址描述 */
+  address: string
+}
+
+/** 手机状态接口 */
+export interface PhoneLocationStatus {
+  /** 纬度 */
+  f_latitude: number
+  /** 经度 */
+  f_longitude: number
+  /** 其他可能的状态属性 */
+  [key: string]: unknown
+}
+
+/** 初始化参数接口 */
+export interface InitParams {
+  /** 地图中心点坐标 [经度, 纬度] */
+  center?: [number, number]
+  /** 地图缩放级别 */
+  zoom?: number
+  /** 最大缩放级别 */
+  maxZoom?: number
+  /** 最小缩放级别 */
+  minZoom?: number
+  /** 天地图密钥 */
+  tianDiTuKey?: string
+  /** 是否开启地址选择模式 */
+  enableLocationPicker?: boolean
+  /** 高德地图 API key */
+  amapKey?: string
+}
+
+/** 点位数据接口 */
+export interface PointData {
+  /** 经度 */
+  longitude: number
+  /** 纬度 */
+  latitude: number
+  /** 点标题 */
+  title?: string
+  /** 自定义数据 */
+  extData?: Record<string, any>
+}
+
+/** 点位数据提供者函数类型 */
+export type PointDataProvider = () => PointData[] | Promise<PointData[]>
+
+/** 点位图层配置接口 */
+export interface PointLayerConfig {
+  /** 图层ID */
+  id: number
+  /** 图层名称 */
+  value: string
+  /** 是否显示 */
+  show: boolean
+  /** 是否在控制面板显示 */
+  showInControl?: boolean
+  /** 图标URL */
+  icon: string
+  /** 图标锚点 */
+  iconAnchor?: [number, number]
+  /** 点击事件处理函数 */
+  onClick?: (point: PointData, event: any) => void
+  /** 点位数据提供者 */
+  dataProvider?: () => PointData[] | Promise<PointData[]>
+}
+
+/** WebGL渲染配置接口 */
+export interface WebGLPointOptions extends PointLayerConfig {
+  /** 图标大小 */
+  iconSize?: [number, number]
+  /** 是否开启聚合 */
+  enableCluster?: boolean
+  /** 聚合距离，单位像素 */
+  clusterDistance?: number
+  /** 聚合样式配置 */
+  clusterStyle?: {
+    /** 填充颜色 */
+    fillColor?: string
+    /** 边框颜色 */
+    strokeColor?: string
+    /** 文字颜色 */
+    textColor?: string
+  }
+  /** 渲染性能配置 */
+  performance?: {
+    /** 是否开启分块加载 */
+    enableChunk?: boolean
+    /** 每块数据量 */
+    chunkSize?: number
+    /** 是否开启节流 */
+    enableThrottle?: boolean
+    /** 节流时间间隔(ms) */
+    throttleWait?: number
+  }
+}
+
+/** WMS 图层配置接口 */
+export interface WMSLayerConfig {
+  /** 图层名称 */
+  layerName: string
+  /** 图层显示名称 */
+  value: string
+  /** 是否显示 */
+  show: boolean
+  /** 手机端是否显示 */
+  phoneShow: boolean
+  /** 图层 ID */
+  id: number
+}
+
+/** WMS 服务配置接口 */
+export interface WMSConfig {
+  /** 工作空间 */
+  workspace: string
+  /** 坐标系 */
+  srs: string
+  /** 图片格式 */
+  format: string
+  /** WMS 版本 */
+  version: string
+  /** WMS 服务地址 */
+  url: string
+}
+
+/** WMS 完整配置接口 */
+export interface WMSOptions {
+  /** WMS 图层列表 */
+  layers: WMSLayerConfig[]
+  /** WMS 服务配置 */
+  wms: WMSConfig
+}

package/src/router/routes.ts

@@ -1,6 +1,5 @@
 import type { RouteRecordRaw } from 'vue-router'
 import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
-import XOlMapView from '@af-mobile-client-vue3/components/data/XOlMap/demo.vue'
 import XReport from '@af-mobile-client-vue3/components/data/XReportGrid/XReport.vue'
 import GridView from '@af-mobile-client-vue3/layout/GridView/index.vue'
 import PageLayout from '@af-mobile-client-vue3/layout/PageLayout.vue'
@@ -13,6 +12,8 @@ import XCellListView from '@af-mobile-client-vue3/views/component/XCellListView/
 import XFormAppraiseView from '@af-mobile-client-vue3/views/component/XFormAppraiseView/index.vue'
 import XFormGroupView from '@af-mobile-client-vue3/views/component/XFormGroupView/index.vue'
 import XFormView from '@af-mobile-client-vue3/views/component/XFormView/index.vue'
+import XOlMapView from '@af-mobile-client-vue3/views/component/XOlMapView/index.vue'
+import XLocationPicker from '@af-mobile-client-vue3/views/component/XOlMapView/XLocationPicker/index.vue'
 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'
@@ -82,6 +83,11 @@ const routes: Array<RouteRecordRaw> = [
         name: 'XOlMapView',
         component: XOlMapView,
       },
+      {
+        path: '/Component/XOlMapView/XLocationPicker',
+        name: 'XLocationPicker',
+        component: XLocationPicker,
+      },
       // {
       //   path: '/Components/XForm',
       //   name: 'XForm',

package/src/services/api/common.ts

@@ -50,8 +50,8 @@ export function getConfigByNameWithoutIndexedDB(configName: string, serviceName
 /**
  * 通用执行业务逻辑
  */
-export function runLogic(logicName: string, parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/logic/${logicName}`, parameter)
+export function runLogic<T>(logicName: string, parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): Promise<T> {
+  return post<T>(`/${serviceName}/logic/${logicName}`, parameter)
 }
 
 /**

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/views/component/XOlMapView/XLocationPicker/index.vue

@@ -0,0 +1,120 @@
+<script setup lang="ts">
+import type { LocationResult } from '@af-mobile-client-vue3/components/data/XOlMap/types'
+import LocationPicker from '@af-mobile-client-vue3/components/data/XOlMap/XLocationPicker/index.vue'
+import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { showNotify } from 'vant'
+import { ref } from 'vue'
+
+const selectedLocation = ref<LocationResult>()
+
+// 处理位置选择
+function handleLocationConfirm(location: LocationResult) {
+  console.log('选择的位置:', location)
+  selectedLocation.value = location
+  showNotify({ type: 'success', message: '位置已选择' })
+}
+</script>
+
+<template>
+  <NormalDataLayout id="XLocationPicker" title="XOlMap地址选择器">
+    <template #layout_content>
+      <div class="location-picker-demo">
+        <!-- 页面标题 -->
+        <div class="page-header">
+          <div class="title">
+            位置选择
+          </div>
+        </div>
+
+        <!-- 选择结果展示 -->
+        <div v-if="selectedLocation" class="location-result">
+          <div class="label">
+            已选位置:
+          </div>
+          <div class="value">
+            {{ selectedLocation.address }}
+          </div>
+          <div class="coordinates">
+            经度: {{ selectedLocation.longitude.toFixed(6) }},
+            纬度: {{ selectedLocation.latitude.toFixed(6) }}
+          </div>
+        </div>
+
+        <!-- 地图组件 -->
+        <div class="map-container">
+          <LocationPicker
+            v-model="selectedLocation"
+            tian-di-tu-key="c16876b28898637c0a1a68b3fa410504"
+            amap-key="5ebabc4536d4b42e0dd1e20175cca8ab"
+            :default-center="[108.948024, 34.263161]"
+            :default-zoom="12"
+            @confirm="handleLocationConfirm"
+          />
+        </div>
+      </div>
+    </template>
+  </NormalDataLayout>
+</template>
+
+<style scoped lang="less">
+.location-picker-demo {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  background-color: #f7f8fa;
+}
+
+.page-header {
+  height: 44px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: white;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+  position: relative;
+  z-index: 1;
+
+  .title {
+    font-size: 16px;
+    color: #333;
+    font-weight: 500;
+  }
+}
+
+.location-result {
+  background: white;
+  padding: 12px 16px;
+  margin: 10px;
+  border-radius: 8px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+
+  .label {
+    font-size: 14px;
+    color: #666;
+    margin-bottom: 4px;
+  }
+
+  .value {
+    font-size: 16px;
+    color: #333;
+    margin-bottom: 8px;
+    word-break: break-all;
+  }
+
+  .coordinates {
+    font-size: 12px;
+    color: #999;
+  }
+}
+
+.map-container {
+  flex: 1;
+  position: relative;
+  margin: 0 10px 10px 10px;
+  border-radius: 8px;
+  overflow: hidden;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+</style>