af-mobile-client-vue3 1.3.87 → 1.3.89

package/package.json

@@ -1,115 +1,115 @@
-{
-  "name": "af-mobile-client-vue3",
-  "type": "module",
-  "version": "1.3.87",
-  "packageManager": "pnpm@10.13.1",
-  "description": "Vue + Vite component lib",
-  "engines": {
-    "node": ">=20.19.0"
-  },
-  "scripts": {
-    "dev": "cross-env MOCK_SERVER_PORT=8086 vite",
-    "compress": "node ./compress.js",
-    "build:dev": "vue-tsc --noEmit && vite build --mode development && pnpm run compress",
-    "build:pro": "vue-tsc --noEmit && vite build --mode production && pnpm run compress",
-    "preview": "vite preview",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
-    "release": "bumpp --commit --push --tag",
-    "typecheck": "vue-tsc --noEmit",
-    "commitlint": "commitlint --edit",
-    "prepare": "simple-git-hooks"
-  },
-  "dependencies": {
-    "@iconify/vue": "4.3.0",
-    "@micro-zoe/micro-app": "1.0.0-rc.26",
-    "@unhead/vue": "2.0.12",
-    "@vant/area-data": "^2.0.0",
-    "@vant/touch-emulator": "^1.4.0",
-    "@vant/use": "^1.6.0",
-    "@vueuse/core": "^13.5.0",
-    "axios": "^1.10.0",
-    "crypto-js": "^4.2.0",
-    "dayjs": "^1.11.13",
-    "echarts": "^5.6.0",
-    "lodash-es": "^4.17.21",
-    "nprogress": "^0.2.0",
-    "ol": "^10.5.0",
-    "pinia": "^3.0.3",
-    "pinia-plugin-persistedstate": "^4.4.1",
-    "resize-detector": "^0.3.0",
-    "vant": "^4.9.21",
-    "vconsole": "^3.15.1",
-    "vue": "^3.5.17",
-    "vue-i18n": "^11.1.10",
-    "vue-router": "^4.5.1",
-    "vue3-hash-calendar": "^1.1.3",
-    "weixin-js-sdk": "^1.6.5"
-  },
-  "devDependencies": {
-    "@antfu/eslint-config": "4.17.0",
-    "@commitlint/cli": "^19.8.1",
-    "@commitlint/config-conventional": "^19.8.1",
-    "@commitlint/types": "^19.8.1",
-    "@iconify/json": "2.2.318",
-    "@iconify/utils": "^2.3.0",
-    "@intlify/unplugin-vue-i18n": "^6.0.8",
-    "@types/crypto-js": "^4.2.2",
-    "@types/lodash-es": "^4.17.12",
-    "@types/node": "^24.0.14",
-    "@types/nprogress": "^0.2.3",
-    "@unocss/eslint-config": "66.3.3",
-    "@vitejs/plugin-legacy": "^7.0.1",
-    "@vitejs/plugin-vue": "^6.0.0",
-    "autoprefixer": "^10.4.21",
-    "bumpp": "^10.2.0",
-    "consola": "^3.4.2",
-    "cross-env": "^7.0.3",
-    "eslint": "^9.31.0",
-    "eslint-plugin-format": "^1.0.1",
-    "less": "^4.4.0",
-    "lint-staged": "^16.1.2",
-    "mockjs": "^1.1.0",
-    "postcss-mobile-forever": "^5.0.0",
-    "rollup": "^4.45.1",
-    "simple-git-hooks": "^2.13.0",
-    "tar": "^7.4.3",
-    "terser": "^5.43.1",
-    "typescript": "^5.8.3",
-    "unocss": "66.3.3",
-    "vite": "^7.0.5",
-    "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-mock-dev-server": "^1.9.1",
-    "vite-plugin-pwa": "^1.0.1",
-    "vite-plugin-sitemap": "^0.8.2",
-    "vite-plugin-vconsole": "^2.1.1",
-    "vite-plugin-vue-devtools": "^7.7.7",
-    "vue-tsc": "^3.0.2"
-  },
-  "pnpm": {
-    "allowedDeprecatedVersions": {
-      "glob": "7.2.3",
-      "inflight": "1.0.6",
-      "sourcemap-codec": "1.4.8"
-    },
-    "peerDependencyRules": {
-      "allowedVersions": {}
-    },
-    "onlyBuiltDependencies": [
-      "core-js",
-      "esbuild",
-      "simple-git-hooks",
-      "unrs-resolver"
-    ]
-  },
-  "resolutions": {
-    "vite": "^7.0.5"
-  },
-  "simple-git-hooks": {
-    "pre-commit": "pnpm lint-staged",
-    "commit-msg": "pnpm commitlint $1"
-  },
-  "lint-staged": {
-    "*": "eslint --fix"
-  }
-}
+{
+  "name": "af-mobile-client-vue3",
+  "type": "module",
+  "version": "1.3.89",
+  "packageManager": "pnpm@10.13.1",
+  "description": "Vue + Vite component lib",
+  "engines": {
+    "node": ">=20.19.0"
+  },
+  "scripts": {
+    "dev": "cross-env MOCK_SERVER_PORT=8086 vite",
+    "compress": "node ./compress.js",
+    "build:dev": "vue-tsc --noEmit && vite build --mode development && pnpm run compress",
+    "build:pro": "vue-tsc --noEmit && vite build --mode production && pnpm run compress",
+    "preview": "vite preview",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "release": "bumpp --commit --push --tag",
+    "typecheck": "vue-tsc --noEmit",
+    "commitlint": "commitlint --edit",
+    "prepare": "simple-git-hooks"
+  },
+  "dependencies": {
+    "@iconify/vue": "4.3.0",
+    "@micro-zoe/micro-app": "1.0.0-rc.26",
+    "@unhead/vue": "2.0.12",
+    "@vant/area-data": "^2.0.0",
+    "@vant/touch-emulator": "^1.4.0",
+    "@vant/use": "^1.6.0",
+    "@vueuse/core": "^13.5.0",
+    "axios": "^1.10.0",
+    "crypto-js": "^4.2.0",
+    "dayjs": "^1.11.13",
+    "echarts": "^5.6.0",
+    "lodash-es": "^4.17.21",
+    "nprogress": "^0.2.0",
+    "ol": "^10.5.0",
+    "pinia": "^3.0.3",
+    "pinia-plugin-persistedstate": "^4.4.1",
+    "resize-detector": "^0.3.0",
+    "vant": "^4.9.21",
+    "vconsole": "^3.15.1",
+    "vue": "^3.5.17",
+    "vue-i18n": "^11.1.10",
+    "vue-router": "^4.5.1",
+    "vue3-hash-calendar": "^1.1.3",
+    "weixin-js-sdk": "^1.6.5"
+  },
+  "devDependencies": {
+    "@antfu/eslint-config": "4.17.0",
+    "@commitlint/cli": "^19.8.1",
+    "@commitlint/config-conventional": "^19.8.1",
+    "@commitlint/types": "^19.8.1",
+    "@iconify/json": "2.2.318",
+    "@iconify/utils": "^2.3.0",
+    "@intlify/unplugin-vue-i18n": "^6.0.8",
+    "@types/crypto-js": "^4.2.2",
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "^24.0.14",
+    "@types/nprogress": "^0.2.3",
+    "@unocss/eslint-config": "66.3.3",
+    "@vitejs/plugin-legacy": "^7.0.1",
+    "@vitejs/plugin-vue": "^6.0.0",
+    "autoprefixer": "^10.4.21",
+    "bumpp": "^10.2.0",
+    "consola": "^3.4.2",
+    "cross-env": "^7.0.3",
+    "eslint": "^9.31.0",
+    "eslint-plugin-format": "^1.0.1",
+    "less": "^4.4.0",
+    "lint-staged": "^16.1.2",
+    "mockjs": "^1.1.0",
+    "postcss-mobile-forever": "^5.0.0",
+    "rollup": "^4.45.1",
+    "simple-git-hooks": "^2.13.0",
+    "tar": "^7.4.3",
+    "terser": "^5.43.1",
+    "typescript": "^5.8.3",
+    "unocss": "66.3.3",
+    "vite": "^7.0.5",
+    "vite-plugin-compression": "^0.5.1",
+    "vite-plugin-mock-dev-server": "^1.9.1",
+    "vite-plugin-pwa": "^1.0.1",
+    "vite-plugin-sitemap": "^0.8.2",
+    "vite-plugin-vconsole": "^2.1.1",
+    "vite-plugin-vue-devtools": "^7.7.7",
+    "vue-tsc": "^3.0.2"
+  },
+  "pnpm": {
+    "allowedDeprecatedVersions": {
+      "glob": "7.2.3",
+      "inflight": "1.0.6",
+      "sourcemap-codec": "1.4.8"
+    },
+    "peerDependencyRules": {
+      "allowedVersions": {}
+    },
+    "onlyBuiltDependencies": [
+      "core-js",
+      "esbuild",
+      "simple-git-hooks",
+      "unrs-resolver"
+    ]
+  },
+  "resolutions": {
+    "vite": "^7.0.5"
+  },
+  "simple-git-hooks": {
+    "pre-commit": "pnpm lint-staged",
+    "commit-msg": "pnpm commitlint $1"
+  },
+  "lint-staged": {
+    "*": "eslint --fix"
+  }
+}

package/src/api/user/index.ts

@@ -1,45 +1,45 @@
-import { loginApi } from '@af-mobile-client-vue3/services/api/Login'
-
-import { get, post } from '@af-mobile-client-vue3/services/restTools'
-import { http } from '@af-mobile-client-vue3/utils/http'
-
-export interface BasicResponseModel<T = any> {
-  code: number
-  msg: string
-  data: T
-}
-
-export function login(data: any) {
-  return post(
-    loginApi.Login,
-    data,
-  )
-}
-
-export function OALogin(data: any) {
-  return get(`/af-system/user/${data.username}/${data.password}/智慧OA`)
-}
-
-/**
- * @description: 获取用户信息
- */
-export function getUserInfo(data: any) {
-  const params = {
-    resourceName: data.resourceName,
-    isMobile: true,
-  }
-  return get(
-    `/af-system/user/info/${data.username}`,
-    params,
-  )
-}
-
-/**
- * @description: 用户登出
- */
-export function doLogout() {
-  return http.request({
-    url: loginApi.Logout,
-    method: 'DELETE',
-  })
-}
+import { loginApi } from '@af-mobile-client-vue3/services/api/Login'
+
+import { get, post } from '@af-mobile-client-vue3/services/restTools'
+import { http } from '@af-mobile-client-vue3/utils/http'
+
+export interface BasicResponseModel<T = any> {
+  code: number
+  msg: string
+  data: T
+}
+
+export function login(data: any) {
+  return post(
+    loginApi.Login,
+    data,
+  )
+}
+
+export function OALogin(data: any) {
+  return get(`/af-system/user/${data.username}/${data.password}/智慧OA`)
+}
+
+/**
+ * @description: 获取用户信息
+ */
+export function getUserInfo(data: any) {
+  const params = {
+    resourceName: data.resourceName,
+    isMobile: true,
+  }
+  return get(
+    `/af-system/user/info/${data.username}`,
+    params,
+  )
+}
+
+/**
+ * @description: 用户登出
+ */
+export function doLogout() {
+  return http.request({
+    url: loginApi.Logout,
+    method: 'DELETE',
+  })
+}

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

@@ -1308,7 +1308,7 @@ function handleCheckboxChange(item: any, checked: boolean) {
           min-width: 76px;
           height: 40px;
           border-radius: 10px;
-          padding: 0 14px;
+          padding: 0 10px;
           // font-size: var(--van-font-size-md);
           transition: all 0.2s ease;
           &:active {

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

@@ -12,6 +12,8 @@ import type {
   PhoneLocationStatus,
   PointData,
   PointLayerConfig,
+  PolygonData,
+  PolygonLayerConfig,
   TrackData,
   WebGLPointOptions,
   WMSLayerConfig,
@@ -25,6 +27,7 @@ import { defaults as defaultControls, ScaleLine } from 'ol/control'
 import Feature from 'ol/Feature'
 import LineString from 'ol/geom/LineString'
 import Point from 'ol/geom/Point'
+import Polygon from 'ol/geom/Polygon'
 import { defaults as defaultInteractions } from 'ol/interaction'
 import { Image as ImageLayer, Tile as TileLayer, Vector as VectorLayer } from 'ol/layer'
 import { fromLonLat, toLonLat } from 'ol/proj'
@@ -91,6 +94,10 @@ let locationLayer: VectorLayer<VectorSource> | null = null
 const trackLayers: Record<number, VectorLayer<VectorSource>> = {}
 const trackLayerStatus = ref<TrackData[]>([])
 
+/** 存储多边形图层 */
+const polygonLayers: Record<number, VectorLayer<VectorSource>> = {}
+const polygonLayerStatus = ref<PolygonLayerConfig[]>([])
+
 /**
  * 创建位置图标图层
  */
@@ -188,6 +195,7 @@ function initializeLayers(tianDiTuKey = ''): void {
         url: 'https://wprd04.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}',
         crossOrigin: 'anonymous',
         projection: 'EPSG:3857',
+        maxZoom: 18,
       }),
     })
 
@@ -197,6 +205,7 @@ function initializeLayers(tianDiTuKey = ''): void {
         url: 'https://webst01.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}',
         crossOrigin: 'anonymous',
         projection: 'EPSG:3857',
+        maxZoom: 16,
       }),
       visible: false,
     })
@@ -207,6 +216,7 @@ function initializeLayers(tianDiTuKey = ''): void {
         url: 'https://webst02.is.autonavi.com/appmaptile?style=8&x={x}&y={y}&z={z}',
         crossOrigin: 'anonymous',
         projection: 'EPSG:3857',
+        maxZoom: 18,
       }),
       visible: false,
     })
@@ -218,6 +228,7 @@ function initializeLayers(tianDiTuKey = ''): void {
           + 'SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&'
           + `FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=${tianDiTuKey}`,
         projection: wgs84ToGcj02Projection,
+        maxZoom: 18,
       }),
       visible: false,
     })
@@ -229,6 +240,7 @@ function initializeLayers(tianDiTuKey = ''): void {
           + 'SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&'
           + `FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=${tianDiTuKey}`,
         projection: wgs84ToGcj02Projection,
+        maxZoom: 18,
       }),
       visible: false,
     })
@@ -240,6 +252,7 @@ function initializeLayers(tianDiTuKey = ''): void {
           + 'SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&'
           + `FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=${tianDiTuKey}`,
         projection: wgs84ToGcj02Projection,
+        maxZoom: 18,
       }),
       visible: false,
     })
@@ -251,6 +264,7 @@ function initializeLayers(tianDiTuKey = ''): void {
           + 'SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cia&STYLE=default&TILEMATRIXSET=w&'
           + `FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=${tianDiTuKey}`,
         projection: wgs84ToGcj02Projection,
+        maxZoom: 18,
       }),
       visible: false,
     })
@@ -557,6 +571,46 @@ function createPointFeature(point: PointData, icon: string, iconAnchor: [number,
   return feature
 }
 
+/**
+ * 创建多边形要素
+ * @param polygon - 多边形数据
+ * @returns 返回要素实例
+ */
+function createPolygonFeature(polygon: PolygonData): Feature {
+  // 将经纬度坐标转换为地图坐标
+  const coordinates = polygon.coordinates.map(coord => fromLonLat(coord))
+
+  const feature = new Feature({
+    geometry: new Polygon([coordinates]),
+    properties: polygon,
+  })
+
+  // 设置多边形样式
+  const style = new Style({
+    fill: new Fill({
+      color: polygon.fillColor || 'rgba(255, 0, 0, 0.3)',
+    }),
+    stroke: new Stroke({
+      color: polygon.strokeColor || '#ff0000',
+      width: polygon.strokeWidth || 2,
+    }),
+    text: new Text({
+      text: polygon.name || '',
+      font: '12px sans-serif',
+      fill: new Fill({
+        color: '#333',
+      }),
+      stroke: new Stroke({
+        color: '#fff',
+        width: 2,
+      }),
+    }),
+  })
+
+  feature.setStyle(style)
+  return feature
+}
+
 /**
  * 创建点位图层
  * @param config - 图层配置
@@ -904,6 +958,102 @@ function navigationHandleLocation() {
   }
 }
 
+/**
+ * 创建多边形图层
+ * @param config - 图层配置
+ * @returns 返回图层实例
+ */
+function createPolygonLayer(config: PolygonLayerConfig): VectorLayer<VectorSource> {
+  const vectorSource = new VectorSource()
+  const vectorLayer = new VectorLayer({
+    source: vectorSource,
+    visible: config.show,
+    zIndex: config.id === undefined ? 1 : 4, // 多边形图层层级稍高
+  })
+
+  // 添加多边形要素
+  const addFeatures = (data: PolygonData[]) => {
+    // 清除现有要素
+    vectorSource.clear()
+    // 添加新的多边形要素
+    data.forEach((polygon) => {
+      const feature = createPolygonFeature(polygon)
+      vectorSource.addFeature(feature)
+    })
+  }
+
+  // 添加点击事件处理
+  if (config.onClick) {
+    map?.on('click', (event) => {
+      const feature = map.forEachFeatureAtPixel(event.pixel, feature => feature, {
+        layerFilter: layer => layer === vectorLayer,
+      })
+      if (feature) {
+        const properties = feature.getProperties()
+        const { geometry, ...polygonData } = properties
+        config.onClick(polygonData as PolygonData, event)
+      }
+    })
+  }
+
+  // 监听图层可见性变化
+  vectorLayer.on('change:visible', async () => {
+    if (vectorLayer.getVisible() && config.dataProvider) {
+      try {
+        const data = await config.dataProvider()
+        addFeatures(data)
+      }
+      catch (error) {
+        console.error('获取多边形数据失败:', error)
+      }
+    }
+  })
+
+  // 初始加载数据
+  if (config.show && config.dataProvider) {
+    const result = config.dataProvider()
+    if (result instanceof Promise) {
+      result.then((data) => {
+        addFeatures(data)
+      }).catch((error) => {
+        console.error('获取初始多边形数据失败:', error)
+      })
+    }
+    else {
+      addFeatures(result)
+    }
+  }
+
+  return vectorLayer
+}
+
+/**
+ * 添加多边形图层
+ * @param config - 图层配置
+ * @returns 返回图层实例
+ */
+function addPolygonLayer(config: PolygonLayerConfig): VectorLayer<VectorSource> | null {
+  if (!map)
+    return null
+
+  const vectorLayer = createPolygonLayer(config)
+  map.addLayer(vectorLayer)
+  polygonLayers[config.id] = vectorLayer
+
+  // 更新图层状态
+  if (config.showInControl !== false) {
+    const existingIndex = polygonLayerStatus.value.findIndex(layer => layer.id === config.id)
+    if (existingIndex === -1) {
+      polygonLayerStatus.value.push(config)
+    }
+    else {
+      polygonLayerStatus.value[existingIndex] = config
+    }
+  }
+
+  return vectorLayer
+}
+
 /**
  * 添加轨迹图层
  * @param trackData - 轨迹数据
@@ -1037,6 +1187,31 @@ function handleToggleTrackLayer(track: TrackData): void {
   setTrackLayerVisible(track.id, track.show)
 }
 
+/**
+ * 控制多边形图层显示/隐藏
+ * @param layerId - 图层ID
+ * @param visible - 是否显示
+ */
+function setPolygonLayerVisible(layerId: number, visible: boolean): void {
+  const layer = polygonLayers[layerId]
+  if (layer) {
+    layer.setVisible(visible)
+    // 更新图层状态
+    const layerIndex = polygonLayerStatus.value.findIndex(layer => layer.id === layerId)
+    if (layerIndex !== -1) {
+      polygonLayerStatus.value[layerIndex].show = visible
+    }
+  }
+}
+
+/**
+ * 切换多边形图层显示状态
+ */
+function handleTogglePolygonLayer(layer: PolygonLayerConfig): void {
+  layer.show = !layer.show
+  setPolygonLayerVisible(layer.id, layer.show)
+}
+
 // 暴露方法给父组件
 defineExpose({
   updateLocationMarker,
@@ -1060,6 +1235,9 @@ defineExpose({
   addTrackLayer,
   setTrackLayerVisible,
   handleToggleTrackLayer,
+  addPolygonLayer,
+  setPolygonLayerVisible,
+  handleTogglePolygonLayer,
 })
 
 // 组件卸载时清理地图实例
@@ -1178,6 +1356,25 @@ onUnmounted(() => {
             </div>
           </div>
         </div>
+
+        <!-- 多边形图层 -->
+        <div v-if="polygonLayerStatus.length > 0" class="control-panel layer-control">
+          <div class="control-title">
+            <i class="van-icon van-icon-map-marked" /> 多边形图层
+          </div>
+          <div class="layer-list">
+            <div
+              v-for="layer in polygonLayerStatus"
+              :key="layer.id"
+              class="layer-item"
+              :class="{ active: layer.show }"
+              @click="handleTogglePolygonLayer(layer)"
+            >
+              <i class="van-icon" :class="layer.show ? 'van-icon-eye' : 'van-icon-closed-eye'" />
+              <span>{{ layer.value }}</span>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
   </div>

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

@@ -147,3 +147,45 @@ export interface TrackData {
   color: string
   show?: boolean // 是否显示
 }
+
+/**
+ * 多边形数据接口
+ */
+export interface PolygonData {
+  /** 多边形ID */
+  id: number
+  /** 多边形名称 */
+  name: string
+  /** 多边形坐标点数组 [经度, 纬度][] */
+  coordinates: [number, number][]
+  /** 填充颜色 */
+  fillColor?: string
+  /** 边框颜色 */
+  strokeColor?: string
+  /** 边框宽度 */
+  strokeWidth?: number
+  /** 透明度 */
+  opacity?: number
+  /** 是否显示 */
+  show?: boolean
+  /** 自定义数据 */
+  extData?: Record<string, any>
+}
+
+/**
+ * 多边形图层配置接口
+ */
+export interface PolygonLayerConfig {
+  /** 图层ID */
+  id: number
+  /** 图层名称 */
+  value: string
+  /** 是否显示 */
+  show: boolean
+  /** 是否在控制面板显示 */
+  showInControl?: boolean
+  /** 点击事件处理函数 */
+  onClick?: (polygon: PolygonData, event: any) => void
+  /** 多边形数据提供者 */
+  dataProvider?: () => PolygonData[] | Promise<PolygonData[]>
+}

package/src/router/routes.ts

@@ -155,7 +155,7 @@ const routes: Array<RouteRecordRaw> = [
         component: XFormAppraiseView,
       },
       {
-        path: '/Component/XFormView/:id/:openid',
+        path: '/Component/XFormView',
         name: 'XFormView',
         component: XFormView,
       },