Browse Source

feat: sso用户统一

master
wangxiang 2 years ago
parent
commit
3804614e76
No known key found for this signature in database
GPG Key ID: 1BA7946AB6B232E4
  1. 4
      src/api/common/data/entity/index.ts
  2. 31
      src/api/platform/system/controller/ssoUser.ts
  3. 37
      src/api/platform/system/entity/ssoUser.ts
  4. 96
      src/views/system/user/sso/ResetPwdModal.vue
  5. 113
      src/views/system/user/sso/SsoModal.vue
  6. 35
      src/views/system/user/sso/index.vue
  7. 220
      src/views/system/user/sso/sso.data.ts

4
src/api/common/data/entity/index.ts

@ -6,6 +6,8 @@ @@ -6,6 +6,8 @@
* @create: 2022/4/8
*/
import { BaseEntity } from '/@/api/common/base/entity';
/** 分页模型 */
export interface Page {
size: number;
@ -15,7 +17,7 @@ export interface Page { @@ -15,7 +17,7 @@ export interface Page {
}
/** 通用模型 */
export interface CommonEntity {
export interface CommonEntity extends BaseEntity {
createById: string;
createByName: string;
createTime: string;

31
src/api/platform/system/controller/ssoUser.ts

@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
/**
* api模板规范代码参考,
* Copyright © 2023-2023 <a href="https://godolphinx.org"></a> All rights reserved.
* author wangxiang4
*/
import type { SsoUserParams, SsoUser ,SsoUserResult } from '/@/api/platform/system/entity/ssoUser';
import { defHttp } from '/@/utils/http/axios';
enum Api {
list = '/system_proxy/system/ssoUser/list',
add = '/system_proxy/system/ssoUser/save',
get = '/system_proxy/system/ssoUser',
edit = '/system_proxy/system/ssoUser/update',
del = '/system_proxy/system/ssoUser/remove',
updatePwd = '/system_proxy/system/ssoUser/updatePwd',
resetPwd='/system_proxy/system/ssoUser/resetPwd',
}
export const listSsoUser = (params?: Partial<SsoUserParams>) => defHttp.get<SsoUserResult>({ url: Api.list, params }, { isReturnResultResponse: true });
export const addSsoUser = (params: Partial<SsoUser>) => defHttp.post({ url: Api.add, data: params });
export const editSsoUser = (params: Partial<SsoUser>) => defHttp.put({ url: Api.edit, data: params });
export const getSsoUser = (id: string) => defHttp.get<SsoUser>({ url: `${Api.get}/${id}` });
export const delSsoUser = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` });
export const updatePwd = (params: Partial<SsoUser>) => defHttp.put({ url: Api.updatePwd, params });
export const resetPwd = (params: Partial<SsoUser>) => defHttp.put({ url: Api.resetPwd, data: params });

37
src/api/platform/system/entity/ssoUser.ts

@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
/**
* @program: kicc-ui
* @description: SSO用户统一实体类
*
* @author: wangxiang4
* @create: 2022/4/8
*/
import type { R } from '/#/axios';
import type { Page } from '/@/api/common/data/entity';
import { CommonEntity } from '/@/api/common/data/entity';
export type SsoUserParams = Page & SsoUser;
export interface SsoUser extends CommonEntity {
// 用户id
id: string;
// 用户名
userName: string;
// 昵称
nickName: string;
// 头像
avatar: string;
// 邮箱
email: string;
// 手机号
phone: string;
// 用户密码
password: string;
// 用户性别
sex: string;
// 最后登陆IP
loginIp: string;
// 最后登陆时间
loginTime: string;
[key: string]: any;
}
export type SsoUserResult = R<SsoUser[]>;

96
src/views/system/user/sso/ResetPwdModal.vue

@ -0,0 +1,96 @@ @@ -0,0 +1,96 @@
<template>
<BasicModal
v-bind="$attrs"
centered
title="重置密码"
minHeight="100px"
@ok="handleSubmit"
@register="registerModal"
>
<Form :model="modelRef" :rules="rulesRef">
<FormItem name="newPassword" v-bind="validateInfos.newPassword">
<StrengthMeter v-model:value="modelRef.newPassword" placeholder="请输入重置密码"/>
</FormItem>
</Form>
</BasicModal>
</template>
<script lang="ts" setup>
/**
* 提供模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
* 采用ant-design-vue原生组件编写表单,采用 setup 写法
* Copyright © 2023-2023 <a href="https://godolphinx.org">海豚生态开源社区</a> All rights reserved.
* author wangxiang4
*/
import { reactive } from 'vue';
import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
import { StrengthMeter } from '/@/components/StrengthMeter';
import { Form } from 'ant-design-vue';
import { resetPwd } from '/@/api/platform/system/controller/ssoUser';
import { useMessage } from '/@/hooks/web/useMessage';
/** 类型规范统一声明定义区域 */
interface WindowState {
id: string;
newPassword: string;
}
/** 通用变量统一声明区域 */
const { createMessage } = useMessage();
/** https://v3.cn.vuejs.org/api/options-data.html#emits */
const emit = defineEmits(['success', 'register']);
const FormItem = Form.Item;
const useForm = Form.useForm;
const modelRef = reactive<WindowState>({
id: '',
newPassword: ''
});
const rulesRef = reactive<Recordable>({
newPassword: [
{
required: true,
whitespace: true,
message: '请输入密码!',
},
{
pattern: new RegExp('[^\\u4e00-\\u9fa5]+'),
type: 'string',
message: '密码不能输入汉字!',
},
{
min: 6,
max: 32,
message: '长度必需在6-32之间!',
}
]
});
const { resetFields, clearValidate, validate, validateInfos } = useForm(modelRef, rulesRef);
const [registerModal, { setModalProps, closeModal }] = useModalInner( (data: BoxPayload) => {
//
resetFields();
clearValidate();
//
modelRef.id = data.record?.id;
const props: Partial<ModalProps> = { confirmLoading: false };
// :
setModalProps(props);
});
/** 处理模态框提交 */
async function handleSubmit() {
try {
//
await validate();
//
setModalProps({ confirmLoading: true });
if (!modelRef.id) return createMessage.error('用户编号ID不存在,请检查!');
await resetPwd(modelRef);
//
closeModal();
emit('success');
} finally {
setModalProps({ confirmLoading: false });
}
}
</script>

113
src/views/system/user/sso/SsoModal.vue

@ -5,7 +5,23 @@ @@ -5,7 +5,23 @@
@ok="handleSubmit"
@register="registerModal"
>
<BasicForm @register="registerForm"/>
<ARow :gutter="24">
<ACol :span="14">
<BasicForm @register="registerForm"/>
</ACol>
<ACol :span="10">
<div class="change-avatar">
<CropperAvatar
:uploadApi="commonUpload"
:value="state.avatar"
btnText="更换头像"
:btnProps="{ preIcon: 'ant-design:cloud-upload-outlined' }"
:width="150"
@change="handleAvatarChange"
/>
</div>
</ACol>
</ARow>
</BasicModal>
</template>
<script lang="ts">
@ -15,38 +31,40 @@ @@ -15,38 +31,40 @@
* Copyright © 2023-2023 <a href="https://godolphinx.org">海豚生态开源社区</a> All rights reserved.
* author wangxiang4
*/
import {defineComponent, reactive, toRaw } from 'vue';
import { defineComponent, reactive } from 'vue';
import { BasicModal, useModalInner } from '/@/components/Modal';
import { BasicForm, useForm } from '/@/components/Form/index';
import { userFormSchema } from './sso.data';
import { listDept } from '/@/api/platform/system/controller/dept';
import { addUser, editUser, getUser } from '/@/api/platform/system/controller/user';
import { listToTree } from '/@/utils/helper/treeHelper';
import { addSsoUser, editSsoUser, getSsoUser, listSsoUser } from '/@/api/platform/system/controller/ssoUser';
import { ModalProps } from '/@/components/Modal';
import { findListNameById } from '/@/utils';
import { TreeItem } from '/@/components/Tree';
import { useMessage } from '/@/hooks/web/useMessage';
import {isBase64image, isEmpty} from '/@/utils/is';
import { Col, Row } from 'ant-design-vue';
import { CropperAvatar } from '/@/components/Cropper';
import { commonUpload } from '/@/api/platform/core/controller/upload';
/** 类型规范统一声明定义区域 */
interface WindowState {
tag: string;
deptTree: TreeItem[];
avatar: string;
}
export default defineComponent({
name: 'UserModal',
components: { BasicModal, BasicForm },
name: 'SSOUserModal',
components: {
CropperAvatar,
BasicModal,
BasicForm,
ARow: Row,
ACol: Col
},
emits: ['success', 'register'],
setup(props, { emit }) {
setup(_, { emit }) {
/** 通用变量统一声明区域 */
const state = reactive<WindowState>({
//
tag: '',
//
deptTree: []
avatar: ''
});
const { createMessage } = useMessage();
const [registerForm, { resetFields, setFieldsValue, updateSchema, validate, clearValidate }] = useForm({
labelWidth: 100,
schemas: userFormSchema,
@ -58,29 +76,34 @@ @@ -58,29 +76,34 @@
await resetFields();
await clearValidate();
//
state.avatar = 'https://godolphinx.org/dolphin1024x1024.png';
state.tag = data._tag;
state.deptTree = listToTree(await listDept());
const userId = data.record?.id;
const props: Partial<ModalProps> = { confirmLoading: false };
const id = data.record?.id;
const props: Partial<ModalProps> = {};
await updateSchema([
{
field: 'deptId',
componentProps: {
treeData: toRaw(state.deptTree),
disabled: state.tag != 'add'
}
},
{
field: 'password',
ifShow: state.tag == 'add'
},
{
field: 'userName',
componentProps: { disabled: state.tag != 'add' }
},
{
field: 'userType',
componentProps: { disabled: state.tag != 'add' }
componentProps: { disabled: state.tag != 'add' },
rules: [
{
required: true,
whitespace: true,
message: '请输入用户名称'
},
{
validator: async (rule, value) => {
if (!isEmpty(value)) {
const result = await listSsoUser({ userName: value });
if(result.data?.length > 0) return Promise.reject('该用户名称已存在!');
}
return Promise.resolve();
},
validateTrigger: 'blur'
}]
}
]);
// tag
@ -90,8 +113,9 @@ @@ -90,8 +113,9 @@
break;
case 'edit':
props.title = '编辑用户';
const result = await getUser(userId);
await setFieldsValue(result.result);
const ssoUser = await getSsoUser(id);
await setFieldsValue(ssoUser);
ssoUser.avatar && (state.avatar = ssoUser.avatar);
break;
}
// :
@ -103,17 +127,17 @@ @@ -103,17 +127,17 @@
try {
//
const formData = await validate();
//
!isBase64image(state.avatar) && (formData.avatar = state.avatar);
//
setModalProps({ confirmLoading: true });
formData.deptName = findListNameById(formData.deptId, toRaw(state.deptTree), { idField: 'deptId' });
if (!formData.deptName) return createMessage.error('部门名称数据为空,请重试!');
// tag
switch (state.tag) {
case 'add':
await addUser(formData);
await addSsoUser(formData);
break;
case 'edit':
await editUser(formData);
await editSsoUser(formData);
break;
}
//
@ -124,11 +148,24 @@ @@ -124,11 +148,24 @@
}
}
function handleAvatarChange({ src, data }) {
state.avatar = data.availablePath;
}
return {
state,
registerModal,
registerForm,
handleSubmit
handleSubmit,
commonUpload,
handleAvatarChange,
};
}
});
</script>
<style lang="less" scoped>
.change-avatar {
margin-top: 35px;
text-align: center;
}
</style>

35
src/views/system/user/sso/index.vue

@ -15,41 +15,41 @@ @@ -15,41 +15,41 @@
@click="handleEdit()"
>修改用户</a-button>
<a-button
danger
type="primary"
:disabled="state.multiple"
@click="handleDel()"
>删除用户</a-button>
</template>
<template #bodyCell="{ column, record }">
<template #bodyCell="{ column, record, text }">
<template v-if="column.key === 'action'">
<TableAction
:actions="[
{
label: '编辑',
icon: 'fa6-regular:pen-to-square',
auth: ['user_edit'],
onClick: handleEdit.bind(null, record)
},
{
label: '删除',
icon: 'ant-design:delete-outlined',
color: 'error',
auth: ['user_del'],
onClick: handleDel.bind(null, record)
}]"
:dropDownActions="[
},
{
label: '重置密码',
icon: 'fa6-brands:battle-net',
auth: ['user_reset'],
icon: 'fa6-solid:power-off',
onClick: handleResetPassword.bind(null, record),
}]"
/>
</template>
<template v-else-if="column.key === 'avatar'">
<TableImg :size="60" :simpleShow="true" :imgList="text"/>
</template>
</template>
</BasicTable>
<!--弹出窗体区域-->
<UserModal @register="registerModal" @success="handleRefreshTable"/>
<SsoModal @register="registerModal" @success="handleRefreshTable"/>
<ResetPwdModal @register="registerResetPwdModal" @success="handleRefreshTable"/>
</div>
</template>
@ -58,19 +58,18 @@ @@ -58,19 +58,18 @@
/**
* 提供模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
* 采用vben-动态表格表单封装组件编写,不采用 setup 写法
* Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
* Copyright © 2023-2023 <a href="https://godolphinx.org">海豚生态开源社区</a> All rights reserved.
* author wangxiang4
*/
import { defineComponent, reactive, toRaw } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { listUser, delUser } from '/@/api/platform/system/controller/user';
import { BasicTable, useTable, TableAction, TableImg } from '/@/components/Table';
import { listSsoUser, delSsoUser } from '/@/api/platform/system/controller/ssoUser';
import ResetPwdModal from './ResetPwdModal.vue';
import { useModal } from '/@/components/Modal';
import UserModal from './UserModal.vue';
import SsoModal from './SsoModal.vue';
import { columns, searchFormSchema } from './sso.data';
import { useMessage } from '/@/hooks/web/useMessage';
/** 类型规范统一声明定义区域 */
interface TableState {
ids: string[];
single: boolean;
@ -78,11 +77,12 @@ @@ -78,11 +77,12 @@
}
export default defineComponent({
name: 'SsoUserManagement',
name: 'SSOUserManagement',
components: {
TableImg,
BasicTable,
TableAction,
UserModal,
SsoModal,
ResetPwdModal,
},
setup() {
@ -98,7 +98,7 @@ @@ -98,7 +98,7 @@
const [registerModal, { openModal }] = useModal();
const [registerResetPwdModal, { openModal: openResetPwdModal }] = useModal();
const [registerTable, { reload, clearSelectedRowKeys }] = useTable({
api: listUser,
api: listSsoUser,
rowKey: 'id',
columns,
formConfig: {
@ -146,7 +146,6 @@ @@ -146,7 +146,6 @@
/** 处理重置用户密码 */
function handleResetPassword(record: Recordable) {
record = record || { id: toRaw(state.ids) };
openResetPwdModal(true, { record });
}
@ -158,7 +157,7 @@ @@ -158,7 +157,7 @@
title: '警告',
content: `是否确认删除用户编号为${ids}用户吗?`,
onOk: async () => {
await delUser(ids);
await delSsoUser(ids);
createMessage.success('删除成功!');
handleRefreshTable();
}

220
src/views/system/user/sso/sso.data.ts

@ -1,81 +1,52 @@ @@ -1,81 +1,52 @@
/**
* @program: kicc-ui
* @description:
* @author: wangxiang4
* @create: 2022/4/21
*/
import { BasicColumn } from '/@/components/Table';
import { FormSchema } from '/@/components/Table';
import { h } from 'vue';
import { Switch } from 'ant-design-vue';
import {Switch, Tag} from 'ant-design-vue';
import { listRole } from '/@/api/platform/system/controller/role';
import { changeStatus } from '/@/api/platform/system/controller/user';
import { useMessage } from '/@/hooks/web/useMessage';
import { getUserTypeList } from '/@/api/platform/system/controller/user';
import { SystemUserType } from '/@/enums/permissionEnum';
/** 通用变量统一声明区域 */
const { createConfirm } = useMessage();
/** 表格列配置 */
export const columns: BasicColumn[] = [
{
title: '用户名',
title: '用户名',
dataIndex: 'userName',
width: 120
},
{
title: '用户昵称',
title: '昵称',
dataIndex: 'nickName',
width: 120
},
{
title: '机构名称',
dataIndex: 'deptName',
title: '邮箱',
dataIndex: 'phone',
width: 200
},
{
title: '手机号',
title: '手机号',
dataIndex: 'phone',
width: 200
},
{
title: '状态',
dataIndex: 'status',
width: 120,
title: '性别',
dataIndex: 'sex',
width: 80,
customRender: ({ record }) => {
// 设置请求加载状态标识
if (!Reflect.has(record, 'pendingStatus')) {
record.pendingStatus = false;
}
return h(Switch, {
checked: record.status === '0',
checkedChildren: '已启用',
unCheckedChildren: '已禁用',
loading: record.pendingStatus,
onChange(checked: boolean) {
const text = checked ? '启用' : '停用';
createConfirm({
iconType: 'warning',
title: '警告',
content: `确认要"${text}${record.userName}用户吗?`,
onOk: async () => {
record.pendingStatus = true;
const newStatus = checked ? '0' : '1';
const { createMessage } = useMessage();
changeStatus(record.id, newStatus).then(() => {
record.status = newStatus;
createMessage.success(`${text}成功`);
}).catch(() => {
createMessage.error(`${text}失败`);
}).finally(() => record.pendingStatus = false);
}
});
}
});
const sex = record.sex;
const enable = ~~sex === 0;
const color = enable ? '#6AB5F9' : '#F087BD';
const text = enable ? '男' : '女';
return h(Tag, { color: color }, () => text);
}
},
{
title: '头像',
dataIndex: 'avatar',
width: 120,
},
{
title: '创建时间',
dataIndex: 'createTime',
@ -116,8 +87,8 @@ export const userFormSchema: FormSchema[] = [ @@ -116,8 +87,8 @@ export const userFormSchema: FormSchema[] = [
show: false
},
{
field: 'nickName',
label: '用户昵称',
field: 'userName',
label: '用户',
component: 'Input',
required: true,
colProps: {
@ -125,29 +96,39 @@ export const userFormSchema: FormSchema[] = [ @@ -125,29 +96,39 @@ export const userFormSchema: FormSchema[] = [
}
},
{
field: 'avatar',
label: '头像',
field: 'nickName',
label: '用户昵称',
component: 'Input',
defaultValue: 'https://godolphinx.org/dolphin1024x1024.png',
show: false
},
{
field: 'deptId',
label: '归属机构',
component: 'TreeSelect',
componentProps: {
fieldNames: {
label: 'name',
key: 'deptId',
value: 'deptId'
},
getPopupContainer: () => document.body
},
required: true,
colProps: {
span: 12
}
},
{
field: 'password',
label: '密码',
component: 'InputPassword',
colProps: {
span: 12
},
rules: [
{
required: true,
whitespace: true,
message: '请输入密码!',
},
{
pattern: new RegExp('[^\\u4e00-\\u9fa5]+'),
type: 'string',
message: '密码不能输入汉字!',
},
{
min: 6,
max: 32,
message: '长度必需在6-32之间!',
}
]
},
{
field: 'phone',
label: '手机号',
@ -180,40 +161,6 @@ export const userFormSchema: FormSchema[] = [ @@ -180,40 +161,6 @@ export const userFormSchema: FormSchema[] = [
}
]
},
{
field: 'userName',
label: '用户名',
component: 'Input',
required: true,
colProps: {
span: 12
}
},
{
field: 'password',
label: '密码',
component: 'InputPassword',
colProps: {
span: 12
},
rules: [
{
required: true,
whitespace: true,
message: '请输入密码!',
},
{
pattern: new RegExp('[^\\u4e00-\\u9fa5]+'),
type: 'string',
message: '密码不能输入汉字!',
},
{
min: 6,
max: 32,
message: '长度必需在6-32之间!',
}
]
},
{
field: 'sex',
label: '性别',
@ -230,77 +177,8 @@ export const userFormSchema: FormSchema[] = [ @@ -230,77 +177,8 @@ export const userFormSchema: FormSchema[] = [
}
},
{
field: 'status',
label: '状态',
component: 'RadioGroup',
defaultValue: '0',
componentProps: {
options: [
{ label: '正常', value: '0' },
{ label: '停用', value: '1' }
]
},
colProps: {
span: 12
}
},
{
field: 'roleIds',
label: '授权角色',
component: 'ApiSelect',
required: true,
componentProps: {
mode: 'multiple',
api: listRole,
labelField: 'name',
valueField: 'id',
resultField: 'data'
},
colProps: {
span: 12
}
},
{
field: 'userType',
label: '用户类型',
component: 'ApiSelect',
required: true,
componentProps: {
api: getUserTypeList,
resultField: 'data'
},
colProps: {
span: 12
}
},
{
field: 'mapCenter',
label: '地图中心点',
component: 'Input',
required: true,
colProps: {
span: 12
},
ifShow: ({values}) => values.userType == SystemUserType.CUSTOMER_SERVICE
},
{
field: 'mapOrientation',
label: '图片旋转值',
component: 'InputNumber',
defaultValue: 0,
componentProps: {
style: { width:'100%' },
min: 0
},
colProps: {
span: 12
},
ifShow: ({ values }) => values.userType == SystemUserType.CUSTOMER_SERVICE,
required: true,
},
{
label: '备注',
field: 'remarks',
label: '备注',
component: 'InputTextArea',
componentProps: {
rows: 6

Loading…
Cancel
Save