af-mobile-client-vue3 1.3.18 → 1.3.19

package/package.json

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

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

@@ -31,6 +31,7 @@ const {
   scanOptions,
   customAdd = false,
   customEdit = false,
+  customDelete = false,
   hideAllActions = false,
 } = defineProps<{
   configName?: string
@@ -42,9 +43,10 @@ const {
     type?: string | string[] // 显示类型：可以是单个类型或类型数组 'nfc' / ['scan', 'nfc']
     defaultMode?: string // 默认模式
   }
-  // 是否自定义新增、编辑按钮
+  // 是否自定义新增、编辑、删除按钮
   customAdd?: boolean
   customEdit?: boolean
+  customDelete?: boolean
   // 是否隐藏所有操作按钮
   hideAllActions?: boolean
 }>()
@@ -52,7 +54,7 @@ const {
 const emit = defineEmits<{
   (e: 'toDetail', item: any): void
   (e: 'update', item: any): void
-  (e: 'deleteRow', item: any): void
+  (e: 'delete', item: any): void
   (e: 'add'): void
   (e: string, item: any): void
   (e: 'updateCondition', params: any): void
@@ -234,9 +236,9 @@ function initComponent() {
       buttonState.value = result.buttonState
       buttonPermissions.value = result.buttonPermissions
       if (buttonState.value.edit && buttonState.value.edit === true && (filterButtonPermissions('edit').state === false || ((filterButtonPermissions('edit').state === true && userState.f.resources.f_role_name.includes((filterButtonPermissions('edit').roleStr))))))
-        allActions.value.push({ text: '修改', func: 'updateRow' })
+        allActions.value.push({ text: '修改', func: 'update' })
       if (buttonState.value.delete && buttonState.value.delete === true && (filterButtonPermissions('delete').state === false || ((filterButtonPermissions('delete').state === true && userState.f.resources.f_role_name.includes((filterButtonPermissions('delete').roleStr))))))
-        allActions.value.push({ text: '删除', func: 'deleteRow' })
+        allActions.value.push({ text: '删除', func: 'delete' })
     }
     splitArrayAt(allActions.value, 3)
 
@@ -429,14 +431,19 @@ const reversedMainActions = computed(() => {
 // 设置 Popover 的事件
 function onSelectMenu(item: any, event: any) {
   if (event.text === '删除') {
-    showConfirmDialog({
-      title: '删除',
-      message:
-        '请确认是否删除！！！',
-    }).then(() => {
-      emit(event.func, item)
-    }).catch(() => {
-    })
+    if (customDelete) {
+      emit('delete', item)
+    }
+    else {
+      showConfirmDialog({
+        title: '删除',
+        message:
+          '请确认是否删除！！！',
+      }).then(() => {
+        emit(event.func, item)
+      }).catch(() => {
+      })
+    }
   }
   else if (event.text === '修改') {
     if (customEdit) {

package/src/views/user/register/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { openApiLogic } from '@af-mobile-client-vue3/services/api/common'
+import { getConfigByName, openApiLogic } from '@af-mobile-client-vue3/services/api/common'
 import { useSettingStore } from '@af-mobile-client-vue3/stores/modules/setting'
 import {
   showFailToast,
@@ -24,6 +24,7 @@ interface FormData {
   name: string
   phone: string
   gender: string
+  code: string
   email: string
   username: string
   password: string
@@ -62,6 +63,7 @@ const formData = ref<FormData>({
   name: '',
   phone: '',
   gender: '',
+  code: '',
   email: '',
   username: '',
   password: '',
@@ -79,6 +81,8 @@ const openId = ref('')
 // 错误信息
 const errors = ref<Errors>({})
 
+const registerConfig = ref({})
+
 // 状态管理
 const isSubmitting = ref<boolean>(false)
 const showSuccess = ref<boolean>(false)
@@ -106,6 +110,14 @@ function validateName(): boolean {
   delete errors.value.name
   return true
 }
+function validateCode(): boolean {
+  if (!formData.value.code.trim()) {
+    errors.value.code = '员工编号不能为空'
+    return false
+  }
+  delete errors.value.code
+  return true
+}
 
 function validatePhone(): boolean {
   const phoneRegex = /^1[3-9]\d{9}$/
@@ -205,6 +217,7 @@ function validateGender(): boolean {
 function validateAll(): boolean {
   const validations = [
     validateName(),
+    validateCode(),
     validatePhone(),
     validateEmail(),
     validateUsername(),
@@ -268,6 +281,18 @@ async function fetchOrganizationInfo(strategyId: any): Promise<void> {
   }
 }
 
+async function initConfig(): Promise<void> {
+  try {
+    getConfigByName('registerConfig', (res: any) => {
+      console.log('res', res)
+    }, 'af-system')
+  }
+  catch (error) {
+    console.error('获取组织信息失败:', error)
+    showToast('获取组织信息失败')
+  }
+}
+
 // 提交注册
 async function submitRegistration(): Promise<void> {
   if (usernameStatus.value === 'checking') {
@@ -302,6 +327,7 @@ function resetForm(): void {
     name: '',
     phone: '',
     gender: '',
+    code: '',
     email: '',
     username: '',
     password: '',
@@ -357,6 +383,8 @@ function goBack() {
 
 // 组件挂载时获取组织信息
 onMounted(async () => {
+  console.log('route.query', route.query)
+  console.log('route.params', route.params)
   const strategyId = route.query.strategyId || route.params.strategyId
   openId.value = route.query.openId as string || route.params.openId as string
   formData.value.openId = openId.value
@@ -450,16 +478,30 @@ onMounted(async () => {
               </template>
               <template #input>
                 <VanRadioGroup v-model="formData.gender" @change="validateGender">
-                  <VanRadio name="male">
+                  <VanRadio name="男">
                     男
                   </VanRadio>
-                  <VanRadio name="female">
+                  <VanRadio name="女">
                     女
                   </VanRadio>
                 </VanRadioGroup>
               </template>
             </VanField>
-
+            <!-- 员工编号 -->
+            <VanField
+              v-model="formData.code"
+              label="员工编号"
+              placeholder="请输入员工编号"
+              :error="!!errors.code"
+              :error-message="errors.code"
+              label-align="top"
+              @blur="validateCode"
+            >
+              <template #label>
+                <i class="i-solar-user-id-bold text-purple-500" />
+                员工编号 <span class="required">*</span>
+              </template>
+            </VanField>
             <!-- 邮箱 -->
             <VanField
               v-model="formData.email"