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 
Resolved merge conflicts and integrated changes from remote branch.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
YunaiV
2025-10-15 21:18:29 +08:00
parent d9da7bd6fb 4052e3c8d2
commit 68192bfacc
78 changed files with 273 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/web-ele/src/components/upload/file-upload.vue
View File

@@ -5,6 +5,7 @@ import type {
UploadInstance,
UploadProps,
UploadRawFile,
UploadRequestOptions,
UploadUserFile,
} from 'element-plus';

4
apps/web-ele/src/views/infra/demo/general/demo03/normal/modules/demo03-course-form.vue
View File

@@ -24,7 +24,7 @@ const onAdd = async () => {
};
/** 删除学生课程 */
const onDelete = async (row: Demo03StudentApi.Demo03Course) => {
const handleDelete = async (row: Demo03StudentApi.Demo03Course) => {
await tableRef.value?.remove(row);
};
@@ -73,7 +73,7 @@ watch(
size="small"
type="danger"
link
@click="onDelete(row as any)"
@click="handleDelete(row as any)"
v-access:code="['infra:demo03-student:delete']"
>
{{ $t('ui.actionTitle.delete') }}

6
apps/web-ele/src/views/mall/product/spu/index.vue
View File

@@ -64,7 +64,7 @@ const tabsData = ref([
]);
/** 刷新表格 */
async function onRefresh() {
async function handleRefresh() {
await gridApi.query();
await getTabCount();
}
@@ -104,7 +104,7 @@ async function handleDelete(row: MallSpuApi.Spu) {
try {
await deleteSpu(row.id as number);
ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
await onRefresh();
await handleRefresh();
} finally {
loadingInstance.close();
}
@@ -120,7 +120,7 @@ async function handleStatus02Change(row: MallSpuApi.Spu, newStatus: number) {
await confirm(`确认要"${row.name}"${text}吗？`);
await updateStatus({ id: row.id as number, status: newStatus });
ElMessage.success(`${text}成功`);
await onRefresh();
await handleRefresh();
}
/** 更新状态 */

6
apps/web-ele/src/views/mall/promotion/article/category/index.vue
View File

@@ -22,7 +22,7 @@ const [FormModal, formModalApi] = useVbenModal({
});
/** 刷新表格 */
function onRefresh() {
function handleRefresh() {
gridApi.query();
}
@@ -44,7 +44,7 @@ async function handleDelete(row: MallArticleCategoryApi.ArticleCategory) {
try {
await deleteArticleCategory(row.id as number);
ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
onRefresh();
handleRefresh();
} finally {
loadingInstance.close();
}
@@ -82,7 +82,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
<template>
<Page auto-content-height>
<FormModal @success="onRefresh" />
<FormModal @success="handleRefresh" />
<Grid table-title="文章分类列表">
<template #toolbar-tools>
<TableAction

6
apps/web-ele/src/views/mall/promotion/article/index.vue
View File

@@ -19,7 +19,7 @@ const [FormModal, formModalApi] = useVbenModal({
});
/** 刷新表格 */
function onRefresh() {
function handleRefresh() {
gridApi.query();
}
@@ -41,7 +41,7 @@ async function handleDelete(row: MallArticleApi.Article) {
try {
await deleteArticle(row.id as number);
ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.title]));
onRefresh();
handleRefresh();
} finally {
loadingInstance.close();
}
@@ -79,7 +79,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
<template>
<Page auto-content-height>
<FormModal @success="onRefresh" />
<FormModal @success="handleRefresh" />
<Grid table-title="文章列表">
<template #toolbar-tools>
<TableAction

6
apps/web-ele/src/views/mall/promotion/banner/index.vue
View File

@@ -19,7 +19,7 @@ const [FormModal, formModalApi] = useVbenModal({
});
/** 刷新表格 */
function onRefresh() {
function handleRefresh() {
gridApi.query();
}
@@ -41,7 +41,7 @@ async function handleDelete(row: MallBannerApi.Banner) {
try {
await deleteBanner(row.id as number);
ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.title]));
onRefresh();
handleRefresh();
} finally {
loadingInstance.close();
}
@@ -79,7 +79,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
<template>
<Page auto-content-height>
<FormModal @success="onRefresh" />
<FormModal @success="handleRefresh" />
<Grid table-title="Banner列表">
<template #toolbar-tools>
<TableAction

8
apps/web-ele/src/views/mall/promotion/bargain/activity/index.vue
View File

@@ -25,7 +25,7 @@ const [FormModal, formModalApi] = useVbenModal({
});
/** 刷新表格 */
function onRefresh() {
function handleRefresh() {
gridApi.query();
}
@@ -44,7 +44,7 @@ async function handleClose(row: MallBargainActivityApi.BargainActivity) {
await confirm('确定关闭该砍价活动吗？');
await closeBargainActivity(row.id as number);
ElMessage.success('关闭成功');
onRefresh();
handleRefresh();
}
/** 删除砍价活动 */
@@ -55,7 +55,7 @@ async function handleDelete(row: MallBargainActivityApi.BargainActivity) {
try {
await deleteBargainActivity(row.id as number);
ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
onRefresh();
handleRefresh();
} finally {
loadingInstance.close();
}
@@ -101,7 +101,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
/>
</template>
<FormModal @success="onRefresh" />
<FormModal @success="handleRefresh" />
<Grid table-title="砍价活动列表">
<template #toolbar-tools>

8
apps/web-ele/src/views/mall/promotion/combination/activity/index.vue
View File

@@ -25,7 +25,7 @@ const [FormModal, formModalApi] = useVbenModal({
});
/** 刷新表格 */
function onRefresh() {
function handleRefresh() {
gridApi.query();
}
@@ -46,7 +46,7 @@ async function handleClose(
await confirm('确定关闭该拼团活动吗？');
await closeCombinationActivity(row.id as number);
ElMessage.success('关闭成功');
onRefresh();
handleRefresh();
}
/** 删除拼团活动 */
@@ -59,7 +59,7 @@ async function handleDelete(
try {
await deleteCombinationActivity(row.id as number);
ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
onRefresh();
handleRefresh();
} finally {
loadingInstance.close();
}
@@ -105,7 +105,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
/>
</template>
<FormModal @success="onRefresh" />
<FormModal @success="handleRefresh" />
<Grid table-title="拼团活动列表">
<template #toolbar-tools>

4
apps/web-ele/src/views/mall/promotion/coupon/index.vue
View File

@@ -30,14 +30,14 @@ async function handleDelete(row: MallCouponApi.Coupon) {
try {
await deleteCoupon(row.id as number);
ElMessage.success('回收成功');
onRefresh();
handleRefresh();
} finally {
loadingInstance.close();
}
}
/** 刷新表格 */
function onRefresh() {
function handleRefresh() {
gridApi.query();
}

6
apps/web-ele/src/views/mall/promotion/coupon/template/index.vue
View File

@@ -28,7 +28,7 @@ const [FormModal, formModalApi] = useVbenModal({
});
/** 刷新表格 */
function onRefresh() {
function handleRefresh() {
gridApi.query();
}
@@ -50,7 +50,7 @@ async function handleDelete(row: MallCouponTemplateApi.CouponTemplate) {
try {
await deleteCouponTemplate(row.id as number);
ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
onRefresh();
handleRefresh();
} finally {
loadingInstance.close();
}
@@ -129,7 +129,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
/>
</template>
<FormModal @success="onRefresh" />
<FormModal @success="handleRefresh" />
<Grid table-title="优惠券列表">
<template #toolbar-tools>
<TableAction

8
apps/web-ele/src/views/mall/promotion/discountActivity/index.vue
View File

@@ -25,7 +25,7 @@ const [FormModal, formModalApi] = useVbenModal({
});
/** 刷新表格 */
function onRefresh() {
function handleRefresh() {
gridApi.query();
}
@@ -44,7 +44,7 @@ async function handleClose(row: MallDiscountActivityApi.DiscountActivity) {
await confirm('确定关闭该限时折扣活动吗？');
await closeDiscountActivity(row.id as number);
ElMessage.success('关闭成功');
onRefresh();
handleRefresh();
}
/** 删除满减活动 */
@@ -55,7 +55,7 @@ async function handleDelete(row: MallDiscountActivityApi.DiscountActivity) {
try {
await deleteDiscountActivity(row.id as number);
ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
onRefresh();
handleRefresh();
} finally {
loadingInstance.close();
}
@@ -101,7 +101,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
/>
</template>
<FormModal @success="onRefresh" />
<FormModal @success="handleRefresh" />
<Grid table-title="限时折扣活动列表">
<template #toolbar-tools>

6
apps/web-ele/src/views/mall/promotion/diy/page/index.vue
View File

@@ -25,7 +25,7 @@ const [FormModal, formModalApi] = useVbenModal({
const { push } = useRouter();
/** 刷新表格 */
function onRefresh() {
function handleRefresh() {
gridApi.query();
}
@@ -53,7 +53,7 @@ async function handleDelete(row: MallDiyPageApi.DiyPage) {
try {
await deleteDiyPage(row.id as number);
ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
onRefresh();
handleRefresh();
} finally {
loadingInstance.close();
}
@@ -99,7 +99,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
/>
</template>
<FormModal @success="onRefresh" />
<FormModal @success="handleRefresh" />
<Grid table-title="装修页面列表">
<template #toolbar-tools>

8
apps/web-ele/src/views/mall/promotion/diy/template/index.vue
View File

@@ -29,7 +29,7 @@ const [FormModal, formModalApi] = useVbenModal({
const router = useRouter();
/** 刷新表格 */
function onRefresh() {
function handleRefresh() {
gridApi.query();
}
@@ -55,7 +55,7 @@ async function handleUse(row: MallDiyTemplateApi.DiyTemplate) {
// 发起删除
await useDiyTemplate(row.id as number);
ElMessage.success('使用成功');
onRefresh();
handleRefresh();
}
/** 删除DIY模板 */
@@ -66,7 +66,7 @@ async function handleDelete(row: MallDiyTemplateApi.DiyTemplate) {
try {
await deleteDiyTemplate(row.id as number);
ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
onRefresh();
handleRefresh();
} finally {
loadingInstance.close();
}
@@ -112,7 +112,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
/>
</template>
<FormModal @success="onRefresh" />
<FormModal @success="handleRefresh" />
<Grid table-title="装修模板列表">
<template #toolbar-tools>

8
apps/web-ele/src/views/mall/promotion/point/activity/index.vue
View File

@@ -33,7 +33,7 @@ const getRedeemedQuantity = computed(
);
/** 刷新表格 */
function onRefresh() {
function handleRefresh() {
gridApi.query();
}
@@ -52,7 +52,7 @@ async function handleClose(row: MallPointActivityApi.PointActivity) {
await confirm('确认关闭该积分商城活动吗？');
await closePointActivity(row.id);
ElMessage.success('关闭成功');
onRefresh();
handleRefresh();
}
/** 删除积分活动 */
@@ -62,7 +62,7 @@ async function handleDelete(row: MallPointActivityApi.PointActivity) {
});
try {
await deletePointActivity(row.id);
onRefresh();
handleRefresh();
} finally {
loadingInstance.close();
}
@@ -108,7 +108,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
/>
</template>
<FormModal @success="onRefresh" />
<FormModal @success="handleRefresh" />
<Grid table-title="积分商城活动列表">
<template #toolbar-tools>

8
apps/web-ele/src/views/mall/promotion/rewardActivity/index.vue
View File

@@ -25,7 +25,7 @@ const [FormModal, formModalApi] = useVbenModal({
});
/** 刷新表格 */
function onRefresh() {
function handleRefresh() {
gridApi.query();
}
@@ -44,7 +44,7 @@ async function handleClose(row: MallRewardActivityApi.RewardActivity) {
await confirm('确认关闭该满减送活动吗？');
await closeRewardActivity(row.id as number);
ElMessage.success('关闭成功');
onRefresh();
handleRefresh();
}
/** 删除活动 */
@@ -55,7 +55,7 @@ async function handleDelete(row: MallRewardActivityApi.RewardActivity) {
try {
await deleteRewardActivity(row.id as number);
ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
onRefresh();
handleRefresh();
} finally {
loadingInstance.close();
}
@@ -101,7 +101,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
/>
</template>
<FormModal @success="onRefresh" />
<FormModal @success="handleRefresh" />
<Grid table-title="满减送活动列表">
<template #toolbar-tools>

8
apps/web-ele/src/views/mall/promotion/seckill/activity/index.vue
View File

@@ -29,7 +29,7 @@ const [FormModal, formModalApi] = useVbenModal({
});
/** 刷新表格 */
function onRefresh() {
function handleRefresh() {
gridApi.query();
}
@@ -48,7 +48,7 @@ async function handleClose(row: MallSeckillActivityApi.SeckillActivity) {
await confirm('确认关闭该秒杀活动吗？');
await closeSeckillActivity(row.id as number);
ElMessage.success('关闭成功');
onRefresh();
handleRefresh();
}
/** 删除活动 */
@@ -59,7 +59,7 @@ async function handleDelete(row: MallSeckillActivityApi.SeckillActivity) {
try {
await deleteSeckillActivity(row.id as number);
ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
onRefresh();
handleRefresh();
} finally {
loadingInstance.close();
}
@@ -115,7 +115,7 @@ onMounted(async () => {
/>
</template>
<FormModal @success="onRefresh" />
<FormModal @success="handleRefresh" />
<Grid table-title="秒杀活动列表">
<template #toolbar-tools>
<TableAction

6
apps/web-ele/src/views/mall/promotion/seckill/config/index.vue
View File

@@ -23,7 +23,7 @@ const [FormModal, formModalApi] = useVbenModal({
});
/** 刷新表格 */
function onRefresh() {
function handleRefresh() {
gridApi.query();
}
@@ -45,7 +45,7 @@ async function handleDelete(row: MallSeckillConfigApi.SeckillConfig) {
try {
await deleteSeckillConfig(row.id as number);
ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
onRefresh();
handleRefresh();
} finally {
loadingInstance.close();
}
@@ -111,7 +111,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
<template>
<Page auto-content-height>
<FormModal @success="onRefresh" />
<FormModal @success="handleRefresh" />
<Grid table-title="秒杀时段列表">
<template #toolbar-tools>
<TableAction