ls-pro-common 3.1.63 → 3.1.65

package/es/utils/taskProcess.d.ts

@@ -1,3 +1,4 @@
+import { ApiResponse } from '../typing';
 /**
  * 后台任务进度查看
  *
@@ -5,5 +6,5 @@
  * @param taskName 后台任务名称,
  * @returns
  */
-declare const taskProcess: (taskId: string, taskName?: string) => void;
+declare const taskProcess: (taskId: string, taskName: string | undefined, callback: (result: ApiResponse | false) => void) => void;
 export default taskProcess;

package/es/utils/taskProcess.js

@@ -14,7 +14,9 @@ import { httpGet } from '../http';
  */
 var taskProcess = function taskProcess(taskId) {
   var taskName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  var callback = arguments.length > 2 ? arguments[2] : undefined;
   if (!taskId) {
+    callback(false);
     return;
   }
   var exit = false;
@@ -81,6 +83,7 @@ var taskProcess = function taskProcess(taskId) {
       })),
       onClose: function onClose() {
         exit = true;
+        callback(false);
         document.removeEventListener('mouseup', onUp);
         document.removeEventListener('mousemove', onMove);
       }
@@ -91,8 +94,8 @@ var taskProcess = function taskProcess(taskId) {
     if (exit) return;
     var url = '/lesoon/lesoon-msg-center-api/bizAsyncTaskManage/page';
     httpGet(url, {
-      'page': 1,
-      'pageSize': 1,
+      page: 1,
+      pageSize: 1,
       where: {
         taskId: taskId
       }
@@ -102,6 +105,7 @@ var taskProcess = function taskProcess(taskId) {
       var row = rows === null || rows === void 0 ? void 0 : rows[0];
       if (!row) {
         showError('获取任务进度失败,请在消息中心查看任务结果');
+        callback(result);
         _notification.close(key);
       } else {
         var status = row.status,
@@ -123,12 +127,20 @@ var taskProcess = function taskProcess(taskId) {
             showWarn('任务已终止,请在消息中心查看任务结果');
           }
           sleep(1.5).then(function () {
+            callback(result);
             _notification.close(key);
           });
         }
       }
     }).catch(function () {
       showError('获取任务进度失败,请在消息中心查看任务结果');
+      callback({
+        flag: {
+          retCode: '9999',
+          retMsg: '获取任务进度失败,请在消息中心查看任务结果'
+        },
+        success: false
+      });
       _notification.close(key);
     });
   };

package/es/utils/url.js

@@ -13,6 +13,17 @@ export var getUrlQuery = function getUrlQuery(name) {
   var r = url.match(reg);
   if (r != null) {
     return decodeURIComponent(decodeURI(r[2]));
+  } else if (url === location.search.slice(1)) {
+    // 如果参数放在hash后面，则需要从href中获取.
+    url = location.href;
+    var _r = url.match(reg);
+    if (_r != null) {
+      var value = decodeURIComponent(decodeURI(_r[2]));
+      if (value === null || value === void 0 ? void 0 : value.includes('#/')) {
+        return value.split('#/')[0];
+      }
+      return value;
+    }
   }
   return '';
 };

package/lib/utils/taskProcess.d.ts

@@ -1,3 +1,4 @@
+import { ApiResponse } from '../typing';
 /**
  * 后台任务进度查看
  *
@@ -5,5 +6,5 @@
  * @param taskName 后台任务名称,
  * @returns
  */
-declare const taskProcess: (taskId: string, taskName?: string) => void;
+declare const taskProcess: (taskId: string, taskName: string | undefined, callback: (result: ApiResponse | false) => void) => void;
 export default taskProcess;

package/lib/utils/taskProcess.js

@@ -14,7 +14,9 @@ import { httpGet } from '../http';
  */
 var taskProcess = function taskProcess(taskId) {
   var taskName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  var callback = arguments.length > 2 ? arguments[2] : undefined;
   if (!taskId) {
+    callback(false);
     return;
   }
   var exit = false;
@@ -81,6 +83,7 @@ var taskProcess = function taskProcess(taskId) {
       })),
       onClose: function onClose() {
         exit = true;
+        callback(false);
         document.removeEventListener('mouseup', onUp);
         document.removeEventListener('mousemove', onMove);
       }
@@ -91,8 +94,8 @@ var taskProcess = function taskProcess(taskId) {
     if (exit) return;
     var url = '/lesoon/lesoon-msg-center-api/bizAsyncTaskManage/page';
     httpGet(url, {
-      'page': 1,
-      'pageSize': 1,
+      page: 1,
+      pageSize: 1,
       where: {
         taskId: taskId
       }
@@ -102,6 +105,7 @@ var taskProcess = function taskProcess(taskId) {
       var row = rows === null || rows === void 0 ? void 0 : rows[0];
       if (!row) {
         showError('获取任务进度失败,请在消息中心查看任务结果');
+        callback(result);
         _notification.close(key);
       } else {
         var status = row.status,
@@ -123,12 +127,20 @@ var taskProcess = function taskProcess(taskId) {
             showWarn('任务已终止,请在消息中心查看任务结果');
           }
           sleep(1.5).then(function () {
+            callback(result);
             _notification.close(key);
           });
         }
       }
     }).catch(function () {
       showError('获取任务进度失败,请在消息中心查看任务结果');
+      callback({
+        flag: {
+          retCode: '9999',
+          retMsg: '获取任务进度失败,请在消息中心查看任务结果'
+        },
+        success: false
+      });
       _notification.close(key);
     });
   };

package/lib/utils/url.js

@@ -13,6 +13,17 @@ export var getUrlQuery = function getUrlQuery(name) {
   var r = url.match(reg);
   if (r != null) {
     return decodeURIComponent(decodeURI(r[2]));
+  } else if (url === location.search.slice(1)) {
+    // 如果参数放在hash后面，则需要从href中获取.
+    url = location.href;
+    var _r = url.match(reg);
+    if (_r != null) {
+      var value = decodeURIComponent(decodeURI(_r[2]));
+      if (value === null || value === void 0 ? void 0 : value.includes('#/')) {
+        return value.split('#/')[0];
+      }
+      return value;
+    }
   }
   return '';
 };

package/package.json

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