aiotagro/admin-vben
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
xingyu4j
2025-09-23 14:52:15 +08:00
parent a143e0cee3 94c5c4c57e
commit b7bb7ecd5d
50 changed files with 185 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/web-antd/src/views/infra/codegen/data.ts
View File

@@ -366,8 +366,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
label: '表名称',
component: 'Input',
componentProps: {
placeholder: '请输入表名称',
allowClear: true,
placeholder: '请输入表名称',
},
},
{
@@ -375,8 +375,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
label: '表描述',
component: 'Input',
componentProps: {
placeholder: '请输入表描述',
allowClear: true,
placeholder: '请输入表描述',
},
},
{

4
apps/web-antd/src/views/infra/codegen/edit/index.vue
View File

@@ -154,8 +154,8 @@ getDetail();
</div>
<div class="mt-4 flex justify-end space-x-2">
<Button v-show="currentStep > 0" @click="prevStep">上一步</Button>
<Button v-show="currentStep < steps.length - 1" @click="nextStep">
<Button :disabled="currentStep === 0" @click="prevStep">上一步</Button>
<Button :disabled="currentStep === steps.length - 1" @click="nextStep">
下一步
</Button>
<Button type="primary" :loading="loading" @click="submitForm">

8
apps/web-antd/src/views/infra/config/index.vue
View File

@@ -27,7 +27,7 @@ const [FormModal, formModalApi] = useVbenModal({
});
/** 刷新表格 */
function onRefresh() {
function handleRefresh() {
gridApi.query();
}
@@ -56,7 +56,7 @@ async function handleDelete(row: InfraConfigApi.Config) {
try {
await deleteConfig(row.id as number);
message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
onRefresh();
handleRefresh();
} finally {
hideLoading();
}
@@ -73,7 +73,7 @@ async function handleDeleteBatch() {
await deleteConfigList(checkedIds.value);
checkedIds.value = [];
message.success($t('ui.actionMessage.deleteSuccess'));
onRefresh();
handleRefresh();
} finally {
hideLoading();
}
@@ -125,7 +125,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
<template>
<Page auto-content-height>
<FormModal @success="onRefresh" />
<FormModal @success="handleRefresh" />
<Grid table-title="参数列表">
<template #toolbar-tools>
<TableAction

7
apps/web-antd/src/views/infra/dataSourceConfig/data.ts
View File

@@ -55,26 +55,31 @@ export function useFormSchema(): VbenFormSchema[] {
/** 列表的字段 */
export function useGridColumns(): VxeTableGridOptions['columns'] {
return [
{ type: 'checkbox', width: 50 },
{ type: 'checkbox', width: 40 },
{
field: 'id',
title: '主键编号',
minWidth: 100,
},
{
field: 'name',
title: '数据源名称',
minWidth: 150,
},
{
field: 'url',
title: '数据源连接',
minWidth: 300,
},
{
field: 'username',
title: '用户名',
minWidth: 120,
},
{
field: 'createTime',
title: '创建时间',
minWidth: 180,
formatter: 'formatDateTime',
},
{

27
apps/web-antd/src/views/infra/dataSourceConfig/index.vue
View File

@@ -2,7 +2,7 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { InfraDataSourceConfigApi } from '#/api/infra/data-source-config';
import { onMounted, ref } from 'vue';
import { ref } from 'vue';
import { confirm, Page, useVbenModal } from '@vben/common-ui';
import { isEmpty } from '@vben/utils';
@@ -25,6 +25,11 @@ const [FormModal, formModalApi] = useVbenModal({
destroyOnClose: true,
});
/** 刷新表格 */
function handleRefresh() {
gridApi.query();
}
/** 创建数据源 */
function handleCreate() {
formModalApi.setData(null).open();
@@ -43,10 +48,8 @@ async function handleDelete(row: InfraDataSourceConfigApi.DataSourceConfig) {
});
try {
await deleteDataSourceConfig(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.name]),
});
await handleLoadData();
message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
handleRefresh();
} finally {
hideLoading();
}
@@ -63,7 +66,7 @@ async function handleDeleteBatch() {
await deleteDataSourceConfigList(checkedIds.value);
checkedIds.value = [];
message.success($t('ui.actionMessage.deleteSuccess'));
await handleLoadData();
handleRefresh();
} finally {
hideLoading();
}
@@ -101,21 +104,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
checkboxChange: handleRowCheckboxChange,
},
});
/** 加载数据 */
async function handleLoadData() {
await gridApi.query();
}
/** 初始化 */
onMounted(() => {
handleLoadData();
});
</script>
<template>
<Page auto-content-height>
<FormModal @success="handleLoadData" />
<FormModal @success="handleRefresh" />
<Grid table-title="数据源列表">
<template #toolbar-tools>
<TableAction

2
apps/web-antd/src/views/infra/dataSourceConfig/modules/form.vue
View File

@@ -83,7 +83,7 @@ const [Modal, modalApi] = useVbenModal({
</script>
<template>
<Modal class="w-2/5" :title="getTitle">
<Modal :title="getTitle">
<Form class="mx-4" />
</Modal>
</template>

2
apps/web-antd/src/views/system/dept/index.vue
View File

@@ -159,7 +159,7 @@ onMounted(async () => {
onClick: handleExpand,
},
{
label: '批量删除',
label: $t('ui.actionTitle.deleteBatch'),
type: 'primary',
danger: true,
icon: ACTION_ICON.DELETE,

4
apps/web-antd/src/views/system/dict/data.ts
View File

@@ -292,9 +292,7 @@ export function useDataGridFormSchema(): VbenFormSchema[] {
];
}
/**
* 字典数据表格列
*/
/** 字典数据表格列 */
export function useDataGridColumns(): VxeTableGridOptions['columns'] {
return [
{ type: 'checkbox', width: 40 },

5
apps/web-antd/src/views/system/dict/modules/type-grid.vue
View File

@@ -1,8 +1,5 @@
<script lang="ts" setup>
import type {
VxeGridListeners,
VxeTableGridOptions,
} from '#/adapter/vxe-table';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { SystemDictTypeApi } from '#/api/system/dict/type';
import { ref } from 'vue';

1
apps/web-antd/src/views/system/mail/account/index.vue
View File

@@ -44,6 +44,7 @@ function handleEdit(row: SystemMailAccountApi.MailAccount) {
async function handleDelete(row: SystemMailAccountApi.MailAccount) {
const hideLoading = message.loading({
content: $t('ui.actionMessage.deleting', [row.mail]),
duration: 0,
});
try {
await deleteMailAccount(row.id as number);

21
apps/web-antd/src/views/system/mail/template/data.ts
View File

@@ -119,28 +119,31 @@ export function useSendMailFormSchema(): VbenFormSchema[] {
{
fieldName: 'toMails',
label: '收件邮箱',
component: 'Textarea',
component: 'Select',
componentProps: {
placeholder: '请输入收件邮箱，每行一个邮箱地址',
rows: 3,
mode: 'tags',
allowClear: true,
placeholder: '请输入收件邮箱，按 Enter 添加',
},
},
{
fieldName: 'ccMails',
label: '抄送邮箱',
component: 'Textarea',
component: 'Select',
componentProps: {
placeholder: '请输入抄送邮箱，每行一个邮箱地址',
rows: 2,
mode: 'tags',
allowClear: true,
placeholder: '请输入抄送邮箱，按 Enter 添加',
},
},
{
fieldName: 'bccMails',
label: '密送邮箱',
component: 'Textarea',
component: 'Select',
componentProps: {
placeholder: '请输入密送邮箱，每行一个邮箱地址',
rows: 2,
mode: 'tags',
allowClear: true,
placeholder: '请输入密送邮箱，按 Enter 添加',
},
},
];

15
apps/web-antd/src/views/system/mail/template/modules/send-form.vue
View File

@@ -42,17 +42,10 @@ const [Modal, modalApi] = useVbenModal({
paramsObj[param] = values[`param_${param}`];
});
}
const parseEmails = (text: string): string[] => {
if (!text) return [];
return text
.split('\n')
.map((email) => email.trim())
.filter((email) => email.length > 0);
};
const data: SystemMailTemplateApi.MailSendReqVO = {
toMails: parseEmails(values.toMails || ''),
ccMails: parseEmails(values.ccMails || ''),
bccMails: parseEmails(values.bccMails || ''),
toMails: values.toMails,
ccMails: values.ccMails,
bccMails: values.bccMails,
templateCode: formData.value?.code || '',
templateParams: paramsObj,
};
@@ -64,8 +57,6 @@ const [Modal, modalApi] = useVbenModal({
await modalApi.close();
emit('success');
message.success('邮件发送成功');
} catch (error) {
console.error('发送邮件失败', error);
} finally {
modalApi.unlock();
}

2
apps/web-antd/src/views/system/notify/my/data.ts
View File

@@ -21,8 +21,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
component: 'Select',
componentProps: {
options: getDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING, 'boolean'),
placeholder: '请选择是否已读',
allowClear: true,
placeholder: '请选择是否已读',
},
},
{

2
apps/web-antd/src/views/system/sms/template/index.vue
View File

@@ -185,7 +185,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
{
label: '测试',
type: 'link',
icon: ACTION_ICON.ADD,
icon: ACTION_ICON.VIEW,
auth: ['system:sms-template:send-sms'],
onClick: handleSend.bind(null, row),
},

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

@@ -47,7 +47,7 @@ async function handleDelete(row: SystemSocialClientApi.SocialClient) {
duration: 0,
});
try {
await deleteSocialClient(row.id as number);
await deleteSocialClient(row.id!);
message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
handleRefresh();
} finally {

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

@@ -8,9 +8,8 @@ import { h } from 'vue';
import { DICT_TYPE } from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
import { getRangePickerDefaultProps } from '#/utils';
import { DictTag } from '#/components/dict-tag';
import { getRangePickerDefaultProps } from '#/utils';
/** 列表的搜索表单 */
export function useGridFormSchema(): VbenFormSchema[] {
@@ -126,9 +125,9 @@ export function useDetailSchema(): DescriptionItemSchema[] {
{
field: 'avatar',
label: '用户头像',
// TODO @芋艿：使用 antd 的 Image 组件
content: (data: SystemSocialUserApi.SocialUser) => {
if (data?.avatar) {
// TODO @芋艿：使用 antd 的 Image 组件
return h('img', {
src: data.avatar,
style: 'width: 30px; height: 30px; cursor: pointer;',