From 24e889adbe3c51a24dd6e2d59ac09641865b667b Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Mon, 25 Nov 2024 09:38:48 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E5=B7=A5=E5=85=B7function?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/api/helper.ts | 70 --------------------------- packages/utils/src/helpers/request.ts | 48 ------------------ 2 files changed, 118 deletions(-) diff --git a/apps/web-antd/src/api/helper.ts b/apps/web-antd/src/api/helper.ts index 00f2dcbb..88360d9f 100644 --- a/apps/web-antd/src/api/helper.ts +++ b/apps/web-antd/src/api/helper.ts @@ -1,75 +1,5 @@ -import { isObject, isString } from '@vben/utils'; - import { requestClient } from './request'; -const DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm:ss'; - -export function joinTimestamp( - join: boolean, - restful: T, -): T extends true ? string : object; - -export function joinTimestamp(join: boolean, restful = false): object | string { - if (!join) { - return restful ? '' : {}; - } - const now = Date.now(); - if (restful) { - return `?_t=${now}`; - } - return { _t: now }; -} - -/** - * @description: Format request parameter time - */ -export function formatRequestDate(params: Record) { - if (Object.prototype.toString.call(params) !== '[object Object]') { - return; - } - - for (const key in params) { - const format = params[key]?.format ?? null; - if (format && typeof format === 'function') { - params[key] = params[key].format(DATE_TIME_FORMAT); - } - if (isString(key)) { - const value = params[key]; - if (value) { - try { - params[key] = isString(value) ? value.trim() : value; - } catch (error: any) { - throw new Error(error); - } - } - } - if (isObject(params[key])) { - formatRequestDate(params[key]); - } - } -} - -/** - * Add the object as a parameter to the URL - * @param baseUrl url - * @param obj - * @returns {string} - * eg: - * let obj = {a: '3', b: '4'} - * setObjToUrlParams('www.baidu.com', obj) - * ==>www.baidu.com?a=3&b=4 - */ -export function setObjToUrlParams(baseUrl: string, obj: any): string { - let parameters = ''; - for (const key in obj) { - parameters += `${key}=${encodeURIComponent(obj[key])}&`; - } - parameters = parameters.replace(/&$/, ''); - return /\?$/.test(baseUrl) - ? baseUrl + parameters - : baseUrl.replace(/\/?$/, '?') + parameters; -} - /** * @description: contentType */ diff --git a/packages/utils/src/helpers/request.ts b/packages/utils/src/helpers/request.ts index c5e49342..b29e294a 100644 --- a/packages/utils/src/helpers/request.ts +++ b/packages/utils/src/helpers/request.ts @@ -1,54 +1,6 @@ /** * 一些发送请求 需要用到的工具 */ -import { isObject, isString } from '@vben-core/shared/utils'; - -const DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm:ss'; - -export function joinTimestamp( - join: boolean, - restful: T, -): T extends true ? string : object; - -export function joinTimestamp(join: boolean, restful = false): object | string { - if (!join) { - return restful ? '' : {}; - } - const now = Date.now(); - if (restful) { - return `?_t=${now}`; - } - return { _t: now }; -} - -/** - * @description: Format request parameter time - */ -export function formatRequestDate(params: Record) { - if (Object.prototype.toString.call(params) !== '[object Object]') { - return; - } - - for (const key in params) { - const format = params[key]?.format ?? null; - if (format && typeof format === 'function') { - params[key] = params[key].format(DATE_TIME_FORMAT); - } - if (isString(key)) { - const value = params[key]; - if (value) { - try { - params[key] = isString(value) ? value.trim() : value; - } catch (error: any) { - throw new Error(error); - } - } - } - if (isObject(params[key])) { - formatRequestDate(params[key]); - } - } -} /** * Add the object as a parameter to the URL