xh-lab-rc 0.16.0 → 0.16.3

package/dist/LabAltimeter/KemiAlt/index.js

@@ -1,9 +1,11 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: xqy
  * @Date: 2024-06-28 14:07:14
  * @LastEditors: xqy
- * @LastEditTime: 2024-07-14 18:30:17
+ * @LastEditTime: 2024-07-16 16:34:17
  * @Description:科密高拍仪
  */
 import { Uint8ArrayToString, byteToString, formatDate, stringToByte } from "../../utils/utils";
@@ -27,15 +29,7 @@ var KemiAlt = /*#__PURE__*/forwardRef(function (props, ref) {
     setSocketConnected = _useState2[1]; // socket连接状态
 
   var cameraRef = useRef(null);
-  var _useState3 = useState({}),
-    _useState4 = _slicedToArray(_useState3, 2),
-    captureResult = _useState4[0],
-    setCaptureResult = _useState4[1]; //拍照返回的结果
-  var _useState5 = useState({}),
-    _useState6 = _slicedToArray(_useState5, 2),
-    compPDFResult = _useState6[0],
-    setCompPDFResult = _useState6[1]; //合成返回的pdf结果
-
+  var intervalRef = useRef(null);
   console.log('isOpenMainCamera', isOpenMainCamera, socketConnected);
 
   //摄像头信息定义
@@ -46,12 +40,10 @@ var KemiAlt = /*#__PURE__*/forwardRef(function (props, ref) {
   var pMainShowStartX = 0;
   var pMainShowStartY = 0;
   var isMouseDown = false;
-
-  //等待一段时间
-  var sleep = function sleep(milliSeconds) {
+  function sleep(milliSeconds) {
     var startTime = new Date().getTime();
     while (new Date().getTime() < startTime + milliSeconds);
-  };
+  }
 
   //设置文件格式
   function SetFileType(filetype) {
@@ -222,6 +214,18 @@ var KemiAlt = /*#__PURE__*/forwardRef(function (props, ref) {
     socket.binaryType = 'arraybuffer';
   };
 
+  //掉线重连
+  function reconnect() {
+    clearInterval(intervalRef.current);
+    // 设置新的定时器
+    intervalRef.current = setInterval(function () {
+      if (!isSocketConnect) {
+        webSocketConnect();
+      }
+      console.log('reconnectTimer.........!', isSocketConnect);
+    }, 3000); // 每3秒执行一次
+  }
+
   // 获取设备信息等基本信息
   function GetDevCount() {
     try {
@@ -236,6 +240,7 @@ var KemiAlt = /*#__PURE__*/forwardRef(function (props, ref) {
   }
   var handleSocketOpen = function handleSocketOpen(event) {
     console.log('9999', event);
+    clearInterval(intervalRef.current);
     isSocketConnect = true;
     setSocketConnected(true);
     isEffectiveService = true;
@@ -245,8 +250,9 @@ var KemiAlt = /*#__PURE__*/forwardRef(function (props, ref) {
     console.log(',Close', event, isEffectiveService, isSocketConnect);
     isSocketConnect = false;
     if (isEffectiveService) {
-      webSocketConnect();
-      message.warning('socket服务关闭,正在重启....');
+      // webSocketConnect();
+      // message.warning('socket服务关闭,正在重启....');
+      reconnect();
     } else {
       message.warning('socket连接失败,请重启服务....');
     }
@@ -255,7 +261,8 @@ var KemiAlt = /*#__PURE__*/forwardRef(function (props, ref) {
     console.log(',Error', event, isEffectiveService, isSocketConnect);
     isSocketConnect = false;
     if (isEffectiveService) {
-      webSocketConnect();
+      // webSocketConnect();
+      reconnect();
       message.warning('socket服务出错,正在重启....');
     } else {
       message.warning('socket服务出错,请重启服务....');
@@ -275,24 +282,58 @@ var KemiAlt = /*#__PURE__*/forwardRef(function (props, ref) {
     socket.send(aDataArray.buffer);
   }
 
+  //*************设置JPG图片质量*************
+  function Cam_SetJpgQuality(val) {
+    console.log('val', val);
+    if (isSocketConnect) {
+      var aDataArray = new Uint8Array(4);
+      aDataArray[0] = 0x77;
+      aDataArray[1] = 0x88;
+      aDataArray[2] = 0x29;
+      aDataArray[3] = val;
+      socket.send(aDataArray.buffer);
+    }
+  }
+
   /**
    * 获取设备信息
    * @param devCount 设备数量
    * @param devNameArr 设备名称组
    */
-  function GetDevCountAndNameResultCB(devCount, devNameArr) {
-    if (devCount > 0) {
-      //获取分辨率信息
-      GetResolution(devNameArr[0]); // 发送获取分辨率的指令
-    } else {
-      message.error('没有发现合适的设备！');
-    }
+  function GetDevCountAndNameResultCB(_x, _x2) {
+    return _GetDevCountAndNameResultCB.apply(this, arguments);
   }
-
   /**
    * 返回摄像头开启状态
    * @param status
    */
+  function _GetDevCountAndNameResultCB() {
+    _GetDevCountAndNameResultCB = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(devCount, devNameArr) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!(devCount > 0)) {
+              _context.next = 7;
+              break;
+            }
+            _context.next = 3;
+            return GetResolution(devNameArr[0]);
+          case 3:
+            _context.next = 5;
+            return Cam_SetJpgQuality('30');
+          case 5:
+            _context.next = 8;
+            break;
+          case 7:
+            message.error('没有发现合适的设备！');
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return _GetDevCountAndNameResultCB.apply(this, arguments);
+  }
   function GetCameraOnOffStatus(status) {
     if (status === 0) {
       message.success('设备开启成功');
@@ -449,7 +490,7 @@ var KemiAlt = /*#__PURE__*/forwardRef(function (props, ref) {
     console.log('拍照结果返回', flag, path, base64Str);
     // localPath-本地路径
     if (flag === 0) {
-      setCaptureResult({
+      getCaptureResult === null || getCaptureResult === void 0 || getCaptureResult({
         photoBase64: base64Str,
         localPath: path
       });
@@ -464,7 +505,6 @@ var KemiAlt = /*#__PURE__*/forwardRef(function (props, ref) {
     var path = encodeURI(filePath);
     var pathArray = stringToByte(path);
     var len = pathArray.length;
-    console.log('path', path, pathArray, len);
     if (isSocketConnect) {
       if (filePath === '') {
         var _len2 = 0;
@@ -572,7 +612,7 @@ var KemiAlt = /*#__PURE__*/forwardRef(function (props, ref) {
     console.log('合并pdf的结果', flag, PdfBase64Str);
     if (flag === 0) {
       console.log(PdfBase64Str);
-      setCompPDFResult({
+      getCompPDFResult === null || getCompPDFResult === void 0 || getCompPDFResult({
         base64: PdfBase64Str
       });
     } else {
@@ -801,9 +841,10 @@ var KemiAlt = /*#__PURE__*/forwardRef(function (props, ref) {
 
   //拍照
   var takePhoto = function takePhoto() {
+    console.log('拍照');
     var name = formatDate(new Date().getTime());
-    var path = 'D:\\' + name + '.png'; //定下文件类型
-    SetFileType(1); //设置文件格式(1-png文件格式)
+    var path = 'D:\\' + name + '.jpg'; //定下文件类型
+    SetFileType(0); //设置文件格式(0-jpg文件格式)
     Cam_Photo(path); //主摄像头拍照
   };
 
@@ -811,12 +852,12 @@ var KemiAlt = /*#__PURE__*/forwardRef(function (props, ref) {
   var _ToAddPDFFile = function ToAddPDFFile(path) {
     console.log('添加要合并的pdf路径', path);
     AddImgFileToPDF(path);
+    sleep(80);
   };
 
   //合并PDF文件(compPDFResult 获取合并返回的结果)
   var _ToCombinePDF = function ToCombinePDF(index) {
     console.log('index', index);
-    sleep(100);
     CombinePDF("D:\\".concat(index, ".pdf")); //合并之后的保存的pdf路径
   };
 
@@ -872,29 +913,18 @@ var KemiAlt = /*#__PURE__*/forwardRef(function (props, ref) {
       // 接收消息
       socket.onmessage = handleSocketMessage.bind(props);
     }
-    // return () => {
-    //   CloseCamera();
-    //   socket.onopen = null;
-    //   socket.onclose = null;
-    //   socket.onerror = null;
-    //   socket.onmessage = null;
-    //   isSocketConnect = false;
-    //   MainCanvas = null;
-    //   MainContext = null;
-    // };
+    return function () {
+      clearInterval(intervalRef.current);
+      // CloseCamera();
+      // socket.onopen = null;
+      // socket.onclose = null;
+      // socket.onerror = null;
+      // socket.onmessage = null;
+      // isSocketConnect = false;
+      // MainCanvas = null;
+      // MainContext = null;
+    };
   }, []);
-  useEffect(function () {
-    var _Object$keys;
-    if (captureResult && ((_Object$keys = Object.keys(captureResult)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) > 0) {
-      getCaptureResult === null || getCaptureResult === void 0 || getCaptureResult(captureResult);
-    }
-  }, [captureResult]);
-  useEffect(function () {
-    var _Object$keys2;
-    if (compPDFResult && ((_Object$keys2 = Object.keys(compPDFResult)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length) > 0) {
-      getCompPDFResult === null || getCompPDFResult === void 0 || getCompPDFResult(compPDFResult);
-    }
-  }, [compPDFResult]);
   return /*#__PURE__*/React.createElement("div", {
     id: "CameraCtl",
     ref: cameraRef,

package/dist/LabAltimeter/index.js

@@ -8,12 +8,12 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
  * @Author: xqy
  * @Date: 2024-04-23 13:43:55
  * @LastEditors: xqy
- * @LastEditTime: 2024-07-14 18:38:11
+ * @LastEditTime: 2024-07-16 17:01:17
  * @Description: 高拍仪
  */
 import { Iconfont } from "../components";
 import { LabBase64ToFile } from "../utils/utils";
-import { Button, Checkbox, Input, Select, message } from 'antd';
+import { Button, Checkbox, Input, Select, Spin, message } from 'antd';
 import cn from 'classnames';
 import dayjs from 'dayjs';
 import React, { useEffect, useRef, useState } from 'react';
@@ -102,18 +102,36 @@ var LabAltimeter = function LabAltimeter(_ref) {
     //高拍仪类型
     pdfQueResult: [] //pdf队列数组
   });
-  var _useState25 = useState({}),
+  var _useState25 = useState(false),
     _useState26 = _slicedToArray(_useState25, 2),
-    captureResult = _useState26[0],
-    setCaptureResult = _useState26[1]; //科密拍照返回的结果
-  var _useState27 = useState({}),
+    loading = _useState26[0],
+    setLoading = _useState26[1]; //加载中
+  var _useState27 = useState(''),
     _useState28 = _slicedToArray(_useState27, 2),
-    pdfQueueResult = _useState28[0],
-    setPdfQueueResult = _useState28[1]; //添加图片到pdf队列返回结果
+    tipMsg = _useState28[0],
+    setTipMsg = _useState28[1]; //加载提示语
+
   var _useState29 = useState({}),
     _useState30 = _slicedToArray(_useState29, 2),
-    compPDFResult = _useState30[0],
-    setCompPDFResult = _useState30[1]; //合成返回的pdf结果
+    captureResult = _useState30[0],
+    setCaptureResult = _useState30[1]; //科密拍照返回的结果
+  var _useState31 = useState({}),
+    _useState32 = _slicedToArray(_useState31, 2),
+    pdfQueueResult = _useState32[0],
+    setPdfQueueResult = _useState32[1]; //添加图片到pdf队列返回结果
+  var _useState33 = useState({}),
+    _useState34 = _slicedToArray(_useState33, 2),
+    compPDFResult = _useState34[0],
+    setCompPDFResult = _useState34[1]; //合成返回的pdf结果
+
+  var _useState35 = useState(0),
+    _useState36 = _slicedToArray(_useState35, 2),
+    curCompIndex = _useState36[0],
+    setCurCompIndex = _useState36[1]; // 当前添加到合成队列的是第几个图片
+  var _useState37 = useState([]),
+    _useState38 = _slicedToArray(_useState37, 2),
+    checkImgs = _useState38[0],
+    setCheckImgs = _useState38[1]; // 勾选的图片集合
 
   var kemiAltRef = useRef({
     toKemiTakePhoto: function toKemiTakePhoto() {},
@@ -235,6 +253,10 @@ var LabAltimeter = function LabAltimeter(_ref) {
       //科密高拍仪
       kemiAltRef === null || kemiAltRef === void 0 || (_kemiAltRef$current = kemiAltRef.current) === null || _kemiAltRef$current === void 0 || _kemiAltRef$current.openKemiCamera();
       setCurPreImgPath('');
+      setCurCompIndex(0);
+      setCheckImgs([]);
+      filterRef.current.pdfQueResult = [];
+      console.log('filterRef.current.pdfQueResult', filterRef.current.pdfQueResult);
     }
     setIsShowPdf(false);
   };
@@ -264,16 +286,18 @@ var LabAltimeter = function LabAltimeter(_ref) {
             return fetchRequest('http://127.0.0.1:38088/video=grabimage', params, 'POST');
           case 5:
             res = _context2.sent;
-            _context2.next = 9;
+            _context2.next = 11;
             break;
           case 8:
             //科密高拍仪拍照
             kemiAltRef === null || kemiAltRef === void 0 || (_kemiAltRef$current2 = kemiAltRef.current) === null || _kemiAltRef$current2 === void 0 || _kemiAltRef$current2.toKemiTakePhoto();
-          case 9:
+            setLoading(true);
+            setTipMsg('图片生成中...');
+          case 11:
             if (_typeof(res) === 'object' && Object.keys(res).length > 0) {
               add_image((_res = res) === null || _res === void 0 ? void 0 : _res.photoBase64, 0);
             }
-          case 10:
+          case 12:
           case "end":
             return _context2.stop();
         }
@@ -357,7 +381,8 @@ var LabAltimeter = function LabAltimeter(_ref) {
   var onPreviewFile = function onPreviewFile(item) {
     console.log('预览图片和pdf', item.filePath, item);
     if (item.fileType === 'pdf') {
-      setCurPreviewPath(item === null || item === void 0 ? void 0 : item.filePath);
+      var newFilePath = URL.createObjectURL(LabBase64ToFile(item === null || item === void 0 ? void 0 : item.filePath, item.fileName));
+      setCurPreviewPath(newFilePath);
       setIsShowPdf(true);
     } else {
       var _document2;
@@ -404,71 +429,12 @@ var LabAltimeter = function LabAltimeter(_ref) {
     return item.isChecked;
   }).length;
 
-  //添加图片到pdf队列中
-  var addImgToPdfQueue = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(checkImgList) {
-      var newPromise;
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
-          case 0:
-            if (!(checkImgList && checkImgList !== null && checkImgList !== void 0 && checkImgList.length)) {
-              _context5.next = 6;
-              break;
-            }
-            newPromise = checkImgList.map( /*#__PURE__*/function () {
-              var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(item) {
-                var _kemiAltRef$current5;
-                return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-                  while (1) switch (_context4.prev = _context4.next) {
-                    case 0:
-                      _context4.prev = 0;
-                      _context4.next = 3;
-                      return kemiAltRef === null || kemiAltRef === void 0 || (_kemiAltRef$current5 = kemiAltRef.current) === null || _kemiAltRef$current5 === void 0 ? void 0 : _kemiAltRef$current5.ToAddPDFFile(item === null || item === void 0 ? void 0 : item.localPath);
-                    case 3:
-                      item.executeFinish = true;
-                      _context4.next = 9;
-                      break;
-                    case 6:
-                      _context4.prev = 6;
-                      _context4.t0 = _context4["catch"](0);
-                      item.executeFinish = false;
-                    case 9:
-                    case "end":
-                      return _context4.stop();
-                  }
-                }, _callee4, null, [[0, 6]]);
-              }));
-              return function (_x7) {
-                return _ref6.apply(this, arguments);
-              };
-            }()); // 等待所有Promise都完成
-            _context5.next = 4;
-            return Promise.all(newPromise);
-          case 4:
-            if (!checkImgList.every(function (item) {
-              return item.executeFinish === true;
-            })) {
-              _context5.next = 6;
-              break;
-            }
-            return _context5.abrupt("return", true);
-          case 6:
-          case "end":
-            return _context5.stop();
-        }
-      }, _callee5);
-    }));
-    return function addImgToPdfQueue(_x6) {
-      return _ref5.apply(this, arguments);
-    };
-  }();
-
   //图片合成PDF
   var ComposePhotosPDF = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
       var index, updateList, checkImgList, _Object$keys, imgs, data, params, _data;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             index = pdfIndex + 1;
             updateList = _toConsumableArray(imgList);
@@ -476,7 +442,7 @@ var LabAltimeter = function LabAltimeter(_ref) {
               return item.isChecked;
             }); //选中的图片合成
             if (!(checkImgList && checkImgList.length)) {
-              _context6.next = 19;
+              _context4.next = 20;
               break;
             }
             imgs = checkImgList.map(function (i) {
@@ -484,15 +450,16 @@ var LabAltimeter = function LabAltimeter(_ref) {
             }).join(',');
             data = {}; //合成pdf返回的参数
             if (!(filterRef.current.deviceVal === '2')) {
-              _context6.next = 11;
+              _context4.next = 12;
               break;
             }
-            _context6.next = 9;
-            return addImgToPdfQueue(checkImgList);
-          case 9:
-            _context6.next = 15;
+            // 保存勾选的图片
+            setCheckImgs(checkImgList);
+            setLoading(true);
+            setTipMsg('PDF合成中...');
+            _context4.next = 16;
             break;
-          case 11:
+          case 12:
             params = {
               outputfilepath: "D:\\\u56FE\u7247\u5408\u6210PDF\\".concat(index, ".pdf"),
               // 输出文件保存地址。例：D://图片合成pdf
@@ -504,27 +471,27 @@ var LabAltimeter = function LabAltimeter(_ref) {
               // 合成后文件类型：0：jpg；1：PDF
               imagelist: imgs.toString()
             };
-            _context6.next = 14;
+            _context4.next = 15;
             return fetchRequest('http://127.0.0.1:38088/compose=photos', params, 'POST');
-          case 14:
-            data = _context6.sent;
           case 15:
+            data = _context4.sent;
+          case 16:
             if (data && ((_Object$keys = Object.keys(data)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) > 0) {
               add_image((_data = data) === null || _data === void 0 ? void 0 : _data.base64, 1);
             }
             setPdfIndex(index);
-            _context6.next = 20;
+            _context4.next = 21;
             break;
-          case 19:
-            message.warning('请先选择图片！');
           case 20:
+            message.warning('请先选择图片！');
+          case 21:
           case "end":
-            return _context6.stop();
+            return _context4.stop();
         }
-      }, _callee6);
+      }, _callee4);
     }));
     return function ComposePhotosPDF() {
-      return _ref7.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 
@@ -580,8 +547,8 @@ var LabAltimeter = function LabAltimeter(_ref) {
   //关闭摄像头
   var closeCamera = function closeCamera() {
     if (filterRef.current.deviceVal === '2') {
-      var _kemiAltRef$current6;
-      kemiAltRef === null || kemiAltRef === void 0 || (_kemiAltRef$current6 = kemiAltRef.current) === null || _kemiAltRef$current6 === void 0 || _kemiAltRef$current6.toCloseCamera();
+      var _kemiAltRef$current5;
+      kemiAltRef === null || kemiAltRef === void 0 || (_kemiAltRef$current5 = kemiAltRef.current) === null || _kemiAltRef$current5 === void 0 || _kemiAltRef$current5.toCloseCamera();
     } else {
       var params = {
         camidx: '0'
@@ -589,12 +556,20 @@ var LabAltimeter = function LabAltimeter(_ref) {
       fetchRequest('http://127.0.0.1:38088/video=close', params, 'POST');
     }
   };
+  useEffect(function () {
+    var _kemiAltRef$current6, _checkImgs$curCompInd;
+    console.log('checkImgs和curCompIndex发生变化了', checkImgs, curCompIndex);
+    if (curCompIndex >= checkImgs.length) return;
+    // 图片按索引顺序，挨个添加到合成队列
+    kemiAltRef === null || kemiAltRef === void 0 || (_kemiAltRef$current6 = kemiAltRef.current) === null || _kemiAltRef$current6 === void 0 || _kemiAltRef$current6.ToAddPDFFile((_checkImgs$curCompInd = checkImgs[curCompIndex]) === null || _checkImgs$curCompInd === void 0 ? void 0 : _checkImgs$curCompInd.localPath);
+  }, [checkImgs, curCompIndex]);
 
   //科密拍照返回结果
   useEffect(function () {
     var _Object$keys2;
     if (captureResult && ((_Object$keys2 = Object.keys(captureResult)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length) > 0) {
       add_image(captureResult === null || captureResult === void 0 ? void 0 : captureResult.photoBase64, 0, captureResult === null || captureResult === void 0 ? void 0 : captureResult.localPath);
+      setLoading(false);
     }
   }, [captureResult]);
 
@@ -604,6 +579,7 @@ var LabAltimeter = function LabAltimeter(_ref) {
     console.log('compPDFResult', compPDFResult);
     if (compPDFResult && ((_Object$keys3 = Object.keys(compPDFResult)) === null || _Object$keys3 === void 0 ? void 0 : _Object$keys3.length) > 0) {
       add_image(compPDFResult === null || compPDFResult === void 0 ? void 0 : compPDFResult.base64, 1);
+      setLoading(false);
     }
   }, [compPDFResult]);
 
@@ -612,10 +588,13 @@ var LabAltimeter = function LabAltimeter(_ref) {
     var _Object$keys4;
     if (pdfQueueResult && ((_Object$keys4 = Object.keys(pdfQueueResult)) === null || _Object$keys4 === void 0 ? void 0 : _Object$keys4.length) > 0) {
       var _imgList$filter;
+      // 上一个图片添加到合成队列后，就累加curCompIndex
+      setCurCompIndex(curCompIndex + 1);
       var checkLength = (_imgList$filter = imgList.filter(function (item) {
         return item.isChecked;
       })) === null || _imgList$filter === void 0 ? void 0 : _imgList$filter.length; //选中的图片数量
       var newQueueResult = filterRef.current.pdfQueResult;
+      console.log('xxxxxxxxxx', filterRef.current.pdfQueResult, curCompIndex);
       //执行合并事件
       newQueueResult.push(pdfQueueResult);
       if ((newQueueResult === null || newQueueResult === void 0 ? void 0 : newQueueResult.length) === checkLength) {
@@ -646,6 +625,9 @@ var LabAltimeter = function LabAltimeter(_ref) {
   }, [filterRef.current.deviceVal]);
   return /*#__PURE__*/React.createElement("div", {
     className: "altimeter"
+  }, /*#__PURE__*/React.createElement(Spin, {
+    spinning: loading,
+    tip: tipMsg
   }, /*#__PURE__*/React.createElement("div", {
     className: "top"
   }, /*#__PURE__*/React.createElement("span", {
@@ -664,6 +646,7 @@ var LabAltimeter = function LabAltimeter(_ref) {
     onChange: function onChange(val) {
       filterRef.current.deviceVal = val;
       setImgList([]);
+      setLoading(false);
     }
   }), /*#__PURE__*/React.createElement("div", {
     className: "g-f-rc icon-div"
@@ -720,14 +703,12 @@ var LabAltimeter = function LabAltimeter(_ref) {
     getPdfQueueResult: function getPdfQueueResult(result) {
       return setPdfQueueResult(result);
     }
-  }) : /*#__PURE__*/React.createElement("embed", {
+  }) : /*#__PURE__*/React.createElement("iframe", {
     src: curPreviewPath,
-    type: "application/pdf",
-    width: "100%",
-    height: "100%",
     style: {
-      minHeight: '725px',
-      overflowY: 'auto'
+      width: '100%',
+      height: '100%',
+      minHeight: '70vh'
     }
   })), /*#__PURE__*/React.createElement("div", {
     className: "con-right"
@@ -818,7 +799,7 @@ var LabAltimeter = function LabAltimeter(_ref) {
         }
       })
     })));
-  }) : null))), /*#__PURE__*/React.createElement(SetupModal, {
+  }) : null)))), /*#__PURE__*/React.createElement(SetupModal, {
     visible: setUpVisible,
     onCancel: handleCancel
   }));

package/dist/LabPdfView/index.d.ts

@@ -4,7 +4,7 @@ interface PdfViewerProps {
     src: string;
     pdfjsSrc?: string;
     fileId?: string;
-    showMode: SHOWMODE;
+    showMode: number;
     isShowCheck?: boolean;
     checkedKey?: any[];
     selectedBookId?: any;
@@ -14,9 +14,5 @@ interface PdfViewerProps {
     onGetAllBookmarkDatas?: (any: any) => void;
     onTimeoutCallback?: () => void;
 }
-declare const enum SHOWMODE {
-    NormalMode = 0,// 预览模式
-    BookMarkMode = 1
-}
 declare const LabPdfView: ({ src, pdfjsSrc, isShowCheck, checkedKey, selectedBookId, fileId, showMode, timeout, onCheckingBookIds, onGetAllBookmarkDatas, onSelectIngBookmark, onTimeoutCallback, }: PdfViewerProps) => React.JSX.Element;
 export default LabPdfView;

package/dist/LabPdfViewMobile/index.d.ts

@@ -11,6 +11,10 @@ interface PdfViewerProps {
     timeout?: number;
     onChangeBookmarkDatas?: (any: any) => void;
     onTimeoutCallback?: () => void;
+    onCollected?: () => void;
+    onDownloaded?: () => void;
+    isColl?: boolean;
+    btnShowList?: Array<boolean>;
 }
-declare const LabPdfViewMobile: ({ src, pdfjsSrc, fileTypeName, fileTitle, timeout, showTop, onTimeoutCallback, onChangeBookmarkDatas, }: PdfViewerProps) => React.JSX.Element;
+declare const LabPdfViewMobile: ({ src, pdfjsSrc, fileTypeName, fileTitle, isColl, timeout, showTop, onCollected, onDownloaded, onTimeoutCallback, onChangeBookmarkDatas, btnShowList, }: PdfViewerProps) => React.JSX.Element;
 export default LabPdfViewMobile;

package/dist/LabPdfViewMobile/index.js

@@ -1,3 +1,5 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Descripttion:
@@ -7,7 +9,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
  * @LastEditTime: 2024-06-14 14:28:21
  */
 import { SearchBar, TabBar } from 'antd-mobile';
-import { CloseOutline, LeftOutline, RightOutline, SearchOutline, UnorderedListOutline } from 'antd-mobile-icons';
+import { CloseOutline, DownlandOutline, LeftOutline, RightOutline, SearchOutline, StarOutline, UnorderedListOutline } from 'antd-mobile-icons';
 import * as React from 'react';
 import { useEffect, useState } from 'react';
 import "./style.less";
@@ -18,12 +20,18 @@ var LabPdfViewMobile = function LabPdfViewMobile(_ref) {
     pdfjsSrc = _ref$pdfjsSrc === void 0 ? '/statics/pdfjs/web/viewer.html' : _ref$pdfjsSrc,
     fileTypeName = _ref.fileTypeName,
     fileTitle = _ref.fileTitle,
+    _ref$isColl = _ref.isColl,
+    isColl = _ref$isColl === void 0 ? false : _ref$isColl,
     _ref$timeout = _ref.timeout,
     timeout = _ref$timeout === void 0 ? 5000 : _ref$timeout,
     _ref$showTop = _ref.showTop,
     showTop = _ref$showTop === void 0 ? true : _ref$showTop,
+    onCollected = _ref.onCollected,
+    onDownloaded = _ref.onDownloaded,
     onTimeoutCallback = _ref.onTimeoutCallback,
-    onChangeBookmarkDatas = _ref.onChangeBookmarkDatas;
+    onChangeBookmarkDatas = _ref.onChangeBookmarkDatas,
+    _ref$btnShowList = _ref.btnShowList,
+    btnShowList = _ref$btnShowList === void 0 ? [true, true, false, false] : _ref$btnShowList;
   var fileSrc = src.replace(/\.(doc|docx|xls|xlsx)$/, '.pdf');
   var isTimeout = false;
   var isWork = false;
@@ -64,7 +72,24 @@ var LabPdfViewMobile = function LabPdfViewMobile(_ref) {
       ReplacePage.innerHTML = "\u7B2C".concat(curPages, "\u9875 \u5171").concat(totalPages, "\u9875");
     }
   }
-  // 切换Tab
+  //下载文件
+  function downFileToLocal() {
+    return _downFileToLocal.apply(this, arguments);
+  } // 切换Tab
+  function _downFileToLocal() {
+    _downFileToLocal = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            onDownloaded === null || onDownloaded === void 0 || onDownloaded();
+          case 1:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return _downFileToLocal.apply(this, arguments);
+  }
   function changeTabHandle(key) {
     setIsShowBookMark(false);
     setIsShowFind(false);
@@ -72,9 +97,11 @@ var LabPdfViewMobile = function LabPdfViewMobile(_ref) {
       setIsShowBookMark(true);
     } else if (key === 'find') {
       setIsShowFind(true);
-    } else if (key === 'dwon') {
+    } else if (key === 'down') {
+      downFileToLocal();
       setIsShowBookMark(false);
     } else if (key === 'remark') {
+      onCollected === null || onCollected === void 0 || onCollected();
       setIsShowBookMark(false);
     }
   }
@@ -106,6 +133,7 @@ var LabPdfViewMobile = function LabPdfViewMobile(_ref) {
     iframeWindow.PDFViewerApplication.findBar.highlightAll.checked = true;
     iframeWindow.PDFViewerApplication.findBar.dispatchEvent('highlightallchange');
     if (value === '') {
+      setFindCount(['0', '0']);
       return;
     }
     setTimeout(function () {
@@ -151,6 +179,7 @@ var LabPdfViewMobile = function LabPdfViewMobile(_ref) {
    ** 但是需要确保pdfjs已经基本完成初始化；
    ** 以下采用定时轮询方法，轮询完成后执行其他pdfjs操作；
    */
+
   function loadSuccessBookMask(bookMarksList) {
     if (isTimeout) return;
     isWork = true;
@@ -304,7 +333,7 @@ var LabPdfViewMobile = function LabPdfViewMobile(_ref) {
     },
     fontSize: 16,
     onClick: clickPreviousHandle
-  }), /*#__PURE__*/React.createElement("span", null, findCount[0]), "/", /*#__PURE__*/React.createElement("span", null, findCount[1]), /*#__PURE__*/React.createElement(RightOutline, {
+  }), /*#__PURE__*/React.createElement("span", null, (findCount === null || findCount === void 0 ? void 0 : findCount[0]) || '0'), "/", /*#__PURE__*/React.createElement("span", null, (findCount === null || findCount === void 0 ? void 0 : findCount[1]) || '0'), /*#__PURE__*/React.createElement(RightOutline, {
     style: {
       marginLeft: '10px'
     },
@@ -313,14 +342,26 @@ var LabPdfViewMobile = function LabPdfViewMobile(_ref) {
   })))), /*#__PURE__*/React.createElement(TabBar, {
     activeKey: '',
     onChange: changeTabHandle
-  }, /*#__PURE__*/React.createElement(TabBar.Item, {
+  }, btnShowList[0] && /*#__PURE__*/React.createElement(TabBar.Item, {
     key: 'title',
     icon: /*#__PURE__*/React.createElement(UnorderedListOutline, null),
     title: '目录'
-  }), /*#__PURE__*/React.createElement(TabBar.Item, {
+  }), btnShowList[1] && /*#__PURE__*/React.createElement(TabBar.Item, {
     key: 'find',
     icon: /*#__PURE__*/React.createElement(SearchOutline, null),
     title: '查询'
+  }), btnShowList[2] && /*#__PURE__*/React.createElement(TabBar.Item, {
+    key: 'down',
+    icon: /*#__PURE__*/React.createElement(DownlandOutline, null),
+    title: '下载'
+  }), btnShowList[3] && /*#__PURE__*/React.createElement(TabBar.Item, {
+    key: 'remark',
+    icon: /*#__PURE__*/React.createElement(StarOutline, {
+      style: {
+        color: isColl ? '#0069fd' : ''
+      }
+    }),
+    title: '收藏'
   })));
 };
 export default LabPdfViewMobile;

package/package.json

@@ -1,81 +1,82 @@
-{
-  "name": "xh-lab-rc",
-  "version": "0.16.0",
-  "description": " A react library for xinhelab",
-  "license": "MIT",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "build": "father build",
-    "build:watch": "father dev",
-    "dev": "dumi dev",
-    "docs:build": "dumi build",
-    "doctor": "father doctor",
-    "lint": "npm run lint:es && npm run lint:css",
-    "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
-    "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
-    "prepare": "husky install && dumi setup",
-    "prepublishOnly": "father doctor && npm run build",
-    "start": "npm run dev"
-  },
-  "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
-    ]
-  },
-  "lint-staged": {
-    "*.{md,json}": [
-      "prettier --write --no-error-on-unmatched-pattern"
-    ],
-    "*.{css,less}": [
-      "stylelint --fix",
-      "prettier --write"
-    ],
-    "*.{js,jsx}": [
-      "eslint --fix",
-      "prettier --write"
-    ],
-    "*.{ts,tsx}": [
-      "eslint --fix",
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "dependencies": {
-    "@ant-design/icons": "^5.3.5",
-    "@babel/runtime": "^7.24.6",
-    "antd": "^5.15.3",
-    "antd-mobile": "^5.36.1",
-    "antd-mobile-icons": "^0.3.0",
-    "classnames": "^2.5.1",
-    "dayjs": "^1.11.10"
-  },
-  "devDependencies": {
-    "@commitlint/cli": "^17.1.2",
-    "@commitlint/config-conventional": "^17.1.0",
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "@umijs/lint": "^4.0.0",
-    "dumi": "^2.2.13",
-    "eslint": "^8.23.0",
-    "father": "^4.1.0",
-    "husky": "^8.0.1",
-    "lint-staged": "^13.0.3",
-    "prettier": "^2.7.1",
-    "prettier-plugin-organize-imports": "^3.0.0",
-    "prettier-plugin-packagejson": "^2.2.18",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "stylelint": "^14.9.1"
-  },
-  "peerDependencies": {
-    "react": "^16.3.0 || ^17.0.0 || ^18.0.0",
-    "react-dom": "^16.3.0 || ^17.0.0 || ^18.0.0"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "authors": []
-}
+{
+  "name": "xh-lab-rc",
+  "version": "0.16.3",
+  "description": " A react library for xinhelab",
+  "license": "MIT",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "father build",
+    "build:watch": "father dev",
+    "dev": "dumi dev",
+    "docs:build": "dumi build",
+    "doctor": "father doctor",
+    "lint": "npm run lint:es && npm run lint:css",
+    "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
+    "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
+    "prepare": "husky install && dumi setup",
+    "prepublishOnly": "father doctor && npm run build",
+    "start": "npm run dev"
+  },
+  "commitlint": {
+    "extends": [
+      "@commitlint/config-conventional"
+    ]
+  },
+  "lint-staged": {
+    "*.{md,json}": [
+      "prettier --write --no-error-on-unmatched-pattern"
+    ],
+    "*.{css,less}": [
+      "stylelint --fix",
+      "prettier --write"
+    ],
+    "*.{js,jsx}": [
+      "eslint --fix",
+      "prettier --write"
+    ],
+    "*.{ts,tsx}": [
+      "eslint --fix",
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "dependencies": {
+    "@ant-design/icons": "^5.3.5",
+    "@babel/runtime": "^7.24.6",
+    "antd": "^5.15.3",
+    "antd-mobile": "^5.36.1",
+    "antd-mobile-icons": "^0.3.0",
+    "axios": "^1.7.2",
+    "classnames": "^2.5.1",
+    "dayjs": "^1.11.10"
+  },
+  "devDependencies": {
+    "@commitlint/cli": "^17.1.2",
+    "@commitlint/config-conventional": "^17.1.0",
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.0",
+    "@umijs/lint": "^4.0.0",
+    "dumi": "^2.2.13",
+    "eslint": "^8.23.0",
+    "father": "^4.1.0",
+    "husky": "^8.0.1",
+    "lint-staged": "^13.0.3",
+    "prettier": "^2.7.1",
+    "prettier-plugin-organize-imports": "^3.0.0",
+    "prettier-plugin-packagejson": "^2.2.18",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
+    "stylelint": "^14.9.1"
+  },
+  "peerDependencies": {
+    "react": "^16.3.0 || ^17.0.0 || ^18.0.0",
+    "react-dom": "^16.3.0 || ^17.0.0 || ^18.0.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "authors": []
+}