@ecolovo/uniapp-components 2.0.3 → 2.0.5

package/utils/date.js

@@ -4,24 +4,21 @@
  * @returns Date 对象
  */
 export function toDate(dateValue) {
-	if (dateValue instanceof Date) {
-		return new Date(dateValue);
-	}
-	if (typeof dateValue === 'number') {
-		return new Date(dateValue);
-	}
-	if (!dateValue) {
-		return null;
-	}
-	if (typeof dateValue !== 'string') {
-		throw new Error("dateValue's type is invalid");
-	}
-	// 兼容 iOS 日期格式
-	const result = new Date(dateValue.replace(/-/g, '/'));
-	if (isNaN(result.getTime())) {
-		throw new Error('dateValue cannot be parsed to Date object');
-	}
-	return result;
+    if (dateValue instanceof Date)
+        return new Date(dateValue);
+    if (typeof dateValue === 'number')
+        return new Date(dateValue);
+    if (!dateValue)
+        return null;
+    if (typeof dateValue !== 'string') {
+        throw new Error("dateValue's type is invalid");
+    }
+    // 兼容 iOS 日期格式
+    const result = new Date(dateValue.replace(/-/g, '/'));
+    if (isNaN(result.getTime())) {
+        throw new Error('dateValue cannot be parsed to Date object');
+    }
+    return result;
 }
 /**
  * 格式化日期
@@ -41,61 +38,58 @@ export function toDate(dateValue) {
  * @returns 格式化后的日期
  */
 export const formatDate = (date, format = formatDate.DATE_WITH_YEAR) => {
-	if (!date) {
-		return '';
-	}
-	const fullYear = date.getFullYear().toString();
-	const year = fullYear.substring(fullYear.length - 2);
-	const month = (date.getMonth() + 1).toString();
-	const day = date.getDate().toString();
-	const hour = date.getHours().toString();
-	const min = date.getMinutes().toString();
-	const sec = date.getSeconds().toString();
-	const ms = date.getMilliseconds().toString();
-	const week = date.getDay().toString();
-	let weekCN = '';
-	switch (week) {
-		case '0':
-			weekCN = '日';
-			break;
-		case '1':
-			weekCN = '一';
-			break;
-		case '2':
-			weekCN = '二';
-			break;
-		case '3':
-			weekCN = '三';
-			break;
-		case '4':
-			weekCN = '四';
-			break;
-		case '5':
-			weekCN = '五';
-			break;
-		case '6':
-			weekCN = '六';
-			break;
-	}
-	const replacement = [
-		{ reg: 'Y{3,4}', val: fullYear, pad: 0 },
-		{ reg: 'Y{1,2}', val: year, pad: 0 },
-		{ reg: 'M{1,2}', val: month, pad: 2 },
-		{ reg: 'D{1,2}', val: day, pad: 2 },
-		{ reg: 'H{1,2}', val: hour, pad: 2 },
-		{ reg: 'm{1,2}', val: min, pad: 2 },
-		{ reg: 's{1,2}', val: sec, pad: 2 },
-		{ reg: 'S{1,3}', val: ms, pad: 3 },
-		{ reg: 'w', val: week, pad: 0 },
-		{ reg: 'W', val: weekCN, pad: 0 },
-	];
-	for (let i = 0; i < replacement.length; i++) {
-		const r = replacement[i];
-		format = format.replace(new RegExp(r.reg, 'g'), (m) =>
-			r.pad > 0 ? r.val.padStart(Math.min(r.pad, m.length), '0') : r.val
-		);
-	}
-	return format;
+    if (!date)
+        return '';
+    const fullYear = date.getFullYear().toString();
+    const year = fullYear.substring(fullYear.length - 2);
+    const month = (date.getMonth() + 1).toString();
+    const day = date.getDate().toString();
+    const hour = date.getHours().toString();
+    const min = date.getMinutes().toString();
+    const sec = date.getSeconds().toString();
+    const ms = date.getMilliseconds().toString();
+    const week = date.getDay().toString();
+    let weekCN = '';
+    switch (week) {
+        case '0':
+            weekCN = '日';
+            break;
+        case '1':
+            weekCN = '一';
+            break;
+        case '2':
+            weekCN = '二';
+            break;
+        case '3':
+            weekCN = '三';
+            break;
+        case '4':
+            weekCN = '四';
+            break;
+        case '5':
+            weekCN = '五';
+            break;
+        case '6':
+            weekCN = '六';
+            break;
+    }
+    const replacement = [
+        { reg: 'Y{3,4}', val: fullYear, pad: 0 },
+        { reg: 'Y{1,2}', val: year, pad: 0 },
+        { reg: 'M{1,2}', val: month, pad: 2 },
+        { reg: 'D{1,2}', val: day, pad: 2 },
+        { reg: 'H{1,2}', val: hour, pad: 2 },
+        { reg: 'm{1,2}', val: min, pad: 2 },
+        { reg: 's{1,2}', val: sec, pad: 2 },
+        { reg: 'S{1,3}', val: ms, pad: 3 },
+        { reg: 'w', val: week, pad: 0 },
+        { reg: 'W', val: weekCN, pad: 0 },
+    ];
+    for (let i = 0; i < replacement.length; i++) {
+        const r = replacement[i];
+        format = format.replace(new RegExp(r.reg, 'g'), (m) => r.pad > 0 ? r.val.padStart(Math.min(r.pad, m.length), '0') : r.val);
+    }
+    return format;
 };
 /** 月日 */
 formatDate.DATE = 'MM-DD';
@@ -127,16 +121,14 @@ const TIMEZONE_OFFSET = new Date().getTimezoneOffset() * 60 * 1000;
  * @returns 毫秒数
  */
 function toDayTimestamp(date) {
-	if (typeof date === 'number') {
-		return date - TIMEZONE_OFFSET;
-	}
-	if (typeof date === 'string') {
-		return toDate(date).getTime() - TIMEZONE_OFFSET;
-	}
-	if (date instanceof Date) {
-		return date.getTime() - TIMEZONE_OFFSET;
-	}
-	return Date.now() - TIMEZONE_OFFSET;
+    if (typeof date === 'number')
+        return date - TIMEZONE_OFFSET;
+    if (typeof date === 'string') {
+        return toDate(date).getTime() - TIMEZONE_OFFSET;
+    }
+    if (date instanceof Date)
+        return date.getTime() - TIMEZONE_OFFSET;
+    return Date.now() - TIMEZONE_OFFSET;
 }
 /**
  * 获取两个时间的天数差
@@ -145,8 +137,6 @@ function toDayTimestamp(date) {
  * @returns 天数差，负数: day1 < day2
  */
 export function daysDiff(day1, day2) {
-	return (
-		Math.floor(toDayTimestamp(day1) / 8.64e7) -
-		Math.floor(toDayTimestamp(day2) / 8.64e7)
-	);
+    return (Math.floor(toDayTimestamp(day1) / 8.64e7) -
+        Math.floor(toDayTimestamp(day2) / 8.64e7));
 }

package/utils/freezeDeep.js

@@ -1,9 +1,9 @@
 export function freezeDeep(obj) {
-	if (!(typeof obj === 'object' && obj)) {
-		return obj;
-	}
-	for (const key in obj) {
-		freezeDeep(obj[key]);
-	}
-	return Object.freeze(obj);
+    if (!(typeof obj === 'object' && obj)) {
+        return obj;
+    }
+    for (const key in obj) {
+        freezeDeep(obj[key]);
+    }
+    return Object.freeze(obj);
 }

package/utils/price.d.ts

@@ -1,27 +1,24 @@
 interface FormatPriceOption {
-	/** 精度，默认为 2 */
-	precision: number;
-	/** 是否补齐小数部分 0 */
-	padDecimal: boolean;
+    /** 精度，默认为 2 */
+    precision: number;
+    /** 是否补齐小数部分 0 */
+    padDecimal: boolean;
 }
 interface FormatPriceResult {
-	/** 格式化的价格字符串 */
-	price: string;
-	/** 是否负值 */
-	negative: boolean;
-	/** 整数部分价格 */
-	integer: string;
-	/** 小数部分价格 */
-	decimal: string;
-	/** 价格对应数值 */
-	number: number;
+    /** 格式化的价格字符串 */
+    price: string;
+    /** 是否负值 */
+    negative: boolean;
+    /** 整数部分价格 */
+    integer: string;
+    /** 小数部分价格 */
+    decimal: string;
+    /** 价格对应数值 */
+    number: number;
 }
 /**
  * 格式化价格
  * @param price 价格
  */
-export declare function formatPrice(
-	price: number | string,
-	option?: FormatPriceOption
-): FormatPriceResult;
+export declare function formatPrice(price: number | string, option?: FormatPriceOption): FormatPriceResult;
 export {};

package/utils/price.js

@@ -3,41 +3,40 @@
  * @param price 价格
  */
 export function formatPrice(price, option) {
-	if (isNaN(Number(price))) {
-		return {
-			price: '',
-			negative: false,
-			integer: '',
-			decimal: '',
-			number: NaN,
-		};
-	}
-	price = Number(price);
-	let negative = false;
-	if (price < 0) {
-		negative = true;
-		price = -price;
-	}
-	const integer = Math.floor(price).toString();
-	const decimalNum =
-		Math.round(Number(price + 'e' + (option?.precision ?? 2))) % 100;
-	let decimal;
-	if (option?.padDecimal ?? true) {
-		decimal =
-			'.' + decimalNum.toString().padStart(option?.precision ?? 2, '0');
-	} else {
-		if (decimalNum === 0) {
-			decimal = '';
-		} else {
-			decimal = decimalNum.toString().slice(1);
-		}
-	}
-	const formattedPrice = `${negative ? '-' : ''}${integer}.${decimal}`;
-	return {
-		price: formattedPrice, // 价格字符串
-		negative,
-		integer, // 整数部分
-		decimal, // 小数部分
-		number: Number(formattedPrice),
-	};
+    if (isNaN(Number(price))) {
+        return {
+            price: '',
+            negative: false,
+            integer: '',
+            decimal: '',
+            number: NaN,
+        };
+    }
+    price = Number(price);
+    let negative = false;
+    if (price < 0) {
+        negative = true;
+        price = -price;
+    }
+    const integer = Math.floor(price).toString();
+    const decimalNum = Math.round(Number(price + 'e' + (option?.precision ?? 2))) % 100;
+    let decimal;
+    if (option?.padDecimal ?? true) {
+        decimal =
+            '.' + decimalNum.toString().padStart(option?.precision ?? 2, '0');
+    }
+    else {
+        if (decimalNum === 0)
+            decimal = '';
+        else
+            decimal = decimalNum.toString().slice(1);
+    }
+    const formattedPrice = `${negative ? '-' : ''}${integer}.${decimal}`;
+    return {
+        price: formattedPrice, // 价格字符串
+        negative,
+        integer, // 整数部分
+        decimal, // 小数部分
+        number: Number(formattedPrice),
+    };
 }

package/utils/upload.d.ts

@@ -0,0 +1 @@
+export declare const toUploadMediaFile: (files: (UniApp.UploadMediaFile | string)[]) => UniApp.UploadMediaFile[];

package/utils/upload.js

@@ -0,0 +1,8 @@
+export const toUploadMediaFile = (files) => {
+    return files.map((file) => typeof file === 'string'
+        ? { url: file, uploadStatus: 'success' }
+        : {
+            ...file,
+            uploadStatus: file.uploadStatus || 'success',
+        });
+};

package/utils/upload.ts

@@ -0,0 +1,12 @@
+export const toUploadMediaFile = (
+	files: (UniApp.UploadMediaFile | string)[]
+): UniApp.UploadMediaFile[] => {
+	return files.map((file) =>
+		typeof file === 'string'
+			? { url: file, uploadStatus: 'success' }
+			: {
+					...file,
+					uploadStatus: file.uploadStatus || 'success',
+			  }
+	);
+};

package/utils/windowInfo.d.ts

@@ -12,12 +12,4 @@ declare let navBarTopOffset: number;
 declare let navBarBottomOffset: number;
 /** 底部安全区域高度 */
 declare let safeAreaInsetBottom: number;
-export {
-	menuButton,
-	menuButtonWidthInCss,
-	windowInfo,
-	navBarHeight,
-	navBarTopOffset,
-	navBarBottomOffset,
-	safeAreaInsetBottom,
-};
+export { menuButton, menuButtonWidthInCss, windowInfo, navBarHeight, navBarTopOffset, navBarBottomOffset, safeAreaInsetBottom, };

package/utils/windowInfo.js

@@ -21,25 +21,18 @@ windowInfo = uni.getWindowInfo();
 // eslint-disable-next-line no-console
 console.log('windowInfo:', windowInfo);
 if (menuButton) {
-	if (navBarHeight < menuButton.height) {
-		navBarHeight = menuButton.height + 12;
-	}
-	navBarTopOffset = menuButton.top - (navBarHeight - menuButton.height) / 2;
-	menuButtonWidthInCss = 'calc(100vw - ' + menuButton.left + 'px)';
-} else {
-	navBarTopOffset = windowInfo.safeArea.top || windowInfo.statusBarHeight;
+    if (navBarHeight < menuButton.height) {
+        navBarHeight = menuButton.height + 12;
+    }
+    navBarTopOffset = menuButton.top - (navBarHeight - menuButton.height) / 2;
+    menuButtonWidthInCss = 'calc(100vw - ' + menuButton.left + 'px)';
+}
+else {
+    navBarTopOffset = windowInfo.safeArea.top || windowInfo.statusBarHeight;
 }
 navBarBottomOffset = navBarTopOffset + navBarHeight;
 const _safeAreaBottom = windowInfo.screenHeight - windowInfo.safeArea.bottom;
 if (_safeAreaBottom) {
-	safeAreaInsetBottom = _safeAreaBottom;
+    safeAreaInsetBottom = _safeAreaBottom;
 }
-export {
-	menuButton,
-	menuButtonWidthInCss,
-	windowInfo,
-	navBarHeight,
-	navBarTopOffset,
-	navBarBottomOffset,
-	safeAreaInsetBottom,
-};
+export { menuButton, menuButtonWidthInCss, windowInfo, navBarHeight, navBarTopOffset, navBarBottomOffset, safeAreaInsetBottom, };

package/utils/round.d.ts

@@ -1,2 +0,0 @@
-export declare function round(val: number, precision?: number): number;
-export declare function round2(val: number): number;

package/utils/round.js

@@ -1,13 +0,0 @@
-export function round(val, precision = 0) {
-	if (val.toString().indexOf('e') >= 0) {
-		const exponential = val.toString().split('e');
-		return (
-			Math.round(+`${exponential[0]}e${+exponential[1] + precision}`) /
-			10 ** precision
-		);
-	}
-	return Math.round(+`${val}e${precision}`) / 10 ** precision;
-}
-export function round2(val) {
-	return round(val, 2);
-}

package/utils/round.ts

@@ -1,14 +0,0 @@
-export function round(val: number, precision = 0): number {
-	if (val.toString().indexOf('e') >= 0) {
-		const exponential = val.toString().split('e');
-		return (
-			Math.round(+`${exponential[0]}e${+exponential[1]! + precision}`) /
-			10 ** precision
-		);
-	}
-	return Math.round(+`${val}e${precision}`) / 10 ** precision;
-}
-
-export function round2(val: number): number {
-	return round(val, 2);
-}