af-mobile-client-vue3 1.2.25 → 1.2.26

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

@@ -1,172 +1,133 @@
-<script setup lang="ts">
-import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
-import { getConfigByName } from '@af-mobile-client-vue3/services/api/common'
-import {
-  Button as VanButton,
-  Tab as VanTab,
-  Tabs as VanTabs,
-} from 'vant'
-import { defineEmits, defineProps, onBeforeMount, ref, watch, useSlots, computed } from 'vue'
-
-const props = withDefaults(defineProps<{
-  configName?: string
-  serviceName?: string
-  groupFormData?: object
-  mode?: string
-}>(), {
-  configName: '',
-  serviceName: undefined,
-  groupFormData: () => ({}),
-  mode: '查询',
-})
-const emit = defineEmits(['submit'])
-
-interface Form {
-  configName?: string
-  serviceName?: string
-  groupFormData?: object
-  mode?: string
-}
-
-const groupItems = ref([])
-const formData = ref({})
-const submitGroup = ref(false)
-const submitSimple = ref(false)
-const isInit = ref(false)
-const initStatus = ref(false)
-const propsData = ref<Partial<Form>>({})
-
-const slots = useSlots()
-const renderableGroupItems = computed(() => {
-  return groupItems.value.filter(item => {
-    if (item.formGroupType === 'slot') {
-      return !!(item.slotName && slots[item.slotName])
-    }
-    return true
-  })
-})
-
-// 组件初始化函数
-function init(params: Form) {
-  initStatus.value = true
-  propsData.value = {
-    configName: props.configName,
-    serviceName: props.serviceName,
-    groupFormData: props.groupFormData,
-    mode: props.mode,
-    ...params,
-  }
-  formData.value = propsData.value.groupFormData
-  getConfigByName(propsData.value.configName, (result) => {
-    console.log('result===', result)
-    if (result?.groups) {
-      groupItems.value = result.groups
-      result.groups.forEach((group) => {
-        if (!formData.value[group.groupName])
-          formData.value[group.groupName] = {}
-        if (group.showSubmitBtn)
-          submitGroup.value = true
-      })
-    }
-    else {
-      submitSimple.value = result.showSubmitBtn
-      groupItems.value = [{ ...result }]
-    }
-    isInit.value = true
-  }, propsData.value.serviceName)
-}
-watch(() => props.groupFormData, (_val) => {
-  formData.value = { ...formData.value, ...props.groupFormData }
-})
-onBeforeMount(() => {
-  if (!initStatus.value)
-    init(props)
-})
-interface XFormLike {
-  validate: () => Promise<void>
-  formGroupName?: string
-  form?: any
-  getFormData?: () => object
-}
-const xFormListRef = ref<XFormLike[]>([])
-
-// 注册表单实例，避免重复
-function setRef(refValue: XFormLike) {
-  if (refValue && !xFormListRef.value.includes(refValue)) {
-    xFormListRef.value.push(refValue)
-  }
-}
-// 注销表单实例
-function removeRef(refValue: XFormLike) {
-  const idx = xFormListRef.value.indexOf(refValue)
-  if (idx !== -1) xFormListRef.value.splice(idx, 1)
-}
-
-async function submit() {
-  for (const res of xFormListRef.value) {
-    try {
-      await res.validate()
-      if (res.formGroupName && res.form) {
-        formData.value[res.formGroupName] = res.form
-      } else if (typeof res.getFormData === 'function') {
-        Object.assign(formData.value, res.getFormData())
-      }
-    } catch (msg) {
-      console.log('error:', msg)
-      return
-    }
-  }
-  console.log('formData.value===', formData.value)
-  emit('submit', formData.value)
-}
-
-defineExpose({ init, removeRef, xFormListRef })
-</script>
-
-<template>
-  <div v-if="isInit" id="x-form-group">
-    <VanTabs scrollspy sticky>
-      <VanTab
-        v-for="(item, index) in renderableGroupItems"
-        :key="item.groupName ? (item.groupName + index) : index"
-        :title="item.describe ? item.describe : item.tableName "
-      >
-        <div class="x-form-group-item">
-          <template v-if="item.formGroupType === 'slot'">
-            <slot :name="item.slotName"
-                  :item="item"
-                  :form-data="item.groupName ? formData[item.groupName] : formData"
-                  :set-ref="setRef"
-                  :remove-ref="removeRef"
-            />
-          </template>
-          <template v-else>
-            <XForm
-              ref="xFormListRef"
-              :mode="props.mode"
-              :group-form-items="item"
-              :form-data="item.groupName ? formData[item.groupName] : formData"
-              :form-name="item.groupName"
-              :service-name="props.serviceName"
-              :submit-button="submitSimple"
-              @on-submit="submit"
-            />
-          </template>
-        </div>
-      </VanTab>
-    </VanTabs>
-    <VanButton v-if="submitGroup" round block type="primary" @click="submit">
-      提交
-    </VanButton>
-  </div>
-</template>
-
-<style scoped lang="less">
-#x-form-group {
-  background-color: rgb(247, 248, 250);
-  padding-bottom: 10px;
-  .x-form-group-item {
-    margin: 20px 0;
-  }
-}
-</style>
+<script setup lang="ts">
+import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
+import { getConfigByName } from '@af-mobile-client-vue3/services/api/common'
+import {
+  Button as VanButton,
+  Tab as VanTab,
+  Tabs as VanTabs,
+} from 'vant'
+import { defineEmits, defineProps, onBeforeMount, ref, watch } from 'vue'
+
+const props = withDefaults(defineProps<{
+  configName?: string
+  serviceName?: string
+  groupFormData?: object
+  mode?: string
+}>(), {
+  configName: '',
+  serviceName: undefined,
+  groupFormData: () => ({}),
+  mode: '查询',
+})
+const emit = defineEmits(['submit'])
+
+interface Form {
+  configName?: string
+  serviceName?: string
+  groupFormData?: object
+  mode?: string
+}
+
+const groupItems = ref([])
+const formData = ref({})
+const submitGroup = ref(false)
+const submitSimple = ref(false)
+const isInit = ref(false)
+const initStatus = ref(false)
+const propsData = ref({})
+
+// 组件初始化函数
+function init(params: Form) {
+  initStatus.value = true
+  propsData.value = {
+    // configName: '',
+    // serviceName: undefined,
+    // groupFormData: () => ({}),
+    // mode: '查询',
+    configName: props.configName,
+    serviceName: props.serviceName,
+    groupFormData: props.groupFormData,
+    mode: props.mode,
+    ...params,
+  }
+  formData.value = propsData.value.groupFormData
+  getConfigByName(propsData.value.configName, (result) => {
+    if (result?.groups) {
+      // submitGroup.value = true
+      groupItems.value = result.groups
+      result.groups.forEach((group) => {
+        if (!formData.value[group.groupName])
+          formData.value[group.groupName] = {}
+        if (group.showSubmitBtn)
+          submitGroup.value = true
+      })
+    }
+    else {
+      submitSimple.value = result.showSubmitBtn
+      groupItems.value = [{ ...result }]
+    }
+    isInit.value = true
+  }, propsData.value.serviceName)
+}
+watch(() => props.groupFormData, (_val) => {
+  formData.value = { ...formData.value, ...props.groupFormData }
+})
+onBeforeMount(() => {
+  if (!initStatus.value)
+    init(props)
+})
+const xFormListRef = ref([])
+async function submit() {
+  for (const res of xFormListRef.value) {
+    await res.validate()
+    formData.value[res.formGroupName] = res.form
+  }
+  emit('submit', formData.value)
+}
+
+// function initXForm(index: number) {
+// 获取自身示例
+// refs[`xFormListRef-${index}`].init({})
+// }
+
+defineExpose({ init })
+</script>
+
+<template>
+  <div v-if="isInit" id="x-form-group">
+    <VanTabs scrollspy sticky>
+      <VanTab
+        v-for="(item, index) in groupItems"
+        :key="item.groupName ? (item.groupName + index) : index"
+        :title="item.describe ? item.describe : item.tableName "
+      >
+        <div class="x-form-group-item">
+          <!--          :ref="`xFormListRef-${index}`" -->
+          <XForm
+            ref="xFormListRef"
+            :mode="props.mode"
+            :group-form-items="item"
+            :form-data="item.groupName ? formData[item.groupName] : formData"
+            :form-name="item.groupName"
+            :service-name="props.serviceName"
+            :submit-button="submitSimple"
+            @on-submit="submit"
+          />
+        </div>
+      </VanTab>
+    </VanTabs>
+    <VanButton v-if="submitGroup" round block type="primary" @click="submit">
+      提交
+    </VanButton>
+  </div>
+</template>
+
+<style scoped lang="less">
+#x-form-group {
+  background-color: rgb(247, 248, 250);
+  padding-bottom: 10px;
+  .x-form-group-item {
+    margin: 20px 0;
+  }
+}
+</style>

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

@@ -1,154 +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)
+// 导入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)