eoss-ui 0.5.69 → 0.5.70
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/button-group.js +34 -36
- package/lib/button.js +34 -36
- package/lib/checkbox-group.js +70 -56
- package/lib/data-table-form.js +37 -39
- package/lib/data-table.js +58 -58
- package/lib/date-picker.js +34 -36
- package/lib/dialog.js +49 -51
- package/lib/eoss-ui.common.js +660 -562
- package/lib/flow-group.js +34 -36
- package/lib/flow-list.js +36 -38
- package/lib/flow.js +40 -42
- package/lib/form.js +410 -376
- package/lib/handle-user.js +36 -38
- package/lib/handler.js +34 -36
- package/lib/index.js +1 -1
- package/lib/input-number.js +34 -36
- package/lib/input.js +65 -48
- package/lib/layout.js +2 -2
- package/lib/login.js +54 -55
- package/lib/main.js +39 -41
- package/lib/menu.js +4 -3
- package/lib/nav.js +34 -36
- package/lib/page.js +34 -36
- package/lib/player.js +34 -36
- package/lib/qr-code.js +34 -36
- package/lib/radio-group.js +69 -53
- package/lib/retrial-auth.js +34 -36
- package/lib/select-ganged.js +122 -106
- package/lib/select.js +112 -96
- package/lib/selector-panel.js +90 -76
- package/lib/selector.js +34 -36
- package/lib/sizer.js +36 -38
- package/lib/steps.js +60 -44
- package/lib/switch.js +34 -36
- package/lib/table-form.js +36 -38
- package/lib/tabs.js +34 -36
- package/lib/tips.js +59 -42
- package/lib/tree-group.js +34 -36
- package/lib/tree.js +93 -77
- package/lib/upload.js +111 -94
- package/lib/utils/util.js +34 -36
- package/lib/wujie.js +34 -36
- package/lib/wxlogin.js +34 -36
- package/package.json +2 -2
- package/packages/checkbox-group/src/main.vue +7 -1
- package/packages/data-table/src/main.vue +3 -1
- package/packages/dialog/src/main.vue +2 -3
- package/packages/form/src/main.vue +11 -2
- package/packages/input/src/main.vue +8 -1
- package/packages/login/src/main.vue +15 -11
- package/packages/menu/src/main.vue +2 -1
- package/packages/radio-group/src/main.vue +7 -1
- package/packages/select/src/main.vue +7 -1
- package/packages/select-ganged/src/main.vue +7 -1
- package/packages/selector-panel/src/main.vue +7 -1
- package/packages/steps/src/main.vue +9 -3
- package/packages/tips/src/main.vue +8 -1
- package/packages/tree/src/main.vue +8 -2
- package/packages/upload/src/main.vue +11 -2
- package/src/index.js +1 -1
- package/src/utils/util.js +34 -34
package/lib/main.js
CHANGED
|
@@ -153,21 +153,17 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
|
|
|
153
153
|
* @param {Array} [encodes] - 需要对参数值进行encodeURIComponent编码的参数值名称
|
|
154
154
|
**/
|
|
155
155
|
// 请求
|
|
156
|
-
|
|
157
|
-
function getRequestKey(config) {
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
if (pendingRequest.has(requestKey)) {
|
|
168
|
-
pendingRequest.delete(requestKey);
|
|
169
|
-
}
|
|
170
|
-
}
|
|
156
|
+
// const pendingRequest = new Map();
|
|
157
|
+
// function getRequestKey(config) {
|
|
158
|
+
// const { method, url, params, data } = config;
|
|
159
|
+
// return [method, url, qs.stringify(params), qs.stringify(data)].join('&');
|
|
160
|
+
// };
|
|
161
|
+
// function delPendingRequest(config) {
|
|
162
|
+
// let requestKey = getRequestKey(config);
|
|
163
|
+
// if (pendingRequest.has(requestKey)) {
|
|
164
|
+
// pendingRequest.delete(requestKey);
|
|
165
|
+
// }
|
|
166
|
+
// }
|
|
171
167
|
var ajax = function ajax(_ref) {
|
|
172
168
|
var headers = _ref.headers,
|
|
173
169
|
method = _ref.method,
|
|
@@ -216,30 +212,32 @@ var ajax = function ajax(_ref) {
|
|
|
216
212
|
http.interceptors.request.use(function (config) {
|
|
217
213
|
config.headers.common = getStorage();
|
|
218
214
|
// 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
|
|
219
|
-
|
|
220
|
-
// 判断请求是否重复
|
|
221
|
-
if (pendingRequest.has(requestKey)) {
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
}
|
|
228
|
-
// 把请求信息,添加请求到map当中
|
|
229
|
-
// 生成取消方法
|
|
230
|
-
config.cancelToken =
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
215
|
+
// let requestKey = getRequestKey(config);
|
|
216
|
+
// // 判断请求是否重复
|
|
217
|
+
// if (pendingRequest.has(requestKey)) {
|
|
218
|
+
// // 取消上次请求
|
|
219
|
+
// let cancel = pendingRequest.get(requestKey);
|
|
220
|
+
// cancel();
|
|
221
|
+
// // 删除请求信息
|
|
222
|
+
// pendingRequest.delete(requestKey);
|
|
223
|
+
// }
|
|
224
|
+
// // 把请求信息,添加请求到map当中
|
|
225
|
+
// // 生成取消方法
|
|
226
|
+
// config.cancelToken =
|
|
227
|
+
// config.cancelToken ||
|
|
228
|
+
// new axios.CancelToken(cancel => {
|
|
229
|
+
// // 把取消方法添加到map
|
|
230
|
+
// if (!pendingRequest.has(requestKey)) {
|
|
231
|
+
// pendingRequest.set(requestKey, cancel);
|
|
232
|
+
// }
|
|
233
|
+
// });
|
|
236
234
|
return config;
|
|
237
235
|
}, function (err) {
|
|
238
236
|
return err;
|
|
239
237
|
});
|
|
240
238
|
// 响应拦截
|
|
241
239
|
http.interceptors.response.use(function (response) {
|
|
242
|
-
delPendingRequest(response.config);
|
|
240
|
+
// delPendingRequest(response.config);
|
|
243
241
|
loading && loading.close();
|
|
244
242
|
if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
|
|
245
243
|
if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
|
|
@@ -356,9 +354,9 @@ var ajax = function ajax(_ref) {
|
|
|
356
354
|
}
|
|
357
355
|
}, function (error) {
|
|
358
356
|
loading && loading.close();
|
|
359
|
-
if (!
|
|
360
|
-
|
|
361
|
-
}
|
|
357
|
+
// if (!axios.isCancel(error)) {
|
|
358
|
+
// delPendingRequest(error.config || {});
|
|
359
|
+
// }
|
|
362
360
|
if (error && error.response) {
|
|
363
361
|
if (error.response.status) {
|
|
364
362
|
switch (error.response.status) {
|
|
@@ -3765,7 +3763,8 @@ module.exports = require("stompjs");
|
|
|
3765
3763
|
module.exports = require("sm-crypto");
|
|
3766
3764
|
|
|
3767
3765
|
/***/ }),
|
|
3768
|
-
/* 11
|
|
3766
|
+
/* 11 */,
|
|
3767
|
+
/* 12 */
|
|
3769
3768
|
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
3770
3769
|
|
|
3771
3770
|
"use strict";
|
|
@@ -3792,13 +3791,12 @@ window.__store = store;
|
|
|
3792
3791
|
/* harmony default export */ __webpack_exports__["a"] = (store);
|
|
3793
3792
|
|
|
3794
3793
|
/***/ }),
|
|
3795
|
-
/*
|
|
3794
|
+
/* 13 */
|
|
3796
3795
|
/***/ (function(module, exports) {
|
|
3797
3796
|
|
|
3798
3797
|
module.exports = require("babel-runtime/regenerator");
|
|
3799
3798
|
|
|
3800
3799
|
/***/ }),
|
|
3801
|
-
/* 13 */,
|
|
3802
3800
|
/* 14 */,
|
|
3803
3801
|
/* 15 */,
|
|
3804
3802
|
/* 16 */,
|
|
@@ -4299,7 +4297,7 @@ userinfovue_type_template_id_75d533de_render._withStripped = true
|
|
|
4299
4297
|
var api = __webpack_require__(1);
|
|
4300
4298
|
|
|
4301
4299
|
// EXTERNAL MODULE: ./src/utils/store.js
|
|
4302
|
-
var store = __webpack_require__(
|
|
4300
|
+
var store = __webpack_require__(12);
|
|
4303
4301
|
|
|
4304
4302
|
// EXTERNAL MODULE: ./src/utils/util.js
|
|
4305
4303
|
var util = __webpack_require__(0);
|
|
@@ -5949,7 +5947,7 @@ async_componentvue_type_template_id_8b78c8b6_scoped_true_render._withStripped =
|
|
|
5949
5947
|
// CONCATENATED MODULE: ./packages/main/src/async-component/index.vue?vue&type=template&id=8b78c8b6&scoped=true&
|
|
5950
5948
|
|
|
5951
5949
|
// EXTERNAL MODULE: external "babel-runtime/regenerator"
|
|
5952
|
-
var regenerator_ = __webpack_require__(
|
|
5950
|
+
var regenerator_ = __webpack_require__(13);
|
|
5953
5951
|
var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator_);
|
|
5954
5952
|
|
|
5955
5953
|
// EXTERNAL MODULE: external "runtime-import"
|
package/lib/menu.js
CHANGED
|
@@ -87,7 +87,7 @@ module.exports =
|
|
|
87
87
|
/************************************************************************/
|
|
88
88
|
/******/ ({
|
|
89
89
|
|
|
90
|
-
/***/
|
|
90
|
+
/***/ 11:
|
|
91
91
|
/***/ (function(module, exports) {
|
|
92
92
|
|
|
93
93
|
module.exports = require("throttle-debounce");
|
|
@@ -207,7 +207,7 @@ function normalizeComponent(
|
|
|
207
207
|
__webpack_require__.r(__webpack_exports__);
|
|
208
208
|
|
|
209
209
|
// EXTERNAL MODULE: external "throttle-debounce"
|
|
210
|
-
var external_throttle_debounce_ = __webpack_require__(
|
|
210
|
+
var external_throttle_debounce_ = __webpack_require__(11);
|
|
211
211
|
|
|
212
212
|
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/menu/src/main.vue?vue&type=script&lang=js&
|
|
213
213
|
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
|
|
@@ -291,13 +291,14 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
|
|
|
291
291
|
isChange: false
|
|
292
292
|
};
|
|
293
293
|
},
|
|
294
|
-
|
|
294
|
+
beforeCreate: function beforeCreate() {
|
|
295
295
|
var _this = this;
|
|
296
296
|
|
|
297
297
|
this.getMaxWidth = Object(external_throttle_debounce_["debounce"])(300, function () {
|
|
298
298
|
_this.getWidth();
|
|
299
299
|
});
|
|
300
300
|
},
|
|
301
|
+
created: function created() {},
|
|
301
302
|
mounted: function mounted() {
|
|
302
303
|
this.getMaxWidth();
|
|
303
304
|
},
|
package/lib/nav.js
CHANGED
|
@@ -154,21 +154,17 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
|
|
|
154
154
|
* @param {Array} [encodes] - 需要对参数值进行encodeURIComponent编码的参数值名称
|
|
155
155
|
**/
|
|
156
156
|
// 请求
|
|
157
|
-
|
|
158
|
-
function getRequestKey(config) {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
if (pendingRequest.has(requestKey)) {
|
|
169
|
-
pendingRequest.delete(requestKey);
|
|
170
|
-
}
|
|
171
|
-
}
|
|
157
|
+
// const pendingRequest = new Map();
|
|
158
|
+
// function getRequestKey(config) {
|
|
159
|
+
// const { method, url, params, data } = config;
|
|
160
|
+
// return [method, url, qs.stringify(params), qs.stringify(data)].join('&');
|
|
161
|
+
// };
|
|
162
|
+
// function delPendingRequest(config) {
|
|
163
|
+
// let requestKey = getRequestKey(config);
|
|
164
|
+
// if (pendingRequest.has(requestKey)) {
|
|
165
|
+
// pendingRequest.delete(requestKey);
|
|
166
|
+
// }
|
|
167
|
+
// }
|
|
172
168
|
var ajax = function ajax(_ref) {
|
|
173
169
|
var headers = _ref.headers,
|
|
174
170
|
method = _ref.method,
|
|
@@ -217,30 +213,32 @@ var ajax = function ajax(_ref) {
|
|
|
217
213
|
http.interceptors.request.use(function (config) {
|
|
218
214
|
config.headers.common = getStorage();
|
|
219
215
|
// 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
|
|
220
|
-
|
|
221
|
-
// 判断请求是否重复
|
|
222
|
-
if (pendingRequest.has(requestKey)) {
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
}
|
|
229
|
-
// 把请求信息,添加请求到map当中
|
|
230
|
-
// 生成取消方法
|
|
231
|
-
config.cancelToken =
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
216
|
+
// let requestKey = getRequestKey(config);
|
|
217
|
+
// // 判断请求是否重复
|
|
218
|
+
// if (pendingRequest.has(requestKey)) {
|
|
219
|
+
// // 取消上次请求
|
|
220
|
+
// let cancel = pendingRequest.get(requestKey);
|
|
221
|
+
// cancel();
|
|
222
|
+
// // 删除请求信息
|
|
223
|
+
// pendingRequest.delete(requestKey);
|
|
224
|
+
// }
|
|
225
|
+
// // 把请求信息,添加请求到map当中
|
|
226
|
+
// // 生成取消方法
|
|
227
|
+
// config.cancelToken =
|
|
228
|
+
// config.cancelToken ||
|
|
229
|
+
// new axios.CancelToken(cancel => {
|
|
230
|
+
// // 把取消方法添加到map
|
|
231
|
+
// if (!pendingRequest.has(requestKey)) {
|
|
232
|
+
// pendingRequest.set(requestKey, cancel);
|
|
233
|
+
// }
|
|
234
|
+
// });
|
|
237
235
|
return config;
|
|
238
236
|
}, function (err) {
|
|
239
237
|
return err;
|
|
240
238
|
});
|
|
241
239
|
// 响应拦截
|
|
242
240
|
http.interceptors.response.use(function (response) {
|
|
243
|
-
delPendingRequest(response.config);
|
|
241
|
+
// delPendingRequest(response.config);
|
|
244
242
|
loading && loading.close();
|
|
245
243
|
if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
|
|
246
244
|
if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
|
|
@@ -357,9 +355,9 @@ var ajax = function ajax(_ref) {
|
|
|
357
355
|
}
|
|
358
356
|
}, function (error) {
|
|
359
357
|
loading && loading.close();
|
|
360
|
-
if (!
|
|
361
|
-
|
|
362
|
-
}
|
|
358
|
+
// if (!axios.isCancel(error)) {
|
|
359
|
+
// delPendingRequest(error.config || {});
|
|
360
|
+
// }
|
|
363
361
|
if (error && error.response) {
|
|
364
362
|
if (error.response.status) {
|
|
365
363
|
switch (error.response.status) {
|
package/lib/page.js
CHANGED
|
@@ -154,21 +154,17 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
|
|
|
154
154
|
* @param {Array} [encodes] - 需要对参数值进行encodeURIComponent编码的参数值名称
|
|
155
155
|
**/
|
|
156
156
|
// 请求
|
|
157
|
-
|
|
158
|
-
function getRequestKey(config) {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
if (pendingRequest.has(requestKey)) {
|
|
169
|
-
pendingRequest.delete(requestKey);
|
|
170
|
-
}
|
|
171
|
-
}
|
|
157
|
+
// const pendingRequest = new Map();
|
|
158
|
+
// function getRequestKey(config) {
|
|
159
|
+
// const { method, url, params, data } = config;
|
|
160
|
+
// return [method, url, qs.stringify(params), qs.stringify(data)].join('&');
|
|
161
|
+
// };
|
|
162
|
+
// function delPendingRequest(config) {
|
|
163
|
+
// let requestKey = getRequestKey(config);
|
|
164
|
+
// if (pendingRequest.has(requestKey)) {
|
|
165
|
+
// pendingRequest.delete(requestKey);
|
|
166
|
+
// }
|
|
167
|
+
// }
|
|
172
168
|
var ajax = function ajax(_ref) {
|
|
173
169
|
var headers = _ref.headers,
|
|
174
170
|
method = _ref.method,
|
|
@@ -217,30 +213,32 @@ var ajax = function ajax(_ref) {
|
|
|
217
213
|
http.interceptors.request.use(function (config) {
|
|
218
214
|
config.headers.common = getStorage();
|
|
219
215
|
// 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
|
|
220
|
-
|
|
221
|
-
// 判断请求是否重复
|
|
222
|
-
if (pendingRequest.has(requestKey)) {
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
}
|
|
229
|
-
// 把请求信息,添加请求到map当中
|
|
230
|
-
// 生成取消方法
|
|
231
|
-
config.cancelToken =
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
216
|
+
// let requestKey = getRequestKey(config);
|
|
217
|
+
// // 判断请求是否重复
|
|
218
|
+
// if (pendingRequest.has(requestKey)) {
|
|
219
|
+
// // 取消上次请求
|
|
220
|
+
// let cancel = pendingRequest.get(requestKey);
|
|
221
|
+
// cancel();
|
|
222
|
+
// // 删除请求信息
|
|
223
|
+
// pendingRequest.delete(requestKey);
|
|
224
|
+
// }
|
|
225
|
+
// // 把请求信息,添加请求到map当中
|
|
226
|
+
// // 生成取消方法
|
|
227
|
+
// config.cancelToken =
|
|
228
|
+
// config.cancelToken ||
|
|
229
|
+
// new axios.CancelToken(cancel => {
|
|
230
|
+
// // 把取消方法添加到map
|
|
231
|
+
// if (!pendingRequest.has(requestKey)) {
|
|
232
|
+
// pendingRequest.set(requestKey, cancel);
|
|
233
|
+
// }
|
|
234
|
+
// });
|
|
237
235
|
return config;
|
|
238
236
|
}, function (err) {
|
|
239
237
|
return err;
|
|
240
238
|
});
|
|
241
239
|
// 响应拦截
|
|
242
240
|
http.interceptors.response.use(function (response) {
|
|
243
|
-
delPendingRequest(response.config);
|
|
241
|
+
// delPendingRequest(response.config);
|
|
244
242
|
loading && loading.close();
|
|
245
243
|
if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
|
|
246
244
|
if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
|
|
@@ -357,9 +355,9 @@ var ajax = function ajax(_ref) {
|
|
|
357
355
|
}
|
|
358
356
|
}, function (error) {
|
|
359
357
|
loading && loading.close();
|
|
360
|
-
if (!
|
|
361
|
-
|
|
362
|
-
}
|
|
358
|
+
// if (!axios.isCancel(error)) {
|
|
359
|
+
// delPendingRequest(error.config || {});
|
|
360
|
+
// }
|
|
363
361
|
if (error && error.response) {
|
|
364
362
|
if (error.response.status) {
|
|
365
363
|
switch (error.response.status) {
|
package/lib/player.js
CHANGED
|
@@ -154,21 +154,17 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
|
|
|
154
154
|
* @param {Array} [encodes] - 需要对参数值进行encodeURIComponent编码的参数值名称
|
|
155
155
|
**/
|
|
156
156
|
// 请求
|
|
157
|
-
|
|
158
|
-
function getRequestKey(config) {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
if (pendingRequest.has(requestKey)) {
|
|
169
|
-
pendingRequest.delete(requestKey);
|
|
170
|
-
}
|
|
171
|
-
}
|
|
157
|
+
// const pendingRequest = new Map();
|
|
158
|
+
// function getRequestKey(config) {
|
|
159
|
+
// const { method, url, params, data } = config;
|
|
160
|
+
// return [method, url, qs.stringify(params), qs.stringify(data)].join('&');
|
|
161
|
+
// };
|
|
162
|
+
// function delPendingRequest(config) {
|
|
163
|
+
// let requestKey = getRequestKey(config);
|
|
164
|
+
// if (pendingRequest.has(requestKey)) {
|
|
165
|
+
// pendingRequest.delete(requestKey);
|
|
166
|
+
// }
|
|
167
|
+
// }
|
|
172
168
|
var ajax = function ajax(_ref) {
|
|
173
169
|
var headers = _ref.headers,
|
|
174
170
|
method = _ref.method,
|
|
@@ -217,30 +213,32 @@ var ajax = function ajax(_ref) {
|
|
|
217
213
|
http.interceptors.request.use(function (config) {
|
|
218
214
|
config.headers.common = getStorage();
|
|
219
215
|
// 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
|
|
220
|
-
|
|
221
|
-
// 判断请求是否重复
|
|
222
|
-
if (pendingRequest.has(requestKey)) {
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
}
|
|
229
|
-
// 把请求信息,添加请求到map当中
|
|
230
|
-
// 生成取消方法
|
|
231
|
-
config.cancelToken =
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
216
|
+
// let requestKey = getRequestKey(config);
|
|
217
|
+
// // 判断请求是否重复
|
|
218
|
+
// if (pendingRequest.has(requestKey)) {
|
|
219
|
+
// // 取消上次请求
|
|
220
|
+
// let cancel = pendingRequest.get(requestKey);
|
|
221
|
+
// cancel();
|
|
222
|
+
// // 删除请求信息
|
|
223
|
+
// pendingRequest.delete(requestKey);
|
|
224
|
+
// }
|
|
225
|
+
// // 把请求信息,添加请求到map当中
|
|
226
|
+
// // 生成取消方法
|
|
227
|
+
// config.cancelToken =
|
|
228
|
+
// config.cancelToken ||
|
|
229
|
+
// new axios.CancelToken(cancel => {
|
|
230
|
+
// // 把取消方法添加到map
|
|
231
|
+
// if (!pendingRequest.has(requestKey)) {
|
|
232
|
+
// pendingRequest.set(requestKey, cancel);
|
|
233
|
+
// }
|
|
234
|
+
// });
|
|
237
235
|
return config;
|
|
238
236
|
}, function (err) {
|
|
239
237
|
return err;
|
|
240
238
|
});
|
|
241
239
|
// 响应拦截
|
|
242
240
|
http.interceptors.response.use(function (response) {
|
|
243
|
-
delPendingRequest(response.config);
|
|
241
|
+
// delPendingRequest(response.config);
|
|
244
242
|
loading && loading.close();
|
|
245
243
|
if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
|
|
246
244
|
if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
|
|
@@ -357,9 +355,9 @@ var ajax = function ajax(_ref) {
|
|
|
357
355
|
}
|
|
358
356
|
}, function (error) {
|
|
359
357
|
loading && loading.close();
|
|
360
|
-
if (!
|
|
361
|
-
|
|
362
|
-
}
|
|
358
|
+
// if (!axios.isCancel(error)) {
|
|
359
|
+
// delPendingRequest(error.config || {});
|
|
360
|
+
// }
|
|
363
361
|
if (error && error.response) {
|
|
364
362
|
if (error.response.status) {
|
|
365
363
|
switch (error.response.status) {
|
package/lib/qr-code.js
CHANGED
|
@@ -154,21 +154,17 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
|
|
|
154
154
|
* @param {Array} [encodes] - 需要对参数值进行encodeURIComponent编码的参数值名称
|
|
155
155
|
**/
|
|
156
156
|
// 请求
|
|
157
|
-
|
|
158
|
-
function getRequestKey(config) {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
if (pendingRequest.has(requestKey)) {
|
|
169
|
-
pendingRequest.delete(requestKey);
|
|
170
|
-
}
|
|
171
|
-
}
|
|
157
|
+
// const pendingRequest = new Map();
|
|
158
|
+
// function getRequestKey(config) {
|
|
159
|
+
// const { method, url, params, data } = config;
|
|
160
|
+
// return [method, url, qs.stringify(params), qs.stringify(data)].join('&');
|
|
161
|
+
// };
|
|
162
|
+
// function delPendingRequest(config) {
|
|
163
|
+
// let requestKey = getRequestKey(config);
|
|
164
|
+
// if (pendingRequest.has(requestKey)) {
|
|
165
|
+
// pendingRequest.delete(requestKey);
|
|
166
|
+
// }
|
|
167
|
+
// }
|
|
172
168
|
var ajax = function ajax(_ref) {
|
|
173
169
|
var headers = _ref.headers,
|
|
174
170
|
method = _ref.method,
|
|
@@ -217,30 +213,32 @@ var ajax = function ajax(_ref) {
|
|
|
217
213
|
http.interceptors.request.use(function (config) {
|
|
218
214
|
config.headers.common = getStorage();
|
|
219
215
|
// 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
|
|
220
|
-
|
|
221
|
-
// 判断请求是否重复
|
|
222
|
-
if (pendingRequest.has(requestKey)) {
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
}
|
|
229
|
-
// 把请求信息,添加请求到map当中
|
|
230
|
-
// 生成取消方法
|
|
231
|
-
config.cancelToken =
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
216
|
+
// let requestKey = getRequestKey(config);
|
|
217
|
+
// // 判断请求是否重复
|
|
218
|
+
// if (pendingRequest.has(requestKey)) {
|
|
219
|
+
// // 取消上次请求
|
|
220
|
+
// let cancel = pendingRequest.get(requestKey);
|
|
221
|
+
// cancel();
|
|
222
|
+
// // 删除请求信息
|
|
223
|
+
// pendingRequest.delete(requestKey);
|
|
224
|
+
// }
|
|
225
|
+
// // 把请求信息,添加请求到map当中
|
|
226
|
+
// // 生成取消方法
|
|
227
|
+
// config.cancelToken =
|
|
228
|
+
// config.cancelToken ||
|
|
229
|
+
// new axios.CancelToken(cancel => {
|
|
230
|
+
// // 把取消方法添加到map
|
|
231
|
+
// if (!pendingRequest.has(requestKey)) {
|
|
232
|
+
// pendingRequest.set(requestKey, cancel);
|
|
233
|
+
// }
|
|
234
|
+
// });
|
|
237
235
|
return config;
|
|
238
236
|
}, function (err) {
|
|
239
237
|
return err;
|
|
240
238
|
});
|
|
241
239
|
// 响应拦截
|
|
242
240
|
http.interceptors.response.use(function (response) {
|
|
243
|
-
delPendingRequest(response.config);
|
|
241
|
+
// delPendingRequest(response.config);
|
|
244
242
|
loading && loading.close();
|
|
245
243
|
if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
|
|
246
244
|
if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
|
|
@@ -357,9 +355,9 @@ var ajax = function ajax(_ref) {
|
|
|
357
355
|
}
|
|
358
356
|
}, function (error) {
|
|
359
357
|
loading && loading.close();
|
|
360
|
-
if (!
|
|
361
|
-
|
|
362
|
-
}
|
|
358
|
+
// if (!axios.isCancel(error)) {
|
|
359
|
+
// delPendingRequest(error.config || {});
|
|
360
|
+
// }
|
|
363
361
|
if (error && error.response) {
|
|
364
362
|
if (error.response.status) {
|
|
365
363
|
switch (error.response.status) {
|