af-mobile-client-vue3 1.1.8 → 1.1.9

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

@@ -1,133 +1,44 @@
 <script setup lang="ts">
-import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
+import XFormGroup from '@af-mobile-client-vue3/components/data/XFormGroup/index.vue'
 import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
-import { getConfigByName } from '@af-mobile-client-vue3/services/api/common'
-import { post } from '@af-mobile-client-vue3/services/restTools'
-import {
-  showDialog,
-  NavBar as VanNavBar,
-  Space as VanSpace,
-} from 'vant'
-import { defineEmits, getCurrentInstance, onBeforeMount, ref } from 'vue'
-import { useRoute } from 'vue-router'
-
-const emit = defineEmits(['onSumbit'])
-const xForm = ref(null)
-const id = ref(-1)
-const openid = ref('')
-const instance = getCurrentInstance()
-const xFormInit = ref(false)
-const route = useRoute()
-const configName = route.query.configName as string
-const serviceName = route.query.serviceName as string
-const mode = route.query.mode as string
-const updateData = ref({})
-const title = ref('')
-const groupFormItems = ref({})
-const api = ref('/af-system/logic/commonQuery')
-const updateId = {
-  queryParamsName: 'crud_oper_log_manage',
-  pageNo: 1,
-  pageSize: 20,
-  conditionParams: { o_id: route.params.id as string },
-}
-const loadUpdate = ref(false)
-// const serviceName = ref('af-revenue')
-const _currentEvaluate = {
-  id: null,
-  f_business_name: '',
-  f_evaluate_state: '',
-}
-
-// 组件挂载前获取数据
-onBeforeMount(async () => {
-  if (instance) {
-    id.value = route.params.id as unknown as number
-    openid.value = route.params.openid as string
-    formInit()
-  }
+import { ref } from 'vue'
+
+const configName = ref('PointBindingForm')
+const serviceName = ref('af-linepatrol')
+
+const formData = ref({
+  t1_f_number: '点位编号>>',
+  t2_f_name: '所属区域>>',
+  t1_f_address: '地址信息>>',
+  t1_f_address_lon_lat: '118.842054,39.246094',
+  t1_f_describe: '点位描述>>',
+  t1_f_state: '点位状态>>',
 })
-
-// 组件初始化前的判断
-async function formInit() {
-  getConfigByName(configName, (result) => {
-    groupFormItems.value = result
-    title.value = result.title
-    if (mode === '修改')
-      getUpdateData()
-    xFormInit.value = true
-  }, serviceName)
-}
-
-// 获取配置信息
-function queryData() {
-
-}
-
-// 提交操作
-function onSubmit(params) {
-  // const data = {
-  //   id: currentEvaluate.id,
-  //   f_json: params,
-  //   f_evaluate_date: formatDate(new Date()),
-  //   f_evaluate_state: '已评价',
-  //   f_evaluate_type: '用户评价',
-  //   f_evaluate_userid: openid.value,
-  // }
-  // openApiLogic(data, 'saveEvaluate', formServiveName).then((_res: any) => {
-  //     showDialog({ message: '评价成功了' }).then(() => {history.back()})
-  // }).catch(() => {
-  //   showDialog({ message: '评价失败了' })
+const formGroup = ref(null)
+function submit(result) {
+  console.log('>>>> result: ', result)
+  // showDialog({ message: '提交成功' }).then(() => {
+  //   history.back()
   // })
-  if (params) {
-    emit('onSumbit', params)
-    showDialog({ message: '评价成功了' }).then(() => {
-      history.back()
-    })
-  }
-  else {
-    showDialog({ message: '评价失败了' }).then(() => {
-      history.back()
-    })
-  }
-}
-
-// 查询需要修改的数据
-async function getUpdateData() {
-  if (api.value && updateId) {
-    const res = await post(api.value, updateId)
-    updateData.value = res.data[0]
-  }
 }
 </script>
 
 <template>
-  <NormalDataLayout id="XFormView" title="XForm表单">
+  <NormalDataLayout id="XFormGroupView" title="纯表单">
     <template #layout_content>
-      <VanSpace direction="vertical" fill>
-        <VanNavBar :title="title ? mode.concat(title) : null" />
-        <XForm
-          v-if="xFormInit"
-          ref="xForm"
-          :group-form-items="JSON.parse(JSON.stringify(groupFormItems))"
-          :service-name="serviceName"
-          :form-data="updateData"
-          :mode="mode"
-          style="margin-bottom: 14px;"
-          @on-submit="onSubmit"
-        />
-      </VanSpace>
+      <!--      v-if="isInit" -->
+      <XFormGroup
+        ref="formGroup"
+        :config-name="configName"
+        :service-name="serviceName"
+        :group-form-data="formData"
+        mode="新增"
+        @submit="submit"
+      />
     </template>
   </NormalDataLayout>
 </template>
 
-<style scoped>
-.van-doc-demo-block__title {
-  margin: 0;
-  padding: 32px 16px 16px;
-  color: black;
-  font-weight: 400;
-  font-size: 14px;
-  line-height: 16px;
-}
+<style scoped lang="less">
+
 </style>

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

@@ -0,0 +1,50 @@
+<script setup lang="ts">
+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 { getConfigByName } from '@af-mobile-client-vue3/services/api/common'
+import { nextTick, onMounted, ref } from 'vue'
+
+const xForm = ref(null)
+const serviceName = 'af-linepatrol'
+
+onMounted(() => {
+  const modifyModelData = {
+    t1_f_number: '点位编号',
+    t2_f_name: '所属区域',
+    t1_f_address: '116.450355,40.057394',
+    t1_f_describe: '点位描述',
+    t1_f_state: '点位状态',
+  }
+  getConfigByName('PointBindingForm', async (res) => {
+    const initData = {
+      formItems: res, // 琉璃配置
+      serviceName, // 服务名称
+      formData: JSON.stringify(modifyModelData), // 数据
+      mode: '修改', // 修改
+    }
+    console.log('>>>> initData: ', JSON.stringify(initData))
+    await nextTick()
+    xForm.value.init(initData)
+  }, 'af-linepatrol')
+})
+
+// 提交操作
+function onSubmit(params) {
+  console.log('>>>> params: ', JSON.stringify(params))
+}
+</script>
+
+<template>
+  <NormalDataLayout id="XFormView" title="XForm表单">
+    <template #layout_content>
+      <XForm
+        ref="xForm"
+        service-name="af-linepatrol"
+        @on-submit="onSubmit"
+      />
+    </template>
+  </NormalDataLayout>
+</template>
+
+<style scoped>
+</style>

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

@@ -1,120 +1,118 @@
-<script setup lang="ts">
-import type { LocationResult } from '@af-mobile-client-vue3/components/data/XOlMap/types'
-import LocationPicker from '@af-mobile-client-vue3/components/data/XOlMap/XLocationPicker/index.vue'
-import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
-import { showNotify } from 'vant'
-import { ref } from 'vue'
-
-const selectedLocation = ref<LocationResult>()
-
-// 处理位置选择
-function handleLocationConfirm(location: LocationResult) {
-  // console.log('选择的位置:', location)
-  // selectedLocation.value = location
-  showNotify({ type: 'success', message: '位置已选择' })
-}
-</script>
-
-<template>
-  <NormalDataLayout id="XLocationPicker" title="XOlMap地址选择器">
-    <template #layout_content>
-      <div class="location-picker-demo">
-        <!-- 页面标题 -->
-        <div class="page-header">
-          <div class="title">
-            位置选择
-          </div>
-        </div>
-
-        <!-- 选择结果展示 -->
-        <div v-if="selectedLocation" class="location-result">
-          <div class="label">
-            已选位置:
-          </div>
-          <div class="value">
-            {{ selectedLocation.address }}
-          </div>
-          <div class="coordinates">
-            经度: {{ selectedLocation.longitude.toFixed(6) }},
-            纬度: {{ selectedLocation.latitude.toFixed(6) }}
-          </div>
-        </div>
-
-        <!-- 地图组件 -->
-        <div class="map-container">
-          <LocationPicker
-            v-model="selectedLocation"
-            tian-di-tu-key="c16876b28898637c0a1a68b3fa410504"
-            amap-key="5ebabc4536d4b42e0dd1e20175cca8ab"
-            :default-center="[108.948024, 34.263161]"
-            :default-zoom="12"
-            @confirm="handleLocationConfirm"
-          />
-        </div>
-      </div>
-    </template>
-  </NormalDataLayout>
-</template>
-
-<style scoped lang="less">
-.location-picker-demo {
-  width: 100%;
-  height: 100%;
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  background-color: #f7f8fa;
-}
-
-.page-header {
-  height: 44px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background: white;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
-  position: relative;
-  z-index: 1;
-
-  .title {
-    font-size: 16px;
-    color: #333;
-    font-weight: 500;
-  }
-}
-
-.location-result {
-  background: white;
-  padding: 12px 16px;
-  margin: 10px;
-  border-radius: 8px;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
-
-  .label {
-    font-size: 14px;
-    color: #666;
-    margin-bottom: 4px;
-  }
-
-  .value {
-    font-size: 16px;
-    color: #333;
-    margin-bottom: 8px;
-    word-break: break-all;
-  }
-
-  .coordinates {
-    font-size: 12px;
-    color: #999;
-  }
-}
-
-.map-container {
-  flex: 1;
-  position: relative;
-  margin: 0 10px 10px 10px;
-  border-radius: 8px;
-  overflow: hidden;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-}
-</style>
+<script setup lang="ts">
+import type { LocationResult } from '@af-mobile-client-vue3/components/data/XOlMap/types'
+import LocationPicker from '@af-mobile-client-vue3/components/data/XOlMap/XLocationPicker/index.vue'
+import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { showNotify } from 'vant'
+import { ref } from 'vue'
+
+const selectedLocation = ref<LocationResult>()
+
+// 处理位置选择
+function handleLocationConfirm(location: LocationResult) {
+  // console.log('选择的位置:', location)
+  // selectedLocation.value = location
+  showNotify({ type: 'success', message: '位置已选择' })
+}
+</script>
+
+<template>
+  <NormalDataLayout id="XLocationPicker" title="XOlMap地址选择器">
+    <template #layout_content>
+      <div class="location-picker-demo">
+        <!-- 页面标题 -->
+        <div class="page-header">
+          <div class="title">
+            位置选择
+          </div>
+        </div>
+
+        <!-- 选择结果展示 -->
+        <div v-if="selectedLocation" class="location-result">
+          <div class="label">
+            已选位置:
+          </div>
+          <div class="value">
+            {{ selectedLocation.address }}
+          </div>
+          <div class="coordinates">
+            经度: {{ selectedLocation.longitude.toFixed(6) }},
+            纬度: {{ selectedLocation.latitude.toFixed(6) }}
+          </div>
+        </div>
+
+        <!-- 地图组件 -->
+        <div class="map-container">
+          <LocationPicker
+            v-model="selectedLocation"
+            :default-center="[108.948024, 34.263161]"
+            :default-zoom="12"
+            @confirm="handleLocationConfirm"
+          />
+        </div>
+      </div>
+    </template>
+  </NormalDataLayout>
+</template>
+
+<style scoped lang="less">
+.location-picker-demo {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  background-color: #f7f8fa;
+}
+
+.page-header {
+  height: 44px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: white;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+  position: relative;
+  z-index: 1;
+
+  .title {
+    font-size: 16px;
+    color: #333;
+    font-weight: 500;
+  }
+}
+
+.location-result {
+  background: white;
+  padding: 12px 16px;
+  margin: 10px;
+  border-radius: 8px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+
+  .label {
+    font-size: 14px;
+    color: #666;
+    margin-bottom: 4px;
+  }
+
+  .value {
+    font-size: 16px;
+    color: #333;
+    margin-bottom: 8px;
+    word-break: break-all;
+  }
+
+  .coordinates {
+    font-size: 12px;
+    color: #999;
+  }
+}
+
+.map-container {
+  flex: 1;
+  position: relative;
+  margin: 0 10px 10px 10px;
+  border-radius: 8px;
+  overflow: hidden;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+</style>

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

@@ -63,14 +63,12 @@ const wmsConfig = {
 }
 
 // 初始化地图
-onMounted(() => {
-  mapRef.value.init({
+onMounted(async () => {
+  await mapRef.value.init({
     center: [108.948024, 34.263161], // 西安坐标
     zoom: 12,
-    maxZoom: 18,
-    minZoom: 4,
   })
-  mapRef.value.addWMSLayers(wmsConfig)
+  await mapRef.value.addWMSLayers(wmsConfig)
 })
 
 // 地图控制函数

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

@@ -1,47 +1,47 @@
-<script setup lang="ts">
-import XReportForm from '@af-mobile-client-vue3/components/data/XReportForm/index.vue'
-
-import { onMounted, onUnmounted, ref } from 'vue'
-
-const localConfig = ref(undefined)
-const configName = ref(undefined)
-const configData = ref(undefined)
-
-function receiveMessage(event) {
-  try {
-    if (event.data && typeof event.data === 'object' && event.data.type === 'setConfig') {
-      localConfig.value = event.data.localConfig
-      configName.value = event.data.configName
-      configData.value = event.data.configData
-    }
-  }
-  catch (e) {
-    console.error(e)
-  }
-}
-
-onMounted(() => {
-  window.addEventListener('message', receiveMessage, false)
-  window.parent.postMessage('calParentSend', '*')
-})
-
-onUnmounted(() => {
-  window.removeEventListener('message', receiveMessage, false)
-})
-
-function saveConfig(_config) {
-  const config = JSON.parse(JSON.stringify(_config))
-  window.parent.postMessage({
-    type: 'saveConfig',
-    config,
-  }, '*')
-}
-</script>
-
-<template>
-  <!-- 业务上只保存了data，传递的 localconfig 也是 data 这里临时吧 localconfig 作为data使用 -->
-  <XReportForm v-if="localConfig || configName" :config-name="configName" :show-nav="false" :local-config="localConfig" :config-data="configData" @save-config="saveConfig" />
-</template>
-
-<style scoped lang="less">
-</style>
+<script setup lang="ts">
+import XReportForm from '@af-mobile-client-vue3/components/data/XReportForm/index.vue'
+
+import { onMounted, onUnmounted, ref } from 'vue'
+
+const localConfig = ref(undefined)
+const configName = ref(undefined)
+const configData = ref(undefined)
+
+function receiveMessage(event) {
+  try {
+    if (event.data && typeof event.data === 'object' && event.data.type === 'setConfig') {
+      localConfig.value = event.data.localConfig
+      configName.value = event.data.configName
+      configData.value = event.data.configData
+    }
+  }
+  catch (e) {
+    console.error(e)
+  }
+}
+
+onMounted(() => {
+  window.addEventListener('message', receiveMessage, false)
+  window.parent.postMessage('calParentSend', '*')
+})
+
+onUnmounted(() => {
+  window.removeEventListener('message', receiveMessage, false)
+})
+
+function saveConfig(_config) {
+  const config = JSON.parse(JSON.stringify(_config))
+  window.parent.postMessage({
+    type: 'saveConfig',
+    config,
+  }, '*')
+}
+</script>
+
+<template>
+  <!-- 业务上只保存了data，传递的 localconfig 也是 data 这里临时吧 localconfig 作为data使用 -->
+  <XReportForm v-if="localConfig || configName" :config-name="configName" :show-nav="false" :local-config="localConfig" :config-data="configData" @save-config="saveConfig" />
+</template>
+
+<style scoped lang="less">
+</style>

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

@@ -1,13 +1,13 @@
-<script setup lang="ts">
-import XReportForm from '@af-mobile-client-vue3/components/data/XReportForm/index.vue'
-import { ref } from 'vue'
-
-const configName = ref('ceshi1')
-</script>
-
-<template>
-  <XReportForm :config-name="configName" />
-</template>
-
-<style scoped lang="less">
-</style>
+<script setup lang="ts">
+import XReportForm from '@af-mobile-client-vue3/components/data/XReportForm/index.vue'
+import { ref } from 'vue'
+
+const configName = ref('ceshi1')
+</script>
+
+<template>
+  <XReportForm :config-name="configName" />
+</template>
+
+<style scoped lang="less">
+</style>