af-mobile-client-vue3 1.2.49 → 1.2.51

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.2.49",
+  "version": "1.2.51",
   "packageManager": "pnpm@10.12.3",
   "description": "Vue + Vite component lib",
   "engines": {
@@ -78,6 +78,7 @@
     "vite-plugin-mock-dev-server": "^1.9.1",
     "vite-plugin-pwa": "^1.0.0",
     "vite-plugin-sitemap": "^0.8.2",
+    "vite-plugin-svg-icons": "^2.0.1",
     "vite-plugin-vconsole": "^2.1.1",
     "vite-plugin-vue-devtools": "^7.7.7",
     "vue-tsc": "^2.2.10"

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

@@ -1,5 +1,5 @@
 <script setup>
-import SvgIcon from './components/core/SvgIcon/index.vue'
+import SvgIcon from '@af-mobile-client-vue3/components/core/SvgIcon/index.vue'
 </script>
 
 <template>
@@ -40,8 +40,14 @@ import SvgIcon from './components/core/SvgIcon/index.vue'
 }
 
 @keyframes fade {
-  0% { opacity: 1; }
-  50% { opacity: 0.3; }
-  100% { opacity: 1; }
+  0% {
+    opacity: 1;
+  }
+  50% {
+    opacity: 0.3;
+  }
+  100% {
+    opacity: 1;
+  }
 }
 </style>

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

@@ -56,6 +56,6 @@ const styleExternalIcon = computed(() => {
 }
 
 .svg-icon-active-blue {
-  color: #1989FA
+  color: #1989fa;
 }
 </style>

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

@@ -47,7 +47,6 @@ const renderableGroupItems = computed(() => {
 
 // 组件初始化函数
 function init(params: Form) {
-  console.log('初始化数据------', { ...params })
   initStatus.value = true
   propsData.value = {
     configName: props.configName,
@@ -56,7 +55,6 @@ function init(params: Form) {
     mode: props.mode,
     ...params,
   }
-  console.log('数据整合----', propsData.value)
   formData.value = propsData.value.groupFormData
   getConfigByName(propsData.value.configName, (result) => {
     if (result?.groups) {
@@ -72,12 +70,10 @@ function init(params: Form) {
       submitSimple.value = result?.showSubmitBtn
       groupItems.value = [{ ...result }]
     }
-    console.log('即将加载完成的数据--:', formData.value)
     isInit.value = true
   }, propsData.value.serviceName)
 }
 watch(() => props.groupFormData, (_val) => {
-  console.log('监听器-------', props.groupFormData)
   formData.value = { ...formData.value, ...props.groupFormData }
 })
 onBeforeMount(() => {

package/src/main.ts

@@ -10,6 +10,8 @@ import 'virtual:uno.css'
 import '@af-mobile-client-vue3/styles/app.less'
 import '@af-mobile-client-vue3/styles/var.less'
 
+// svg icon
+import 'virtual:svg-icons-register'
 // Vant 桌面端适配
 import '@vant/touch-emulator'
 

package/src/router/routes.ts

@@ -10,7 +10,6 @@ import XCellDetailView from '@af-mobile-client-vue3/views/component/XCellDetailV
 import XCellListView from '@af-mobile-client-vue3/views/component/XCellListView/index.vue'
 import XFormAppraiseView from '@af-mobile-client-vue3/views/component/XFormAppraiseView/index.vue'
 import XFormGroupView from '@af-mobile-client-vue3/views/component/XFormGroupView/index.vue'
-import xformgroup222 from '@af-mobile-client-vue3/views/component/XFormGroupView/xformgroup222.vue'
 import XFormView from '@af-mobile-client-vue3/views/component/XFormView/index.vue'
 import XOlMapView from '@af-mobile-client-vue3/views/component/XOlMapView/index.vue'
 import XLocationPicker from '@af-mobile-client-vue3/views/component/XOlMapView/XLocationPicker/index.vue'
@@ -67,11 +66,6 @@ const routes: Array<RouteRecordRaw> = [
         name: 'XCellDetailView',
         component: XCellDetailView,
       },
-      {
-        path: '/xformgroup222',
-        name: 'xformgroup222',
-        component: xformgroup222,
-      },
       {
         path: '/Component/XFormGroupView',
         name: 'XFormGroupView',

package/src/utils/queryFormDefaultRangePicker.ts

@@ -1,57 +1,57 @@
-/**
- * 根据类型获取日期区间字符串
- * @param type '当年' | 'curMonth' | '当日'
- * @param show 区分实际值还是显示值, true为实际值, false为显示值
- * @returns [start, end] 例：['2024-01-01 00:00:00', '2024-12-31 23:59:59']
- */
-export function getRangeByType(type: string, show: boolean): [string, string] {
-  const now = new Date()
-  const year = now.getFullYear()
-  const month = (now.getMonth() + 1).toString().padStart(2, '0')
-  const day = now.getDate().toString().padStart(2, '0')
-
-  if (!show) {
-    if (type === 'curYear') {
-      return [
-        `${year}-01-01 00:00:00`,
-        `${year}-12-31 23:59:59`,
-      ]
-    }
-    if (type === 'curMonth') {
-      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
-      return [
-        `${year}-${month}-01 00:00:00`,
-        `${year}-${month}-${lastDay.toString().padStart(2, '0')} 23:59:59`,
-      ]
-    }
-    if (type === 'curDay') {
-      return [
-        `${year}-${month}-${day} 00:00:00`,
-        `${year}-${month}-${day} 23:59:59`,
-      ]
-    }
-  }
-  if (show) {
-    if (type === 'curYear') {
-      return [
-        `${year}-01-01`,
-        `${year}-12-31`,
-      ]
-    }
-    if (type === 'curMonth') {
-      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
-      return [
-        `${year}-${month}-01`,
-        `${year}-${month}-${lastDay.toString().padStart(2, '0')}`,
-      ]
-    }
-    if (type === 'curDay') {
-      return [
-        `${year}-${month}-${day}`,
-        `${year}-${month}-${day}`,
-      ]
-    }
-  }
-  // 兜底返回空字符串数组
-  return ['', '']
-}
+/**
+ * 根据类型获取日期区间字符串
+ * @param type '当年' | 'curMonth' | '当日'
+ * @param show 区分实际值还是显示值, true为实际值, false为显示值
+ * @returns [start, end] 例：['2024-01-01 00:00:00', '2024-12-31 23:59:59']
+ */
+export function getRangeByType(type: string, show: boolean): [string, string] {
+  const now = new Date()
+  const year = now.getFullYear()
+  const month = (now.getMonth() + 1).toString().padStart(2, '0')
+  const day = now.getDate().toString().padStart(2, '0')
+
+  if (!show) {
+    if (type === 'curYear') {
+      return [
+        `${year}-01-01 00:00:00`,
+        `${year}-12-31 23:59:59`,
+      ]
+    }
+    if (type === 'curMonth') {
+      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
+      return [
+        `${year}-${month}-01 00:00:00`,
+        `${year}-${month}-${lastDay.toString().padStart(2, '0')} 23:59:59`,
+      ]
+    }
+    if (type === 'curDay') {
+      return [
+        `${year}-${month}-${day} 00:00:00`,
+        `${year}-${month}-${day} 23:59:59`,
+      ]
+    }
+  }
+  if (show) {
+    if (type === 'curYear') {
+      return [
+        `${year}-01-01`,
+        `${year}-12-31`,
+      ]
+    }
+    if (type === 'curMonth') {
+      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
+      return [
+        `${year}-${month}-01`,
+        `${year}-${month}-${lastDay.toString().padStart(2, '0')}`,
+      ]
+    }
+    if (type === 'curDay') {
+      return [
+        `${year}-${month}-${day}`,
+        `${year}-${month}-${day}`,
+      ]
+    }
+  }
+  // 兜底返回空字符串数组
+  return ['', '']
+}

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('测试2')
+const configName = ref('lngChargeAuditMobileCRUD')
 const serviceName = ref('af-gaslink')
-// const configName = ref('mobile_liushuiQueryCRUD')
-// const serviceName = ref('af-revenue')
 
 // 资源权限测试
 // const configName = ref('crud_sources_test')
@@ -55,12 +48,12 @@ const serviceName = ref('af-gaslink')
 // 跳转到表单——以表单组来渲染纯表单
 function toDetail(item) {
   router.push({
-    name: 'xformgroup222',
-    // query: {
-    //   id: item[idKey.value],
-    // id: item.rr_id,
-    // o_id: item.o_id,
-    // },
+    name: 'XFormGroupView',
+    query: {
+      id: item[idKey.value],
+      // id: item.rr_id,
+      // o_id: item.o_id,
+    },
   })
 }
 
@@ -76,35 +69,19 @@ function toDetail(item) {
 //     },
 //   })
 // }
-function addOption() {
-  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) {
-  console.log('用户----', userInfo)
-  router.push({
-    name: 'XFormView',
-    params: { id: 1, openid: 2 },
-    query: {
-      configName: configName.value,
-      serviceName: serviceName.value,
-      mode: '修改',
-    },
-  })
-}
+// 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) {
@@ -115,38 +92,13 @@ function deleteRow(result) {
 <template>
   <NormalDataLayout id="XCellListView" title="工作计划">
     <template #layout_content>
-      <!--      <XCellList -->
-      <!--        :config-name="configName" -->
-      <!--        :service-name="serviceName" -->
-      <!--        :custom-add="true" -->
-      <!--        :custom-edit="true" -->
-      <!--        :id-key="idKey" -->
-      <!--        @to-detail="toDetail" -->
-      <!--        @delete-row="deleteRow" -->
-      <!--        @update="updateRow" -->
-      <!--        @add="addOption" -->
-      <!--      /> -->
-
-      <!--      :fix-query-form="{ u_f_price_state: ['生效', '待生效'] }" -->
-
-      <!--      <XCellList -->
-      <!--        config-name="ApplyMobileSuperviseCRUD" -->
-      <!--        service-name="af-apply" -->
-      <!--        @to-detail="toDetail" -->
-      <!--        @delete-row="deleteRow" -->
-      <!--      /> -->
-
-      <!--      <XCellList -->
-      <!--        service-name="af-revenue" -->
-      <!--        config-name="userfiles_sel_address" -->
-      <!--        @to-detail="toDetail" -->
-      <!--      /> -->
       <XCellList
-        service-name="af-apply"
-        config-name="ApplyContractPhoneCRUD"
-        :custom-add="true"
+        :config-name="configName"
+        :service-name="serviceName"
+        :fix-query-form="{ o_f_oper_name: 'edu_test' }"
+        :id-key="idKey"
         @to-detail="toDetail"
-        @add="addOption"
+        @delete-row="deleteRow"
       />
     </template>
   </NormalDataLayout>

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

@@ -5,19 +5,16 @@ 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_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)
@@ -25,8 +22,7 @@ const route = useRoute()
 const isInit = ref(false)
 function submit(_result) {
   showDialog({ message: '提交成功' }).then(() => {
-    console.log('12121')
-    // history.back()
+    history.back()
   })
 }
 
@@ -67,8 +63,8 @@ function submit(_result) {
       <!--      v-if="isInit" -->
       <XFormGroup
         ref="formGroup"
-        config-name="ceshi11111FormGroup"
-        service-name="af-apply"
+        :config-name="configName"
+        :service-name="serviceName"
         :group-form-data="formData"
         mode="新增"
         @submit="submit"

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

@@ -3,8 +3,8 @@ 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 { ref } from 'vue'
 
-const configName = ref('addappapplychargeForm')
-const serviceName = ref('af-apply')
+const configName = ref('AddConstructionForm')
+const serviceName = ref('af-linepatrol')
 
 const formGroupAddConstruction = ref(null)
 </script>

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

@@ -1,94 +0,0 @@
-<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('2909')
-const userinfoid = ref('93015')
-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()
-  })
-}
-function init() {
-  if (model.value === '编辑') {
-    runLogic('getFileDetailForEdit', { f_userinfo_id: userinfoid.value }, 'af-revenue').then((res) => {
-      if (res.t_userfiles.f_gasbrand_id) {
-        res.t_userfiles.f_gasbrand_id = [res.t_userfiles.f_gasbrand_id]
-      }
-      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
-    })
-  }
-}
-onMounted(() => {
-  init()
-})
-</script>
-
-<template>
-  <XFormGroup
-    mode="修改"
-    :config-name="configName"
-    :service-name="serviceName"
-    :group-form-data="groupFormData"
-    @submit="submit"
-  />
-</template>
-
-<style scoped lang="less">
-
-</style>