af-mobile-client-vue3 1.1.6 → 1.1.8

package/.env

@@ -2,6 +2,6 @@ VITE_APP_PUBLIC_PATH=/example-web
 VITE_APP_PREVIEW=true
 VITE_APP_API_BASE_URL=/api
 VITE_APP_WEB_CONFIG_KEY=admin.webconfig
-VITE_APP_SYSTEM_NAME=af-system
+VITE_APP_SYSTEM_NAME=af-revenue
 # 最低兼容性 V4（最新产品）V3(V3产品) OA(公司OA)
 VITE_APP_COMPATIBLE=V4

package/package.json

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

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

@@ -127,7 +127,7 @@ onBeforeMount(() => {
 function initComponent() {
   getConfigByName(configName, (result) => {
     groupFormItems.value = result
-    title.value = result.title
+    title.value = result?.title
     for (let i = 0; i < result.columnJson.length; i++) {
       const item = result.columnJson[i]
       item.span = item.flexSpan
@@ -436,6 +436,7 @@ function evaluateCustomFunction(funcString: string | undefined, record: any, ind
               <VanRow gutter="20" class="card_item_details" @click="emit('toDetail', item)">
                 <VanCol v-for="column of detailColumns" :key="`details_${column.dataIndex}`" :span="column.span">
                   <p>
+                    {{ `${column.title}: ` }}
                     <XBadge
                       :style="handleFunctionStyle(column.styleFunctionForValue, item[column.dataIndex])"
                       :dict-name="column.dictName" :dict-value="item[column.dataIndex]"

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

@@ -112,6 +112,10 @@ function setFormProps(form, item) {
   }
 }
 
+function setForm(obj) {
+  Object.assign(form.value, obj)
+}
+
 function onSubmit() {
   emits('onSubmit', form.value)
 }
@@ -137,6 +141,7 @@ defineExpose({ init, form, formGroupName, validate })
         :rules="rules"
         :service-name="myServiceName"
         :get-data-params="myGetDataParams"
+        @set-form="setForm"
       />
     </VanCellGroup>
     <div v-if="props.submitButton && props.mode !== '预览'" style="margin: 16px;">

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

@@ -88,7 +88,7 @@ const props = defineProps({
 
 })
 
-const emits = defineEmits(['update:modelValue'])
+const emits = defineEmits(['update:modelValue', 'set-form'])
 // 判断并初始化防抖函数
 let debouncedUserLinkFunc: (() => void) | null = null
 let debouncedDepLinkFunc: (() => void) | null = null
@@ -127,7 +127,8 @@ const currInst = getCurrentInstance()
 // 配置中心->表单项变更触发函数
 const dataChangeFunc = debounce(async () => {
   if (attr.dataChangeFunc)
-    await executeStrFunctionByContext(currInst, attr.dataChangeFunc, [form, attr, null, mode])
+    // eslint-disable-next-line vue/custom-event-name-casing
+    await executeStrFunctionByContext(currInst, attr.dataChangeFunc, [form, val => emits('set-form', val), attr, null, mode])
 }, 500)
 
 // 配置中心->表单项展示函数
@@ -1018,8 +1019,6 @@ function handleAddressConfirm(location) {
         v-model="localValue as LocationResult"
         tian-di-tu-key="c16876b28898637c0a1a68b3fa410504"
         amap-key="5ebabc4536d4b42e0dd1e20175cca8ab"
-        :default-center="[108.948024, 34.263161]"
-        :default-zoom="12"
         @confirm="handleAddressConfirm"
       />
     </VanPopup>

package/src/components/data/XOlMap/README.md

@@ -52,8 +52,6 @@ const initParams: InitParams = {
   zoom: 12,                   // 初始缩放级别
   maxZoom: 18,               // 最大缩放级别
   minZoom: 4,                // 最小缩放级别
-  tianDiTuKey: 'your_key',   // 天地图密钥
-  amapKey: 'your_key',       // 高德地图密钥
 }
 
 // 中心点变化回调

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

@@ -1,22 +1,36 @@
 <script setup lang="ts">
-import type { LocationResult } from '../types'
+import type { LocationResult, PhoneLocationStatus } from '../types'
+import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
 import { Button } from 'vant'
 import { nextTick, onMounted, ref, watch } from 'vue'
 import XOlMap from '../index.vue'
 
 interface Props {
   modelValue?: LocationResult
-  tianDiTuKey: string
-  amapKey: string
   defaultCenter?: [number, number]
   defaultZoom?: number
 }
 
 const props = withDefaults(defineProps<Props>(), {
-  defaultCenter: () => [116.404, 39.915],
-  defaultZoom: 10,
-  tianDiTuKey: '',
-  amapKey: '',
+  defaultCenter: () => {
+    try {
+      mobileUtil.execute({
+        param: undefined,
+        funcName: 'getPhoneStatus',
+        callbackFunc: (result) => {
+          const locationResult = result as PhoneLocationStatus
+          if (locationResult.f_latitude && locationResult.f_longitude) {
+            return [locationResult.f_longitude, locationResult.f_latitude]
+          }
+        },
+      })
+    }
+    catch (error) {
+      console.error('获取位置信息失败:', error)
+    }
+    return [108.948024, 34.263161] // 北京天安门坐标
+  },
+  defaultZoom: 16,
 })
 
 const emit = defineEmits<{
@@ -55,8 +69,6 @@ onMounted(() => {
     mapRef.value.init({
       center: props.defaultCenter,
       zoom: props.defaultZoom,
-      tianDiTuKey: props.tianDiTuKey,
-      amapKey: props.amapKey,
     })
 
     // 初始化后尝试获取地址信息

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

@@ -17,6 +17,7 @@ import type {
   WMSOptions,
 } from './types'
 import locationIcon from '@af-mobile-client-vue3/assets/img/component/positioning.png'
+import { getConfigByName } from '@af-mobile-client-vue3/services/api/common'
 import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
 import { Map, View } from 'ol'
 import { defaults as defaultControls, ScaleLine } from 'ol/control'
@@ -73,6 +74,8 @@ const wmsLayerStatus = ref<WMSLayerConfig[]>([])
 const vectorLayers: Record<number, VectorLayer<VectorSource>> = {}
 const pointLayerStatus = ref<PointLayerConfig[]>([])
 
+const tiandityKey = ref()
+const gaodeKey = ref()
 /** 导航模式 是否正在跟随定位 */
 const isFollowingLocation = ref(false)
 /** 定位定时器 */
@@ -85,11 +88,10 @@ let locationLayer: VectorLayer<VectorSource> | null = null
  */
 function createLocationLayer(): VectorLayer<VectorSource> {
   const source = new VectorSource()
-  const layer = new VectorLayer({
+  return new VectorLayer({
     source,
     zIndex: 10, // 确保位置图标在最上层
   })
-  return layer
 }
 
 /**
@@ -252,7 +254,7 @@ function initializeLayers(tianDiTuKey = ''): void {
  */
 async function getAddressInfo(location: [number, number]): Promise<string> {
   try {
-    const key = mapParams.value.amapKey
+    const key = gaodeKey.value
 
     if (!key) {
       return '获取地址失败: 未配置密钥'
@@ -320,86 +322,91 @@ function init(params: InitParams = {}): void {
     zoom = 10,
     maxZoom = 18,
     minZoom = 4,
-    tianDiTuKey = '',
-    amapKey = '',
   } = params
 
   try {
-    // 初始化所有底图图层
-    initializeLayers(tianDiTuKey)
-
-    // 创建地图实例 - 加载所有底图图层，但默认只显示高德地图
-    map = new Map({
-      target: mapRef.value,
-      layers: Object.values(baseMaps), // 加载所有底图图层
-      view: new View({
-        center: fromLonLat(center),
-        zoom,
-        projection: 'EPSG:3857',
-        maxZoom,
-        minZoom,
-      }),
-      controls: defaultControls({
-        zoom: false,
-        rotate: false,
-        attribution: false,
-      }).extend([
-        new ScaleLine({
-          units: 'metric',
-          className: 'ol-scale-line',
+    getConfigByName('webConfig', (res) => {
+      const tianDiTuKey = res.tianDiTuKey || 'c16876b28898637c0a1a68b3fa410504'
+      const amapKey = res.amapKey || '5ebabc4536d4b42e0dd1e20175cca8ab'
+
+      tiandityKey.value = tianDiTuKey
+      gaodeKey.value = amapKey
+      // 初始化所有底图图层
+      initializeLayers(tianDiTuKey)
+
+      // 创建地图实例 - 加载所有底图图层，但默认只显示高德地图
+      map = new Map({
+        target: mapRef.value,
+        layers: Object.values(baseMaps), // 加载所有底图图层
+        view: new View({
+          center: fromLonLat(center),
+          zoom,
+          projection: 'EPSG:3857',
+          maxZoom,
+          minZoom,
+        }),
+        controls: defaultControls({
+          zoom: false,
+          rotate: false,
+          attribution: false,
+        }).extend([
+          new ScaleLine({
+            units: 'metric',
+            className: 'ol-scale-line',
+          }),
+        ]),
+        interactions: defaultInteractions({
+          altShiftDragRotate: false,
+          pinchRotate: false,
         }),
-      ]),
-      interactions: defaultInteractions({
-        altShiftDragRotate: false,
-        pinchRotate: false,
-      }),
-    })
-
-    // 更新地图大小，确保地图正确渲染
-    setTimeout(() => {
-      if (map) {
-        map.updateSize()
-        // 确保默认图层正确显示
-        handleMapChange('tianditu')
-      }
-    }, 200)
-
-    // 监听地图移动结束事件
-    map.on('moveend', handleMoveEnd)
-
-    // 设置鼠标样式
-    if (mapRef.value) {
-      mapRef.value.style.cursor = 'grab'
-      // 监听地图事件
-      const mapElement = mapRef.value
-
-      // 鼠标按下时
-      mapElement.addEventListener('mousedown', () => {
-        mapElement.style.cursor = 'grabbing'
-        // 用户开始拖动地图，取消跟随定位
-        if (locationTimer) {
-          isFollowingLocation.value = false
-        }
       })
 
-      // 触摸开始时
-      mapElement.addEventListener('touchstart', () => {
-        // 用户开始拖动地图，取消跟随定位
-        if (locationTimer) {
-          isFollowingLocation.value = false
+      // 更新地图大小，确保地图正确渲染
+      setTimeout(() => {
+        if (map) {
+          map.updateSize()
+          // 确保默认图层正确显示
+          handleMapChange('tianditu')
         }
-      })
+      }, 200)
+
+      // 监听地图移动结束事件
+      map.on('moveend', handleMoveEnd)
+
+      // 设置鼠标样式
+      if (mapRef.value) {
+        mapRef.value.style.cursor = 'grab'
+        // 监听地图事件
+        const mapElement = mapRef.value
+
+        // 鼠标按下时
+        mapElement.addEventListener('mousedown', () => {
+          mapElement.style.cursor = 'grabbing'
+          // 用户开始拖动地图，取消跟随定位
+          if (locationTimer) {
+            isFollowingLocation.value = false
+          }
+        })
 
-      // 鼠标释放时
-      mapElement.addEventListener('mouseup', () => {
-        mapElement.style.cursor = 'grab'
-      })
+        // 触摸开始时
+        mapElement.addEventListener('touchstart', () => {
+          // 用户开始拖动地图，取消跟随定位
+          if (locationTimer) {
+            isFollowingLocation.value = false
+          }
+        })
 
-      // 鼠标离开地图时
-      mapElement.addEventListener('mouseleave', () => {
-        mapElement.style.cursor = 'grab'
-      })
-    }
+        // 鼠标释放时
+        mapElement.addEventListener('mouseup', () => {
+          mapElement.style.cursor = 'grab'
+        })
+
+        // 鼠标离开地图时
+        mapElement.addEventListener('mouseleave', () => {
+          mapElement.style.cursor = 'grab'
+        })
+      }
+    })
   }
   catch (error) {
     console.error('地图初始化失败:', error)

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

@@ -28,12 +28,8 @@ export interface InitParams {
   maxZoom?: number
   /** 最小缩放级别 */
   minZoom?: number
-  /** 天地图密钥 */
-  tianDiTuKey?: string
   /** 是否开启地址选择模式 */
   enableLocationPicker?: boolean
-  /** 高德地图 API key */
-  amapKey?: string
 }
 
 /** 点位数据接口 */

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

@@ -12,8 +12,8 @@ const router = useRouter()
 const idKey = ref('o_id')
 
 // 简易crud表单测试
-const configName = ref('crud_oper_log_manage')
-const serviceName = ref('af-system')
+const configName = ref('mobile_ChargeQueryCRUD')
+const serviceName = ref('af-revenue')
 
 // 资源权限测试
 // const configName = ref('crud_sources_test')

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

@@ -69,7 +69,6 @@ onMounted(() => {
     zoom: 12,
     maxZoom: 18,
     minZoom: 4,
-    tianDiTuKey: 'c16876b28898637c0a1a68b3fa410504',
   })
   mapRef.value.addWMSLayers(wmsConfig)
 })