iv-npm 1.7.70 → 1.7.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iv-npm",
-  "version": "1.7.70",
+  "version": "1.7.72",
   "description": "公共通用包",
   "author": "Mr.Cong",
   "license": "ISC",

package/packages/ui/dist/Altimeter/index.html

@@ -16,10 +16,7 @@
         result += chars[Math.floor(Math.random() * chars.length)];
       return result;
     }
-    var messageId = getMessageId(
-      10,
-      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    );
+    var messageId = null
 
     var fileBase64Str = "";
     var file_path = "";
@@ -72,7 +69,7 @@
         Cam_GetDevResolution(CamID);
       } else {
         window.parent.postMessage(
-          { error: "没有发现合适的设备！", id: messageId },
+          { error: "没有发现合适的设备！", messageId: messageId },
           "*"
         );
       }
@@ -107,7 +104,7 @@
         var CamID = document.getElementById("DevName").selectedIndex;
         Cam_Open(CamID, width, height);
       } else {
-        window.parent.postMessage({ error: "获取分辨率信息失败！" , id: messageId}, "*");
+        window.parent.postMessage({ error: "获取分辨率信息失败！" , messageId: messageId}, "*");
       }
     }
 
@@ -116,10 +113,10 @@
   ----------------------------------------------------*/
     function GetCameraOnOffStatus(status) {
       if (status == 0) {
-        window.parent.postMessage({ message: "设备开启成功", id: messageId }, "*");
+        window.parent.postMessage({ message: "设备开启成功", messageId: messageId }, "*");
         Cam_SetCutMode(1); //设备开启后自动裁剪
       } else {
-        window.parent.postMessage({ error: "设备开启失败", id: messageId }, "*");
+        window.parent.postMessage({ error: "设备开启失败", messageId: messageId }, "*");
       }
     }
 
@@ -133,19 +130,19 @@
         var obj = document.getElementById("CameraPhoto");
         obj.src = "data:;base64," + base64Str;
         if (path == "") {
-          window.parent.postMessage({ message: "拍照成功", id: messageId }, "*");
+          window.parent.postMessage({ message: "拍照成功", messageId: messageId }, "*");
         } else {
           window.parent.postMessage(
             {
               message: "拍照成功，图片保存位置：" + path,
               GetCaptrueImgResultCB: "data:;base64," + base64Str,
-              id: messageId
+              messageId: messageId
             },
             "*"
           );
         }
       } else {
-        window.parent.postMessage({ error: "拍照失败", id: messageId }, "*");
+        window.parent.postMessage({ error: "拍照失败", messageId: messageId }, "*");
       }
     }
 
@@ -176,9 +173,9 @@
         document.getElementById("CardEffectDate").value = EffectedDate;
         var obj = document.getElementById("IdCardPhoto");
         obj.src = "data:;base64," + CardImgBase64;
-        window.parent.postMessage({ message: "读卡成功", id: messageId }, "*");
+        window.parent.postMessage({ message: "读卡成功", messageId: messageId }, "*");
       } else {
-        window.parent.postMessage({ error: "读卡失败" , id: messageId}, "*");
+        window.parent.postMessage({ error: "读卡失败" , messageId: messageId}, "*");
       }
     }
 
@@ -188,10 +185,10 @@
     function QrBarCodeRecogResultCB(flag, codeStr) {
       if (flag == 0)
         window.parent.postMessage(
-          { message: "条码/二维码识别结果:" + codeStr, id: messageId },
+          { message: "条码/二维码识别结果:" + codeStr, messageId: messageId },
           "*"
         );
-      else window.parent.postMessage({ error: "未识别到内容", id: messageId }, "*");
+      else window.parent.postMessage({ error: "未识别到内容", messageId: messageId }, "*");
     }
 
     /*********************
@@ -203,6 +200,10 @@
         alert("浏览器不支持HTML5,请更新或者使用其它浏览器!");
       }
       //console.log("LoadCameraDocument");
+      messageId = getMessageId(
+      10,
+      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    );
       var obj = document.getElementById("CameraCtl");
       Cam_ControlInit(obj, 0, 0, 600, 400);
     }
@@ -407,11 +408,11 @@
   ----------------------------------------------------*/
     function AddImgFileToPDFResultCB(flag, base64Str) {
       if (flag == 0) {
-        window.parent.postMessage({ message: "添加合并的PDF文件成功", id: messageId }, "*");
+        window.parent.postMessage({ message: "添加合并的PDF文件成功", messageId: messageId }, "*");
         var obj = document.getElementById("CameraPhoto");
         obj.src = "data:;base64," + base64Str;
       } else {
-        window.parent.postMessage({ error: "添加合并的PDF文件失败", id: messageId }, "*");
+        window.parent.postMessage({ error: "添加合并的PDF文件失败", messageId: messageId }, "*");
       }
     }
 
@@ -426,10 +427,10 @@
   ----------------------------------------------------*/
     function PdfCombineResultCB(flag, PdfBase64Str) {
       if (flag == 0) {
-        window.parent.postMessage({ message: "合并PDF完成, id: messageId" }, "*");
+        window.parent.postMessage({ message: "合并PDF完成, messageId: messageId" }, "*");
         console.log(PdfBase64Str);
       } else {
-        window.parent.postMessage({ error: "合并PDF失败", id: messageId }, "*");
+        window.parent.postMessage({ error: "合并PDF失败", messageId: messageId }, "*");
       }
     }
 
@@ -439,7 +440,7 @@
       MergeCount++;
       if (MergeCount > 4) {
         window.parent.postMessage(
-          { error: "提示：图像合并最多支持四页合并", id: messageId },
+          { error: "提示：图像合并最多支持四页合并", messageId: messageId },
           "*"
         );
         return;
@@ -453,11 +454,11 @@
   ----------------------------------------------------*/
     function AddMergeImageFileResultCB(flag, base64Str) {
       if (flag == 0) {
-        window.parent.postMessage({ message: "添加合并图像文件成功", id: messageId }, "*");
+        window.parent.postMessage({ message: "添加合并图像文件成功", messageId: messageId }, "*");
         var obj = document.getElementById("CameraPhoto");
         obj.src = "data:;base64," + base64Str;
       } else {
-        window.parent.postMessage({ error: "添加合并图像文件失败", id: messageId }, "*");
+        window.parent.postMessage({ error: "添加合并图像文件失败", messageId: messageId }, "*");
       }
     }
 
@@ -472,11 +473,11 @@
   ----------------------------------------------------*/
     function MergeImagesResultCB(flag, base64Str) {
       if (flag == 0) {
-        window.parent.postMessage({ message: "图像合并完成" , id: messageId}, "*");
+        window.parent.postMessage({ message: "图像合并完成" , messageId: messageId}, "*");
         var obj = document.getElementById("CameraPhoto");
         obj.src = "data:;base64," + base64Str;
       } else {
-        window.parent.postMessage({ error: "图像合并失败", id: messageId }, "*");
+        window.parent.postMessage({ error: "图像合并失败", messageId: messageId }, "*");
       }
     }
 
@@ -485,9 +486,9 @@
   ----------------------------------------------------*/
     function GetDriveResultCB(driveStr) {
       if (driveStr == "") {
-        window.parent.postMessage({ error: "获取盘符失败", id: messageId }, "*");
+        window.parent.postMessage({ error: "获取盘符失败", messageId: messageId }, "*");
       } else {
-        window.parent.postMessage({ message: "获取盘符：" + driveStr , id: messageId}, "*");
+        window.parent.postMessage({ message: "获取盘符：" + driveStr , messageId: messageId}, "*");
       }
     }
 
@@ -532,9 +533,9 @@
     //删除文件返回结果
     function GetDeleteFileResultCB(flag) {
       if (flag == 0) {
-        window.parent.postMessage({ message: "删除文件成功", id: messageId }, "*");
+        window.parent.postMessage({ message: "删除文件成功", messageId: messageId }, "*");
       } else {
-        window.parent.postMessage({ error: "删除文件失败！", id: messageId }, "*");
+        window.parent.postMessage({ error: "删除文件失败！", messageId: messageId }, "*");
       }
     }
   </script>