Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	web/src/views/system/dept/components/DeptUserCom/crud.tsx
#	web/src/views/system/user/crud.tsx

web/src/views/system/dept/components/DeptUserCom/crud.tsx

@@ -100,10 +100,7 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 							placement: 'top',
 							content: '重设密码',
 						},
-						click: (ctx: any) => {
-							const { row } = ctx;
-							context?.handleResetPwdOpen(row);
-						},
+						click: (ctx: any) => context?.handleResetPwdOpen(ctx.row),
 					},
 				},
 			},

web/src/views/system/user/crud.tsx

@@ -18,6 +18,7 @@ import {storeToRefs} from "pinia";
 import { computed } from "vue";
 import { Md5 } from 'ts-md5';
 import { commonCrudConfig } from "/@/utils/commonCrud";
+import { ElMessageBox } from 'element-plus';
 export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
     const pageRequest = async (query: UserPageQuery) => {
         return await api.GetList(query);
@@ -79,9 +80,10 @@ export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps)
                         text: "导出",//按钮文字
                         title: "导出",//鼠标停留显示的信息
                         show: auth('user:Export'),
-                        click() {
-                            return exportRequest(crudExpose!.getSearchFormData())
-                        }
+                        click: (ctx: any) => ElMessageBox.confirm(
+                            '确定重设密码吗？', '提示',
+                            { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }
+                        ).then(() => resetToDefaultPasswordRequest(ctx.row))
                     }
                 }
             },