Merge remote-tracking branch 'yudao/master' into master-dev

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,

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)
         }
       }

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
       }
     ]
   })

src/views/Login/components/ForgetPasswordForm.vue

@@ -39,6 +39,7 @@
       </el-col>
       <Verify
         ref="verify"
+        v-if="resetPasswordData.captchaEnable === 'true'"
         :captchaType="captchaType"
         :imgSize="{ width: '400px', height: '200px' }"
         mode="pop"

src/views/crm/clue/detail/index.vue

@@ -18,7 +18,7 @@
     >
       转化为客户
     </el-button>
-    <el-button v-else disabled type="success">已转化客户</el-button>
+    <el-button v-if="clue.transformStatus" disabled type="success">已转化客户</el-button>
   </ClueDetailsHeader>
   <el-col>
     <el-tabs>