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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	apps/web-antd/src/views/infra/demo/demo01/index.vue
This commit is contained in:
YunaiV
2025-05-06 22:33:23 +08:00
parent 2fd6367983 3b8b328053
commit 361cfca312
102 changed files with 740 additions and 1021 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/web-antd/src/views/infra/apiErrorLog/index.vue
View File

@@ -5,11 +5,11 @@ import type {
} from '#/adapter/vxe-table';
import type { InfraApiErrorLogApi } from '#/api/infra/api-error-log';
import { Page, useVbenModal } from '@vben/common-ui';
import { confirm, Page, useVbenModal } from '@vben/common-ui';
import { Download } from '@vben/icons';
import { downloadFileFromBlobPart } from '@vben/utils';
import { Button, message, Modal } from 'ant-design-vue';
import { Button, message } from 'ant-design-vue';
import { useVbenVxeGrid } from '#/adapter/vxe-table';
import {
@@ -47,18 +47,13 @@ function onDetail(row: InfraApiErrorLogApi.ApiErrorLog) {
/** 处理已处理 / 已忽略的操作 */
async function onProcess(id: number, processStatus: number) {
Modal.confirm({
title: '确认操作',
confirm({
content: `确认标记为${InfraApiErrorLogProcessStatusEnum.DONE ? '已处理' : '已忽略'}?`,
onOk: async () => {
await updateApiErrorLogStatus(id, processStatus);
// 关闭并提示
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
onRefresh();
},
}).then(async () => {
await updateApiErrorLogStatus(id, processStatus);
// 关闭并提示
message.success($t('ui.actionMessage.operationSuccess'));
onRefresh();
});
}

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

@@ -74,10 +74,7 @@ const submitForm = async () => {
columns,
});
// 关闭并提示
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
close();
} catch (error) {
console.error('保存失败', error);

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

@@ -80,10 +80,7 @@ async function onDelete(row: InfraCodegenApi.CodegenTable) {
});
try {
await deleteCodegenTable(row.id);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.tableName]),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.deleteSuccess', [row.tableName]));
onRefresh();
} finally {
hideLoading();
@@ -99,10 +96,7 @@ async function onSync(row: InfraCodegenApi.CodegenTable) {
});
try {
await syncCodegenFromDB(row.id);
message.success({
content: $t('ui.actionMessage.updateSuccess', [row.tableName]),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.updateSuccess', [row.tableName]));
onRefresh();
} finally {
hideLoading();
@@ -125,10 +119,7 @@ async function onGenerate(row: InfraCodegenApi.CodegenTable) {
link.download = `codegen-${row.className}.zip`;
link.click();
window.URL.revokeObjectURL(url);
message.success({
content: '代码生成成功',
key: 'action_process_msg',
});
message.success('代码生成成功');
} finally {
hideLoading();
}

5
apps/web-antd/src/views/infra/codegen/modules/import-table.vue
View File

@@ -104,10 +104,7 @@ const [Modal, modalApi] = useVbenModal({
// 关闭并提示
await modalApi.close();
emit('success');
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
hideLoading();
modalApi.unlock();

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

@@ -53,10 +53,7 @@ async function onDelete(row: InfraConfigApi.Config) {
});
try {
await deleteConfig(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.name]),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
onRefresh();
} catch {
hideLoading();

5
apps/web-antd/src/views/infra/config/modules/form.vue
View File

@@ -48,10 +48,7 @@ const [Modal, modalApi] = useVbenModal({
// 关闭并提示
await modalApi.close();
emit('success');
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}

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

@@ -46,10 +46,7 @@ async function onDelete(row: InfraDataSourceConfigApi.DataSourceConfig) {
});
try {
await deleteDataSourceConfig(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.name]),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
await handleLoadData();
} catch {
hideLoading();

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

@@ -55,10 +55,7 @@ const [Modal, modalApi] = useVbenModal({
// 关闭并提示
await modalApi.close();
emit('success');
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}

304
apps/web-antd/src/views/infra/demo/demo01/index.vue
View File

@@ -1,86 +1,39 @@
<script lang="ts" setup>
import type { VxeTableInstance } from 'vxe-table';
import type {
OnActionClickParams,
VxeTableGridOptions,
} from '#/adapter/vxe-table';
import type { Demo01ContactApi } from '#/api/infra/demo/demo01';
import { h, nextTick, onMounted, reactive, ref } from 'vue';
import { h } from 'vue';
import { Page, useVbenModal } from '@vben/common-ui';
import { Download, Plus } from '@vben/icons';
import { cloneDeep, formatDateTime } from '@vben/utils';
import { downloadFileFromBlobPart } from '@vben/utils';
import {
Button,
Form,
Input,
message,
Pagination,
RangePicker,
Select,
} from 'ant-design-vue';
import { VxeColumn, VxeTable } from 'vxe-table';
import { Button, message } from 'ant-design-vue';
import { useVbenVxeGrid } from '#/adapter/vxe-table';
import {
deleteDemo01Contact,
exportDemo01Contact,
getDemo01ContactPage,
} from '#/api/infra/demo/demo01';
import { ContentWrap } from '#/components/content-wrap';
import { DictTag } from '#/components/dict-tag';
import { TableToolbar } from '#/components/table-toolbar';
import { $t } from '#/locales';
import { getRangePickerDefaultProps } from '#/utils/date';
import { DICT_TYPE, getDictOptions } from '#/utils/dict';
import { downloadByData } from '#/utils/download';
import Demo01ContactForm from './modules/form.vue';
const loading = ref(true); // 列表的加载中
const list = ref<Demo01ContactApi.Demo01Contact[]>([]); // 列表的数据
const total = ref(0); // 列表的总页数
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
name: undefined,
sex: undefined,
createTime: undefined,
});
const queryFormRef = ref(); // 搜索的表单
const exportLoading = ref(false); // 导出的加载中
/** 查询列表 */
const getList = async () => {
loading.value = true;
try {
const params = cloneDeep(queryParams) as any;
if (params.createTime && Array.isArray(params.createTime)) {
params.createTime = (params.createTime as string[]).join(',');
}
const data = await getDemo01ContactPage(params);
list.value = data.list;
total.value = data.total;
} finally {
loading.value = false;
}
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1;
getList();
};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields();
handleQuery();
};
import { useGridColumns, useGridFormSchema } from './data';
import Form from './modules/form.vue';
const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Demo01ContactForm,
connectedComponent: Form,
destroyOnClose: true,
});
/** 刷新表格 */
function onRefresh() {
gridApi.query();
}
/** 创建示例联系人 */
function onCreate() {
formModalApi.setData({}).open();
@@ -100,11 +53,8 @@ async function onDelete(row: Demo01ContactApi.Demo01Contact) {
});
try {
await deleteDemo01Contact(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.id]),
key: 'action_process_msg',
});
await getList();
message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
onRefresh();
} catch {
hideLoading();
}
@@ -112,166 +62,84 @@ async function onDelete(row: Demo01ContactApi.Demo01Contact) {
/** 导出表格 */
async function onExport() {
try {
exportLoading.value = true;
const data = await exportDemo01Contact(queryParams);
downloadByData(data, '示例联系人.xls');
} finally {
exportLoading.value = false;
const data = await exportDemo01Contact(await gridApi.formApi.getValues());
downloadFileFromBlobPart({ fileName: '示例联系人.xls', source: data });
}
/** 表格操作按钮的回调函数 */
function onActionClick({
code,
row,
}: OnActionClickParams<Demo01ContactApi.Demo01Contact>) {
switch (code) {
case 'delete': {
onDelete(row);
break;
}
case 'edit': {
onEdit(row);
break;
}
}
}
/** 隐藏搜索栏 */
const hiddenSearchBar = ref(false);
const tableToolbarRef = ref<InstanceType<typeof TableToolbar>>();
const tableRef = ref<VxeTableInstance>();
/** 初始化 */
onMounted(async () => {
await getList();
await nextTick();
// 挂载 toolbar 工具栏
const table = tableRef.value;
const tableToolbar = tableToolbarRef.value;
if (table && tableToolbar) {
await table.connect(tableToolbar.getToolbarRef()!);
}
const [Grid, gridApi] = useVbenVxeGrid({
formOptions: {
schema: useGridFormSchema(),
},
gridOptions: {
columns: useGridColumns(onActionClick),
height: 'auto',
pagerConfig: {
enabled: true,
},
proxyConfig: {
ajax: {
query: async ({ page }, formValues) => {
return await getDemo01ContactPage({
pageNo: page.currentPage,
pageSize: page.pageSize,
...formValues,
});
},
},
},
rowConfig: {
keyField: 'id',
isHover: true,
},
toolbarConfig: {
refresh: { code: 'query' },
search: true,
},
} as VxeTableGridOptions<Demo01ContactApi.Demo01Contact>,
});
</script>
<template>
<Page auto-content-height>
<FormModal @success="getList" />
<FormModal @success="onRefresh" />
<ContentWrap v-if="!hiddenSearchBar">
<!-- 搜索工作栏 -->
<Form :model="queryParams" ref="queryFormRef" layout="inline">
<Form.Item label="名字" name="name">
<Input
v-model:value="queryParams.name"
placeholder="请输入名字"
allow-clear
@press-enter="handleQuery"
class="w-full"
/>
</Form.Item>
<!-- TODO @puhui999：貌似性别的宽度不对；并且选择后，会变哈； -->
<Form.Item label="性别" name="sex">
<Select
v-model:value="queryParams.sex"
placeholder="请选择性别"
allow-clear
class="w-full"
>
<!-- TODO @puhui999：要不咱还是把 getIntDictOptions 还是搞出来？总归方便点~ -->
<Select.Option
v-for="dict in getDictOptions(
DICT_TYPE.SYSTEM_USER_SEX,
'number',
)"
:key="dict.value"
:value="dict.value"
>
{{ dict.label }}
</Select.Option>
</Select>
</Form.Item>
<Form.Item label="创建时间" name="createTime">
<RangePicker
v-model:value="queryParams.createTime"
v-bind="getRangePickerDefaultProps()"
class="w-full"
/>
</Form.Item>
<Form.Item>
<Button class="ml-2" @click="resetQuery"> 重置 </Button>
<Button class="ml-2" @click="handleQuery" type="primary">
搜索
</Button>
</Form.Item>
</Form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap title="示例联系人">
<!-- TODO @puhui999：暗黑模式下，会有个黑底 -->
<template #extra>
<TableToolbar
ref="tableToolbarRef"
v-model:hidden-search="hiddenSearchBar"
<Grid table-title="示例联系人列表">
<template #toolbar-tools>
<Button
:icon="h(Plus)"
type="primary"
@click="onCreate"
v-access:code="['infra:demo01-contact:create']"
>
<Button
class="ml-2"
:icon="h(Plus)"
type="primary"
@click="onCreate"
v-access:code="['infra:demo01-contact:create']"
>
{{ $t('ui.actionTitle.create', ['示例联系人']) }}
</Button>
<Button
:icon="h(Download)"
type="primary"
class="ml-2"
:loading="exportLoading"
@click="onExport"
v-access:code="['infra:demo01-contact:export']"
>
{{ $t('ui.actionTitle.export') }}
</Button>
</TableToolbar>
{{ $t('ui.actionTitle.create', ['示例联系人']) }}
</Button>
<Button
:icon="h(Download)"
type="primary"
class="ml-2"
@click="onExport"
v-access:code="['infra:demo01-contact:export']"
>
{{ $t('ui.actionTitle.export') }}
</Button>
</template>
<VxeTable ref="tableRef" :data="list" show-overflow :loading="loading">
<VxeColumn field="id" title="编号" align="center" />
<VxeColumn field="name" title="名字" align="center" />
<VxeColumn field="sex" title="性别" align="center">
<template #default="{ row }">
<DictTag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="row.sex" />
</template>
</VxeColumn>
<VxeColumn field="birthday" title="出生年" align="center">
<template #default="{ row }">
{{ formatDateTime(row.birthday) }}
</template>
</VxeColumn>
<VxeColumn field="description" title="简介" align="center" />
<VxeColumn field="avatar" title="头像" align="center" />
<VxeColumn field="createTime" title="创建时间" align="center">
<template #default="{ row }">
{{ formatDateTime(row.createTime) }}
</template>
</VxeColumn>
<VxeColumn field="operation" title="操作" align="center">
<template #default="{ row }">
<Button
size="small"
type="link"
@click="onEdit(row as any)"
v-access:code="['infra:demo01-contact:update']"
>
{{ $t('ui.actionTitle.edit') }}
</Button>
<Button
size="small"
type="link"
class="ml-2"
@click="onDelete(row as any)"
v-access:code="['infra:demo01-contact:delete']"
>
{{ $t('ui.actionTitle.delete') }}
</Button>
</template>
</VxeColumn>
</VxeTable>
<!-- 分页 -->
<div class="mt-2 flex justify-end">
<Pagination
:total="total"
v-model:current="queryParams.pageNo"
v-model:page-size="queryParams.pageSize"
show-size-changer
@change="getList"
/>
</div>
</ContentWrap>
</Grid>
</Page>
</template>

5
apps/web-antd/src/views/infra/demo/demo01/modules/form.vue
View File

@@ -75,10 +75,7 @@ const [Modal, modalApi] = useVbenModal({
// 关闭并提示
await modalApi.close();
emit('success');
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}

5
apps/web-antd/src/views/infra/demo/demo02/index.vue
View File

@@ -71,10 +71,7 @@ async function onDelete(row: Demo02CategoryApi.Demo02Category) {
});
try {
await deleteDemo02Category(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.id]),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
onRefresh();
} catch {
hideLoading();

5
apps/web-antd/src/views/infra/demo/demo02/modules/form.vue
View File

@@ -60,10 +60,7 @@ const [Modal, modalApi] = useVbenModal({
// 关闭并提示
await modalApi.close();
emit('success');
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}

5
apps/web-antd/src/views/infra/demo/demo03/erp/index.vue
View File

@@ -59,10 +59,7 @@ async function onDelete(row: Demo03StudentApi.Demo03Student) {
});
try {
await deleteDemo03Student(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.id]),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
onRefresh();
} catch {
hideLoading();

5
apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-course-form.vue
View File

@@ -56,10 +56,7 @@ const [Modal, modalApi] = useVbenModal({
// 关闭并提示
await modalApi.close();
emit('success');
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}

5
apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-course-list.vue
View File

@@ -57,10 +57,7 @@ async function onDelete(row: Demo03StudentApi.Demo03Course) {
});
try {
await deleteDemo03Course(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.id]),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
onRefresh();
} catch {
hideLoading();

5
apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-grade-form.vue
View File

@@ -56,10 +56,7 @@ const [Modal, modalApi] = useVbenModal({
// 关闭并提示
await modalApi.close();
emit('success');
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}

5
apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-grade-list.vue
View File

@@ -57,10 +57,7 @@ async function onDelete(row: Demo03StudentApi.Demo03Grade) {
});
try {
await deleteDemo03Grade(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.id]),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
onRefresh();
} catch {
hideLoading();

5
apps/web-antd/src/views/infra/demo/demo03/erp/modules/form.vue
View File

@@ -54,10 +54,7 @@ const [Modal, modalApi] = useVbenModal({
// 关闭并提示
await modalApi.close();
emit('success');
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}

5
apps/web-antd/src/views/infra/demo/demo03/inner/index.vue
View File

@@ -58,10 +58,7 @@ async function onDelete(row: Demo03StudentApi.Demo03Student) {
});
try {
await deleteDemo03Student(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.id]),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
onRefresh();
} catch {
hideLoading();

5
apps/web-antd/src/views/infra/demo/demo03/inner/modules/form.vue
View File

@@ -70,10 +70,7 @@ const [Modal, modalApi] = useVbenModal({
// 关闭并提示
await modalApi.close();
emit('success');
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}

5
apps/web-antd/src/views/infra/demo/demo03/normal/index.vue
View File

@@ -53,10 +53,7 @@ async function onDelete(row: Demo03StudentApi.Demo03Student) {
});
try {
await deleteDemo03Student(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.id]),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
onRefresh();
} catch {
hideLoading();

5
apps/web-antd/src/views/infra/demo/demo03/normal/modules/form.vue
View File

@@ -70,10 +70,7 @@ const [Modal, modalApi] = useVbenModal({
// 关闭并提示
await modalApi.close();
emit('success');
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}

16
apps/web-antd/src/views/infra/demo/general/demo01/index.vue
View File

@@ -7,7 +7,12 @@ import { h, nextTick, onMounted, reactive, ref } from 'vue';
import { Page, useVbenModal } from '@vben/common-ui';
import { Download, Plus } from '@vben/icons';
import { cloneDeep, formatDateTime } from '@vben/utils';
import {
cloneDeep,
downloadFileFromBlobPart,
formatDateTime,
getRangePickerDefaultProps,
} from '@vben/utils';
import {
Button,
@@ -29,9 +34,7 @@ import { ContentWrap } from '#/components/content-wrap';
import { DictTag } from '#/components/dict-tag';
import { TableToolbar } from '#/components/table-toolbar';
import { $t } from '#/locales';
import { getRangePickerDefaultProps } from '#/utils/date';
import { DICT_TYPE, getDictOptions } from '#/utils/dict';
import { downloadByData } from '#/utils/download';
import Demo01ContactForm from './modules/form.vue';
@@ -100,10 +103,7 @@ async function onDelete(row: Demo01ContactApi.Demo01Contact) {
});
try {
await deleteDemo01Contact(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.id]),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
await getList();
} catch {
hideLoading();
@@ -115,7 +115,7 @@ async function onExport() {
try {
exportLoading.value = true;
const data = await exportDemo01Contact(queryParams);
downloadByData(data, '示例联系人.xls');
downloadFileFromBlobPart({ fileName: '示例联系人.xls', source: data });
} finally {
exportLoading.value = false;
}

5
apps/web-antd/src/views/infra/demo/general/demo01/modules/form.vue
View File

@@ -75,10 +75,7 @@ const [Modal, modalApi] = useVbenModal({
// 关闭并提示
await modalApi.close();
emit('success');
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}

17
apps/web-antd/src/views/infra/demo/general/demo02/index.vue
View File

@@ -7,7 +7,13 @@ import { h, nextTick, onMounted, reactive, ref } from 'vue';
import { Page, useVbenModal } from '@vben/common-ui';
import { Download, Plus } from '@vben/icons';
import { cloneDeep, formatDateTime, isEmpty } from '@vben/utils';
import {
cloneDeep,
downloadFileFromBlobPart,
formatDateTime,
getRangePickerDefaultProps,
isEmpty,
} from '@vben/utils';
import { Button, Form, Input, message, RangePicker } from 'ant-design-vue';
import { VxeColumn, VxeTable } from 'vxe-table';
@@ -20,8 +26,6 @@ import {
import { ContentWrap } from '#/components/content-wrap';
import { TableToolbar } from '#/components/table-toolbar';
import { $t } from '#/locales';
import { getRangePickerDefaultProps } from '#/utils/date';
import { downloadByData } from '#/utils/download';
import Demo02CategoryForm from './modules/form.vue';
@@ -90,10 +94,7 @@ async function onDelete(row: Demo02CategoryApi.Demo02Category) {
});
try {
await deleteDemo02Category(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.id]),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
await getList();
} catch {
hideLoading();
@@ -105,7 +106,7 @@ async function onExport() {
try {
exportLoading.value = true;
const data = await exportDemo02Category(queryParams);
downloadByData(data, '示例分类.xls');
downloadFileFromBlobPart({ fileName: '示例分类.xls', source: data });
} finally {
exportLoading.value = false;
}

5
apps/web-antd/src/views/infra/demo/general/demo02/modules/form.vue
View File

@@ -71,10 +71,7 @@ const [Modal, modalApi] = useVbenModal({
// 关闭并提示
await modalApi.close();
emit('success');
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}

16
apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue
View File

@@ -7,7 +7,12 @@ import { h, nextTick, onMounted, reactive, ref } from 'vue';
import { Page, useVbenModal } from '@vben/common-ui';
import { Download, Plus } from '@vben/icons';
import { cloneDeep, formatDateTime } from '@vben/utils';
import {
cloneDeep,
downloadFileFromBlobPart,
formatDateTime,
getRangePickerDefaultProps,
} from '@vben/utils';
import {
Button,
@@ -31,9 +36,7 @@ import { ContentWrap } from '#/components/content-wrap';
import { DictTag } from '#/components/dict-tag';
import { TableToolbar } from '#/components/table-toolbar';
import { $t } from '#/locales';
import { getRangePickerDefaultProps } from '#/utils/date';
import { DICT_TYPE, getDictOptions } from '#/utils/dict';
import { downloadByData } from '#/utils/download';
import Demo03CourseList from './modules/demo03-course-list.vue';
import Demo03GradeList from './modules/demo03-grade-list.vue';
@@ -117,10 +120,7 @@ async function onDelete(row: Demo03StudentApi.Demo03Student) {
});
try {
await deleteDemo03Student(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.id]),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
await getList();
} catch {
hideLoading();
@@ -132,7 +132,7 @@ async function onExport() {
try {
exportLoading.value = true;
const data = await exportDemo03Student(queryParams);
downloadByData(data, '学生.xls');
downloadFileFromBlobPart({ fileName: '学生.xls', source: data });
} finally {
exportLoading.value = false;
}

5
apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-form.vue
View File

@@ -50,10 +50,7 @@ const [Modal, modalApi] = useVbenModal({
// 关闭并提示
await modalApi.close();
emit('success');
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}

12
apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue
View File

@@ -7,7 +7,11 @@ import { h, nextTick, onMounted, reactive, ref, watch } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { Plus } from '@vben/icons';
import { cloneDeep, formatDateTime } from '@vben/utils';
import {
cloneDeep,
formatDateTime,
getRangePickerDefaultProps,
} from '@vben/utils';
import {
Button,
@@ -26,7 +30,6 @@ import {
import { ContentWrap } from '#/components/content-wrap';
import { TableToolbar } from '#/components/table-toolbar';
import { $t } from '#/locales';
import { getRangePickerDefaultProps } from '#/utils/date';
import Demo03CourseForm from './demo03-course-form.vue';
@@ -62,10 +65,7 @@ async function onDelete(row: Demo03StudentApi.Demo03Course) {
});
try {
await deleteDemo03Course(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.id]),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
getList();
} catch {
hideLoading();

5
apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-form.vue
View File

@@ -50,10 +50,7 @@ const [Modal, modalApi] = useVbenModal({
// 关闭并提示
await modalApi.close();
emit('success');
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}

12
apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue
View File

@@ -7,7 +7,11 @@ import { h, nextTick, onMounted, reactive, ref, watch } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { Plus } from '@vben/icons';
import { cloneDeep, formatDateTime } from '@vben/utils';
import {
cloneDeep,
formatDateTime,
getRangePickerDefaultProps,
} from '@vben/utils';
import {
Button,
@@ -26,7 +30,6 @@ import {
import { ContentWrap } from '#/components/content-wrap';
import { TableToolbar } from '#/components/table-toolbar';
import { $t } from '#/locales';
import { getRangePickerDefaultProps } from '#/utils/date';
import Demo03GradeForm from './demo03-grade-form.vue';
@@ -62,10 +65,7 @@ async function onDelete(row: Demo03StudentApi.Demo03Grade) {
});
try {
await deleteDemo03Grade(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.id]),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
getList();
} catch {
hideLoading();

5
apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/form.vue
View File

@@ -72,10 +72,7 @@ const [Modal, modalApi] = useVbenModal({
// 关闭并提示
await modalApi.close();
emit('success');
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}

16
apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue
View File

@@ -7,7 +7,12 @@ import { h, nextTick, onMounted, reactive, ref } from 'vue';
import { Page, useVbenModal } from '@vben/common-ui';
import { Download, Plus } from '@vben/icons';
import { cloneDeep, formatDateTime } from '@vben/utils';
import {
cloneDeep,
downloadFileFromBlobPart,
formatDateTime,
getRangePickerDefaultProps,
} from '@vben/utils';
import {
Button,
@@ -31,9 +36,7 @@ import { ContentWrap } from '#/components/content-wrap';
import { DictTag } from '#/components/dict-tag';
import { TableToolbar } from '#/components/table-toolbar';
import { $t } from '#/locales';
import { getRangePickerDefaultProps } from '#/utils/date';
import { DICT_TYPE, getDictOptions } from '#/utils/dict';
import { downloadByData } from '#/utils/download';
import Demo03CourseList from './modules/demo03-course-list.vue';
import Demo03GradeList from './modules/demo03-grade-list.vue';
@@ -113,10 +116,7 @@ async function onDelete(row: Demo03StudentApi.Demo03Student) {
});
try {
await deleteDemo03Student(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.id]),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
await getList();
} catch {
hideLoading();
@@ -128,7 +128,7 @@ async function onExport() {
try {
exportLoading.value = true;
const data = await exportDemo03Student(queryParams);
downloadByData(data, '学生.xls');
downloadFileFromBlobPart({ fileName: '学生.xls', source: data });
} finally {
exportLoading.value = false;
}

10
apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/form.vue
View File

@@ -82,8 +82,9 @@ const [Modal, modalApi] = useVbenModal({
// 提交表单
const data = formData.value as Demo03StudentApi.Demo03Student;
// 拼接子表的数据
data.demo03Courses = demo03CourseFormRef.value?.getData();
data.demo03Grade = demo03GradeFormRef.value?.getValues();
data.demo03courses = demo03CourseFormRef.value?.getData();
data.demo03grade =
demo03GradeFormRef.value?.getValues() as Demo03StudentApi.Demo03Grade;
try {
await (formData.value?.id
? updateDemo03Student(data)
@@ -91,10 +92,7 @@ const [Modal, modalApi] = useVbenModal({
// 关闭并提示
await modalApi.close();
emit('success');
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}

16
apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue
View File

@@ -7,7 +7,12 @@ import { h, nextTick, onMounted, reactive, ref } from 'vue';
import { Page, useVbenModal } from '@vben/common-ui';
import { Download, Plus } from '@vben/icons';
import { cloneDeep, formatDateTime } from '@vben/utils';
import {
cloneDeep,
downloadFileFromBlobPart,
formatDateTime,
getRangePickerDefaultProps,
} from '@vben/utils';
import {
Button,
@@ -30,9 +35,7 @@ import { ContentWrap } from '#/components/content-wrap';
import { DictTag } from '#/components/dict-tag';
import { TableToolbar } from '#/components/table-toolbar';
import { $t } from '#/locales';
import { getRangePickerDefaultProps } from '#/utils/date';
import { DICT_TYPE, getDictOptions } from '#/utils/dict';
import { downloadByData } from '#/utils/download';
import Demo03StudentForm from './modules/form.vue';
@@ -107,10 +110,7 @@ async function onDelete(row: Demo03StudentApi.Demo03Student) {
});
try {
await deleteDemo03Student(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.id]),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
await getList();
} catch {
hideLoading();
@@ -122,7 +122,7 @@ async function onExport() {
try {
exportLoading.value = true;
const data = await exportDemo03Student(queryParams);
downloadByData(data, '学生.xls');
downloadFileFromBlobPart({ fileName: '学生.xls', source: data });
} finally {
exportLoading.value = false;
}

5
apps/web-antd/src/views/infra/demo/general/demo03/normal/modules/form.vue
View File

@@ -91,10 +91,7 @@ const [Modal, modalApi] = useVbenModal({
// 关闭并提示
await modalApi.close();
emit('success');
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}

10
apps/web-antd/src/views/infra/file/index.vue
View File

@@ -7,6 +7,7 @@ import type { InfraFileApi } from '#/api/infra/file';
import { Page, useVbenModal } from '@vben/common-ui';
import { Upload } from '@vben/icons';
import { openWindow } from '@vben/utils';
import { useClipboard } from '@vueuse/core';
import { Button, Image, message } from 'ant-design-vue';
@@ -52,7 +53,7 @@ async function onCopyUrl(row: InfraFileApi.File) {
/** 打开 URL */
function openUrl(url?: string) {
if (url) {
window.open(url, '_blank');
openWindow(url);
}
}
@@ -65,10 +66,9 @@ async function onDelete(row: InfraFileApi.File) {
});
try {
await deleteFile(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.name || row.path]),
key: 'action_process_msg',
});
message.success(
$t('ui.actionMessage.deleteSuccess', [row.name || row.path]),
);
onRefresh();
} catch {
hideLoading();

5
apps/web-antd/src/views/infra/file/modules/form.vue
View File

@@ -41,10 +41,7 @@ const [Modal, modalApi] = useVbenModal({
// 关闭并提示
await modalApi.close();
emit('success');
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}

24
apps/web-antd/src/views/infra/fileConfig/index.vue
View File

@@ -5,10 +5,11 @@ import type {
} from '#/adapter/vxe-table';
import type { InfraFileConfigApi } from '#/api/infra/file-config';
import { Page, useVbenModal } from '@vben/common-ui';
import { confirm, Page, useVbenModal } from '@vben/common-ui';
import { Plus } from '@vben/icons';
import { openWindow } from '@vben/utils';
import { Button, message, Modal } from 'ant-design-vue';
import { Button, message } from 'ant-design-vue';
import { useVbenVxeGrid } from '#/adapter/vxe-table';
import {
@@ -51,10 +52,7 @@ async function onMaster(row: InfraFileConfigApi.FileConfig) {
});
try {
await updateFileConfigMaster(row.id as number);
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
onRefresh();
} catch {
hideLoading();
@@ -72,14 +70,13 @@ async function onTest(row: InfraFileConfigApi.FileConfig) {
const response = await testFileConfig(row.id as number);
hideLoading();
// 确认是否访问该文件
Modal.confirm({
confirm({
title: '测试上传成功',
content: '是否要访问该文件？',
okText: '访问',
confirmText: '访问',
cancelText: '取消',
onOk: () => {
window.open(response, '_blank');
},
}).then(() => {
openWindow(response);
});
} catch {
hideLoading();
@@ -95,10 +92,7 @@ async function onDelete(row: InfraFileConfigApi.FileConfig) {
});
try {
await deleteFileConfig(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.name]),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
onRefresh();
} catch {
hideLoading();

5
apps/web-antd/src/views/infra/fileConfig/modules/form.vue
View File

@@ -54,10 +54,7 @@ const [Modal, modalApi] = useVbenModal({
// 关闭并提示
await modalApi.close();
emit('success');
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}

39
apps/web-antd/src/views/infra/job/index.vue
View File

@@ -7,11 +7,11 @@ import type { InfraJobApi } from '#/api/infra/job';
import { useRouter } from 'vue-router';
import { Page, useVbenModal } from '@vben/common-ui';
import { confirm, Page, useVbenModal } from '@vben/common-ui';
import { Download, History, Plus } from '@vben/icons';
import { downloadFileFromBlobPart } from '@vben/utils';
import { Button, message, Modal } from 'ant-design-vue';
import { Button, message } from 'ant-design-vue';
import { useVbenVxeGrid } from '#/adapter/vxe-table';
import {
@@ -74,32 +74,24 @@ async function onUpdateStatus(row: InfraJobApi.Job) {
? InfraJobStatusEnum.NORMAL
: InfraJobStatusEnum.STOP;
const statusText = status === InfraJobStatusEnum.NORMAL ? '启用' : '停用';
Modal.confirm({
title: '确认操作',
confirm({
content: `确定${statusText} ${row.name} 吗？`,
onOk: async () => {
await updateJobStatus(row.id as number, status);
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
onRefresh();
},
}).then(async () => {
await updateJobStatus(row.id as number, status);
// 提示成功
message.success($t('ui.actionMessage.operationSuccess'));
onRefresh();
});
}
/** 执行一次任务 */
async function onTrigger(row: InfraJobApi.Job) {
Modal.confirm({
title: '确认操作',
confirm({
content: `确定执行一次 ${row.name} 吗？`,
onOk: async () => {
await runJob(row.id as number);
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
},
}).then(async () => {
await runJob(row.id as number);
message.success($t('ui.actionMessage.operationSuccess'));
});
}
@@ -120,10 +112,7 @@ async function onDelete(row: InfraJobApi.Job) {
});
try {
await deleteJob(row.id as number);
message.success({
content: $t('ui.actionMessage.deleteSuccess', [row.name]),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
onRefresh();
} finally {
hideLoading();

5
apps/web-antd/src/views/infra/job/modules/form.vue
View File

@@ -48,10 +48,7 @@ const [Modal, modalApi] = useVbenModal({
// 关闭并提示
await modalApi.close();
emit('success');
message.success({
content: $t('ui.actionMessage.operationSuccess'),
key: 'action_process_msg',
});
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}