af-mobile-client-vue3 1.1.49 → 1.1.50

package/package.json

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

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

@@ -146,7 +146,21 @@ function init(params) {
 }
 
 function setFormProps(form, item) {
-  form.value[item.model] = undefined
+  // 只有在字段未定义时，按类型赋有意义的默认值
+  if (form.value[item.model] === undefined) {
+    switch (item.rule?.type) {
+      case 'number':
+      case 'integer':
+      case 'float':
+        form.value[item.model] = 0
+        break
+      case 'string':
+        form.value[item.model] = ''
+        break
+      default:
+        form.value[item.model] = ''
+    }
+  }
   if (item.rule) {
     rules[item.model] = []
     let defaultValue

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

@@ -277,9 +277,6 @@ watch(() => props.modelValue, (newVal) => {
       pickerValue.value = newVal !== undefined ? `${newVal[0]} ~ ${newVal[1]}` : getDefaultValue()
     }
     else if (['datePicker', 'rangePicker', 'yearPicker', 'monthPicker', 'yearRangePicker', 'monthRangePicker'].includes(attr.type)) {
-      console.log('>>>> attr: ', JSON.stringify(attr))
-      const ss = getDateRange(attr)
-      console.log('>>>> ss: ', ss)
       localValue.value = getDateRange(attr)
     }
     else {
@@ -690,7 +687,6 @@ function handleAddressConfirm(location) {
     [`${attr.model}_lon_lat`]: `${location.longitude},${location.latitude}`,
     [attr.model]: location.address,
   }
-
   // 更新表单数据
   // eslint-disable-next-line vue/custom-event-name-casing
   emits('set-form', formData)

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

@@ -12,27 +12,7 @@ interface Props {
 }
 
 const props = withDefaults(defineProps<Props>(), {
-  defaultCenter: () => {
-    try {
-      mobileUtil.execute({
-        param: {},
-        funcName: 'getLocationResult',
-        callbackFunc: (result) => {
-          const res = result as PhoneLocationStatus
-          if (res.status === 'success') {
-            const locationResult = JSON.parse(res.data.location)
-            if (locationResult.longitude && locationResult.latitude) {
-              return [locationResult.longitude, locationResult.latitude]
-            }
-          }
-        },
-      })
-    }
-    catch (error) {
-      console.error('获取位置信息失败:', error)
-    }
-    return [108.948024, 34.263161] // 北京天安门坐标
-  },
+  defaultCenter: () => [108.948024, 34.263161],
   defaultZoom: 16,
 })
 
@@ -75,6 +55,32 @@ onMounted(async () => {
   })
   // 初始化后尝试获取地址信息
   handleCenterChange(props.defaultCenter)
+
+  // 异步获取定位，获取到后更新 currentLocation 和地图中心
+  try {
+    mobileUtil.execute({
+      param: {},
+      funcName: 'getLocationResult',
+      callbackFunc: (result) => {
+        const res = result as PhoneLocationStatus
+        if (res.status === 'success') {
+          const locationResult = JSON.parse(res.data.location)
+          if (locationResult.longitude && locationResult.latitude) {
+            const newCenter: [number, number] = [locationResult.longitude, locationResult.latitude]
+            currentLocation.value = newCenter
+            // 设置地图中心
+            if (mapRef.value && mapRef.value.setCenter) {
+              mapRef.value.setCenter(newCenter)
+            }
+            handleCenterChange(newCenter)
+          }
+        }
+      },
+    })
+  }
+  catch (error) {
+    console.error('获取位置信息失败:', error)
+  }
 })
 
 // 监听弹窗状态变化
@@ -137,6 +143,9 @@ watch(() => props.modelValue, (newVal) => {
   position: relative;
   flex: 1;
   min-height: 0;
+  border-radius: 40px;
+  overflow: hidden;
+  padding: 10px;
 }
 
 .map {

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

@@ -12,10 +12,10 @@ import type {
   PhoneLocationStatus,
   PointData,
   PointLayerConfig,
+  TrackData,
   WebGLPointOptions,
   WMSLayerConfig,
   WMSOptions,
-  TrackData,
 } from './types'
 import locationIcon from '@af-mobile-client-vue3/assets/img/component/positioning.png'
 import { getConfigByName } from '@af-mobile-client-vue3/services/api/common'
@@ -23,13 +23,13 @@ import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
 import { Map, View } from 'ol'
 import { defaults as defaultControls, ScaleLine } from 'ol/control'
 import Feature from 'ol/Feature'
-import Point from 'ol/geom/Point'
 import LineString from 'ol/geom/LineString'
+import Point from 'ol/geom/Point'
 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'
 import { ImageWMS, Vector as VectorSource, XYZ } from 'ol/source'
-import { Fill, Icon, Stroke, Style, Text, Circle } from 'ol/style'
+import { Circle, Fill, Icon, Stroke, Style, Text } from 'ol/style'
 import { Button } from 'vant'
 import { getCurrentInstance, onUnmounted, ref } from 'vue'
 import { wgs84ToGcj02Projection } from './utils/wgs84ToGcj02'

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

@@ -3,12 +3,27 @@ import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
 import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
 import { ref } from 'vue'
 
-const configName = ref('AddConstructionForm')
+// const configName = ref('AddConstructionForm')
+const configName = ref('PointBindingForm') // 点位绑定
 const serviceName = ref('af-linepatrol')
 
 const formGroupAddConstruction = ref(null)
-</script>
 
+const formData = ref({
+  t1_f_number: 'name',
+  f_region_id: '5',
+  t1_f_address: '龙首原',
+  t1_f_address_lon_lat: '108.948016,34.292333',
+  t1_f_describe: 't1_f_describe',
+  t1_f_state: 't1_f_state',
+  f_points_devices: '' as string,
+  f_brand: null as number,
+})
+
+function submit(result) {
+  console.log('>>>> form result: ', result)
+}
+</script>
 <template>
   <NormalDataLayout id="XFormGroupView" title="纯表单">
     <template #layout_content>
@@ -16,8 +31,10 @@ const formGroupAddConstruction = ref(null)
         <XForm
           ref="formGroupAddConstruction"
           mode="新增"
+          :form-data="formData"
           :config-name="configName"
           :service-name="serviceName"
+          @on-submit="submit"
         />
       </div>
     </template>