diff --git a/package.json b/package.json index 1a12256e..8ef3b4ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "yudao-ui-admin-vue3", - "version": "2025.12-snapshot", + "version": "2026.01-snapshot", "description": "基于vue3、vite4、element-plus、typesScript", "author": "xingyu", "private": false, diff --git a/src/components/FormCreate/src/components/useApiSelect.tsx b/src/components/FormCreate/src/components/useApiSelect.tsx index 25e9d70d..847eb077 100644 --- a/src/components/FormCreate/src/components/useApiSelect.tsx +++ b/src/components/FormCreate/src/components/useApiSelect.tsx @@ -89,31 +89,22 @@ export const useApiSelect = (option: ApiSelectProps) => { // 设置默认当前用户(仅当 defaultCurrentUser 为 true 且无预设值时) const setDefaultCurrentUser = () => { - console.log('[UserSelect] setDefaultCurrentUser called, defaultCurrentUser:', props.defaultCurrentUser) - // 仅当组件名为 UserSelect 且 defaultCurrentUser 为 true 时处理 if (option.name !== 'UserSelect' || !props.defaultCurrentUser) { - console.log('[UserSelect] skip - not UserSelect or defaultCurrentUser is false') return } - // 检查是否已有预设值(预设值优先级高于默认当前用户) if (hasValidPresetValue()) { - console.log('[UserSelect] has preset value, skip:', attrs.modelValue) return } - + // 获取当前用户 ID const userStore = useUserStoreWithOut() const user = userStore.getUser const currentUserId = user?.id - - console.log('[UserSelect] current user:', user, 'userId:', currentUserId) - if (currentUserId) { // 根据多选/单选模式设置默认值 const defaultValue = props.multiple ? [currentUserId] : currentUserId - console.log('[UserSelect] setting default value:', defaultValue) emit('update:modelValue', defaultValue) } } diff --git a/src/components/FormCreate/src/useFormCreateDesigner.ts b/src/components/FormCreate/src/useFormCreateDesigner.ts index 9658f8b7..60d30e32 100644 --- a/src/components/FormCreate/src/useFormCreateDesigner.ts +++ b/src/components/FormCreate/src/useFormCreateDesigner.ts @@ -62,7 +62,7 @@ export const useFormCreateDesigner = async (designer: Ref) => { type: 'switch', field: 'defaultCurrentUser', title: '默认选中当前用户', - value: true + value: false } ] }) @@ -85,7 +85,7 @@ export const useFormCreateDesigner = async (designer: Ref) => { type: 'switch', field: 'defaultCurrentDept', title: '默认选中当前部门', - value: true + value: false } ] }) diff --git a/src/views/Login/components/ForgetPasswordForm.vue b/src/views/Login/components/ForgetPasswordForm.vue index f47b2299..f5f41dc8 100644 --- a/src/views/Login/components/ForgetPasswordForm.vue +++ b/src/views/Login/components/ForgetPasswordForm.vue @@ -39,6 +39,7 @@ 转化为客户 - 已转化客户 + 已转化客户