@deanwu/vue-component-library 1.2.31 → 1.2.33

package/dist/vue-component-library.common.js

@@ -110912,7 +110912,7 @@ var loading_component = normalizeComponent(
   
 )
 
-/* harmony default export */ var loading = (loading_component.exports);
+/* harmony default export */ var popup_loading = (loading_component.exports);
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"48032ffa-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/popup/message.vue?vue&type=template&id=40722425&scoped=true&
 var messagevue_type_template_id_40722425_scoped_true_render = function render() {
   var _vm = this,
@@ -114008,17 +114008,17 @@ function global_install(Vue, config) {
       opt.params = opt.data;
       delete opt.data;
     }
-    opt.loading && this.$loading(Object.assign({
+    let loading = opt.loading && this.$loading(Object.assign({
       timeout: config.request.timeout
     }, typeof opt.loading == 'object' ? opt.loading : undefined));
     const source = axios_default.a.CancelToken.source();
-    axios_default.a.create({
+    const request = axios_default.a.create({
       baseURL: config.request.baseUrl,
       headers: config.request.headers,
       cancelToken: source.token
     })(opt).then(res => {
       delete axios_default.a.requestQueue[index];
-      opt.loading && this.$loadOver();
+      loading && loading.close();
       try {
         const data = deciphering(res.data.ciphertext);
         config.request.log && console.group(`----- success ${opt.url.split('?')[0]} -----`);
@@ -114064,7 +114064,7 @@ function global_install(Vue, config) {
       config.request.log && console.groupEnd();
     }).catch(e => {
       delete axios_default.a.requestQueue[index];
-      opt.loading && this.$loadOver();
+      loading && loading.close();
       if (e.message == 'cancel') return;
       this.$message({
         type: 'fail',
@@ -114076,11 +114076,10 @@ function global_install(Vue, config) {
       axios_default.a.requestQueue = {};
     }
     const index = axios_default.a.requestIndex++;
-    const request = {
-      abort() {
-        source.cancel('cancel');
-        delete axios_default.a.requestQueue[index];
-      }
+    request.abort = () => {
+      loading && loading.close();
+      source.cancel('cancel');
+      delete axios_default.a.requestQueue[index];
     };
     axios_default.a.requestQueue[index] = request;
     return request;
@@ -114271,7 +114270,7 @@ const GLOBAL_COMPS = [upload, public_clipboard, dialog_min];
 
 
 
-const DYNAMIC_COMPS = [loading, popup_message, notice, popup_confirm, popup_preview];
+const DYNAMIC_COMPS = [popup_loading, popup_message, notice, popup_confirm, popup_preview];