af-mobile-client-vue3 1.3.10 → 1.3.12

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.3.10",
+  "version": "1.3.12",
   "packageManager": "pnpm@10.13.1",
   "description": "Vue + Vite component lib",
   "engines": {

package/src/App.vue

@@ -53,7 +53,7 @@ const themeVars: ConfigProviderThemeVars = reactive({
     <router-view v-slot="{ Component }">
       <section class="app-wrapper">
         <keep-alive :include="keepAliveRouteNames">
-          <component :is="Component" />
+          <component :is="Component" :key="$route.fullPath" />
         </keep-alive>
       </section>
     </router-view>

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

@@ -2,7 +2,7 @@
 import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
 import { getConfigByName } from '@af-mobile-client-vue3/services/api/common'
 import { Button as VanButton, Tab as VanTab, Tabs as VanTabs } from 'vant'
-import { computed, defineEmits, defineProps, onBeforeMount, onMounted, ref, useSlots, watch } from 'vue'
+import { computed, defineEmits, defineProps, onBeforeMount, onMounted, ref, useSlots } from 'vue'
 
 const props = withDefaults(defineProps<{
   configName?: string
@@ -11,6 +11,7 @@ const props = withDefaults(defineProps<{
   mode?: string
   isScrollspy?: boolean
   formShow?: any
+  showTabHeader?: boolean
 }>(), {
   configName: '',
   serviceName: undefined,
@@ -18,25 +19,15 @@ const props = withDefaults(defineProps<{
   mode: '查询',
   isScrollspy: true,
   formShow: undefined,
+  showTabHeader: true,
 })
 const emit = defineEmits(['submit', 'xFormItemEmitFunc'])
 
-interface Form {
-  configName?: string
-  serviceName?: string
-  groupFormData?: object
-  mode?: string
-  isScrollspy?: boolean
-  formShow?: any
-}
-
 const groupItems = ref([])
 const formData = ref({})
 const submitGroup = ref(false)
 const submitSimple = ref(false)
 const isInit = ref(false)
-const initStatus = ref(false)
-const propsData = ref<Partial<Form>>({})
 
 const slots = useSlots()
 const renderableGroupItems = computed(() => {
@@ -55,18 +46,9 @@ const renderableGroupItems = computed(() => {
 })
 
 // 组件初始化函数
-function init(params: Form) {
-  initStatus.value = true
-  propsData.value = {
-    configName: props.configName,
-    serviceName: props.serviceName,
-    groupFormData: props.groupFormData,
-    mode: props.mode,
-    formShow: props.formShow,
-    ...params,
-  }
-  formData.value = propsData.value.groupFormData
-  getConfigByName(propsData.value.configName, (result) => {
+function init() {
+  formData.value = props.groupFormData
+  getConfigByName(props.configName, (result) => {
     if (result?.groups) {
       groupItems.value = result.groups
       result.groups.forEach((group) => {
@@ -81,14 +63,13 @@ function init(params: Form) {
       groupItems.value = [{ ...result }]
     }
     isInit.value = true
-  }, propsData.value.serviceName)
+  }, props.serviceName)
 }
-watch(() => props.groupFormData, (_val) => {
-  formData.value = { ...formData.value, ...props.groupFormData }
-})
+// watch(() => props.groupFormData, (_val) => {
+//   formData.value = { ...formData.value, ...props.groupFormData }
+// })
 onBeforeMount(() => {
-  if (!initStatus.value)
-    init(props)
+  init()
 })
 interface XFormLike {
   validate: () => Promise<void>
@@ -112,6 +93,7 @@ function removeRef(refValue: XFormLike) {
 }
 
 async function submit() {
+  console.log(props.groupFormData)
   for (const res of xFormListRef.value) {
     try {
       await res.validate()
@@ -143,7 +125,7 @@ defineExpose({ init, removeRef, xFormListRef })
 
 <template>
   <div v-if="isInit" id="x-form-group">
-    <VanTabs :scrollspy="propsData.isScrollspy" sticky :offset-top="offsetTop">
+    <VanTabs :scrollspy="props.isScrollspy" sticky :offset-top="offsetTop" :show-header="props.showTabHeader">
       <VanTab
         v-for="(item, index) in renderableGroupItems"
         :key="item.groupName ? (item.groupName + index) : index"
@@ -153,7 +135,7 @@ defineExpose({ init, removeRef, xFormListRef })
           class="x-form-group-item"
           :class="{ 'is-last': index === renderableGroupItems.length - 1 }"
         >
-          <div v-if="item.describe && propsData.isScrollspy && (item.groupName || item.slotName)" class="form-group-title">
+          <div v-if="item.describe && props.isScrollspy && (item.groupName || item.slotName)" class="form-group-title">
             <span class="form-group-bar" />
             <span class="form-group-text">{{ item.describe }}</span>
           </div>
@@ -193,7 +175,6 @@ defineExpose({ init, removeRef, xFormListRef })
 
 <style scoped lang="less">
 #x-form-group {
-  padding: 12px;
   display: flex;
   flex-direction: column;
   background-color: rgb(247, 248, 250);

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

@@ -1,97 +1,97 @@
-<script setup lang="ts">
-import XFormGroup from '@af-mobile-client-vue3/components/data/XFormGroup/index.vue'
-import { runLogic } from '@af-mobile-client-vue3/services/api/common'
-import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
-import dayjs from 'dayjs/esm/index'
-import { showToast } from 'vant'
-import { onMounted, ref } from 'vue'
-import { useRoute } from 'vue-router'
-
-const configName = ref('appapplyuserinfoFormGroup')
-const serviceName = ref('af-apply')
-const route = useRoute()
-const userInfo = useUserStore().getUserInfo()
-const workflowId = ref('3045')
-const userinfoid = ref('93116')
-const model = ref('编辑')
-const groupFormData = ref({})
-
-function submit(res) {
-  if (model.value === '新增') {
-    res.t_userinfo.f_operate_date = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    res.t_userinfo.f_orgid = userInfo.f_orgid
-    res.t_userinfo.f_orgname = userInfo.f_orgname
-    res.t_userinfo.f_depid = userInfo.f_depid
-    res.t_userinfo.f_depname = userInfo.f_depname
-    res.t_userinfo.f_operatorid = userInfo.f_operatorid
-    res.t_userinfo.f_operator = userInfo.f_operator
-    res.t_userinfo.f_workflow_id = this.f_workflow_id
-    res.t_userinfo.f_user_state = '预备'
-
-    res.t_userfiles.f_operate_date = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    res.t_userfiles.f_orgid = userInfo.f_orgid
-    res.t_userfiles.f_orgname = userInfo.f_orgname
-    res.t_userfiles.f_depid = userInfo.f_depid
-    res.t_userfiles.f_depname = userInfo.f_depname
-    res.t_userfiles.f_operatorid = userInfo.f_operatorid
-    res.t_userfiles.f_operator = userInfo.f_operator
-    res.t_userfiles.f_workflow_id = this.f_workflow_id
-    res.t_userfiles.f_table_state = '待开通'
-  }
-  let saveData = res
-  if (saveData.t_userfiles.f_gasbrand_id.length > 0) {
-    saveData.t_userfiles.f_gasbrand_id = saveData.t_userfiles.f_gasbrand_id[0]
-  }
-  if (saveData.t_userfiles.f_price_id.length > 0) {
-    saveData.t_userfiles.f_price_id = saveData.t_userfiles.f_price_id[0]
-  }
-  if (model.value === '编辑') {
-    saveData = Object.assign(saveData, {
-      f_operator_record: userInfo.f_operator,
-      f_operatorid_record: userInfo.f_operatorid,
-      f_orgid_record: userInfo.f_orgid,
-      f_orgname_record: userInfo.f_orgname,
-      f_depid_record: userInfo.f_depid,
-      f_depname_record: userInfo.f_depname,
-    })
-  }
-  runLogic('userFIleSaveLogic', saveData, 'af-revenue').then((res) => {
-    showToast('操作成功！')
-    history.back()
-  })
-}
-const isInit = ref(false)
-function init() {
-  if (model.value === '编辑') {
-    runLogic('getFileDetailForEdit', { f_userinfo_id: userinfoid.value }, 'af-revenue').then((res) => {
-      // if (res.t_userfiles.f_gasmodel_id) {
-      //   res.t_userfiles.f_gasmodel_id = 76
-      // }
-      // if (res.t_userfiles.f_price_id) {
-      //   res.t_userfiles.f_price_id = [res.t_userfiles.f_price_id]
-      // }
-      console.log('1111111----,', res)
-      groupFormData.value = res
-      isInit.value = true
-    })
-  }
-}
-onMounted(() => {
-  init()
-})
-</script>
-
-<template>
-  <XFormGroup
-    v-if="isInit"
-    mode="修改"
-    :config-name="configName"
-    :service-name="serviceName"
-    :group-form-data="groupFormData"
-    @submit="submit"
-  />
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script setup lang="ts">
+import XFormGroup from '@af-mobile-client-vue3/components/data/XFormGroup/index.vue'
+import { runLogic } from '@af-mobile-client-vue3/services/api/common'
+import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
+import dayjs from 'dayjs/esm/index'
+import { showToast } from 'vant'
+import { onMounted, ref } from 'vue'
+import { useRoute } from 'vue-router'
+
+const configName = ref('appapplyuserinfoFormGroup')
+const serviceName = ref('af-apply')
+const route = useRoute()
+const userInfo = useUserStore().getUserInfo()
+const workflowId = ref('3045')
+const userinfoid = ref('93116')
+const model = ref('编辑')
+const groupFormData = ref({})
+
+function submit(res) {
+  if (model.value === '新增') {
+    res.t_userinfo.f_operate_date = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    res.t_userinfo.f_orgid = userInfo.f_orgid
+    res.t_userinfo.f_orgname = userInfo.f_orgname
+    res.t_userinfo.f_depid = userInfo.f_depid
+    res.t_userinfo.f_depname = userInfo.f_depname
+    res.t_userinfo.f_operatorid = userInfo.f_operatorid
+    res.t_userinfo.f_operator = userInfo.f_operator
+    res.t_userinfo.f_workflow_id = this.f_workflow_id
+    res.t_userinfo.f_user_state = '预备'
+
+    res.t_userfiles.f_operate_date = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    res.t_userfiles.f_orgid = userInfo.f_orgid
+    res.t_userfiles.f_orgname = userInfo.f_orgname
+    res.t_userfiles.f_depid = userInfo.f_depid
+    res.t_userfiles.f_depname = userInfo.f_depname
+    res.t_userfiles.f_operatorid = userInfo.f_operatorid
+    res.t_userfiles.f_operator = userInfo.f_operator
+    res.t_userfiles.f_workflow_id = this.f_workflow_id
+    res.t_userfiles.f_table_state = '待开通'
+  }
+  let saveData = res
+  if (saveData.t_userfiles.f_gasbrand_id.length > 0) {
+    saveData.t_userfiles.f_gasbrand_id = saveData.t_userfiles.f_gasbrand_id[0]
+  }
+  if (saveData.t_userfiles.f_price_id.length > 0) {
+    saveData.t_userfiles.f_price_id = saveData.t_userfiles.f_price_id[0]
+  }
+  if (model.value === '编辑') {
+    saveData = Object.assign(saveData, {
+      f_operator_record: userInfo.f_operator,
+      f_operatorid_record: userInfo.f_operatorid,
+      f_orgid_record: userInfo.f_orgid,
+      f_orgname_record: userInfo.f_orgname,
+      f_depid_record: userInfo.f_depid,
+      f_depname_record: userInfo.f_depname,
+    })
+  }
+  runLogic('userFIleSaveLogic', saveData, 'af-revenue').then((res) => {
+    showToast('操作成功！')
+    history.back()
+  })
+}
+const isInit = ref(false)
+function init() {
+  if (model.value === '编辑') {
+    runLogic('getFileDetailForEdit', { f_userinfo_id: userinfoid.value }, 'af-revenue').then((res) => {
+      // if (res.t_userfiles.f_gasmodel_id) {
+      //   res.t_userfiles.f_gasmodel_id = 76
+      // }
+      // if (res.t_userfiles.f_price_id) {
+      //   res.t_userfiles.f_price_id = [res.t_userfiles.f_price_id]
+      // }
+      console.log('1111111----,', res)
+      groupFormData.value = res
+      isInit.value = true
+    })
+  }
+}
+onMounted(() => {
+  init()
+})
+</script>
+
+<template>
+  <XFormGroup
+    v-if="isInit"
+    mode="修改"
+    :config-name="configName"
+    :service-name="serviceName"
+    :group-form-data="groupFormData"
+    @submit="submit"
+  />
+</template>
+
+<style scoped lang="less">
+
+</style>