utils-uniapp 1.0.6 → 1.0.8

package/lib/fs/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const v=require("../index-e3f8a8ef.js"),I=require("../http/index.js");require("../object/index.js");const x=I.createDownloadFile(),u=uni.getFileSystemManager(),P=["ascii","base64","binary","hex","ucs2","ucs-2","utf16le","utf-16le","utf-8","utf8","latin1"];function A(){return`data:image/${arguments.length>0&&arguments[0]!==void 0?arguments[0]:"png"};base64,`}function y(r){let{filePath:n,encoding:t,sync:e,opts:i={}}=r;if(!P.includes(t))throw"编码不符合";if(e===!0)try{return u.readFileSync(n,t,i.position,i.length)}catch(a){return console.error(a),null}return new Promise(function(a,s){u.readFile({filePath:n,encoding:t,...i,success(o){a(o)},fail:s})})}y.sync=function(r){return y({...r,sync:!0})};function g(r){let{filePath:n,data:t,encoding:e,sync:i,opts:a}=r;if(e=e||"binary",!P.includes(e))throw"编码不符合";if(i===!0)try{return u.writeFileSync(n,t,e),{tempFilePath:n,unlink:()=>u.unlinkSync(n)}}catch(s){return console.error(s),null}return new Promise(function(s,o){u.writeFile({filePath:n,encoding:e,data:t,...a,success(f){if(f.errMsg!=="writeFile:ok")return o(new Error(f.errMsg));s({tempFilePath:n,unlink:()=>u.unlinkSync(n)})},fail:o})})}g.sync=function(r){return g({...r,sync:!0})};function M(r){let{arraybuffer:n,fileType:t,method:e,canvasId:i,width:a,height:s,ctx:o,sync:f}=r;if(typeof n!="object"||n.toString().slice(8,-1)!=="ArrayBuffer")return reject(new Error("ArrayBuffer must be a ArrayBuffer"));if(e=e||"canvas",t=t||"png",e==="fs"){const d=wx.env.USER_DATA_PATH+"/"+Date.now()+"."+t;return g({filePath:d,data:n,sync:f})}if(e==="canvas")return new Promise(function(d,l){if(!["canvas","fs"].includes(e))return l(new Error("method must be canvas | fs"));const F=`data:image/${t};base64,${uni.arrayBufferToBase64(n)}`;if(typeof i!="string")return l(new Error("canvasId must be a string [#id]"));const w=uni.createSelectorQuery();o&&w.in(o),w.select(i).fields({node:!0,size:!0}).exec(function(){var b=v._asyncToGenerator(function*(c){if(c=c[0],!c)return l(new Error("No canvas nodes were obtained"));a=a||c.width,s=s||c.height;const m=c.node;if(!m)return l(new Error("No canvas instances were obtained"));const p=m.getContext("2d"),h=m.createImage();yield new Promise(T=>{h.onload=T,h.src=F}).catch(l),p.clearRect(0,0,a,s),p.drawImage(h,0,0,a,s),uni.canvasToTempFilePath({canvas:m,width:a,height:s,fileType:t,success:d,fail:l})});return function(c){return b.apply(this,arguments)}}())})}const S=uni.canIUse("chooseMedia");function B(r){return r={count:1,...r},new Promise((n,t)=>{S?uni.chooseMedia({...r,mediaType:"image",sizeType:["original","compressed"],success(e){if(e.errMsg=="chooseMedia:ok"&&e.tempFiles[0]){const i=e.tempFiles.map(a=>a.tempFilePath);n(i)}else t(e.errMsg)},fail(e){t(e)}}):uni.chooseImage({count,success(e){n(e.tempFilePaths)},fail(e){t(e)}})})}function E(r){return new Promise((n,t)=>{x(r).then(e=>{uni.saveImageToPhotosAlbum({filePath:e.tempFilePath,success:i=>{uni.showToast({icon:"none",title:"保存成功"}),n(i)},fail:i=>{t(i)}})})})}exports.$fs=u;exports.chooseImg=B;exports.getArraybufferTempPath=M;exports.getImgBase64Prefix=A;exports.readFile=y;exports.saveImageToPhotosAlbum=E;exports.writeFile=g;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const v=require("../index-e3f8a8ef.js"),I=require("../http/index.js");require("../object/index.js");const x=I.createDownloadFile(),u=uni.getFileSystemManager(),P=["ascii","base64","binary","hex","ucs2","ucs-2","utf16le","utf-16le","utf-8","utf8","latin1"];function A(){return`data:image/${arguments.length>0&&arguments[0]!==void 0?arguments[0]:"png"};base64,`}function y(r){let{filePath:n,encoding:t,sync:e,opts:i={}}=r;if(!P.includes(t))throw"编码不符合";if(e===!0)try{return u.readFileSync(n,t,i.position,i.length)}catch(a){return console.error(a),null}return new Promise(function(a,s){u.readFile({filePath:n,encoding:t,...i,success(o){a(o)},fail:s})})}y.sync=function(r){return y({...r,sync:!0})};function g(r){let{filePath:n,data:t,encoding:e,sync:i,opts:a}=r;if(e=e||"binary",!P.includes(e))throw"编码不符合";if(i===!0)try{return u.writeFileSync(n,t,e),{tempFilePath:n,unlink:()=>u.unlinkSync(n)}}catch(s){return console.error(s),null}return new Promise(function(s,o){u.writeFile({filePath:n,encoding:e,data:t,...a,success(f){if(f.errMsg!=="writeFile:ok")return o(new Error(f.errMsg));s({tempFilePath:n,unlink:()=>u.unlinkSync(n)})},fail:o})})}g.sync=function(r){return g({...r,sync:!0})};function M(r){let{arraybuffer:n,fileType:t,method:e,canvasId:i,width:a,height:s,ctx:o,sync:f}=r;if(typeof n!="object"||n.toString().slice(8,-1)!=="ArrayBuffer")return reject(new Error("ArrayBuffer must be a ArrayBuffer"));if(e=e||"canvas",t=t||"png",e==="fs"){const d=wx.env.USER_DATA_PATH+"/"+Date.now()+"."+t;return g({filePath:d,data:n,sync:f})}if(e==="canvas")return new Promise(function(d,l){if(!["canvas","fs"].includes(e))return l(new Error("method must be canvas | fs"));const F=`data:image/${t};base64,${uni.arrayBufferToBase64(n)}`;if(typeof i!="string")return l(new Error("canvasId must be a string [#id]"));const w=uni.createSelectorQuery();o&&w.in(o),w.select(i).fields({node:!0,size:!0}).exec(function(){var b=v._asyncToGenerator(function*(c){if(c=c[0],!c)return l(new Error("No canvas nodes were obtained"));a=a||c.width,s=s||c.height;const m=c.node;if(!m)return l(new Error("No canvas instances were obtained"));const p=m.getContext("2d"),h=m.createImage();yield new Promise(T=>{h.onload=T,h.src=F}).catch(l),p.clearRect(0,0,a,s),p.drawImage(h,0,0,a,s),uni.canvasToTempFilePath({canvas:m,width:a,height:s,fileType:t,success:d,fail:l})});return function(c){return b.apply(this,arguments)}}())})}const S=uni.canIUse("chooseMedia");function B(r){return r={count:1,...r},new Promise((n,t)=>{S?uni.chooseMedia({...r,mediaType:"image",sizeType:["original","compressed"],success(e){if(e.errMsg=="chooseMedia:ok"&&e.tempFiles[0]){const i=e.tempFiles.map(a=>a.tempFilePath);n(i)}else t(e.errMsg)},fail(e){t(e)}}):uni.chooseImage({count:r.count,success(e){n(e.tempFilePaths)},fail(e){t(e)}})})}function E(r){return new Promise((n,t)=>{x(r).then(e=>{uni.saveImageToPhotosAlbum({filePath:e.tempFilePath,success:i=>{uni.showToast({icon:"none",title:"保存成功"}),n(i)},fail:i=>{t(i)}})})})}exports.$fs=u;exports.chooseImg=B;exports.getArraybufferTempPath=M;exports.getImgBase64Prefix=A;exports.readFile=y;exports.saveImageToPhotosAlbum=E;exports.writeFile=g;

package/lib/getLocation/index.d.ts

@@ -1,35 +1,176 @@
-/** 定位结果（uni.getLocation success） */
-export interface LocationResult {
-  latitude: number;
-  longitude: number;
-  accuracy: number;
-  altitude: number;
-  verticalAccuracy: number;
-  horizontalAccuracy: number;
-  errMsg: string;
-  [key: string]: any;
+// location.d.ts
+
+/**
+ * 定位参数（仅包含 uni.getLocation 支持的参数）
+ */
+export interface LocationParams {
+  /**
+   * 是否获取高度信息
+   * @default true
+   */
+  altitude?: boolean;
+  /**
+   * 坐标系类型
+   * @default 'gcj02'
+   */
+  type?: 'wgs84' | 'gcj02';
+  /**
+   * 超时时间（毫秒）
+   */
+  timeout?: number;
+  /**
+   * 是否启用高精度定位
+   */
+  isHighAccuracy?: boolean;
+  /**
+   * 高精度定位超时时间（毫秒）
+   */
+  highAccuracyExpireTime?: number;
 }
 
 /**
- * 获取当前定位（gcj02）
- * @param { boolean } check 定位失败时是否检查并跳转错误页，默认false
+ * 错误页面配置
  */
-export function getLocation(check?: boolean): Promise<LocationResult>;
+export interface ErrorPageConfig {
+  /**
+   * 错误页面路径
+   * @default '/packageOther/pages/errorPage/errorPage'
+   */
+  path?: string;
+  /**
+   * 错误提示信息
+   * @default '定位失败'
+   */
+  message?: string;
+  /**
+   * 错误类型
+   * @default 2
+   */
+  type?: number;
+  /**
+   * 是否启用错误页面跳转
+   * @default true
+   */
+  enabled?: boolean;
+}
 
-/** 打开地图查看位置参数 */
-export interface OpenLocationOptions {
-  /** 纬度 */
-  latitude: string | number;
-  /** 经度 */
-  longitude: string | number;
-  /** 位置名 */
-  name?: string;
-  /** 详细地址 */
+/**
+ * getLocation 函数配置选项
+ */
+export interface GetLocationOptions {
+  /**
+   * 是否启用错误处理（包括网络检测和错误页面跳转）
+   * @default false
+   */
+  check?: boolean;
+  /**
+   * 定位参数
+   */
+  locationParams?: LocationParams;
+  /**
+   * 错误页面配置
+   */
+  errorPage?: Partial<ErrorPageConfig>;
+  /**
+   * 定位失败回调（在错误页面跳转之前执行）
+   */
+  onLocationFail?: (err: { errMsg: string; code?: number }) => void;
+  /**
+   * 网络检测失败回调（仅在 check 为 true 时生效）
+   */
+  onNetworkFail?: (err: { errMsg: string; code?: number }) => void;
+}
+
+/**
+ * 定位结果
+ */
+export interface LocationResult {
+  /**
+   * 纬度
+   */
+  latitude: number;
+  /**
+   * 经度
+   */
+  longitude: number;
+  /**
+   * 高度（如果 altitude 为 true 且有高度信息）
+   */
+  altitude?: number;
+  /**
+   * 水平精度（米）
+   */
+  accuracy?: number;
+  /**
+   * 垂直精度（米）
+   */
+  verticalAccuracy?: number;
+  /**
+   * 水平精度（米，Android 特有）
+   */
+  horizontalAccuracy?: number;
+  /**
+   * 地址信息（部分平台支持）
+   */
   address?: string;
+  /**
+   * 地址信息（部分平台支持）
+   */
+  addr?: string;
 }
 
 /**
- * 使用微信内置地图查看位置（失败时toast错误信息）
- * @param { OpenLocationOptions } opts 位置参数
+ * 获取当前位置
+ * 
+ * @param options - 配置参数，可以是布尔值（兼容旧方式）或配置对象
+ * @param options.check - 是否启用错误处理
+ * @param options.locationParams - 定位参数（altitude, type等）
+ * @param options.errorPage - 错误页面配置
+ * @param options.onLocationFail - 定位失败回调
+ * @param options.onNetworkFail - 网络检测失败回调
+ * @returns Promise 返回定位结果
+ * 
+ * @example
+ * // 基本用法
+ * const location = await getLocation();
+ * console.log(location.latitude, location.longitude);
+ * 
+ * @example
+ * // 启用错误处理
+ * const location = await getLocation({
+ *   check: true,
+ *   locationParams: { altitude: false, type: 'wgs84' },
+ *   errorPage: { message: '请检查定位权限', type: 1 },
+ *   onLocationFail: (err) => console.warn('定位失败', err)
+ * });
+ * 
+ * @example
+ * // 兼容旧方式
+ * const location = await getLocation(true);
  */
-export function openLocation(opts: OpenLocationOptions): Promise<any>;
+export function getLocation(options?: boolean | GetLocationOptions): Promise<LocationResult>;
+
+/**
+ * 打开地图查看位置
+ * 
+ * @param params - 位置参数
+ * @param params.latitude - 纬度
+ * @param params.longitude - 经度
+ * @param params.name - 位置名称（可选）
+ * @param params.address - 详细地址（可选）
+ * @returns Promise 无返回值
+ * 
+ * @example
+ * await openLocation({
+ *   latitude: 39.90886,
+ *   longitude: 116.39739,
+ *   name: '天安门',
+ *   address: '北京市东城区'
+ * });
+ */
+export function openLocation(params: {
+  latitude: number | string;
+  longitude: number | string;
+  name?: string;
+  address?: string;
+}): Promise<void>;

package/lib/magic/index.d.ts

@@ -90,6 +90,31 @@ export type SearchParams = Record<string, string | string[]>;
  */
 export function getSearchParams(str: string): SearchParams;
 
+/**
+ * 生成随机标识串（时间戳与随机数拼接）
+ * @param { number } random 附加随机数，默认0
+ * @param { string } sign 连接符，默认'-'
+ */
+export function getRandom(random?: number, sign?: string): string;
+
+/**
+ * 字符串转帕斯卡命名（按'-'分段首字母大写）
+ * @param { string } str 目标字符串
+ */
+export function getPascalCase(str: string): string;
+
+/**
+ * 比较版本号
+ * @param { string } v1 版本一
+ * @param { string } v2 版本二
+ */
+export function compareVersion(v1: string, v2: string): 1 | -1 | 0;
+
+/**
+ * 生成随机十六进制颜色值（#开头6位）
+ */
+export function randomColor(): string;
+
 /**
  * 生成随机字符串
  * @param { number } len 长度，默认8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "utils-uniapp",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "aubyn's utils for uniapp",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",