From e6a2e6f9b80fd836d810505d65293c3612b6aeb0 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Sun, 18 Jul 2021 11:53:01 +0800
Subject: [PATCH] 修复H5模式下文本域组件的显示问题
---
bases/Fetcher.js | 290 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 203 insertions(+), 87 deletions(-)
diff --git a/bases/Fetcher.js b/bases/Fetcher.js
index ef8d1c2..5dce631 100644
--- a/bases/Fetcher.js
+++ b/bases/Fetcher.js
@@ -3,10 +3,10 @@
* @author Tevin
*/
-import Axios from 'axios';
+import Taro from '@tarojs/taro';
import Qs from 'qs';
-import {message, Modal} from 'antd';
-import {Tools} from '@components/common/Tools';
+import { Tools } from '@components/common/Tools';
+import project from '@project';
export class Fetcher {
@@ -16,24 +16,29 @@
*/
constructor(options = {}) {
this._data = {
- urlPrefix: options.urlPrefix || ['/api/common', '/api/common'],
+ urlPrefix: options.urlPrefix || ['/api/common/', '/api/common/'],
};
+ if (project.host.mock === 'on') {
+ this._defaultConfig.url = Fetcher.host + project.host.assetsPath.replace('/assets', '/mocks');
+ } else {
+ this._defaultConfig.url = Fetcher.host;
+ }
}
/**
* 请求配置
- * @type {{headers: Object, baseURL: string, responseType: string, timeout: number}}
* @private
*/
_defaultConfig = {
- baseURL: window.location.protocol + '//' + window.location.host,
- headers: {
+ url: '',
+ header: {
'X-Requested-With': 'XMLHttpRequest',
'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
'Ax-Rq-Type': 'separation',
},
- responseType: 'json',
- timeout: 10000,
+ credentials: 'same-origin',
+ dataType: 'json',
+ timeout: 30 * 1000,
};
/**
@@ -44,34 +49,30 @@
*/
spellURL(devSuffix, serSuffix) {
let url = '';
- // 开发环境地址
- if (Fetcher.inDevMod) {
- url = this._data.urlPrefix[0] + devSuffix;
+ // mock 模式
+ if (project.host.mock === 'on') {
+ url = this._data.urlPrefix[0].replace('api/', '') + devSuffix + '.json';
}
- // 生产环境地址
- else {
+ // 强制实际请求模式
+ else if (project.host.mock === 'real') {
url = this._data.urlPrefix[1] + (serSuffix || devSuffix);
+ }
+ // 正常模式
+ else {
+ // 开发环境地址
+ if (Fetcher.inDevMod) {
+ url = this._data.urlPrefix[0] + devSuffix;
+ }
+ // 生产环境地址
+ else {
+ url = this._data.urlPrefix[1] + (serSuffix || devSuffix);
+ }
}
const fixReg = /[a-zA-Z0-9]+\/\.\.\//;
while (url.indexOf('../') >= 0) {
url = url.replace(fixReg, '');
}
url = url.replace(/[./]\//g, '');
- return url;
- }
-
- /**
- * 将 post 参数转换为 get 参数，并拼接 url
- * @param url
- * @param data
- */
- parseParamUrl(url, data) {
- const params = Qs.stringify(data);
- if (url.indexOf('?') >= 0) {
- url += '&' + params;
- } else {
- url += '?' + params;
- }
return url;
}
@@ -84,8 +85,13 @@
* @return {Promise<any>}
*/
get(url, data, remap = [], options = null) {
- const url2 = this.parseParamUrl(url, data);
- return this.query('get', url2, null, remap, options);
+ const params = Qs.stringify(data);
+ if (url.indexOf('?') >= 0) {
+ url += '&' + params;
+ } else {
+ url += '?' + params;
+ }
+ return this.query('get', url, null, remap, options);
}
/**
@@ -97,13 +103,18 @@
* @return {Promise<any>}
*/
post(url, data, remap = [], options = null) {
- // mock 模式
- if (Fetcher.inMockMod) {
- return this.get(url, data, remap, options);
+ if (project.host.mock === 'on') {
+ return this.get(url, data, remap = [], options);
}
- // 正常模式
const params = Qs.stringify(data);
- return this.query('post', url, params, remap, options);
+ const data2 = {};
+ params.split('&').forEach(param => {
+ if (param) {
+ const item = param.split('=');
+ data2[decodeURIComponent(item[0])] = decodeURIComponent(item[1]);
+ }
+ });
+ return this.query('post', url, data2, remap, options);
}
/**
@@ -115,36 +126,61 @@
* @param {object} [options]
* @return {Promise<any>|}
*/
- query(type, url, data = null, remap, options) {
- if (!type || !/^get|post|put$/i.test(type) || !url) {
- return Promise.reject();
- }
- const method = type.toLowerCase();
- const response = Axios[method](url, data, {
- ...this._defaultConfig,
- ...options,
- });
- return response
- .then(response => {
- /**
- * @type {{state: {code, http, msg}, data: Object}}
- * @example response.state.code
- * 2000 通用请求成功
- * 2001 请求成功，但是没有数据，弹窗提示 msg（仅特殊情况使用）
- * 5000 通用请求失败，弹窗提示 msg
- * 9001 登陆已过期，弹窗提示过期且返回登陆页
- * 9002 已登陆但没有操作权限，弹窗提示 msg
- */
- const responseData = this._adaptiveResponseData(response.data);
- responseData.state.http = response.status;
- return this._transformResponseData(responseData, remap);
- })
- // HTTP 异常
- .catch((err) => {
- this._resolveCaughtNetErr(err);
- console.log('query error', err);
- return null;
+ query(type, url, data = null, remap, options = {}) {
+ return new Promise((resolve, reject) => {
+ const header = {
+ ...this._defaultConfig.header,
+ };
+ if (process.env.TARO_ENV === 'weapp') {
+ header['Cookie'] = this._getCookies();
+ }
+ Taro.request({
+ ...this._defaultConfig,
+ header,
+ url: this._defaultConfig.url + url,
+ method: type.toUpperCase(),
+ data,
+ success: response => {
+ if (process.env.TARO_ENV === 'weapp') {
+ this._saveCookies(response.cookies);
+ }
+ /**
+ * @type {{state: {code, http, msg}, data: Object}}
+ * @example response.state.code
+ * 2000 通用请求成功
+ * 2001 请求成功，但是没有数据，弹窗提示 msg（仅特殊情况使用）
+ * 5000 通用请求失败，弹窗提示 msg
+ * 9001 登陆已过期，弹窗提示过期且返回登陆页
+ * 9002 已登陆但没有操作权限，弹窗提示 msg
+ */
+ const responseData = this._adaptiveResponseData(response.data);
+ responseData.state.http = response.statusCode;
+ resolve(this._transformResponseData(responseData, remap));
+ },
+ fail: error => {
+ this._resolveCaughtNetErr(error);
+ reject(null);
+ },
});
+ });
+ }
+
+ _saveCookies(cookies) {
+ const localCookies = JSON.parse(wx.getStorageSync('cookies') || '{}');
+ cookies.forEach(cookie => {
+ const mc = cookie.match(/([a-zA-Z0-9_\-]+)=(.*?);/);
+ localCookies[mc[1]] = mc[2];
+ });
+ wx.setStorageSync('cookies', JSON.stringify(localCookies));
+ }
+
+ _getCookies() {
+ const localCookies = JSON.parse(wx.getStorageSync('cookies') || '{}');
+ const cookiesArr = [];
+ Object.keys(localCookies).forEach(key => {
+ cookiesArr.push(key + '=' + localCookies[key]);
+ });
+ return cookiesArr.join('; ');
}
/**
@@ -159,7 +195,7 @@
// 旧请求，操作类通讯，响应体转换
if (typeof responseData.status !== 'undefined' && typeof responseData.dataMsg !== 'undefined') {
// 转换数据体
- let data2 = {rows: []};
+ let data2 = { rows: [] };
// 数组类型
if (responseData.dataMsg instanceof Array) {
if (responseData.dataMsg.length > 0) {
@@ -184,7 +220,7 @@
// 旧版请求，数据列表类通讯，响应体转换
if (typeof responseData.data !== 'undefined' && typeof responseData.count !== 'undefined') {
const data = (!!responseData.data && typeof responseData.data !== 'object') ?
- {data: responseData.data} : null;
+ { data: responseData.data } : null;
return {
state: {
code: responseData.code === 0 ? 2000 : 5000,
@@ -207,8 +243,8 @@
*/
_resolveCaughtNetErr(err) {
let msg = '';
- if (err.response && err.response.status) {
- switch (err.response.status) {
+ if (err && err.status) {
+ switch (err.status) {
case 400:
msg += '通讯请求有误！(400 Bad Request)';
break;
@@ -243,7 +279,9 @@
} else {
msg += '解析通讯数据异常！';
}
- message.error(msg);
+ setTimeout(() => {
+ this.message('error', msg);
+ }, 20);
}
/**
@@ -276,12 +314,18 @@
return response.data;
}
} else if (response.state.code === 2001) {
- message.info(response.state.msg);
+ setTimeout(() => {
+ this.message('info', response.state.msg);
+ }, 20);
return null;
} else if (response.state.code === 9001) {
- this._showLoginExpired();
+ if (process.env.TARO_ENV === 'weapp') {
+ Taro.navigateTo({ url: '/pages/home/index/index?mode=login' });
+ }
} else {
- message.error(response.state.msg);
+ setTimeout(() => {
+ this.message('error', response.state.msg);
+ }, 20);
return null;
}
}
@@ -435,17 +479,29 @@
if (!path) {
return '';
}
+ // 多项时，先拆分转换，再合并
if (path.indexOf(',') >= 0) {
return path.split(',').map(p => this.transImgPath(type, p)).join(',');
- } else {
+ }
+ // 单项时转换
+ else {
// 修复补齐
if (type === 'fix') {
- if (!path || /^\/(upload|static)/.test(path)) {
+ // 完整 URL，地址不变
+ if (/^http/.test(path)) {
return path;
- } else {
- return '/upload/' + path;
}
- } else if (type === 'cut') {
+ // 绝对路径
+ if (/^(\/upload|\/static)/.test(path)) {
+ return Fetcher.host + path;
+ }
+ // 部分路径
+ else {
+ return Fetcher.host + '/upload/' + path;
+ }
+ }
+ // 裁剪多余部分
+ else if (type === 'cut') {
const pathArr = path.split('upload/');
return pathArr[pathArr.length - 1];
}
@@ -484,21 +540,81 @@
}
/**
+ * 显示提示信息
+ * @param type
+ * @param msg
+ */
+ message(type, msg) {
+ Taro.showToast({
+ title: msg,
+ icon: 'none',
+ mask: true,
+ duration: type === 'error' ? 5000 : 3000,
+ });
+ }
+
+ /**
* 记录是否为本地开发模式
* @type {Boolean}
*/
static inDevMod = (() => {
- // 当处于 mock 请求模式，视为本地开发
- if (Tools.getTopUrlParam('query') === 'mock') {
- return true;
+ // 网页
+ if (process.env.TARO_ENV === 'h5') {
+ // 当没有 url 指定时，只有内网 ip 和 33**/35** 的端口号，视为本地开发模式
+ return /^(192|127|localhost).*?:3[35]\d{2}$/i.test(window.location.host);
}
- // 强制 real 请求，可在本地使用真实请求
- if (Tools.getTopUrlParam('query') === 'real') {
- return false;
+ // 小程序
+ else if (process.env.TARO_ENV === 'weapp') {
+ // 开发编译
+ if (process.env.NODE_ENV === 'development') {
+ return true;
+ }
+ // 生产编译
+ else if (process.env.NODE_ENV === 'production') {
+ return false;
+ }
}
- // 当没有 url 指定时，只有内网 ip 和 35** 的端口号，视为本地开发模式
- return /^(192|127|localhost).*?:35\d{2}$/i.test(window.location.host);
})();
+ /**
+ * 当前服务器主机地址
+ * @type {String}
+ */
+ static host = (() => {
+ // 网页
+ if (process.env.TARO_ENV === 'h5') {
+ // 开发
+ if (Fetcher.inDevMod) {
+ return window.location.protocol + '//' + window.location.host;
+ }
+ // 生产
+ else {
+ // 如果网址参数有指定服务器类型，匹配指定的服务器地址
+ const sever = Tools.getUrlParam('sever');
+ if (sever && typeof project.host.hosts[sever] !== 'undefined') {
+ return project.host.hosts[sever];
+ }
+ // 网页域名提取服务器地址
+ else if (window.location.protocol.indexOf('http') >= 0) {
+ return window.location.protocol + '//' + window.location.host;
+ }
+ // 非 http 协议打开时，使用设置的服务器地址
+ else if (project.host.server) {
+ return project.host.hosts[project.host.serverType];
+ }
+ }
+ }
+ // 小程序
+ else if (process.env.TARO_ENV === 'weapp') {
+ // 开发
+ if (Fetcher.inDevMod) {
+ return project.host.hosts[project.host.devType];
+ }
+ // 生产
+ else {
+ return project.host.hosts[project.host.serverType];
+ }
+ }
+ })();
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1