ls-pro-common 3.1.41 → 3.1.43

package/es/components/ViewOffice.js

@@ -29,12 +29,19 @@ var ViewDocment = function ViewDocment(props) {
     setVisible = _useState2[1];
   var src = useMemo(function () {
     var token = getCookie('token');
-    var filename = getUrlQuery(url, 'fileName'); //文件名,上传的文件名为xxx?fileName=xxx.pdf
+    var filename = getUrlQuery('fileName', url); //文件名,上传的文件名为xxx?fileName=xxx.pdf
     if (!filename) {
       //外部文件比如，xxx/ddd.docx，兜底直接给个临时的，但好像有问题，因为后端不知道文件类型
       filename = url.split('/').pop() || Date.now().toString(32);
     }
-    var doc = base64Encode(url + (url.includes('?') ? '&' : '?') + 'fullfilename=' + filename + '&token=' + token);
+    var href = url;
+    if (!url.includes('token=')) {
+      href = href + (href.includes('?') ? '&' : '?') + 'token=' + token;
+    }
+    if (!href.includes('fullfilename=')) {
+      href = href + (href.includes('?') ? '&' : '?') + 'fullfilename=' + filename;
+    }
+    var doc = base64Encode(href);
     // 如果是生产环境，走下载域名，其它环境走原来域名
     var domain = '';
     if (location.href.includes('.cloud/') && getCache('exportUrl')) {

package/es/http/index.js

@@ -154,7 +154,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
           ifExpireWarn = true;
           setCache('expireWarnFlag', '1', true);
         case 18:
-          if ((retCode === 'timeout' || retCode === '4011' || retCode === '4013') && !isMobile) {
+          if ((retCode === 'timeout' || retCode === '4011' || retCode === '4013' || retCode === '9009' && retMsg === '令牌不能为空') && !isMobile) {
             if (!getCookie('token')) {
               (window.top || window).location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);
             } else {
@@ -223,7 +223,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
           setCache('expireWarnFlag', '1', true);
         case 44:
           if (_retCode && !status.includes(_retCode)) {
-            if ((_retCode === 'timeout' || _retCode === '4011') && !isMobile) {
+            if ((_retCode === 'timeout' || _retCode === '4011' || _retCode === '9009' && _retMsg === '令牌不能为空') && !isMobile) {
               if (!getCookie('token')) {
                 (window.top || window).location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);
               } else {
@@ -267,27 +267,26 @@ function ajax(url) {
       _loading: ''
     }).replace('&_loading=', '').replace('_loading=', '');
   }
+  var finallyFn = function finallyFn() {
+    if (loadText) {
+      exitLoading();
+    }
+  };
   if (type === 'get') {
     return request.get(url, {
       params: params,
       timeout: timeout
-    }).finally(function () {
-      return exitLoading();
-    });
+    }).finally(finallyFn);
   } else if (type === 'delete') {
     return request.delete(url, {
       data: params,
       timeout: timeout
-    }).finally(function () {
-      return exitLoading();
-    });
+    }).finally(finallyFn);
   } else if (type === 'put') {
     return request.put(url, {
       data: params,
       timeout: timeout
-    }).finally(function () {
-      return exitLoading();
-    });
+    }).finally(finallyFn);
   } else {
     // 如果sumProperties存在，则添加sumProperties参数到url中
     if (params.sumProperties && typeof params.sumProperties === 'string') {
@@ -295,15 +294,12 @@ function ajax(url) {
         sumProperties: params.sumProperties
       });
     }
+    var requestType = isJson ? 'json' : 'form';
     return request.post(url, {
       data: params,
       timeout: timeout,
-      requestType: isJson ? 'json' : 'form'
-    }).finally(function () {
-      if (loadText) {
-        exitLoading();
-      }
-    });
+      requestType: requestType
+    }).finally(finallyFn);
   }
 }
 /**

package/lib/components/ViewOffice.js

@@ -29,12 +29,19 @@ var ViewDocment = function ViewDocment(props) {
     setVisible = _useState2[1];
   var src = useMemo(function () {
     var token = getCookie('token');
-    var filename = getUrlQuery(url, 'fileName'); //文件名,上传的文件名为xxx?fileName=xxx.pdf
+    var filename = getUrlQuery('fileName', url); //文件名,上传的文件名为xxx?fileName=xxx.pdf
     if (!filename) {
       //外部文件比如，xxx/ddd.docx，兜底直接给个临时的，但好像有问题，因为后端不知道文件类型
       filename = url.split('/').pop() || Date.now().toString(32);
     }
-    var doc = base64Encode(url + (url.includes('?') ? '&' : '?') + 'fullfilename=' + filename + '&token=' + token);
+    var href = url;
+    if (!url.includes('token=')) {
+      href = href + (href.includes('?') ? '&' : '?') + 'token=' + token;
+    }
+    if (!href.includes('fullfilename=')) {
+      href = href + (href.includes('?') ? '&' : '?') + 'fullfilename=' + filename;
+    }
+    var doc = base64Encode(href);
     // 如果是生产环境，走下载域名，其它环境走原来域名
     var domain = '';
     if (location.href.includes('.cloud/') && getCache('exportUrl')) {

package/lib/http/index.js

@@ -154,7 +154,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
           ifExpireWarn = true;
           setCache('expireWarnFlag', '1', true);
         case 18:
-          if ((retCode === 'timeout' || retCode === '4011' || retCode === '4013') && !isMobile) {
+          if ((retCode === 'timeout' || retCode === '4011' || retCode === '4013' || retCode === '9009' && retMsg === '令牌不能为空') && !isMobile) {
             if (!getCookie('token')) {
               (window.top || window).location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);
             } else {
@@ -223,7 +223,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
           setCache('expireWarnFlag', '1', true);
         case 44:
           if (_retCode && !status.includes(_retCode)) {
-            if ((_retCode === 'timeout' || _retCode === '4011') && !isMobile) {
+            if ((_retCode === 'timeout' || _retCode === '4011' || _retCode === '9009' && _retMsg === '令牌不能为空') && !isMobile) {
               if (!getCookie('token')) {
                 (window.top || window).location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);
               } else {
@@ -267,27 +267,26 @@ function ajax(url) {
       _loading: ''
     }).replace('&_loading=', '').replace('_loading=', '');
   }
+  var finallyFn = function finallyFn() {
+    if (loadText) {
+      exitLoading();
+    }
+  };
   if (type === 'get') {
     return request.get(url, {
       params: params,
       timeout: timeout
-    }).finally(function () {
-      return exitLoading();
-    });
+    }).finally(finallyFn);
   } else if (type === 'delete') {
     return request.delete(url, {
       data: params,
       timeout: timeout
-    }).finally(function () {
-      return exitLoading();
-    });
+    }).finally(finallyFn);
   } else if (type === 'put') {
     return request.put(url, {
       data: params,
       timeout: timeout
-    }).finally(function () {
-      return exitLoading();
-    });
+    }).finally(finallyFn);
   } else {
     // 如果sumProperties存在，则添加sumProperties参数到url中
     if (params.sumProperties && typeof params.sumProperties === 'string') {
@@ -295,15 +294,12 @@ function ajax(url) {
         sumProperties: params.sumProperties
       });
     }
+    var requestType = isJson ? 'json' : 'form';
     return request.post(url, {
       data: params,
       timeout: timeout,
-      requestType: isJson ? 'json' : 'form'
-    }).finally(function () {
-      if (loadText) {
-        exitLoading();
-      }
-    });
+      requestType: requestType
+    }).finally(finallyFn);
   }
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "3.1.41",
+  "version": "3.1.43",
   "description": "ls-pro-common",
   "license": "MIT",
   "sideEffects": [