!208 fix: download query bug

Merge pull request !208 from puhui999/dev

apps/web-antd/src/api/basic/productunit/index.ts

@@ -53,5 +53,5 @@ export function deleteProductUnitListByIds(ids: number[]) {
 
 /** 导出产品单位 */
 export function exportProductUnit(params: any) {
-  return requestClient.download('/basic/product-unit/export-excel', params);
+  return requestClient.download('/basic/product-unit/export-excel', { params });
 }

apps/web-antd/src/api/bpm/processExpression/index.ts

@@ -49,5 +49,7 @@ export async function deleteProcessExpression(id: number) {
 
 /** 导出流程表达式 */
 export async function exportProcessExpression(params: any) {
-  return requestClient.download('/bpm/process-expression/export-excel', params);
+  return requestClient.download('/bpm/process-expression/export-excel', {
+    params,
+  });
 }

apps/web-antd/src/api/bpm/task/index.ts

@@ -133,5 +133,7 @@ export const getChildrenTaskList = async (id: string) => {
 
 // 撤回任务
 export const withdrawTask = async (taskId: string) => {
-  return await requestClient.put('/bpm/task/withdraw', null, { params: { taskId } });
+  return await requestClient.put('/bpm/task/withdraw', null, {
+    params: { taskId },
+  });
 };

apps/web-antd/src/api/crm/business/index.ts

@@ -108,7 +108,7 @@ export function deleteBusiness(id: number) {
 
 /** 导出商机 */
 export function exportBusiness(params: any) {
-  return requestClient.download('/crm/business/export-excel', params);
+  return requestClient.download('/crm/business/export-excel', { params });
 }
 
 /** 联系人关联商机列表 */

apps/web-antd/src/api/crm/clue/index.ts

@@ -67,7 +67,7 @@ export function deleteClue(id: number) {
 
 /** 导出线索 */
 export function exportClue(params: any) {
-  return requestClient.download('/crm/clue/export-excel', params);
+  return requestClient.download('/crm/clue/export-excel', { params });
 }
 
 /** 线索转移 */

apps/web-antd/src/api/crm/contact/index.ts

@@ -96,7 +96,7 @@ export function deleteContact(id: number) {
 
 /** 导出联系人 */
 export function exportContact(params: any) {
-  return requestClient.download('/crm/contact/export-excel', params);
+  return requestClient.download('/crm/contact/export-excel', { params });
 }
 
 /** 获得联系人列表（精简） */

apps/web-antd/src/api/crm/contract/index.ts

@@ -108,7 +108,7 @@ export function deleteContract(id: number) {
 
 /** 导出合同 */
 export function exportContract(params: any) {
-  return requestClient.download('/crm/contract/export-excel', params);
+  return requestClient.download('/crm/contract/export-excel', { params });
 }
 
 /** 提交审核 */

apps/web-antd/src/api/crm/customer/index.ts

@@ -74,7 +74,7 @@ export function deleteCustomer(id: number) {
 
 /** 导出客户 */
 export function exportCustomer(params: any) {
-  return requestClient.download('/crm/customer/export-excel', params);
+  return requestClient.download('/crm/customer/export-excel', { params });
 }
 
 /** 下载客户导入模板 */

apps/web-antd/src/api/crm/product/index.ts

@@ -53,5 +53,5 @@ export function deleteProduct(id: number) {
 
 /** 导出产品 */
 export function exportProduct(params: any) {
-  return requestClient.download('/crm/product/export-excel', params);
+  return requestClient.download('/crm/product/export-excel', { params });
 }

apps/web-antd/src/api/crm/receivable/index.ts

@@ -89,7 +89,7 @@ export function deleteReceivable(id: number) {
 
 /** 导出回款 */
 export function exportReceivable(params: any) {
-  return requestClient.download('/crm/receivable/export-excel', params);
+  return requestClient.download('/crm/receivable/export-excel', { params });
 }
 
 /** 提交审核 */

apps/web-antd/src/api/infra/demo/demo01/index.ts

@@ -55,5 +55,7 @@ export function deleteDemo01ContactList(ids: number[]) {
 
 /** 导出示例联系人 */
 export function exportDemo01Contact(params: any) {
-  return requestClient.download('/infra/demo01-contact/export-excel', params);
+  return requestClient.download('/infra/demo01-contact/export-excel', {
+    params,
+  });
 }

apps/web-antd/src/api/infra/demo/demo02/index.ts

@@ -42,5 +42,7 @@ export function deleteDemo02Category(id: number) {
 
 /** 导出示例分类 */
 export function exportDemo02Category(params: any) {
-  return requestClient.download('/infra/demo02-category/export-excel', params);
+  return requestClient.download('/infra/demo02-category/export-excel', {
+    params,
+  });
 }

apps/web-antd/src/api/system/user/index.ts

@@ -56,7 +56,7 @@ export function deleteUserList(ids: number[]) {
 
 /** 导出用户 */
 export function exportUser(params: any) {
-  return requestClient.download('/system/user/export-excel', params);
+  return requestClient.download('/system/user/export-excel', { params });
 }
 
 /** 下载用户导入模板 */

apps/web-antd/src/views/_core/profile/modules/profile-user.vue

@@ -115,7 +115,11 @@ async function handelUpload({
               所属岗位
             </div>
           </template>
-          {{ profile.posts && profile.posts.length > 0 ? profile.posts.map(post => post.name).join(',') : '-' }}
+          {{
+            profile.posts && profile.posts.length > 0
+              ? profile.posts.map((post) => post.name).join(',')
+              : '-'
+          }}
         </DescriptionsItem>
         <DescriptionsItem>
           <template #label>

apps/web-antd/src/views/bpm/processInstance/detail/index.vue

@@ -3,7 +3,6 @@ import type { BpmProcessInstanceApi } from '#/api/bpm/processInstance';
 import type { SystemUserApi } from '#/api/system/user';
 
 // TODO @jason：业务表单审批时，读取不到界面，参见 https://t.zsxq.com/eif2e
-
 import { nextTick, onMounted, ref, shallowRef, watch } from 'vue';
 
 import { Page } from '@vben/common-ui';

apps/web-antd/src/views/erp/stock/record/data.ts

@@ -143,4 +143,4 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       width: 100,
     },
   ];
-}
+}

apps/web-ele/src/api/basic/productunit/index.ts

@@ -55,5 +55,5 @@ export function deleteProductUnitListByIds(ids: number[]) {
 
 /** 导出产品单位 */
 export function exportProductUnit(params: any) {
-  return requestClient.download('/basic/product-unit/export-excel', params);
+  return requestClient.download('/basic/product-unit/export-excel', { params });
 }

apps/web-ele/src/api/bpm/processExpression/index.ts

@@ -49,5 +49,7 @@ export async function deleteProcessExpression(id: number) {
 
 /** 导出流程表达式 */
 export async function exportProcessExpression(params: any) {
-  return requestClient.download('/bpm/process-expression/export-excel', params);
+  return requestClient.download('/bpm/process-expression/export-excel', {
+    params,
+  });
 }

apps/web-ele/src/api/crm/business/index.ts

@@ -108,7 +108,7 @@ export function deleteBusiness(id: number) {
 
 /** 导出商机 */
 export function exportBusiness(params: any) {
-  return requestClient.download('/crm/business/export-excel', params);
+  return requestClient.download('/crm/business/export-excel', { params });
 }
 
 /** 联系人关联商机列表 */

apps/web-ele/src/api/crm/clue/index.ts

@@ -67,7 +67,7 @@ export function deleteClue(id: number) {
 
 /** 导出线索 */
 export function exportClue(params: any) {
-  return requestClient.download('/crm/clue/export-excel', params);
+  return requestClient.download('/crm/clue/export-excel', { params });
 }
 
 /** 线索转移 */

apps/web-ele/src/api/crm/contact/index.ts

@@ -96,7 +96,7 @@ export function deleteContact(id: number) {
 
 /** 导出联系人 */
 export function exportContact(params: any) {
-  return requestClient.download('/crm/contact/export-excel', params);
+  return requestClient.download('/crm/contact/export-excel', { params });
 }
 
 /** 获得联系人列表（精简） */

apps/web-ele/src/api/crm/contract/index.ts

@@ -108,7 +108,7 @@ export function deleteContract(id: number) {
 
 /** 导出合同 */
 export function exportContract(params: any) {
-  return requestClient.download('/crm/contract/export-excel', params);
+  return requestClient.download('/crm/contract/export-excel', { params });
 }
 
 /** 提交审核 */

apps/web-ele/src/api/crm/customer/index.ts

@@ -74,7 +74,7 @@ export function deleteCustomer(id: number) {
 
 /** 导出客户 */
 export function exportCustomer(params: any) {
-  return requestClient.download('/crm/customer/export-excel', params);
+  return requestClient.download('/crm/customer/export-excel', { params });
 }
 
 /** 下载客户导入模板 */

apps/web-ele/src/api/crm/product/index.ts

@@ -53,5 +53,5 @@ export function deleteProduct(id: number) {
 
 /** 导出产品 */
 export function exportProduct(params: any) {
-  return requestClient.download('/crm/product/export-excel', params);
+  return requestClient.download('/crm/product/export-excel', { params });
 }

apps/web-ele/src/api/crm/receivable/index.ts

@@ -89,7 +89,7 @@ export function deleteReceivable(id: number) {
 
 /** 导出回款 */
 export function exportReceivable(params: any) {
-  return requestClient.download('/crm/receivable/export-excel', params);
+  return requestClient.download('/crm/receivable/export-excel', { params });
 }
 
 /** 提交审核 */

apps/web-ele/src/api/infra/demo/demo01/index.ts

@@ -55,5 +55,7 @@ export function deleteDemo01ContactList(ids: number[]) {
 
 /** 导出示例联系人 */
 export function exportDemo01Contact(params: any) {
-  return requestClient.download('/infra/demo01-contact/export-excel', params);
+  return requestClient.download('/infra/demo01-contact/export-excel', {
+    params,
+  });
 }

apps/web-ele/src/api/infra/demo/demo02/index.ts

@@ -42,5 +42,7 @@ export function deleteDemo02Category(id: number) {
 
 /** 导出示例分类 */
 export function exportDemo02Category(params: any) {
-  return requestClient.download('/infra/demo02-category/export-excel', params);
+  return requestClient.download('/infra/demo02-category/export-excel', {
+    params,
+  });
 }

apps/web-ele/src/api/system/user/index.ts

@@ -56,7 +56,7 @@ export function deleteUserList(ids: number[]) {
 
 /** 导出用户 */
 export function exportUser(params: any) {
-  return requestClient.download('/system/user/export-excel', params);
+  return requestClient.download('/system/user/export-excel', { params });
 }
 
 /** 下载用户导入模板 */

apps/web-ele/src/components/upload/typing.ts

@@ -33,15 +33,15 @@ export function convertToUploadStatus(
   status: UploadResultStatus,
 ): UploadStatus {
   switch (status) {
-    case UploadResultStatus.SUCCESS: {
-      return 'success';
-    }
     case UploadResultStatus.ERROR: {
       return 'fail';
     }
     case UploadResultStatus.REMOVED: {
       return 'removed';
     }
+    case UploadResultStatus.SUCCESS: {
+      return 'success';
+    }
     case UploadResultStatus.UPLOADING: {
       return 'uploading';
     }

apps/web-ele/src/utils/bean.ts

@@ -8,7 +8,7 @@ export const copyValueToTarget = (target: any, source: any) => {
   // 删除多余属性
   Object.keys(newObj).forEach((key) => {
     // 如果不是target中的属性则删除
-    if (Object.keys(target).indexOf(key) === -1) {
+    if (!Object.keys(target).includes(key)) {
       delete newObj[key];
     }
   });

apps/web-ele/src/utils/index.ts

@@ -1,3 +1,4 @@
+export * from './bean';
 export * from './constants';
 export * from './dict';
 export * from './formatTime';
@@ -5,4 +6,3 @@ export * from './formCreate';
 export * from './rangePickerProps';
 export * from './routerHelper';
 export * from './validator';
-export * from './bean';

apps/web-ele/src/views/mall/promotion/diy/template/modules/decorate.vue

@@ -7,6 +7,7 @@ import { onMounted, reactive, ref, unref } from 'vue';
 import { useRouter } from 'vue-router';
 
 import { IconifyIcon } from '@vben/icons';
+import { useAccessStore } from '@vben/stores';
 import { isEmpty } from '@vben/utils';
 
 import { ElMessage } from 'element-plus';
@@ -16,7 +17,6 @@ import * as DiyPageApi from '#/api/mall/promotion/diy/page';
 import * as DiyTemplateApi from '#/api/mall/promotion/diy/template';
 import DiyEditor from '#/components/diy-editor/index.vue';
 import { PAGE_LIBS } from '#/components/diy-editor/util';
-import {useAccessStore} from '@vben/stores';
 
 /** 装修模板表单 */
 defineOptions({ name: 'DiyTemplateDecorate' });

apps/web-naive/src/api/infra/demo/demo01/index.ts

@@ -48,5 +48,7 @@ export function deleteDemo01Contact(id: number) {
 
 /** 导出示例联系人 */
 export function exportDemo01Contact(params: any) {
-  return requestClient.download('/infra/demo01-contact/export-excel', params);
+  return requestClient.download('/infra/demo01-contact/export-excel', {
+    params,
+  });
 }

apps/web-naive/src/api/infra/demo/demo02/index.ts

@@ -42,5 +42,7 @@ export function deleteDemo02Category(id: number) {
 
 /** 导出示例分类 */
 export function exportDemo02Category(params: any) {
-  return requestClient.download('/infra/demo02-category/export-excel', params);
+  return requestClient.download('/infra/demo02-category/export-excel', {
+    params,
+  });
 }

apps/web-naive/src/api/infra/demo/demo03/erp/index.ts

@@ -63,7 +63,9 @@ export function deleteDemo03Student(id: number) {
 
 /** 导出学生 */
 export function exportDemo03Student(params: any) {
-  return requestClient.download('/infra/demo03-student/export-excel', params);
+  return requestClient.download('/infra/demo03-student/export-excel', {
+    params,
+  });
 }
 
 // ==================== 子表（学生课程） ====================

apps/web-naive/src/api/infra/demo/demo03/inner/index.ts

@@ -63,7 +63,9 @@ export function deleteDemo03Student(id: number) {
 
 /** 导出学生 */
 export function exportDemo03Student(params: any) {
-  return requestClient.download('/infra/demo03-student/export-excel', params);
+  return requestClient.download('/infra/demo03-student/export-excel', {
+    params,
+  });
 }
 
 // ==================== 子表（学生课程） ====================

apps/web-naive/src/api/infra/demo/demo03/normal/index.ts

@@ -65,7 +65,9 @@ export function deleteDemo03Student(id: number) {
 
 /** 导出学生 */
 export function exportDemo03Student(params: any) {
-  return requestClient.download('/infra/demo03-student/export-excel', params);
+  return requestClient.download('/infra/demo03-student/export-excel', {
+    params,
+  });
 }
 
 // ==================== 子表（学生课程） ====================

apps/web-naive/src/api/system/user/index.ts

@@ -51,7 +51,7 @@ export function deleteUser(id: number) {
 
 /** 导出用户 */
 export function exportUser(params: any) {
-  return requestClient.download('/system/user/export', params);
+  return requestClient.download('/system/user/export', { params });
 }
 
 /** 下载用户导入模板 */