pengjunjie/JeecgBoot
1
0
Fork 1
mirror of https://github.com/jeecgboot/JeecgBoot.git synced 2026-01-03 20:35:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

3.7.1版本发布

Browse Source
This commit is contained in:
JEECG
2024-09-10 15:40:34 +08:00
parent 17c68f6d53
commit 13cb18b707
106 changed files with 2832 additions and 1721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jeecgboot-vue3/src/views/system/notice/DetailModal.vue
View File

@ -20,5 +20,8 @@
width: 100%;
height: 100%;
min-height: 500px;
// -update-begin--author:liaozhiyang---date:20240702---for：【TV360X-1685】通知公告查看出现两个滚动条
display: block;
// -update-end--author:liaozhiyang---date:20240702---for：【TV360X-1685】通知公告查看出现两个滚动条
}
</style>

7
jeecgboot-vue3/src/views/system/notice/NoticeModal.vue
View File

@ -41,13 +41,16 @@
let values = await validate();
setModalProps({ confirmLoading: true });
//提交表单
//update-begin-author:liusq---date:20230404--for: [issue#429]新增通知公告提交指定用户参数有undefined ---
//update-begin-author:liusq---date:20230404--for: [issue#429]新增通知公告提交指定用户参数有undefined ---
if(values.msgType==='ALL'){
values.userIds = '';
}else{
values.userIds += ',';
}
//update-end-author:liusq---date:20230404--for: [issue#429]新增通知公告提交指定用户参数有undefined ---
//update-end-author:liusq---date:20230404--for: [issue#429]新增通知公告提交指定用户参数有undefined ---
if (isUpdate.value) {
values.sendStatus = '0';
}
await saveOrUpdate(values, isUpdate.value);
//关闭弹窗
closeModal();

2
jeecgboot-vue3/src/views/system/notice/index.vue
View File

@ -129,7 +129,7 @@
{
label: '编辑',
onClick: handleEdit.bind(null, record),
ifShow: record.sendStatus == 0,
ifShow: record.sendStatus == 0 || record.sendStatus == '2',
},
];
}

20
jeecgboot-vue3/src/views/system/notice/notice.data.ts
View File

@ -95,6 +95,22 @@ export const formSchema: FormSchema[] = [
componentProps: {
placeholder: '请输入标题',
},
// update-begin--author:liaozhiyang---date:20240701---for：【TV360X-1632】标题过长保存报错，长度校验
dynamicRules() {
return [
{
validator: (_, value) => {
return new Promise<void>((resolve, reject) => {
if (value.length > 100) {
reject('最长100个字符');
}
resolve();
});
},
},
];
},
// update-end--author:liaozhiyang---date:20240701---for：【TV360X-1632】标题过长保存报错，长度校验
},
{
field: 'msgAbstract',
@ -132,7 +148,9 @@ export const formSchema: FormSchema[] = [
required: true,
componentProps: {
rowKey: 'id',
labelKey: 'username',
// update-begin--author:liaozhiyang---date:20240701---for：【TV360X-1627】通知公告用户选择组件没翻译
labelKey: 'realname',
// update-end--author:liaozhiyang---date:20240701---for：【TV360X-1627】通知公告用户选择组件没翻译
},
ifShow: ({ values }) => values.msgType == 'USER',
},