af-mobile-client-vue3 1.1.36 → 1.1.37

package/package.json

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

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

@@ -726,13 +726,16 @@ defineExpose({
 
 <style scoped lang="less">
 #XCellList {
-  height: calc(94vh - var(--van-nav-bar-height) - 5px);
+  height: calc(100vh - var(--van-nav-bar-height) - 5px);
+  display: flex;
+  flex-direction: column;
   --van-search-padding: 3px;
   --van-dropdown-menu-title-padding: 3px;
   --van-cell-vertical-padding: 0px;
   .main {
+    flex: 1;
+    min-height: 0;
     overflow-y: auto;
-    height: 100%;
     background-color: var(--van-background);
     padding: var(--van-padding-base) var(--van-padding-sm);
 

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

@@ -12,8 +12,8 @@ const router = useRouter()
 const idKey = ref('o_id')
 
 // 简易crud表单测试
-const configName = ref('crud_oper_log_manage')
-const serviceName = ref('af-system')
+const configName = ref('crud_patroltask_managePhoneCRUD')
+const serviceName = ref('af-linepatrol')
 
 // 资源权限测试
 // const configName = ref('crud_sources_test')

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

@@ -2,132 +2,69 @@
 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 { onBeforeMount, ref, toRaw } 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')
+const formGroup = ref(null)
+const formConfig = ref(null)
+const submitSimple = ref(null)
+const isLoading = ref(true)
 
-// 组件挂载前获取数据
-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 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 queryData() {
-
+function submit(result) {
+  console.log('>>>> result: ', safeStringify(result))
 }
 
-// 提交操作
-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()
-    })
-  }
+function loadConfig() {
+  return new Promise((resolve) => {
+    getConfigByName(configName.value, (result) => {
+      submitSimple.value = result.showSubmitBtn
+      formConfig.value = result
+      resolve(result)
+    }, serviceName.value)
+  })
 }
 
-// 查询需要修改的数据
-async function getUpdateData() {
-  if (api.value && updateId) {
-    const res = await post(api.value, updateId)
-    updateData.value = res.data[0]
+onBeforeMount(async () => {
+  try {
+    await loadConfig()
   }
-}
+  finally {
+    isLoading.value = false
+  }
+})
 </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>
+      <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>
-.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>