diff --git a/web/src/views/system/dictionary/subDict/crud.tsx b/web/src/views/system/dictionary/subDict/crud.tsx index 8ee841c..342d989 100644 --- a/web/src/views/system/dictionary/subDict/crud.tsx +++ b/web/src/views/system/dictionary/subDict/crud.tsx @@ -23,7 +23,7 @@ export const createCrudOptions = function ({crudExpose, context}: CreateCrudOpti return await api.DelObj(row.id); }; const addRequest = async ({form}: AddReq) => { - const data = crudExpose.getSearchFormData() + const data = crudExpose!.getSearchFormData() const parent = data.parent form.parent = parent if (parent) { diff --git a/web/src/views/system/user/crud.tsx b/web/src/views/system/user/crud.tsx index 79de3ed..101ce5c 100644 --- a/web/src/views/system/user/crud.tsx +++ b/web/src/views/system/user/crud.tsx @@ -50,7 +50,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp text:"导出",//按钮文字 title:"导出",//鼠标停留显示的信息 click(){ - return exportRequest(crudExpose.getSearchFormData()) + return exportRequest(crudExpose!.getSearchFormData()) } } } @@ -58,7 +58,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp rowHandle: { //固定右侧 fixed: 'right', - width: 140, + width: 200, buttons: { view: { show: false, @@ -73,6 +73,19 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp type: 'text', show: hasPermissions('user:Delete'), }, + custom: { + text: '重设密码', + type: 'text', + show: hasPermissions('user:ResetPassword'), + tooltip: { + placement: 'top', + content: '重设密码', + }, + //@ts-ignore + click: (ctx: any) => { + const { row } = ctx; + }, + }, }, }, columns: {