af-mobile-client-vue3 1.1.40 → 1.1.41

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

@@ -1,26 +1,19 @@
 <script setup lang="ts">
 import XCellList from '@af-mobile-client-vue3/components/data/XCellList/index.vue'
 import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
-import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
 import { defineEmits, ref } from 'vue'
 import { useRouter } from 'vue-router'
 
 // 定义事件
 const emit = defineEmits(['deleteRow'])
-const userInfo = useUserStore().getUserInfo()
 // 访问路由
 const router = useRouter()
 // 获取默认值
 const idKey = ref('o_id')
 
 // 简易crud表单测试
-// const configName = ref('orderCarInMobileCRUD')
-// const serviceName = ref('af-gaslink')
-// const configName = ref('lngPriceManageMobileCRUD')
-const configName = ref('测试')
-const serviceName = ref('af-gaslink')
-// const configName = ref('mobile_liushuiQueryCRUD')
-// const serviceName = ref('af-revenue')
+const configName = ref('crud_patroltask_managePhoneCRUD')
+const serviceName = ref('af-linepatrol')
 
 // 资源权限测试
 // const configName = ref('crud_sources_test')
@@ -56,11 +49,11 @@ const serviceName = ref('af-gaslink')
 function toDetail(item) {
   router.push({
     name: 'XFormGroupView',
-    // query: {
-    //   id: item[idKey.value],
-    // id: item.rr_id,
-    // o_id: item.o_id,
-    // },
+    query: {
+      id: item[idKey.value],
+      // id: item.rr_id,
+      // o_id: item.o_id,
+    },
   })
 }
 
@@ -76,40 +69,19 @@ function toDetail(item) {
 //     },
 //   })
 // }
-function addOption(callback) {
-  router.push({
-    name: 'XFormGroupView',
-    // params: { id: totalCount.value },
-    // query: {
-    //   configName: configName.value,
-    //   serviceName: serviceName.value,
-    //   mode: '新增',
-    // },
-  })
-  // 如果存在回调函数，调用它并传递true表示已处理
-  if (typeof callback === 'function') {
-    callback(true)
-  }
-}
 
 // 修改功能
-function updateRow(result, callback) {
-  console.log('用户----', userInfo)
-  router.push({
-    name: 'XFormGroupView',
-    // params: { id: result.o_id, openid: result.o_id },
-    // query: {
-    //   configName: configName.value,
-    //   serviceName: serviceName.value,
-    //   mode: '修改',
-    // },
-  })
-
-  // 如果存在回调函数，调用它并传递true表示已处理
-  if (typeof callback === 'function') {
-    callback(true)
-  }
-}
+// function updateRow(result) {
+//   router.push({
+//     name: 'XFormView',
+//     params: { id: result.o_id, openid: result.o_id },
+//     query: {
+//       configName: configName.value,
+//       serviceName: serviceName.value,
+//       mode: '修改',
+//     },
+//   })
+// }
 
 // 删除功能
 function deleteRow(result) {
@@ -123,23 +95,11 @@ function deleteRow(result) {
       <XCellList
         :config-name="configName"
         :service-name="serviceName"
+        :fix-query-form="{ o_f_oper_name: 'edu_test' }"
         :id-key="idKey"
         @to-detail="toDetail"
         @delete-row="deleteRow"
-        @update="updateRow"
-        @add="addOption"
       />
-
-      <!--      :fix-query-form="{ u_f_price_state: ['生效', '待生效'] }" -->
-
-      <!--      <XCellList -->
-      <!--        :config-name="configName" -->
-      <!--        :service-name="serviceName" -->
-      <!--        :fix-query-form="{ o_f_oper_name: 'edu_test' }" -->
-      <!--        :id-key="idKey" -->
-      <!--        @to-detail="toDetail" -->
-      <!--        @delete-row="deleteRow" -->
-      <!--      /> -->
     </template>
   </NormalDataLayout>
 </template>

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

@@ -5,19 +5,9 @@ import { showDialog } from 'vant'
 import { ref } from 'vue'
 import { useRoute } from 'vue-router'
 
-// const configName = ref('reviewFormGroup')
-// const serviceName = ref('af-revenue')
-
 // 纯表单
-// const configName = ref('form_check_test')
-// const serviceName = ref('af-system')
-
-// const configName = ref("计划下发Form")
-// const serviceName = ref("af-linepatrol")
-
-// 表单组
-const configName = ref('lngChargeAuditMobileFormGroup')
-const serviceName = ref('af-gaslink')
+const configName = ref('AddConstructionForm')
+const serviceName = ref('af-linepatrol')
 
 const formData = ref({})
 const formGroup = ref(null)
@@ -28,36 +18,6 @@ function submit(_result) {
     history.back()
   })
 }
-
-// 表单组——数据
-// function initComponents () {
-//   runLogic('getlngChargeAuditMobileFormGroupData', {id: 29}, 'af-gaslink').then((res) => {
-//     formData.value = {...res}
-//   })
-// }
-
-// 纯表单——数据
-// function initComponents() {
-//   formData.value = { plan_name: 'af-llllll', plan_point: '1号点位', plan_single: '1号点位', plan_range: '2024-12-12' }
-// }
-
-// function initComponents() {
-//   runLogic('getlngChargeAuditMobileFormGroupData', { id: route.query?.id, o_id: route.query?.o_id }, 'af-gaslink').then((res) => {
-//     console.log('res------', res)
-//     formData.value = { ...res }
-// formGroup.value.init({
-//   configName: configName.value,
-//   serviceName: serviceName.value,
-//   groupFormData: { ...res },
-//   mode: "新增"
-// })
-//     isInit.value = true
-//   })
-// }
-
-// onBeforeMount(() => {
-//   initComponents()
-// })
 </script>
 
 <template>

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

@@ -1,133 +1,27 @@
 <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 { 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'
+import { ref } from 'vue'
 
-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: '',
-}
+const configName = ref('AddConstructionForm')
+const serviceName = ref('af-linepatrol')
 
-// 组件挂载前获取数据
-onBeforeMount(async () => {
-  if (instance) {
-    id.value = route.params.id as unknown as number
-    openid.value = route.params.openid as string
-    formInit()
-  }
-})
-
-// 组件初始化前的判断
-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: '评价失败了' })
-  // })
-  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]
-  }
-}
+const formGroupAddConstruction = ref(null)
 </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>
+      <XForm
+        ref="formGroupAddConstruction"
+        mode="新增"
+        :config-name="configName"
+        :service-name="serviceName"
+      />
     </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,70 @@
+<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 { onBeforeMount, ref, toRaw } from 'vue'
+
+const configName = ref('AddConstructionForm')
+const serviceName = ref('af-linepatrol')
+const formGroup = ref(null)
+const formConfig = ref(null)
+const submitSimple = ref(null)
+const isLoading = ref(true)
+
+function safeStringify(obj) {
+  const seen = new WeakSet()
+  return JSON.stringify(toRaw(obj), (key, val) => {
+    if (typeof val === 'object' && val !== null) {
+      if (seen.has(val))
+        return
+      seen.add(val)
+    }
+    return val
+  }, 2)
+}
+
+function submit(result) {
+  console.log('>>>> result: ', safeStringify(result))
+}
+
+function loadConfig() {
+  return new Promise((resolve) => {
+    getConfigByName(configName.value, (result) => {
+      submitSimple.value = result.showSubmitBtn
+      formConfig.value = result
+      resolve(result)
+    }, serviceName.value)
+  })
+}
+
+onBeforeMount(async () => {
+  try {
+    await loadConfig()
+  }
+  finally {
+    isLoading.value = false
+  }
+})
+</script>
+
+<template>
+  <NormalDataLayout id="XFormGroupView" title="纯表单">
+    <template #layout_content>
+      <van-loading v-if="isLoading" />
+      <XForm
+        v-else
+        ref="formGroup"
+        mode="查询"
+        :service-name="serviceName"
+        :group-form-items="formConfig"
+        :form-data="{}"
+        :form-name="formConfig?.groupName || '11111'"
+        :submit-button="submitSimple"
+        @on-submit="submit"
+      />
+    </template>
+  </NormalDataLayout>
+</template>
+
+<style scoped lang="less">
+</style>

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

@@ -1,118 +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"
-            :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/XReportFormView/index.vue

@@ -2,7 +2,7 @@
 import XReportForm from '@af-mobile-client-vue3/components/data/XReportForm/index.vue'
 import { ref } from 'vue'
 
-const configName = ref('ceshi1')
+const configName = ref('用户户内通气点火工艺流程')
 </script>
 
 <template>