Browse Source

🚀 消息推送模块

master
wangxiang 2 years ago
parent
commit
4ff764d5d0
  1. 28
      src/views/common/push/pushTodoThirdParty/index.vue
  2. 58
      src/views/common/push/pushTodoUserManage/UserManageModal.vue
  3. 25
      src/views/common/push/pushTodoUserManage/index.vue
  4. 96
      src/views/common/push/pushTodoUserManage/userManage.data.ts
  5. 4
      src/views/common/push/pushUserManage/UserManageModal.vue
  6. 24
      src/views/common/push/pushUserManage/index.vue
  7. 96
      src/views/common/push/pushUserManage/userManage.data.ts
  8. 31
      src/views/system/user/index.vue

28
src/views/common/push/pushTodoThirdParty/index.vue vendored

@ -16,6 +16,11 @@
icon: 'fa6-regular:pen-to-square', icon: 'fa6-regular:pen-to-square',
onClick: handleEdit.bind(null, record) onClick: handleEdit.bind(null, record)
}, },
{
label: '推送申请',
icon: 'fa6-regular:pen-to-square',
onClick: handlePushAdd.bind(null, record)
},
{ {
label: '删除', label: '删除',
icon: 'ant-design:delete-outlined', icon: 'ant-design:delete-outlined',
@ -40,10 +45,15 @@
import { reactive, toRaw } from 'vue'; import { reactive, toRaw } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { listPushThirdParty, delPushThirdParty } from '/@/api/platform/common/controller/pushThirdParty'; import { listPushThirdParty, delPushThirdParty } from '/@/api/platform/common/controller/pushThirdParty';
import { addPushUserManage } from '/@/api/platform/common/controller/pushUserManage';
import { useModal } from '/@/components/Modal'; import { useModal } from '/@/components/Modal';
import ThirdPartyModal from './ThirdPartyModal.vue'; import ThirdPartyModal from './ThirdPartyModal.vue';
import { columns, searchFormSchema } from './thirdParty.data'; import { columns, searchFormSchema } from './thirdParty.data';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import {useUserStore} from '/@/store/modules/user';
const userStore = useUserStore();
const userInfoStore = userStore.getUserInfo;
/** 类型规范统一声明定义区域 */ /** 类型规范统一声明定义区域 */
interface TableState { interface TableState {
@ -107,6 +117,24 @@
openModal(true, { _tag: 'edit', record }); openModal(true, { _tag: 'edit', record });
} }
function handlePushAdd(record?: Recordable) {
createConfirm({
iconType: 'warning',
title: '警告',
content: `是否添加推送申请编号为${record?.userId}的数据?`,
onOk: async () => {
await addPushUserManage({
fromUserId: record?.userId,
toUserId: userInfoStore.id,
userName: record?.entName,
type: '1'
});
createMessage.success('申请成功!');
handleRefreshTable();
}
});
}
/** 删除按钮操作,行内删除 */ /** 删除按钮操作,行内删除 */
async function handleDel(record?: Recordable) { async function handleDel(record?: Recordable) {
const ids = record?.id || getSelectRowKeys(); const ids = record?.id || getSelectRowKeys();

58
src/views/common/push/pushTodoUserManage/UserManageModal.vue

@ -1,9 +1,14 @@
<template> <template>
<BasicModal v-bind="$attrs" <BasicModal v-bind="$attrs"
width="720px" width="720px"
:showCancelBtn="false"
okText="同意"
@register="registerModal" @register="registerModal"
@ok="handleSubmit" @ok="handleSubmit"
> >
<template #centerFooter>
<a-button danger type="primary" @click="handleReject">拒绝</a-button>
</template>
<BasicForm @register="registerForm"/> <BasicForm @register="registerForm"/>
</BasicModal> </BasicModal>
</template> </template>
@ -17,59 +22,46 @@
import { ref, unref } from 'vue'; import { ref, unref } from 'vue';
import { BasicForm, useForm } from '/@/components/Form/index'; import { BasicForm, useForm } from '/@/components/Form/index';
import { formSchema } from './userManage.data'; import { formSchema } from './userManage.data';
import { addPushUserManage, editPushUserManage, getPushUserManage } from '/@/api/platform/common/controller/pushUserManage'; import { editPushUserManage, getPushUserManage, delPushUserManage } from '/@/api/platform/common/controller/pushUserManage';
import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal'; import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
import {useMessage} from '/@/hooks/web/useMessage';
/** 通用变量统一声明区域 */ const { createMessage } = useMessage();
const tag = ref<Nullable<string>>('');
/** https://v3.cn.vuejs.org/api/options-data.html#emits */
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
const [registerForm, { resetFields, setFieldsValue, validate, clearValidate, updateSchema }] = useForm({ const [registerForm, { resetFields, setFieldsValue, validate, clearValidate, updateSchema, setProps }] = useForm({
labelWidth: 100, labelWidth: 100,
schemas: formSchema, schemas: formSchema,
showActionButtonGroup: false, showActionButtonGroup: false,
baseColProps: { span: 24 } baseColProps: { span: 24 }
}); });
const id = ref<string>('');
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data: WindowInnerData = { _tag: '' }) => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data: WindowInnerData = { _tag: '' }) => {
//
await resetFields(); await resetFields();
await clearValidate(); await clearValidate();
// id.value = data.record?.id;
tag.value = data._tag;
const refId = data.record?.id;
const props: Partial<ModalProps> = { confirmLoading: false }; const props: Partial<ModalProps> = { confirmLoading: false };
// tag props.title = '推送申请';
switch (unref(tag)) { await setFieldsValue(await getPushUserManage(id.value));
case 'add': await setProps({ disabled: true });
props.title = '新增用户推送';
break;
case 'edit':
props.title = '编辑用户推送';
await setFieldsValue(await getPushUserManage(refId));
break;
}
// :
setModalProps(props); setModalProps(props);
}); });
/** 处理弹出框提交 */ async function handleReject() {
await delPushUserManage(id.value);
closeModal();
createMessage.info('申请拒绝!');
emit('success');
}
async function handleSubmit() { async function handleSubmit() {
try { try {
//
const formData = await validate(); const formData = await validate();
// formData.status = '1';
setModalProps({ confirmLoading: true }); setModalProps({ confirmLoading: true });
// tag await editPushUserManage(formData);
switch (unref(tag)) {
case 'add':
await addPushUserManage(formData);
break;
case 'edit':
await editPushUserManage(formData);
break;
}
//
closeModal(); closeModal();
createMessage.success('申请通过!');
emit('success'); emit('success');
} finally { } finally {
setModalProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });

25
src/views/common/push/pushTodoUserManage/index.vue

@ -4,22 +4,15 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<template #toolbar> <template #toolbar>
<a-button type="primary"
@click="handleAdd()"
>新增用户推送</a-button>
<a-button type="primary"
:disabled="state.single"
@click="handleEdit()"
>修改用户推送</a-button>
<a-button type="primary" <a-button type="primary"
:disabled="state.multiple" :disabled="state.multiple"
@click="handleDel()" @click="handleDel()"
>删除用户推送</a-button> >拒绝</a-button>
</template> </template>
<template #action="{ record }"> <template #action="{ record }">
<TableAction :actions="[ <TableAction :actions="[
{ {
label: '编辑', label: '审核',
icon: 'fa6-regular:pen-to-square', icon: 'fa6-regular:pen-to-square',
onClick: handleEdit.bind(null, record) onClick: handleEdit.bind(null, record)
}, },
@ -51,6 +44,10 @@
import UserManageModal from './UserManageModal.vue'; import UserManageModal from './UserManageModal.vue';
import { columns, searchFormSchema } from './userManage.data'; import { columns, searchFormSchema } from './userManage.data';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import {useUserStore} from '/@/store/modules/user';
const userStore = useUserStore();
const userInfoStore = userStore.getUserInfo;
/** 类型规范统一声明定义区域 */ /** 类型规范统一声明定义区域 */
interface TableState { interface TableState {
@ -68,7 +65,7 @@
const { createConfirm, createMessage } = useMessage(); const { createConfirm, createMessage } = useMessage();
const [registerModal, { openModal }] = useModal(); const [registerModal, { openModal }] = useModal();
const [registerTable, { reload, clearSelectedRowKeys, getSelectRowKeys }] = useTable({ const [registerTable, { reload, clearSelectedRowKeys, getSelectRowKeys }] = useTable({
title: '用户推送列表', title: '推送列表',
api: listPushUserManage, api: listPushUserManage,
rowKey: 'id', rowKey: 'id',
columns, columns,
@ -90,6 +87,10 @@
slots: { customRender: 'action' }, slots: { customRender: 'action' },
fixed: false fixed: false
}, },
searchInfo: {
status: '0',
toUserId: userInfoStore.id
},
handleSearchInfoFn: () => clearSelectedRowKeys() handleSearchInfoFn: () => clearSelectedRowKeys()
}); });
@ -117,10 +118,10 @@
createConfirm({ createConfirm({
iconType: 'warning', iconType: 'warning',
title: '警告', title: '警告',
content: `是否确认删除编号为${ids}的数据?`, content: `是否确认拒绝编号为${ids}的数据?`,
onOk: async () => { onOk: async () => {
await delPushUserManage(ids); await delPushUserManage(ids);
createMessage.success('删除成功!'); createMessage.success('拒绝成功!');
handleRefreshTable(); handleRefreshTable();
} }
}); });

96
src/views/common/push/pushTodoUserManage/userManage.data.ts

@ -4,34 +4,30 @@ import { FormSchema } from '/@/components/Table';
/** 表格列配置 */ /** 表格列配置 */
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
title: '用户昵称', title: '称',
dataIndex: 'nickName' dataIndex: 'userName'
}, },
{ {
title: '性别', title: '是否播放声音',
dataIndex: 'sex', dataIndex: 'playSound',
customRender: ({record}) => { customRender: ({record}) => {
return ~~record?.isVibration === 0 ? '男' : '女'; return ~~record?.playSound === 0 ? '是' : '否';
} }
}, },
{ {
title: '是否震动', title: '是否震动',
dataIndex: 'isVibration', dataIndex: 'playVibrate',
customRender: ({record}) => { customRender: ({record}) => {
return ~~record?.isVibration === 0 ? '是' : '否'; return ~~record?.playVibrate === 0 ? '是' : '否';
} }
}, },
{ {
title: '是否响铃', title: '是否闪光',
dataIndex: 'isSound', dataIndex: 'playLights',
customRender: ({record}) => { customRender: ({record}) => {
return ~~record?.isSound === 0 ? '是' : '否'; return ~~record?.playLights === 0 ? '是' : '否';
} }
}, },
{
title: '自定义响铃',
dataIndex: 'customSound',
},
{ {
title: '创建人', title: '创建人',
dataIndex: 'createByName' dataIndex: 'createByName'
@ -46,11 +42,11 @@ export const columns: BasicColumn[] = [
/** 搜索表单配置 */ /** 搜索表单配置 */
export const searchFormSchema: FormSchema[] = [ export const searchFormSchema: FormSchema[] = [
{ {
field: 'nickName', field: 'userName',
label: '用户昵称', label: '称',
component: 'Input', component: 'Input',
componentProps: { componentProps: {
placeholder: '请输入用户昵称', placeholder: '请输入称',
}, },
colProps: { span: 6 } colProps: { span: 6 }
} }
@ -65,51 +61,47 @@ export const formSchema: FormSchema[] = [
show: false show: false
}, },
{ {
field: 'nickName', field: 'toUserId',
label: '用户昵称', label: '对方用户id',
component: 'Input', component: 'Input',
required: true, show: false
colProps: {
span: 12
}
}, },
{ {
field: 'sex', field: 'fromUserId',
label: '性别', label: '发送方用户id',
component: 'Select', component: 'Input',
required: true, show: false
componentProps: {
options: [
{ label: '男', value: '0' },
{ label: '女', value: '1' }
]
},
colProps: {
span: 12
}
}, },
{ {
field: 'userId', field: 'userName',
label: '用户ID', label: '名称',
component: 'Input', component: 'Input',
required: true, required: true,
colProps: { componentProps: {
span: 12 disabled: true
} },
}, },
{ {
field: 'pushTypeId', field: 'playSound',
label: '推送类型ID', label: '是否播放声音',
component: 'Input', component: 'RadioGroup',
required: true, required: true,
defaultValue: '0',
componentProps: {
options: [
{ label: '是', value: '0' },
{ label: '否', value: '1' }
]
},
colProps: { colProps: {
span: 12 span: 12
} }
}, },
{ {
field: 'isVibration', field: 'playVibrate',
label: '是否震动', label: '是否震动',
component: 'RadioGroup', component: 'RadioGroup',
required: true,
defaultValue: '0', defaultValue: '0',
componentProps: { componentProps: {
options: [ options: [
@ -122,9 +114,10 @@ export const formSchema: FormSchema[] = [
} }
}, },
{ {
field: 'isSound', field: 'playLights',
label: '是否响铃', label: '是否闪光',
component: 'RadioGroup', component: 'RadioGroup',
required: true,
defaultValue: '0', defaultValue: '0',
componentProps: { componentProps: {
options: [ options: [
@ -136,13 +129,4 @@ export const formSchema: FormSchema[] = [
span: 12 span: 12
} }
}, },
{
field: 'customSound',
label: '自定义响铃',
component: 'Input',
required: true,
colProps: {
span: 24
}
},
]; ];

4
src/views/common/push/pushUserManage/UserManageModal.vue

@ -41,10 +41,10 @@
// tag // tag
switch (unref(tag)) { switch (unref(tag)) {
case 'add': case 'add':
props.title = '新增用户推送'; props.title = '新增推送';
break; break;
case 'edit': case 'edit':
props.title = '编辑用户推送'; props.title = '编辑推送';
await setFieldsValue(await getPushUserManage(refId)); await setFieldsValue(await getPushUserManage(refId));
break; break;
} }

24
src/views/common/push/pushUserManage/index.vue

@ -4,17 +4,17 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<template #toolbar> <template #toolbar>
<a-button type="primary" <!--<a-button type="primary"
@click="handleAdd()" @click="handleAdd()"
>新增用户推送</a-button> >新增推送</a-button>-->
<a-button type="primary" <a-button type="primary"
:disabled="state.single" :disabled="state.single"
@click="handleEdit()" @click="handleEdit()"
>修改用户推送</a-button> >修改推送</a-button>
<a-button type="primary" <a-button type="primary"
:disabled="state.multiple" :disabled="state.multiple"
@click="handleDel()" @click="handleDel()"
>删除用户推送</a-button> >移除推送</a-button>
</template> </template>
<template #action="{ record }"> <template #action="{ record }">
<TableAction :actions="[ <TableAction :actions="[
@ -24,7 +24,7 @@
onClick: handleEdit.bind(null, record) onClick: handleEdit.bind(null, record)
}, },
{ {
label: '除', label: '除',
icon: 'ant-design:delete-outlined', icon: 'ant-design:delete-outlined',
color: 'error', color: 'error',
onClick: handleDel.bind(null, record) onClick: handleDel.bind(null, record)
@ -51,6 +51,10 @@
import UserManageModal from './UserManageModal.vue'; import UserManageModal from './UserManageModal.vue';
import { columns, searchFormSchema } from './userManage.data'; import { columns, searchFormSchema } from './userManage.data';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import {useUserStore} from '/@/store/modules/user';
const userStore = useUserStore();
const userInfoStore = userStore.getUserInfo;
/** 类型规范统一声明定义区域 */ /** 类型规范统一声明定义区域 */
interface TableState { interface TableState {
@ -68,7 +72,7 @@
const { createConfirm, createMessage } = useMessage(); const { createConfirm, createMessage } = useMessage();
const [registerModal, { openModal }] = useModal(); const [registerModal, { openModal }] = useModal();
const [registerTable, { reload, clearSelectedRowKeys, getSelectRowKeys }] = useTable({ const [registerTable, { reload, clearSelectedRowKeys, getSelectRowKeys }] = useTable({
title: '用户推送列表', title: '推送列表',
api: listPushUserManage, api: listPushUserManage,
rowKey: 'id', rowKey: 'id',
columns, columns,
@ -90,6 +94,10 @@
slots: { customRender: 'action' }, slots: { customRender: 'action' },
fixed: false fixed: false
}, },
searchInfo: {
status: '1',
fromUserId: userInfoStore.id
},
handleSearchInfoFn: () => clearSelectedRowKeys() handleSearchInfoFn: () => clearSelectedRowKeys()
}); });
@ -117,10 +125,10 @@
createConfirm({ createConfirm({
iconType: 'warning', iconType: 'warning',
title: '警告', title: '警告',
content: `是否确认除编号为${ids}的数据?`, content: `是否确认除编号为${ids}的数据?`,
onOk: async () => { onOk: async () => {
await delPushUserManage(ids); await delPushUserManage(ids);
createMessage.success('除成功!'); createMessage.success('除成功!');
handleRefreshTable(); handleRefreshTable();
} }
}); });

96
src/views/common/push/pushUserManage/userManage.data.ts

@ -4,34 +4,30 @@ import { FormSchema } from '/@/components/Table';
/** 表格列配置 */ /** 表格列配置 */
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
title: '用户昵称', title: '称',
dataIndex: 'nickName' dataIndex: 'userName'
}, },
{ {
title: '性别', title: '是否播放声音',
dataIndex: 'sex', dataIndex: 'playSound',
customRender: ({record}) => { customRender: ({record}) => {
return ~~record?.isVibration === 0 ? '男' : '女'; return ~~record?.playSound === 0 ? '是' : '否';
} }
}, },
{ {
title: '是否震动', title: '是否震动',
dataIndex: 'isVibration', dataIndex: 'playVibrate',
customRender: ({record}) => { customRender: ({record}) => {
return ~~record?.isVibration === 0 ? '是' : '否'; return ~~record?.playVibrate === 0 ? '是' : '否';
} }
}, },
{ {
title: '是否响铃', title: '是否闪光',
dataIndex: 'isSound', dataIndex: 'playLights',
customRender: ({record}) => { customRender: ({record}) => {
return ~~record?.isSound === 0 ? '是' : '否'; return ~~record?.playLights === 0 ? '是' : '否';
} }
}, },
{
title: '自定义响铃',
dataIndex: 'customSound',
},
{ {
title: '创建人', title: '创建人',
dataIndex: 'createByName' dataIndex: 'createByName'
@ -46,11 +42,11 @@ export const columns: BasicColumn[] = [
/** 搜索表单配置 */ /** 搜索表单配置 */
export const searchFormSchema: FormSchema[] = [ export const searchFormSchema: FormSchema[] = [
{ {
field: 'nickName', field: 'userName',
label: '用户昵称', label: '称',
component: 'Input', component: 'Input',
componentProps: { componentProps: {
placeholder: '请输入用户昵称', placeholder: '请输入称',
}, },
colProps: { span: 6 } colProps: { span: 6 }
} }
@ -65,51 +61,47 @@ export const formSchema: FormSchema[] = [
show: false show: false
}, },
{ {
field: 'nickName', field: 'toUserId',
label: '用户昵称', label: '对方用户id',
component: 'Input', component: 'Input',
required: true, show: false
colProps: {
span: 12
}
}, },
{ {
field: 'sex', field: 'fromUserId',
label: '性别', label: '发送方用户id',
component: 'Select', component: 'Input',
required: true, show: false
componentProps: {
options: [
{ label: '男', value: '0' },
{ label: '女', value: '1' }
]
},
colProps: {
span: 12
}
}, },
{ {
field: 'userId', field: 'userName',
label: '用户ID', label: '名称',
component: 'Input', component: 'Input',
required: true, required: true,
colProps: { componentProps: {
span: 12 disabled: true
} },
}, },
{ {
field: 'pushTypeId', field: 'playSound',
label: '推送类型ID', label: '是否播放声音',
component: 'Input', component: 'RadioGroup',
required: true, required: true,
defaultValue: '0',
componentProps: {
options: [
{ label: '是', value: '0' },
{ label: '否', value: '1' }
]
},
colProps: { colProps: {
span: 12 span: 12
} }
}, },
{ {
field: 'isVibration', field: 'playVibrate',
label: '是否震动', label: '是否震动',
component: 'RadioGroup', component: 'RadioGroup',
required: true,
defaultValue: '0', defaultValue: '0',
componentProps: { componentProps: {
options: [ options: [
@ -122,9 +114,10 @@ export const formSchema: FormSchema[] = [
} }
}, },
{ {
field: 'isSound', field: 'playLights',
label: '是否响铃', label: '是否闪光',
component: 'RadioGroup', component: 'RadioGroup',
required: true,
defaultValue: '0', defaultValue: '0',
componentProps: { componentProps: {
options: [ options: [
@ -136,13 +129,4 @@ export const formSchema: FormSchema[] = [
span: 12 span: 12
} }
}, },
{
field: 'customSound',
label: '自定义响铃',
component: 'Input',
required: true,
colProps: {
span: 24
}
},
]; ];

31
src/views/system/user/index.vue

@ -27,6 +27,11 @@
</template> </template>
<template #action="{ record }"> <template #action="{ record }">
<TableAction :actions="[ <TableAction :actions="[
{
label: '推送申请',
icon: 'fa6-regular:pen-to-square',
onClick: handlePushAdd.bind(null, record)
},
{ {
label: '重置密码', label: '重置密码',
icon: 'fa6-brands:battle-net', icon: 'fa6-brands:battle-net',
@ -72,6 +77,11 @@
import UserModal from './UserModal.vue'; import UserModal from './UserModal.vue';
import { columns, searchFormSchema } from './user.data'; import { columns, searchFormSchema } from './user.data';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import {addPushUserManage} from '/@/api/platform/common/controller/pushUserManage';
import {useUserStore} from '/@/store/modules/user';
const userStore = useUserStore();
const userInfoStore = userStore.getUserInfo;
/** 类型规范统一声明定义区域 */ /** 类型规范统一声明定义区域 */
interface TableState { interface TableState {
@ -126,7 +136,7 @@
showIndexColumn: false, showIndexColumn: false,
searchInfo: state.searchInfo, searchInfo: state.searchInfo,
actionColumn: { actionColumn: {
width: 220, width: 350,
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
slots: { customRender: 'action' }, slots: { customRender: 'action' },
@ -135,6 +145,24 @@
handleSearchInfoFn: () => clearSelectedRowKeys() handleSearchInfoFn: () => clearSelectedRowKeys()
}); });
function handlePushAdd(record?: Recordable) {
createConfirm({
iconType: 'warning',
title: '警告',
content: `是否添加推送申请编号为${record?.id}的数据?`,
onOk: async () => {
await addPushUserManage({
fromUserId: userInfoStore.id,
toUserId: record?.id,
userName: record?.nickName,
type: '0'
});
createMessage.success('申请成功!');
handleRefreshTable();
}
});
}
/** 处理多选框选中数据 */ /** 处理多选框选中数据 */
function handleSelectionChange(selection?: Recordable) { function handleSelectionChange(selection?: Recordable) {
const rowSelection = toRaw(selection?.keys) || []; const rowSelection = toRaw(selection?.keys) || [];
@ -188,6 +216,7 @@
} }
return { return {
handlePushAdd,
state, state,
registerTable, registerTable,
registerModal, registerModal,

Loading…
Cancel
Save