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

# Conflicts:
#	apps/web-antd/src/views/infra/demo/demo01/index.vue

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

@@ -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;
   }