af-mobile-client-vue3 1.1.39 → 1.1.41

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

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { FormInstance } from 'vant'
 import XFormItem from '@af-mobile-client-vue3/components/data/XFormItem/index.vue'
+import { post } from '@af-mobile-client-vue3/services/restTools'
 import {
   Button as VanButton,
   CellGroup as VanCellGroup,
@@ -18,8 +19,11 @@ interface FormItem {
 interface GroupFormItems {
   btnName?: string
   formJson: any[] // 根据实际类型调整
+  showSubmitBtn?: boolean
+  groupName?: string
 }
 const props = withDefaults(defineProps<{
+  configName?: string
   groupFormItems?: GroupFormItems
   serviceName?: string
   formData?: object
@@ -27,6 +31,7 @@ const props = withDefaults(defineProps<{
   mode?: string
   submitButton?: boolean
 }>(), {
+  configName: undefined,
   groupFormItems: null,
   serviceName: undefined,
   formData: null,
@@ -39,24 +44,90 @@ const formRef = ref<FormInstance>()
 const myFormItems = ref<FormItem[]>([])
 const rules = reactive({})
 const form = ref({})
-const formGroupName = ref(null)
+const formGroupName = ref<string | null>(null)
 const myServiceName = ref('')
 const loaded = ref(false)
 let myGetDataParams = reactive({})
+
+const internalFormConfig = ref<GroupFormItems | null>(null)
+const internalSubmitButton = ref<boolean | undefined>(undefined)
+
 const realJsonData = computed(() => {
-  return myFormItems.value.filter((item) => {
+  const sourceFormItems = internalFormConfig.value?.formJson || props.groupFormItems?.formJson
+  if (!sourceFormItems)
+    return []
+
+  return sourceFormItems.filter((item) => {
     return item.addOrEdit !== 'no'
   })
 })
+
+const resolvedSubmitButton = computed(() => {
+  if (props.configName && internalSubmitButton.value !== undefined) {
+    return internalSubmitButton.value
+  }
+  return props.submitButton
+})
+
 onBeforeMount(() => {
-  init({ formItems: props.groupFormItems, serviceName: props.serviceName, formData: props.formData, formName: props.formName })
+  if (!props.configName && props.groupFormItems) {
+    init({ formItems: props.groupFormItems, serviceName: props.serviceName, formData: props.formData, formName: props.formName })
+  }
 })
+
+watch(() => props.configName, (newConfigName) => {
+  if (newConfigName) {
+    loadFormConfig(newConfigName)
+  }
+  else if (props.groupFormItems) {
+    init({ formItems: props.groupFormItems, serviceName: props.serviceName, formData: props.formData, formName: props.formName })
+  }
+}, { immediate: true })
+
+async function loadFormConfig(name: string) {
+  loaded.value = false
+  try {
+    const result = await post(`/api/${props.serviceName || 'default-service'}/logic/openapi/getLiuliConfiguration`, { configName: name })
+    if (result) {
+      internalFormConfig.value = result
+      internalSubmitButton.value = result.showSubmitBtn
+      myServiceName.value = props.serviceName || ''
+      formGroupName.value = result.groupName || 'default'
+      myFormItems.value = result.formJson as FormItem[]
+
+      form.value = props.formData || {}
+      Object.keys(rules).forEach(key => delete rules[key])
+      for (const item of realJsonData.value) {
+        setFormProps(form, item)
+      }
+    }
+    else {
+      console.warn(`Config '${name}' 不存在.`)
+      internalFormConfig.value = null
+      internalSubmitButton.value = undefined
+      myFormItems.value = []
+      form.value = {}
+      Object.keys(rules).forEach(key => delete rules[key])
+    }
+  }
+  catch (error) {
+    console.error(`无法加载配置 '${name}':`, error)
+    internalFormConfig.value = null
+    internalSubmitButton.value = undefined
+    myFormItems.value = []
+    form.value = {}
+    Object.keys(rules).forEach(key => delete rules[key])
+  }
+  finally {
+    loaded.value = true
+  }
+}
+
 function init(params) {
   const {
     formItems,
     serviceName,
-    getDataParams = {},
-    formData = null,
+    formData = {},
     formName = 'default',
   } = params
   loaded.value = false
@@ -70,7 +141,7 @@ function init(params) {
   if (formData)
     form.value = formData
 
-  myGetDataParams = getDataParams
+  myGetDataParams = params.getDataParams || {}
   loaded.value = true
 }
 
@@ -123,28 +194,30 @@ async function validate() {
   await formRef.value?.validate()
 }
 watch(() => props.formData, (_val) => {
-  form.value = props.formData
+  form.value = _val
 })
 defineExpose({ init, form, formGroupName, validate })
 </script>
 
 <template>
-  <VanForm ref="formRef" @submit="onSubmit">
-    <VanCellGroup inset>
-      <XFormItem
-        v-for="(item, index) in realJsonData"
-        :key="index"
-        v-model="form[item.model]"
-        :mode="props.mode"
-        :form="form"
-        :attr="item"
-        :rules="rules"
-        :service-name="myServiceName"
-        :get-data-params="myGetDataParams"
-        @set-form="setForm"
-      />
-    </VanCellGroup>
-    <div v-if="props.submitButton && props.mode !== '预览'" style="margin: 16px;">
+  <VanForm ref="formRef" class="x-form-container" @submit="onSubmit">
+    <div class="form-fields-scrollable">
+      <VanCellGroup inset>
+        <XFormItem
+          v-for="(item, index) in realJsonData"
+          :key="index"
+          v-model="form[item.model]"
+          :mode="props.mode"
+          :form="form"
+          :attr="item"
+          :rules="rules"
+          :service-name="myServiceName"
+          :get-data-params="myGetDataParams"
+          @set-form="setForm"
+        />
+      </VanCellGroup>
+    </div>
+    <div v-if="resolvedSubmitButton && props.mode !== '预览'" class="form-footer-fixed">
       <VanButton round block type="primary" native-type="submit">
         {{ props.groupFormItems?.btnName ? props.groupFormItems.btnName : '提交' }}
       </VanButton>
@@ -154,5 +227,23 @@ defineExpose({ init, form, formGroupName, validate })
 </template>
 
 <style scoped>
+.x-form-container {
+  height: calc(100vh - var(--van-nav-bar-height) - 5px);
+  display: flex;
+  flex-direction: column;
+  max-height: 100vh;
+  overflow: hidden;
+}
 
+.form-fields-scrollable {
+  flex: 1;
+  overflow-y: auto;
+  min-height: 0;
+  padding: 0 16px;
+}
+
+.form-footer-fixed {
+  margin: 16px;
+  flex-shrink: 0;
+}
 </style>

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

@@ -868,7 +868,6 @@ function handleAddressConfirm(location) {
     <VanCalendar
       v-model:show="calendarShow"
       switch-mode="year-month"
-      allow-same-day
       type="range"
       teleport="body"
       :show-confirm="attr.showConfirm"

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)