eoss-ui 0.5.68 → 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.
Files changed (96) hide show
  1. package/CHANGELOG.md +929 -0
  2. package/lib/button-group.js +34 -36
  3. package/lib/button.js +34 -36
  4. package/lib/checkbox-group.js +70 -56
  5. package/lib/data-table-form.js +37 -39
  6. package/lib/data-table.js +73 -64
  7. package/lib/date-picker.js +34 -36
  8. package/lib/dialog.js +49 -51
  9. package/lib/eoss-ui.common.js +944 -728
  10. package/lib/flow-group.js +34 -36
  11. package/lib/flow-list.js +36 -38
  12. package/lib/flow.js +40 -42
  13. package/lib/form.js +410 -376
  14. package/lib/handle-user.js +36 -38
  15. package/lib/handler.js +34 -36
  16. package/lib/icon.js +12 -3593
  17. package/lib/icons.js +1 -1
  18. package/lib/index.js +1 -1
  19. package/lib/input-number.js +34 -36
  20. package/lib/input.js +65 -48
  21. package/lib/layout.js +2 -2
  22. package/lib/login.js +131 -114
  23. package/lib/main.js +80 -50
  24. package/lib/menu.js +91 -55
  25. package/lib/nav.js +66 -41
  26. package/lib/page.js +34 -36
  27. package/lib/player.js +36 -38
  28. package/lib/qr-code.js +34 -36
  29. package/lib/radio-group.js +69 -53
  30. package/lib/retrial-auth.js +34 -36
  31. package/lib/select-ganged.js +122 -106
  32. package/lib/select.js +112 -96
  33. package/lib/selector-panel.js +90 -76
  34. package/lib/selector.js +34 -36
  35. package/lib/sizer.js +36 -38
  36. package/lib/steps.js +60 -44
  37. package/lib/switch.js +34 -36
  38. package/lib/table-form.js +36 -38
  39. package/lib/tabs.js +34 -36
  40. package/lib/theme-chalk/base.css +1 -1
  41. package/lib/theme-chalk/fonts/iconfont.ttf +0 -0
  42. package/lib/theme-chalk/fonts/iconfont.woff +0 -0
  43. package/lib/theme-chalk/icon.css +1 -1
  44. package/lib/theme-chalk/index.css +1 -1
  45. package/lib/theme-chalk/login.css +1 -1
  46. package/lib/theme-chalk/main.css +1 -1
  47. package/lib/theme-chalk/menu.css +1 -1
  48. package/lib/theme-chalk/sizer.css +1 -1
  49. package/lib/theme-chalk/upload.css +1 -1
  50. package/lib/tips.js +59 -42
  51. package/lib/tree-group.js +34 -36
  52. package/lib/tree.js +93 -77
  53. package/lib/upload.js +111 -94
  54. package/lib/utils/util.js +34 -36
  55. package/lib/wujie.js +34 -36
  56. package/lib/wxlogin.js +34 -36
  57. package/package.json +2 -2
  58. package/packages/checkbox-group/src/main.vue +7 -1
  59. package/packages/data-table/src/main.vue +13 -6
  60. package/packages/dialog/src/main.vue +2 -3
  61. package/packages/form/src/main.vue +11 -2
  62. package/packages/icon/src/main.vue +10 -3
  63. package/packages/icons/src/icon.json +1 -1
  64. package/packages/input/src/main.vue +8 -1
  65. package/packages/login/src/main.vue +36 -24
  66. package/packages/main/src/main.vue +28 -6
  67. package/packages/menu/src/main.vue +76 -65
  68. package/packages/nav/src/main.vue +23 -4
  69. package/packages/radio-group/src/main.vue +7 -1
  70. package/packages/select/src/main.vue +7 -1
  71. package/packages/select-ganged/src/main.vue +7 -1
  72. package/packages/selector-panel/src/main.vue +7 -1
  73. package/packages/steps/src/main.vue +9 -3
  74. package/packages/theme-chalk/lib/base.css +1 -1
  75. package/packages/theme-chalk/lib/fonts/iconfont.ttf +0 -0
  76. package/packages/theme-chalk/lib/fonts/iconfont.woff +0 -0
  77. package/packages/theme-chalk/lib/icon.css +1 -1
  78. package/packages/theme-chalk/lib/index.css +1 -1
  79. package/packages/theme-chalk/lib/login.css +1 -1
  80. package/packages/theme-chalk/lib/main.css +1 -1
  81. package/packages/theme-chalk/lib/menu.css +1 -1
  82. package/packages/theme-chalk/lib/sizer.css +1 -1
  83. package/packages/theme-chalk/lib/upload.css +1 -1
  84. package/packages/theme-chalk/src/common/var.scss +2 -0
  85. package/packages/theme-chalk/src/fonts/iconfont.ttf +0 -0
  86. package/packages/theme-chalk/src/fonts/iconfont.woff +0 -0
  87. package/packages/theme-chalk/src/icon.scss +430 -426
  88. package/packages/theme-chalk/src/login.scss +2 -3
  89. package/packages/theme-chalk/src/main.scss +14 -5
  90. package/packages/theme-chalk/src/menu.scss +1 -1
  91. package/packages/theme-chalk/src/nav.scss +2 -2
  92. package/packages/tips/src/main.vue +8 -1
  93. package/packages/tree/src/main.vue +8 -2
  94. package/packages/upload/src/main.vue +11 -2
  95. package/src/index.js +1 -1
  96. package/src/utils/util.js +34 -34
package/lib/steps.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
- var pendingRequest = new Map();
158
- function getRequestKey(config) {
159
- var method = config.method,
160
- url = config.url,
161
- params = config.params,
162
- data = config.data;
163
-
164
- return [method, url, qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(params), qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data)].join('&');
165
- };
166
- function delPendingRequest(config) {
167
- var requestKey = getRequestKey(config);
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
- var requestKey = getRequestKey(config);
221
- // 判断请求是否重复
222
- if (pendingRequest.has(requestKey)) {
223
- // 取消上次请求
224
- var cancel = pendingRequest.get(requestKey);
225
- cancel();
226
- // 删除请求信息
227
- pendingRequest.delete(requestKey);
228
- }
229
- // 把请求信息,添加请求到map当中
230
- // 生成取消方法
231
- config.cancelToken = config.cancelToken || new axios__WEBPACK_IMPORTED_MODULE_1___default.a.CancelToken(function (cancel) {
232
- // 把取消方法添加到map
233
- if (!pendingRequest.has(requestKey)) {
234
- pendingRequest.set(requestKey, cancel);
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 (!axios__WEBPACK_IMPORTED_MODULE_1___default.a.isCancel(error)) {
361
- delPendingRequest(error.config || {});
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) {
@@ -3497,6 +3495,13 @@ module.exports = require("sm-crypto");
3497
3495
 
3498
3496
  /***/ }),
3499
3497
 
3498
+ /***/ 11:
3499
+ /***/ (function(module, exports) {
3500
+
3501
+ module.exports = require("throttle-debounce");
3502
+
3503
+ /***/ }),
3504
+
3500
3505
  /***/ 2:
3501
3506
  /***/ (function(module, exports) {
3502
3507
 
@@ -3637,7 +3642,7 @@ module.exports = require("json-bigint");
3637
3642
  // ESM COMPAT FLAG
3638
3643
  __webpack_require__.r(__webpack_exports__);
3639
3644
 
3640
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/steps/src/main.vue?vue&type=template&id=6a6ca54d&
3645
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/steps/src/main.vue?vue&type=template&id=029968af&
3641
3646
  var render = function () {
3642
3647
  var _vm = this
3643
3648
  var _h = _vm.$createElement
@@ -3742,11 +3747,14 @@ var staticRenderFns = []
3742
3747
  render._withStripped = true
3743
3748
 
3744
3749
 
3745
- // CONCATENATED MODULE: ./packages/steps/src/main.vue?vue&type=template&id=6a6ca54d&
3750
+ // CONCATENATED MODULE: ./packages/steps/src/main.vue?vue&type=template&id=029968af&
3746
3751
 
3747
3752
  // EXTERNAL MODULE: ./src/utils/util.js
3748
3753
  var util = __webpack_require__(0);
3749
3754
 
3755
+ // EXTERNAL MODULE: external "throttle-debounce"
3756
+ var external_throttle_debounce_ = __webpack_require__(11);
3757
+
3750
3758
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/steps/src/main.vue?vue&type=script&lang=js&
3751
3759
  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; };
3752
3760
 
@@ -3818,6 +3826,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
3818
3826
  //
3819
3827
 
3820
3828
 
3829
+
3821
3830
  /* harmony default export */ var mainvue_type_script_lang_js_ = ({
3822
3831
  name: 'EsSteps',
3823
3832
  inheritAttrs: false,
@@ -3882,14 +3891,21 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
3882
3891
  }
3883
3892
  }
3884
3893
  },
3894
+ beforeCreate: function beforeCreate() {
3895
+ var _this = this;
3896
+
3897
+ this.getData = Object(external_throttle_debounce_["debounce"])(300, function () {
3898
+ _this.getDatas();
3899
+ });
3900
+ },
3885
3901
  created: function created() {
3886
3902
  this.getData();
3887
3903
  },
3888
3904
  mounted: function mounted() {},
3889
3905
 
3890
3906
  methods: {
3891
- getData: function getData() {
3892
- var _this = this;
3907
+ getDatas: function getDatas() {
3908
+ var _this2 = this;
3893
3909
 
3894
3910
  if (this.url) {
3895
3911
  var param = this.param ? this.param : {};
@@ -3900,15 +3916,15 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
3900
3916
  params: param
3901
3917
  }).then(function (res) {
3902
3918
  if (res.rCode === 0) {
3903
- if (_this.esForm) {
3904
- _this.esForm.stepContent = JSON.parse(JSON.stringify(res.results));
3919
+ if (_this2.esForm) {
3920
+ _this2.esForm.stepContent = JSON.parse(JSON.stringify(res.results));
3905
3921
  } else {
3906
- _this.list = JSON.parse(JSON.stringify(res.results));
3922
+ _this2.list = JSON.parse(JSON.stringify(res.results));
3907
3923
  }
3908
3924
  }
3909
3925
  }).catch(function (err) {
3910
3926
  if (err.message && err.message !== 'canceled') {
3911
- _this.$message.error(err.message);
3927
+ _this2.$message.error(err.message);
3912
3928
  }
3913
3929
  });
3914
3930
  }
package/lib/switch.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
- var pendingRequest = new Map();
158
- function getRequestKey(config) {
159
- var method = config.method,
160
- url = config.url,
161
- params = config.params,
162
- data = config.data;
163
-
164
- return [method, url, qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(params), qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data)].join('&');
165
- };
166
- function delPendingRequest(config) {
167
- var requestKey = getRequestKey(config);
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
- var requestKey = getRequestKey(config);
221
- // 判断请求是否重复
222
- if (pendingRequest.has(requestKey)) {
223
- // 取消上次请求
224
- var cancel = pendingRequest.get(requestKey);
225
- cancel();
226
- // 删除请求信息
227
- pendingRequest.delete(requestKey);
228
- }
229
- // 把请求信息,添加请求到map当中
230
- // 生成取消方法
231
- config.cancelToken = config.cancelToken || new axios__WEBPACK_IMPORTED_MODULE_1___default.a.CancelToken(function (cancel) {
232
- // 把取消方法添加到map
233
- if (!pendingRequest.has(requestKey)) {
234
- pendingRequest.set(requestKey, cancel);
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 (!axios__WEBPACK_IMPORTED_MODULE_1___default.a.isCancel(error)) {
361
- delPendingRequest(error.config || {});
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/table-form.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
- var pendingRequest = new Map();
158
- function getRequestKey(config) {
159
- var method = config.method,
160
- url = config.url,
161
- params = config.params,
162
- data = config.data;
163
-
164
- return [method, url, qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(params), qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data)].join('&');
165
- };
166
- function delPendingRequest(config) {
167
- var requestKey = getRequestKey(config);
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
- var requestKey = getRequestKey(config);
221
- // 判断请求是否重复
222
- if (pendingRequest.has(requestKey)) {
223
- // 取消上次请求
224
- var cancel = pendingRequest.get(requestKey);
225
- cancel();
226
- // 删除请求信息
227
- pendingRequest.delete(requestKey);
228
- }
229
- // 把请求信息,添加请求到map当中
230
- // 生成取消方法
231
- config.cancelToken = config.cancelToken || new axios__WEBPACK_IMPORTED_MODULE_1___default.a.CancelToken(function (cancel) {
232
- // 把取消方法添加到map
233
- if (!pendingRequest.has(requestKey)) {
234
- pendingRequest.set(requestKey, cancel);
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 (!axios__WEBPACK_IMPORTED_MODULE_1___default.a.isCancel(error)) {
361
- delPendingRequest(error.config || {});
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) {
@@ -3497,7 +3495,7 @@ module.exports = require("sm-crypto");
3497
3495
 
3498
3496
  /***/ }),
3499
3497
 
3500
- /***/ 13:
3498
+ /***/ 14:
3501
3499
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
3502
3500
 
3503
3501
  "use strict";
@@ -6462,7 +6460,7 @@ tablevue_type_template_id_38b43090_render._withStripped = true
6462
6460
  // CONCATENATED MODULE: ./packages/form/src/table.vue?vue&type=template&id=38b43090&
6463
6461
 
6464
6462
  // EXTERNAL MODULE: ./src/utils/rules.js
6465
- var rules = __webpack_require__(13);
6463
+ var rules = __webpack_require__(14);
6466
6464
 
6467
6465
  // EXTERNAL MODULE: ./src/utils/util.js
6468
6466
  var util = __webpack_require__(0);
package/lib/tabs.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
- var pendingRequest = new Map();
158
- function getRequestKey(config) {
159
- var method = config.method,
160
- url = config.url,
161
- params = config.params,
162
- data = config.data;
163
-
164
- return [method, url, qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(params), qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data)].join('&');
165
- };
166
- function delPendingRequest(config) {
167
- var requestKey = getRequestKey(config);
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
- var requestKey = getRequestKey(config);
221
- // 判断请求是否重复
222
- if (pendingRequest.has(requestKey)) {
223
- // 取消上次请求
224
- var cancel = pendingRequest.get(requestKey);
225
- cancel();
226
- // 删除请求信息
227
- pendingRequest.delete(requestKey);
228
- }
229
- // 把请求信息,添加请求到map当中
230
- // 生成取消方法
231
- config.cancelToken = config.cancelToken || new axios__WEBPACK_IMPORTED_MODULE_1___default.a.CancelToken(function (cancel) {
232
- // 把取消方法添加到map
233
- if (!pendingRequest.has(requestKey)) {
234
- pendingRequest.set(requestKey, cancel);
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 (!axios__WEBPACK_IMPORTED_MODULE_1___default.a.isCancel(error)) {
361
- delPendingRequest(error.config || {});
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) {