af-mobile-client-vue3 1.0.76 → 1.0.78

package/package.json

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

package/src/components/core/Uploader/index.vue

@@ -2,7 +2,7 @@
 import {
   Uploader as vanUploader,
 } from 'vant'
-import { ref } from 'vue'
+import { onMounted, ref } from 'vue'
 import { deleteFile, upload } from '@af-mobile-client-vue3/services/api/common'
 
 const props = defineProps({
@@ -76,12 +76,18 @@ function deleteFileFunction(file: any) {
 }
 
 // -------------------------  初始化  -------------------------
-initComponent()
 
 function initComponent() {
-  if (props.imageList.length > 0)
-    imageList.value = JSON.parse(JSON.stringify(props.imageList))
+  if (props.imageList.length > 0) {
+    imageList.value = props.imageList.map((item) => {
+      return { id: item.id, name: item.f_filename, url: item.f_downloadpath }
+    })
+  }
 }
+
+onMounted(() => {
+  initComponent()
+})
 </script>
 
 <template>
@@ -95,6 +101,8 @@ function initComponent() {
   <van-uploader
     v-else-if="props.authority === 'admin'"
     v-model="imageList"
+    multiple
+    :preview-image="true"
     :after-read="fileUpload"
     :before-delete="deleteFileFunction"
   />

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

@@ -20,14 +20,39 @@ const props = withDefaults(defineProps<{
   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)
-function initComponents() {
-  getConfigByName(props.configName, (result) => {
-    formData.value = props.groupFormData
-    if (result.groups) {
+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) => {
@@ -39,13 +64,15 @@ function initComponents() {
       submitSimple.value = result.showSubmitBtn
       groupItems.value = [{ ...result }]
     }
-  }, props.serviceName)
+    isInit.value = true
+  }, propsData.value.serviceName)
 }
 watch(() => props.groupFormData, (_val) => {
   formData.value = { ...formData.value, ...props.groupFormData }
 })
 onBeforeMount(() => {
-  initComponents()
+  if (!initStatus.value)
+    init(props)
 })
 const xFormListRef = ref([])
 async function submit() {
@@ -55,10 +82,17 @@ async function submit() {
   }
   emit('submit', formData)
 }
+
+// function initXForm(index: number) {
+// 获取自身示例
+// refs[`xFormListRef-${index}`].init({})
+// }
+
+defineExpose({ init })
 </script>
 
 <template>
-  <div id="x-form-group">
+  <div v-if="isInit" id="x-form-group">
     <VanTabs scrollspy sticky>
       <VanTab
         v-for="(item, index) in groupItems"
@@ -67,7 +101,7 @@ async function submit() {
       >
         <div class="x-form-group-item">
           <XForm
-            ref="xFormListRef"
+            :ref="`xFormListRef-${index}`"
             :mode="props.mode"
             :group-form-items="item"
             :form-data="item.groupName ? formData[item.groupName] : formData"

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

@@ -164,6 +164,7 @@ const localValue = computed({
       case 'citySelect':
       case 'calendar':
       case 'textarea':
+      case 'intervalPicker':
       case 'input':
         if (mode === '查询')
           return props.modelValue !== undefined ? props.modelValue : queryInputDefaultValue.value
@@ -242,7 +243,7 @@ function formTypeCheck(attr, value) {
       }
       break
     case 'landlineNumber':
-      if (!/^(0\d{2,3}-\d{7,8})$|^(0\d{2,3}\d{7,8})$|^$0\d{2,3}$\s?\d{7,8}$/.test(value)) {
+      if (!/^(0\d{2,3}[-\s]?)\d{7,8}$/.test(value)) {
         errorMessage.value = `请输入正确的座机号码`
         return
       }
@@ -382,7 +383,7 @@ function init() {
       initRadioValue()
     }
   }
-  if (attr.type === 'radio' || attr.type === 'rate' || attr.type === 'slider' || attr.type === 'area' || attr.type === 'citySelect' || attr.type === 'calendar' || attr.type === 'textarea' || attr.type === 'input') {
+  if (attr.type === 'radio' || attr.type === 'rate' || attr.type === 'slider' || attr.type === 'area' || attr.type === 'citySelect' || attr.type === 'calendar' || attr.type === 'textarea' || attr.type === 'intervalPicker' || attr.type === 'input') {
     if (attr.formDefault)
       formInputDefaultValue.value = attr.formDefault
     if (attr.queryFormDefault)
@@ -845,10 +846,9 @@ watch(() => form, (_oldVal, _newVal) => {
 
     <!-- 文本输入框 -->
     <VanField
-      v-if="attr.type === 'input' && showItem"
+      v-if="(attr.type === 'input' || attr.type === 'intervalPicker') && showItem"
       v-model="(localValue as string)"
       :label="labelData"
-      :required="attr.rule.required"
       :type="attr.type"
       :readonly="readonly"
       :disabled="attr.disabled"

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

@@ -20,7 +20,7 @@ const serviceName = ref('af-system')
 // const serviceName = ref('af-system')
 
 // 实际业务测试
-// const configName = ref('orderCarOutMobileCRUD')
+// const configName = ref('lngChargeAuditMobileCRUD')
 // const serviceName = ref('af-gaslink')
 
 // 跳转到详情页面
@@ -51,6 +51,8 @@ function toDetail(item) {
     name: 'XFormGroupView',
     query: {
       id: item[idKey.value],
+      // id: item.rr_id,
+      // o_id: item.o_id,
     },
   })
 }

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

@@ -1,22 +1,27 @@
 <script setup lang="ts">
 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 { onBeforeMount, ref } from 'vue'
+import {onBeforeMount, onMounted, ref} from 'vue'
 import { showDialog } from 'vant'
-// import {runLogic} from "@af-mobile-client-vue3/services/api/common";
+import {runLogic} from "@af-mobile-client-vue3/services/api/common";
+import { useRoute } from 'vue-router'
+
 
 // 纯表单
-// const configName = ref("form_check_test")
-// const serviceName = ref("af-system")
+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("lngChargeAuditMobileFormGroup")
+// const serviceName = ref("af-gaslink")
 
 const formData = ref({})
+const formGroup = ref(null)
+const route = useRoute()
+const isInit = ref(false)
 function submit(_result) {
   showDialog({ message: '提交成功' }).then(() => {
     history.back()
@@ -35,6 +40,20 @@ function submit(_result) {
 //   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()
 // })
@@ -43,7 +62,9 @@ function submit(_result) {
 <template>
   <NormalDataLayout id="XFormGroupView" title="纯表单">
     <template #layout_content>
+<!--      v-if="isInit"-->
       <XFormGroup
+        ref="formGroup"
         :config-name="configName"
         :service-name="serviceName"
         :group-form-data="formData"