utils-uniapp 1.0.4 → 1.0.6

package/lib/getLocation/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("../index-e3f8a8ef.js");function g(){let n=arguments.length>0&&arguments[0]!==void 0?arguments[0]:!1;return new Promise((o,r)=>{uni.getLocation({altitude:!0,type:"gcj02",success:o,fail:function(i){n&&uni.getNetworkType({success:function(u){if(u.networkType!="none"){const e=getCurrentPages(),t=e[e.length-1];if(t.route.indexOf("errorPage")!=-1)return;uni.redirectTo({url:"/packageOther/pages/errorPage/errorPage"+c.getSearchStr({url:t.$page.fullPath,message:"定位失败",type:2})})}}}),r(i)}})})}function s(n){let{latitude:o,longitude:r,name:i="",address:u=""}=n;return new Promise((e,t)=>{uni.openLocation({latitude:Number(o),longitude:Number(r),name:i,address:u,success:e,fail:function(a){uni.showToast({icon:"none",title:a.errMsg}),t(a)}})})}exports.getLocation=g;exports.openLocation=s;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const h=require("../index-e3f8a8ef.js"),g="/packageOther/pages/errorPage/errorPage",m={altitude:!0,type:"gcj02"},d={check:!1,errorPage:{path:g,message:"定位失败",type:2,enabled:!0}};function a(e,n){try{return e()}catch(o){console.warn(n||"执行失败",o);return}}function w(){let e=arguments.length>0&&arguments[0]!==void 0?arguments[0]:!1;const n=k(e);return new Promise((o,r)=>{const{success:l,fail:i,...t}=n.locationParams||{},c={...m,...t,success:o,fail:u=>{N(u,n,r)}};uni.getLocation(c)})}function k(e){return typeof e=="boolean"?{check:e,locationParams:{},errorPage:{...d.errorPage},onLocationFail:null,onNetworkFail:null}:e&&typeof e=="object"&&!Array.isArray(e)?{check:e.check!==!1,locationParams:e.locationParams||{},errorPage:{...d.errorPage,...e.errorPage||{}},onLocationFail:e.onLocationFail||null,onNetworkFail:e.onNetworkFail||null}:{check:d.check,locationParams:{},errorPage:{...d.errorPage},onLocationFail:null,onNetworkFail:null}}function N(e,n,o){a(()=>{var r;return(r=n.onLocationFail)===null||r===void 0?void 0:r.call(n,e)},"onLocationFail 回调执行失败"),n.check&&F(n),o(e)}function F(e){uni.getNetworkType({success:n=>{n.networkType==="none"?f(e,new Error("无网络连接")):P(e.errorPage)},fail:n=>{console.warn("网络检测失败",n),f(e,n),P(e.errorPage)}})}function f(e,n){if(typeof e.onNetworkFail=="function")a(()=>e.onNetworkFail(n),"onNetworkFail 回调执行失败");else{const o=(n==null?void 0:n.errMsg)||(n==null?void 0:n.message)||"网络连接异常";a(()=>{uni.showToast({title:o,icon:"none"})},"显示提示失败")}}function P(e){if((e==null?void 0:e.enabled)===!1)return;const n=v();if(!n){console.warn("无法获取当前页面");return}if(L(n))return;const o=y(n,e);a(()=>{uni.redirectTo({url:o})},"跳转错误页面失败")}function v(){try{const e=getCurrentPages();return e&&e.length>0?e[e.length-1]:null}catch(e){return console.warn("获取当前页面失败",e),null}}function L(e){const n=(e==null?void 0:e.route)||"",o=g.replace("/","");return n===o||n.startsWith(o+"/")}function y(e,n){var o;const{path:r,message:l,type:i}=n||{},t={url:(e==null||(o=e.$page)===null||o===void 0?void 0:o.fullPath)||"",message:l||"定位失败",type:i||2};return`${r||g}${h.getSearchStr(t)}`}function E(e){let{latitude:n,longitude:o,name:r="",address:l=""}=e;return new Promise((i,t)=>{const c=Number(n),u=Number(o);if(isNaN(c)||isNaN(u)){const s=new Error("经纬度参数无效");a(()=>{uni.showToast({icon:"none",title:"位置信息不完整"})}),t(s);return}uni.openLocation({latitude:c,longitude:u,name:r||"",address:l||"",success:i,fail:s=>{a(()=>{uni.showToast({icon:"none",title:s.errMsg||"打开地图失败"})}),t(s)}})})}exports.getLocation=w;exports.openLocation=E;

package/lib/http/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const y=require("../index-e3f8a8ef.js"),A=require("../object/index.js"),C=Object.freeze({JSON:"application/json;charset=UTF-8",TEXT:"text/plain;charset=UTF-8",FORM_URLENCODED:"application/x-www-form-urlencoded;charset=UTF-8",FORM_DATA:"multipart/form-data;charset=UTF-8"}),T={caches:Object.create(null),add(e,t){this.caches[e]=t},delete(e){Reflect.deleteProperty(this.caches,e)},_cancel(e){const t=this.caches[e];typeof(t==null?void 0:t.abort)=="function"&&t.abort()},cancelAll(){Object.values(this.caches).forEach(e=>{typeof(e==null?void 0:e.abort)=="function"&&e.abort()}),this.caches=Object.create(null)},source(){const e=`${Date.now()}-${y.getRandomStr(16)}`;return{token:e,cancel:()=>this._cancel(e)}}};function b(e,t){return new Promise((r,a)=>{const o=uni[e]({...t,success(n){if(n.statusCode>=200&&n.statusCode<300)return r(n);a({type:"fail",res:n})},fail(n){a({type:"fail",res:n})},complete(){t.cancelToken&&T.delete(t.cancelToken)}});t.cancelToken&&T.add(t.cancelToken,o)})}let v=0,x=!1;function S(e){x||(x=!0,uni.showLoading({title:e,mask:!0}))}function P(){x&&(x=!1,uni.hideLoading())}function I(){let e=arguments.length>0&&arguments[0]!==void 0?arguments[0]:"加载中...";v++,v===1&&S(e)}function D(){v>0&&v--,v===0&&P()}function w(e,t){return function(r,a,o,n){return e(r,t,a,o,n)}}function U(e){return typeof e=="function"?e:()=>e||{}}function _(e){let t=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},r=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{};const a=U(t.headers)(),o=U(r.headers)(),n={...t,...r,headers:{...a,...o}},{headers:c,...l}=n;return{urlRes:e.startsWith("http")?e:n.baseURL?n.baseURL+e:e,headers:c,configRes:l}}function j(e){return typeof e=="function"?[e]:Array.isArray(e)?e.filter(t=>typeof t=="function"):[]}function k(e){let t=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},r=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{};const a={qs:!0,showError:!0,isCache:!1,cacheKey:`api:${e.url}`,cacheExpire:1e3*60*60*1,loadingText:e.loadingText,loading:!0,reqInterceptor:o=>o,resInterceptor:o=>o,errInterceptor:()=>{},...t,...r};return["reqInterceptor","resInterceptor","errInterceptor"].forEach(o=>{const n=[...j(t[o]),...j(r[o])];a[o]=n.length?y.composeAsync(...n):c=>c}),a}function q(e,t){const r=Array.from(t);return()=>e(...A.cloneDeepWithDescriptors(r))}function E(e,t,r,a,o){return F.apply(this,arguments)}function F(){return F=y._asyncToGenerator(function*(e,t,r,a,o){let n;a.loading&&(I(a.loadingText),n=()=>{D(),n=null});try{var c;const i=yield a.reqInterceptor(r),d=yield e(t,i);return(c=n)===null||c===void 0||c(),yield a.resInterceptor(d,a,o)}catch(i){var l;return(l=n)===null||l===void 0||l(),yield a.errInterceptor(i),Promise.reject(i)}}),F.apply(this,arguments)}function L(e,t){function r(a,o,n,c,l){const i=T.source(),d=q(r,arguments),s=k({url:a,loadingText:"加载中..."},t,l),{urlRes:R,headers:O,configRes:h}=_(a,e,c);if(s.isCache){const u=y.getCache(s.cacheKey);if(u)return Promise.resolve(u)}const m=o.toUpperCase()==="GET"?C.JSON:s.qs?C.FORM_URLENCODED:C.JSON,p={cancelToken:i.token,method:o,url:R,data:n,header:{"Content-Type":m,...O},...h};return E(b,"request",p,s,d).then(u=>(s.isCache&&y.setCache(s.cacheKey,u,s.cacheExpire),u))}return r.get=w(r,"get"),r.post=w(r,"post"),r}function z(e,t){return function r(a,o,n,c){const l=T.source(),i=q(r,arguments),d=k({loadingText:"上传中..."},t,c),{urlRes:s,headers:R,configRes:O}=_(a,e,n),{keyName:h="file",filePath:f,...m}={keyName:"file",...o};if(!f||!f.startsWith("http://tmp")&&!f.startsWith("wxfile://tmp"))return Promise.resolve({data:f});const p={cancelToken:l.token,url:s,filePath:f,name:h,formData:m,header:{...R},...O};return E(b,"uploadFile",p,d,i).then(function(){var u=y._asyncToGenerator(function*(g){try{return g.data=typeof g.data=="string"?JSON.parse(g.data):g.data,yield d.resInterceptor(g,d,i)}catch(N){return Promise.reject({type:"code error",res:N})}});return function(g){return u.apply(this,arguments)}}())}}function G(e,t){return function r(a,o,n,c){const l=T.source(),i=q(r,arguments),d=k({loadingText:"下载中..."},t,c),{urlRes:s,headers:R,configRes:O}=_(a,e,n);let h=s;if(o&&typeof o=="object"){const m=Object.entries(o).filter(p=>{let[,u]=p;return u!=null&&u!==""}).map(p=>{let[u,g]=p;return`${encodeURIComponent(u)}=${encodeURIComponent(g)}`}).join("&");m&&(h+=(h.includes("?")?"&":"?")+m)}const f={cancelToken:l.token,url:h,header:{...R},...O};return E(b,"downloadFile",f,d,i)}}exports.CONTENT_TYPES=C;exports.CancelToken=T;exports.createDownloadFile=G;exports.createRequest=L;exports.createUploadFile=z;exports.endLoading=D;exports.promisifyRequest=b;exports.startLoading=I;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const C=require("../index-e3f8a8ef.js"),A=require("../object/index.js"),O=Object.freeze({JSON:"application/json;charset=UTF-8",TEXT:"text/plain;charset=UTF-8",FORM_URLENCODED:"application/x-www-form-urlencoded;charset=UTF-8",FORM_DATA:"multipart/form-data"}),m={caches:Object.create(null),add(e,t){this.caches[e]=t},delete(e){Reflect.deleteProperty(this.caches,e)},_cancel(e){const t=this.caches[e];typeof(t==null?void 0:t.abort)=="function"&&t.abort()},cancelAll(){Object.values(this.caches).forEach(e=>{typeof(e==null?void 0:e.abort)=="function"&&e.abort()}),this.caches=Object.create(null)},source(){const e=`${Date.now()}-${C.getRandomStr(16)}`;return{token:e,cancel:()=>this._cancel(e)}}};function b(e,t){return new Promise((r,c)=>{const o=uni[e]({...t,success(n){if(n.statusCode>=200&&n.statusCode<300)return r(n);c({type:"fail",res:n})},fail(n){c({type:"fail",res:n})},complete(){t.cancelToken&&m.delete(t.cancelToken)}});t.cancelToken&&m.add(t.cancelToken,o)})}let R=0,v=!1;function N(e){v||(v=!0,uni.showLoading({title:e,mask:!0}))}function S(){v&&(v=!1,uni.hideLoading())}function j(){let e=arguments.length>0&&arguments[0]!==void 0?arguments[0]:"加载中...";R++,R===1&&N(e)}function D(){R>0&&R--,R===0&&S()}function _(e,t){return function(r,c,o,n){return e(r,t,c,o,n)}}function w(e){return typeof e=="function"?e:()=>e||{}}function k(e){let t=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},r=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{};const c=w(t.headers)(),o=w(r.headers)(),n={...t,...r,headers:{...c,...o}},{headers:a,...s}=n;return{urlRes:e.startsWith("http")?e:n.baseURL?n.baseURL+e:e,headers:a,configRes:s}}function U(e){return typeof e=="function"?[e]:Array.isArray(e)?e.filter(t=>typeof t=="function"):[]}function F(e){let t=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},r=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{};const c={qs:!0,showError:!0,isCache:!1,cacheKey:`api:${e.url}`,cacheExpire:1e3*60*60*1,loadingText:e.loadingText,loading:!0,reqInterceptor:o=>o,resInterceptor:o=>o,errInterceptor:()=>{},...t,...r};return["reqInterceptor","resInterceptor","errInterceptor"].forEach(o=>{const n=[...U(t[o]),...U(r[o])];c[o]=n.length?C.composeAsync(...n):a=>a}),c}function q(e,t){const r=Array.from(t);return()=>e(...A.cloneDeepWithDescriptors(r))}function E(e,t,r,c,o){return x.apply(this,arguments)}function x(){return x=C._asyncToGenerator(function*(e,t,r,c,o){let n;c.loading&&(j(c.loadingText),n=()=>{D(),n=null});try{var a;const u=yield c.reqInterceptor(r),l=yield e(t,u);return(a=n)===null||a===void 0||a(),yield c.resInterceptor(l,c,o)}catch(u){var s;(s=n)===null||s===void 0||s();const l=yield c.errInterceptor(u);return l!==void 0?l:Promise.reject(u)}}),x.apply(this,arguments)}function L(e,t){function r(c,o,n,a,s){const u=m.source(),l=q(r,arguments),i=F({url:c,loadingText:"加载中..."},t,s),{urlRes:y,headers:T,configRes:g}=k(c,e,a);if(i.isCache){const d=C.getCache(i.cacheKey);if(d)return Promise.resolve(d)}const p=o.toUpperCase()==="GET"?O.JSON:i.qs?O.FORM_URLENCODED:O.JSON,h={cancelToken:u.token,method:o,url:y,data:n,header:{"Content-Type":p,...T},...g};return E(b,"request",h,i,l).then(d=>(i.isCache&&C.setCache(i.cacheKey,d,i.cacheExpire),d))}return r.get=_(r,"get"),r.post=_(r,"post"),r}function P(e,t){return function r(c,o,n,a){const s=m.source(),u=q(r,arguments),l=F({loadingText:"上传中..."},t,a),{urlRes:i,headers:y,configRes:T}=k(c,e,n),{keyName:g="file",filePath:f,...p}={keyName:"file",...o};if(!f||!f.startsWith("http://tmp")&&!f.startsWith("wxfile://tmp"))return Promise.resolve({data:f});const h={cancelToken:s.token,url:i,filePath:f,name:g,formData:p,header:{...y},...T};return E(b,"uploadFile",h,l,u)}}function z(e,t){return function r(c,o,n,a){const s=m.source(),u=q(r,arguments),l=F({loadingText:"下载中..."},t,a),{urlRes:i,headers:y,configRes:T}=k(c,e,n);let g=i;if(o&&typeof o=="object"){const p=Object.entries(o).filter(h=>{let[,d]=h;return d!=null&&d!==""}).map(h=>{let[d,I]=h;return`${encodeURIComponent(d)}=${encodeURIComponent(I)}`}).join("&");p&&(g+=(g.includes("?")?"&":"?")+p)}const f={cancelToken:s.token,url:g,header:{...y},...T};return E(b,"downloadFile",f,l,u)}}exports.CONTENT_TYPES=O;exports.CancelToken=m;exports.createDownloadFile=z;exports.createRequest=L;exports.createUploadFile=P;exports.endLoading=D;exports.promisifyRequest=b;exports.startLoading=j;

package/lib/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("./array/index.js"),n=require("./date/index.js"),r=require("./fs/index.js"),c=require("./getLocation/index.js"),t=require("./http/index.js");require("./lodash/index.js");const e=require("./index-e3f8a8ef.js"),i=require("./object/index.js"),o=require("./validate/index.js"),s=require("./index-f305d2b7.js");exports.exchangeArrP=a.exchangeArrP;exports.filterTree=a.filterTree;exports.findTreeItem=a.findTreeItem;exports.flatWithKey=a.flatWithKey;exports.getTreePath=a.getTreePath;exports.groupBy=a.groupBy;exports.reverseForEach=a.reverseForEach;exports.treeItemSetParent=a.treeItemSetParent;exports.dateFormat=n.dateFormat;exports.getDate=n.getDate;exports.$fs=r.$fs;exports.chooseImg=r.chooseImg;exports.getArraybufferTempPath=r.getArraybufferTempPath;exports.getImgBase64Prefix=r.getImgBase64Prefix;exports.readFile=r.readFile;exports.saveImageToPhotosAlbum=r.saveImageToPhotosAlbum;exports.writeFile=r.writeFile;exports.getLocation=c.getLocation;exports.openLocation=c.openLocation;exports.CONTENT_TYPES=t.CONTENT_TYPES;exports.CancelToken=t.CancelToken;exports.createDownloadFile=t.createDownloadFile;exports.createRequest=t.createRequest;exports.createUploadFile=t.createUploadFile;exports.endLoading=t.endLoading;exports.promisifyRequest=t.promisifyRequest;exports.startLoading=t.startLoading;exports.compareVersion=e.compareVersion;exports.compose=e.compose;exports.composeAsync=e.composeAsync;exports.debounce=e.debounce;exports.debouncePromise=e.debouncePromise;exports.decodeURIParams=e.decodeURIParams;exports.encodeURIParams=e.encodeURIParams;exports.getCache=e.getCache;exports.getOnLoadParams=e.getOnLoadParams;exports.getPascalCase=e.getPascalCase;exports.getRandom=e.getRandom;exports.getRandomStr=e.getRandomStr;exports.getSearchParams=e.getSearchParams;exports.getSearchStr=e.getSearchStr;exports.pipe=e.pipe;exports.pipeAsync=e.pipeAsync;exports.randomColor=e.randomColor;exports.removeCache=e.removeCache;exports.renewCache=e.renewCache;exports.setCache=e.setCache;exports.throttle=e.throttle;exports.cloneDeepWithDescriptors=i.cloneDeepWithDescriptors;exports.getRawType=i.getRawType;exports.hasOwnProperty=i.hasOwnProperty;exports.isExternal=o.isExternal;exports.validDate=o.validDate;exports.validIDCard=o.validIDCard;exports.validPhone=o.validPhone;exports.validPostalCode=o.validPostalCode;exports.validURL=o.validURL;exports.wx=s.index;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("./array/index.js"),n=require("./date/index.js"),r=require("./fs/index.js"),s=require("./getLocation/index.js"),t=require("./http/index.js"),e=require("./index-e3f8a8ef.js"),i=require("./object/index.js"),o=require("./validate/index.js"),c=require("./index-f305d2b7.js"),d=require("./lodash");Object.assign(exports,d);exports.exchangeArrP=a.exchangeArrP;exports.filterTree=a.filterTree;exports.findTreeItem=a.findTreeItem;exports.flatWithKey=a.flatWithKey;exports.getTreePath=a.getTreePath;exports.groupBy=a.groupBy;exports.reverseForEach=a.reverseForEach;exports.treeItemSetParent=a.treeItemSetParent;exports.dateFormat=n.dateFormat;exports.getDate=n.getDate;exports.$fs=r.$fs;exports.chooseImg=r.chooseImg;exports.getArraybufferTempPath=r.getArraybufferTempPath;exports.getImgBase64Prefix=r.getImgBase64Prefix;exports.readFile=r.readFile;exports.saveImageToPhotosAlbum=r.saveImageToPhotosAlbum;exports.writeFile=r.writeFile;exports.getLocation=s.getLocation;exports.openLocation=s.openLocation;exports.CONTENT_TYPES=t.CONTENT_TYPES;exports.CancelToken=t.CancelToken;exports.createDownloadFile=t.createDownloadFile;exports.createRequest=t.createRequest;exports.createUploadFile=t.createUploadFile;exports.endLoading=t.endLoading;exports.promisifyRequest=t.promisifyRequest;exports.startLoading=t.startLoading;exports.compareVersion=e.compareVersion;exports.compose=e.compose;exports.composeAsync=e.composeAsync;exports.debounce=e.debounce;exports.debouncePromise=e.debouncePromise;exports.decodeURIParams=e.decodeURIParams;exports.encodeURIParams=e.encodeURIParams;exports.getCache=e.getCache;exports.getOnLoadParams=e.getOnLoadParams;exports.getPascalCase=e.getPascalCase;exports.getRandom=e.getRandom;exports.getRandomStr=e.getRandomStr;exports.getSearchParams=e.getSearchParams;exports.getSearchStr=e.getSearchStr;exports.pipe=e.pipe;exports.pipeAsync=e.pipeAsync;exports.randomColor=e.randomColor;exports.removeCache=e.removeCache;exports.renewCache=e.renewCache;exports.setCache=e.setCache;exports.throttle=e.throttle;exports.cloneDeepWithDescriptors=i.cloneDeepWithDescriptors;exports.getRawType=i.getRawType;exports.hasOwnProperty=i.hasOwnProperty;exports.isExternal=o.isExternal;exports.validDate=o.validDate;exports.validIDCard=o.validIDCard;exports.validPhone=o.validPhone;exports.validPostalCode=o.validPostalCode;exports.validURL=o.validURL;exports.wx=c.index;

package/package.json

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