af-mobile-client-vue3 1.2.39 → 1.2.41

package/package.json

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

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

@@ -141,6 +141,9 @@ const title = ref('')
 // 按钮权限
 const buttonPermissions = ref([])
 
+// 默认参数
+const defaultParams = {}
+
 const slots = useSlots()
 
 // 当前组件实例（不推荐使用，可能会在后续的版本更迭中调整，暂时用来绑定函数的上下文）
@@ -235,7 +238,6 @@ function initComponent() {
 
 // 初始化条件参数
 function initConditionParams(formItems, isQuery) {
-  const defaultParams = {}
   let hasDefaults: boolean
 
   // 从表单配置中获取所有默认值
@@ -287,7 +289,7 @@ function onRefresh() {
     finishedText.value = '加载完成'
     finished.value = false
     loading.value = true
-    onLoad()
+    onLoad(defaultParams)
   }, 100)
 }
 

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

@@ -9,11 +9,13 @@ const props = withDefaults(defineProps<{
   serviceName?: string
   groupFormData?: object
   mode?: string
+  isScrollspy?: boolean
 }>(), {
   configName: '',
   serviceName: undefined,
   groupFormData: () => ({}),
   mode: '查询',
+  isScrollspy: true,
 })
 const emit = defineEmits(['submit'])
 
@@ -22,6 +24,7 @@ interface Form {
   serviceName?: string
   groupFormData?: object
   mode?: string
+  isScrollspy?: boolean
 }
 
 const groupItems = ref([])
@@ -89,7 +92,7 @@ defineExpose({ init })
 
 <template>
   <div v-if="isInit" id="x-form-group">
-    <VanTabs scrollspy sticky :offset-top="offsetTop">
+    <VanTabs :scrollspy="propsData.isScrollspy" sticky :offset-top="offsetTop">
       <VanTab
         v-for="(item, index) in groupItems"
         :key="item.groupName ? (item.groupName + index) : index"
@@ -99,6 +102,10 @@ defineExpose({ init })
           class="x-form-group-item"
           :class="{ 'is-last': index === groupItems.length - 1 }"
         >
+          <div v-if="item.describe && propsData.isScrollspy && (item.groupName || item.slotName)" class="form-group-title">
+            <span class="form-group-bar" />
+            <span class="form-group-text">{{ item.describe }}</span>
+          </div>
           <XForm
             ref="xFormListRef"
             :is-group-form="true"
@@ -140,4 +147,25 @@ defineExpose({ init })
 .x-form-group-item.is-last {
   min-height: calc(100vh - var(--van-nav-bar-height) - 40px);
 }
+.form-group-title {
+  display: flex;
+  align-items: center;
+  padding-top: 12px;
+  background: none;
+  margin: 0 0 4px 0;
+}
+.form-group-bar {
+  width: 4px;
+  height: 20px;
+  background: #1989fa;
+  border-radius: 4px;
+  margin-right: 8px;
+  flex-shrink: 0;
+}
+.form-group-text {
+  font-weight: 600;
+  font-size: 15px;
+  color: #222;
+  letter-spacing: 0.5px;
+}
 </style>

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

@@ -187,6 +187,27 @@ function getDefaultValue() {
   const getDefaultByType = () => {
     const def = mode !== '查询' ? attr.formDefault : attr.queryFormDefault
 
+    if (['treeSelect', 'select', 'checkbox'].includes(attr.type) && ['curOrgId', 'curDepId', 'curUserId'].includes(def)) {
+      if (def === 'curOrgId') {
+        if (attr.type === 'treeSelect') {
+          treeValue.value = userState.f.resources.orgs
+        }
+        return attr.type === 'select' ? userState.f.resources.orgid : [userState.f.resources.orgid]
+      }
+      if (def === 'curDepId') {
+        if (attr.type === 'treeSelect') {
+          treeValue.value = userState.f.resources.deps
+        }
+        return attr.type === 'select' ? userState.f.resources.depids : [userState.f.resources.depids]
+      }
+      if (def === 'curUserId') {
+        if (attr.type === 'treeSelect') {
+          treeValue.value = userState.f.resources.name
+        }
+        return attr.type === 'select' ? userState.f.resources.id : [userState.f.resources.id]
+      }
+    }
+
     // 数组类型默认值
     const arrayTypes = ['uploader', 'checkbox', 'file', 'area', 'image', 'treeSelect']
     if (arrayTypes.includes(attr.type)) {
@@ -716,10 +737,34 @@ defineExpose({
   reset,
 })
 
+// 数据处理
+function cleanEmptyChildren(options, fieldNames = { text: 'label', value: 'value', children: 'children' }) {
+  if (!Array.isArray(options))
+    return options
+
+  const childrenKey = fieldNames.children || 'children'
+
+  return options.map((option) => {
+    // 深拷贝选项，避免修改原始数据
+    const newOption = { ...option }
+
+    // 如果存在children属性且是空数组
+    if (newOption[childrenKey] && Array.isArray(newOption[childrenKey]) && newOption[childrenKey].length === 0) {
+      delete newOption[childrenKey]
+    }
+    // 如果存在children属性且非空，则递归处理
+    else if (newOption[childrenKey] && Array.isArray(newOption[childrenKey])) {
+      newOption[childrenKey] = cleanEmptyChildren(newOption[childrenKey], fieldNames)
+    }
+    return newOption
+  })
+}
+
 // 级联选择完成事件
-function onTreeSelectFinish(value) {
-  treeValue.value = value.value
-  modelData.value = [value.value]
+function onTreeSelectFinish({ selectedOptions }) {
+  const index = selectedOptions.length - 1
+  treeValue.value = selectedOptions[index].label
+  modelData.value = [selectedOptions[index].value]
   showTreeSelect.value = false
 }
 
@@ -1217,7 +1262,7 @@ function emitFunc(func, data) {
       overlay-class="date-picker-overlay"
     >
       <VanCascader
-        :options="option"
+        :options="cleanEmptyChildren(option, attr.customFieldName ? attr.customFieldName : { text: 'label', value: 'value', children: 'children' })"
         :field-names="attr.customFieldName ? attr.customFieldName : { text: 'label', value: 'value', children: 'children' }"
         :title="attr.name"
         :closeable="true"

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,19 +1,26 @@
 <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('lngChargeAuditMobileCRUD')
+// const configName = ref('orderCarInMobileCRUD')
+// const serviceName = ref('af-gaslink')
+// const configName = ref('lngPriceManageMobileCRUD')
+const configName = ref('测试2')
 const serviceName = ref('af-gaslink')
+// const configName = ref('mobile_liushuiQueryCRUD')
+// const serviceName = ref('af-revenue')
 
 // 资源权限测试
 // const configName = ref('crud_sources_test')
@@ -49,11 +56,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,
+    // },
   })
 }
 
@@ -69,19 +76,35 @@ 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) {
-//   router.push({
-//     name: 'XFormView',
-//     params: { id: result.o_id, openid: result.o_id },
-//     query: {
-//       configName: configName.value,
-//       serviceName: serviceName.value,
-//       mode: '修改',
-//     },
-//   })
-// }
+function updateRow(result) {
+  console.log('用户----', userInfo)
+  router.push({
+    name: 'XFormGroupView',
+    // params: { id: result.o_id, openid: result.o_id },
+    // query: {
+    //   configName: configName.value,
+    //   serviceName: serviceName.value,
+    //   mode: '修改',
+    // },
+  })
+}
 
 // 删除功能
 function deleteRow(result) {
@@ -92,13 +115,31 @@ 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
-        :config-name="configName"
-        :service-name="serviceName"
-        :fix-query-form="{ o_f_oper_name: 'edu_test' }"
-        :id-key="idKey"
+        service-name="af-revenue"
+        config-name="userfiles_sel_address"
         @to-detail="toDetail"
-        @delete-row="deleteRow"
       />
     </template>
   </NormalDataLayout>

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

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