smart-flow/yudao-ui-admin-vben
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vben into dev-dict

Browse Source 
Signed-off-by: xingyu <xingyu4j@vip.qq.com>
This commit is contained in:
xingyu
2025-09-05 04:28:43 +00:00
committed by Gitee
parent c288098e10 ffbaa89323
commit a303a93a6d
134 changed files with 280 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web-antd/src/views/system/dict/modules/data-form.vue
View File

@@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({
if (data && 'id' in data && data.id) {
modalApi.lock();
try {
formData.value = await getDictData(data.id as number);
formData.value = await getDictData(data.id);
// 设置到 values
if (formData.value) {
await formApi.setValues(formData.value);

2
apps/web-antd/src/views/system/dict/modules/type-form.vue
View File

@@ -69,7 +69,7 @@ const [Modal, modalApi] = useVbenModal({
}
modalApi.lock();
try {
formData.value = await getDictType(data.id as number);
formData.value = await getDictType(data.id);
// 设置到 values
if (formData.value) {
await formApi.setValues(formData.value);

2
apps/web-antd/src/views/system/menu/modules/form.vue
View File

@@ -66,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({
if (data.id) {
modalApi.lock();
try {
data = await getMenu(data.id as number);
data = await getMenu(data.id);
} finally {
modalApi.unlock();
}

5
apps/web-antd/src/views/system/notice/data.ts
View File

@@ -94,14 +94,17 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
{
field: 'id',
title: '公告编号',
minWidth: 100,
},
{
field: 'title',
title: '公告标题',
minWidth: 200,
},
{
field: 'type',
title: '公告类型',
minWidth: 100,
cellRender: {
name: 'CellDict',
props: { type: DICT_TYPE.SYSTEM_NOTICE_TYPE },
@@ -110,6 +113,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
{
field: 'status',
title: '公告状态',
minWidth: 100,
cellRender: {
name: 'CellDict',
props: { type: DICT_TYPE.COMMON_STATUS },
@@ -118,6 +122,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
{
field: 'createTime',
title: '创建时间',
minWidth: 180,
formatter: 'formatDateTime',
},
{

27
apps/web-antd/src/views/system/notice/index.vue
View File

@@ -4,7 +4,7 @@ import type { SystemNoticeApi } from '#/api/system/notice';
import { ref } from 'vue';
import { Page, useVbenModal } from '@vben/common-ui';
import { confirm, Page, useVbenModal } from '@vben/common-ui';
import { isEmpty } from '@vben/utils';
import { message } from 'ant-design-vue';
@@ -45,14 +45,11 @@ function handleEdit(row: SystemNoticeApi.Notice) {
async function handleDelete(row: SystemNoticeApi.Notice) {
const hideLoading = message.loading({
content: $t('ui.actionMessage.deleting', [row.title]),
key: 'action_key_msg',
duration: 0,
});
try {
await deleteNotice(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.title]),
key: 'action_key_msg',
});
message.success($t('ui.actionMessage.deleteSuccess', [row.title]));
onRefresh();
} finally {
hideLoading();
@@ -61,10 +58,10 @@ async function handleDelete(row: SystemNoticeApi.Notice) {
/** 批量删除公告 */
async function handleDeleteBatch() {
await confirm($t('ui.actionMessage.deleteBatchConfirm'));
const hideLoading = message.loading({
content: $t('ui.actionMessage.deleting'),
content: $t('ui.actionMessage.deletingBatch'),
duration: 0,
key: 'action_process_msg',
});
try {
await deleteNoticeList(checkedIds.value);
@@ -82,21 +79,17 @@ function handleRowCheckboxChange({
}: {
records: SystemNoticeApi.Notice[];
}) {
checkedIds.value = records.map((item) => item.id as number);
checkedIds.value = records.map((item) => item.id!);
}
/** 推送公告 */
async function handlePush(row: SystemNoticeApi.Notice) {
const hideLoading = message.loading({
content: '正在推送中',
key: 'action_process_msg',
content: '正在推送中...',
});
try {
await pushNotice(row.id as number);
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_key_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
hideLoading();
}
@@ -152,12 +145,12 @@ const [Grid, gridApi] = useVbenVxeGrid({
onClick: handleCreate,
},
{
label: '批量删除',
label: $t('ui.actionTitle.deleteBatch'),
type: 'primary',
danger: true,
disabled: isEmpty(checkedIds),
icon: ACTION_ICON.DELETE,
auth: ['system:notice:delete'],
disabled: isEmpty(checkedIds),
onClick: handleDeleteBatch,
},
]"

2
apps/web-antd/src/views/system/notice/modules/form.vue
View File

@@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
}
modalApi.lock();
try {
formData.value = await getNotice(data.id as number);
formData.value = await getNotice(data.id);
// 设置到 values
if (formData.value) {
await formApi.setValues(formData.value);

2
apps/web-antd/src/views/system/notify/template/modules/form.vue
View File

@@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
}
modalApi.lock();
try {
formData.value = await getNotifyTemplate(data.id as number);
formData.value = await getNotifyTemplate(data.id);
// 设置到 values
await formApi.setValues(formData.value);
} finally {

2
apps/web-antd/src/views/system/oauth2/client/modules/form.vue
View File

@@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
}
modalApi.lock();
try {
formData.value = await getOAuth2Client(data.id as number);
formData.value = await getOAuth2Client(data.id);
// 设置到 values
await formApi.setValues(formData.value);
} finally {

2
apps/web-antd/src/views/system/post/modules/form.vue
View File

@@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
}
modalApi.lock();
try {
formData.value = await getPost(data.id as number);
formData.value = await getPost(data.id);
// 设置到 values
await formApi.setValues(formData.value);
} finally {

2
apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue
View File

@@ -78,7 +78,7 @@ const [Modal, modalApi] = useVbenModal({
await loadDeptTree();
toggleExpandAll();
// 设置表单值, 一定要在加载树之后
await formApi.setValues(await getRole(data.id as number));
await formApi.setValues(await getRole(data.id));
} finally {
modalApi.unlock();
}

2
apps/web-antd/src/views/system/role/modules/assign-menu-form.vue
View File

@@ -75,7 +75,7 @@ const [Modal, modalApi] = useVbenModal({
modalApi.lock();
try {
// 加载角色菜单
const menuIds = await getRoleMenuList(data.id as number);
const menuIds = await getRoleMenuList(data.id);
await formApi.setFieldValue('menuIds', menuIds);
await formApi.setValues(data);

2
apps/web-antd/src/views/system/role/modules/form.vue
View File

@@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({
}
modalApi.lock();
try {
formData.value = await getRole(data.id as number);
formData.value = await getRole(data.id);
// 设置到 values
await formApi.setValues(formData.value);
} finally {

2
apps/web-antd/src/views/system/sms/channel/modules/form.vue
View File

@@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({
}
modalApi.lock();
try {
formData.value = await getSmsChannel(data.id as number);
formData.value = await getSmsChannel(data.id);
// 设置到 values
await formApi.setValues(formData.value);
} finally {

2
apps/web-antd/src/views/system/social/client/modules/form.vue
View File

@@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
}
modalApi.lock();
try {
formData.value = await getSocialClient(data.id as number);
formData.value = await getSocialClient(data.id);
// 设置到 values
await formApi.setValues(formData.value);
} finally {

2
apps/web-antd/src/views/system/tenant/modules/form.vue
View File

@@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({
}
modalApi.lock();
try {
formData.value = await getTenant(data.id as number);
formData.value = await getTenant(data.id);
// 将数组转换为换行符分隔的字符串
const formValues = {
...formData.value,

2
apps/web-antd/src/views/system/tenantPackage/modules/form.vue
View File

@@ -82,7 +82,7 @@ const [Modal, modalApi] = useVbenModal({
}
modalApi.lock();
try {
formData.value = await getTenantPackage(data.id as number);
formData.value = await getTenantPackage(data.id);
await formApi.setValues(data);
} finally {
modalApi.unlock();

2
apps/web-antd/src/views/system/user/modules/assign-role-form.vue
View File

@@ -58,7 +58,7 @@ const [Modal, modalApi] = useVbenModal({
}
modalApi.lock();
try {
const roleIds = await getUserRoleList(data.id as number);
const roleIds = await getUserRoleList(data.id);
// 设置到 values
await formApi.setValues({
...data,

2
apps/web-antd/src/views/system/user/modules/form.vue
View File

@@ -64,7 +64,7 @@ const [Modal, modalApi] = useVbenModal({
}
modalApi.lock();
try {
formData.value = await getUser(data.id as number);
formData.value = await getUser(data.id);
// 设置到 values
await formApi.setValues(formData.value);
} finally {