@tarojs/taro-h5 3.6.12-alpha.0 → 3.6.12

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { history, navigateBack, navigateTo, reLaunch, redirectTo, getCurrentPage
 export { getCurrentPages, history, navigateBack, navigateTo, reLaunch, redirectTo, switchTab } from '@tarojs/router';
 import { isFunction, toKebabCase, PLATFORM_TYPE } from '@tarojs/shared';
 import { getCurrentPage, getHomePage } from '@tarojs/router/dist/utils';
-import { hooks, Current as Current$1 } from '@tarojs/runtime';
+import { hooks, Current as Current$1, eventCenter as eventCenter$1 } from '@tarojs/runtime';
 import { fromByteArray, toByteArray } from 'base64-js';
 import { getMobileDetect, setTitle } from '@tarojs/router/dist/utils/navigate';
 import isNil from 'lodash-es/isNil';
@@ -2686,12 +2686,16 @@ const previewImage = (options) => __awaiter(void 0, void 0, void 0, function* ()
     const { urls = [], current = '', success, fail, complete } = options;
     const handle = new MethodHandler({ name: 'previewImage', success, fail, complete });
     const container = document.createElement('div');
+    const removeHandler = () => {
+        eventCenter$1.off('__taroRouterChange', removeHandler);
+        container.remove();
+    };
+    // 路由改变后应该关闭预览框
+    eventCenter$1.on('__taroRouterChange', removeHandler);
     container.classList.add('preview-image');
     container.style.cssText =
         'position:fixed;top:0;left:0;z-index:1050;width:100%;height:100%;overflow:hidden;outline:0;background-color:#111;';
-    container.addEventListener('click', () => {
-        container.remove();
-    });
+    container.addEventListener('click', removeHandler);
     const swiper = document.createElement('taro-swiper-core');
     // @ts-ignore
     swiper.full = true;
@@ -5003,19 +5007,21 @@ function generateRequestUrlWithParams(url = '', params) {
 }
 function _request(options = {}) {
     const { success, complete, fail } = options;
-    let url = options.url || '';
     const params = {};
     const res = {};
-    if (options.jsonp) {
-        const { jsonp } = options, opts = __rest(options, ["jsonp"]);
-        Object.assign(params, opts);
+    let { cache = 'default', credentials, data, dataType, header = {}, jsonp, method = 'GET', mode, responseType, signal, timeout = 2000, url = '' } = options, opts = __rest(options, ["cache", "credentials", "data", "dataType", "header", "jsonp", "method", "mode", "responseType", "signal", "timeout", "url"]);
+    Object.assign(params, opts);
+    if (jsonp) {
         // @ts-ignore
-        params.params = opts.data;
+        params.params = data;
         params.cache = opts.jsonpCache;
+        // @ts-ignore
+        params.timeout = timeout;
         if (typeof jsonp === 'string') {
             // @ts-ignore
             params.name = jsonp;
         }
+        // Note: https://github.com/luckyadam/jsonp-retry
         return jsonpRetry(url, params)
             .then(data => {
             res.statusCode = 200;
@@ -5030,50 +5036,49 @@ function _request(options = {}) {
             return Promise.reject(err);
         });
     }
-    params.method = options.method || 'GET';
+    params.method = method;
     const methodUpper = params.method.toUpperCase();
-    params.cache = options.cache || 'default';
+    params.cache = cache;
     if (methodUpper === 'GET' || methodUpper === 'HEAD') {
-        url = generateRequestUrlWithParams(url, options.data);
+        url = generateRequestUrlWithParams(url, data);
     }
-    else if (['[object Array]', '[object Object]'].indexOf(Object.prototype.toString.call(options.data)) >= 0) {
-        options.header = options.header || {};
-        const keyOfContentType = Object.keys(options.header).find(item => item.toLowerCase() === 'content-type');
+    else if (['[object Array]', '[object Object]'].indexOf(Object.prototype.toString.call(data)) >= 0) {
+        const keyOfContentType = Object.keys(header).find(item => item.toLowerCase() === 'content-type');
         if (!keyOfContentType) {
-            options.header['Content-Type'] = 'application/json';
+            header['Content-Type'] = 'application/json';
         }
-        const contentType = options.header[keyOfContentType || 'Content-Type'];
+        const contentType = header[keyOfContentType || 'Content-Type'];
         if (contentType.indexOf('application/json') >= 0) {
-            params.body = JSON.stringify(options.data);
+            params.body = JSON.stringify(data);
         }
         else if (contentType.indexOf('application/x-www-form-urlencoded') >= 0) {
-            params.body = serializeParams(options.data);
+            params.body = serializeParams(data);
         }
         else {
-            params.body = options.data;
+            params.body = data;
         }
     }
     else {
-        params.body = options.data;
+        params.body = data;
     }
-    if (options.header) {
-        params.headers = options.header;
+    if (header) {
+        params.headers = header;
     }
-    if (options.mode) {
-        params.mode = options.mode;
+    if (mode) {
+        params.mode = mode;
     }
     let timeoutTimer = null;
-    if (options.signal) {
-        params.signal = options.signal;
+    if (signal) {
+        params.signal = signal;
     }
-    else if (typeof options.timeout === 'number') {
+    else if (typeof timeout === 'number') {
         const controller = new window.AbortController();
         params.signal = controller.signal;
         timeoutTimer = setTimeout(function () {
             controller.abort();
-        }, options.timeout);
+        }, timeout);
     }
-    params.credentials = options.credentials;
+    params.credentials = credentials;
     return fetch(url, params)
         .then(response => {
         if (timeoutTimer) {
@@ -5089,17 +5094,17 @@ function _request(options = {}) {
         for (const key of response.headers.keys()) {
             res.header[key] = response.headers.get(key);
         }
-        if (options.responseType === 'arraybuffer') {
+        if (responseType === 'arraybuffer') {
             return response.arrayBuffer();
         }
         if (res.statusCode !== 204) {
-            if (options.dataType === 'json' || typeof options.dataType === 'undefined') {
+            if (dataType === 'json' || typeof dataType === 'undefined') {
                 return response.json().catch(() => {
                     return null;
                 });
             }
         }
-        if (options.responseType === 'text' || options.dataType === 'text') {
+        if (responseType === 'text' || dataType === 'text') {
             return response.text();
         }
         return Promise.resolve(null);
@@ -5409,9 +5414,9 @@ function connectSocket(options) {
         // protocols must be array
         const _protocols = Array.isArray(protocols) ? protocols : null;
         // 2 connection at most
-        if (socketTasks.length > 1) {
+        if (socketTasks.length >= 5) {
             return handle.fail({
-                errMsg: '同时最多发起 2 个 socket 请求，更多请参考文档。'
+                errMsg: '同时最多发起 5 个 socket 请求，更多请参考文档。'
             }, { resolve, reject });
         }
         const task = new SocketTask(url, _protocols);