ydb-components-material 0.1.147 → 0.1.149

package/es/components/file-list/item.js

@@ -1,5 +1,5 @@
-import _Dialog from "@alifd/next/es/dialog";
 import _Message from "@alifd/next/es/message";
+import _Dialog from "@alifd/next/es/dialog";
 import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _Radio from "@alifd/next/es/radio";
@@ -249,57 +249,87 @@ var FileItem = function FileItem(_ref) {
   }();
   var upload = function upload() {
     if (disabled) return;
-    var inputEl = document.createElement('input');
-    inputEl.setAttribute('type', 'file');
-    inputEl.style.display = 'none';
-    document.body.appendChild(inputEl);
-    inputEl.click();
-    inputEl.addEventListener('change', function (e) {
-      console.log(e.target.files);
-      var fileData = e.target.files[0];
-      console.log('fileData----', fileData);
-      if (fileData.size > (maxFileSize || 50) * 1024 * 1024) {
-        _Message.notice("\u6587\u4EF6 \"" + fileData.name + "\" \u8D85\u8FC7" + maxFileSize + "MB\u9650\u5236");
-        return;
+    var ua = navigator.userAgent.toLowerCase();
+    var isAndroidWeChat = /android/.test(ua) && /micromessenger/.test(ua);
+    if (isAndroidWeChat) {
+      _Dialog.confirm({
+        title: '请选择',
+        content: '请选择文件上传方式',
+        footerAlign: 'center',
+        okProps: {
+          children: '拍照'
+        },
+        cancelProps: {
+          children: '选择文件'
+        },
+        onOk: function onOk() {
+          return doUpload(true);
+        },
+        onCancel: function onCancel() {
+          return doUpload(false);
+        },
+        onClose: function onClose() {}
+      });
+    } else {
+      doUpload(false);
+    }
+    function doUpload(isCamera) {
+      var inputEl = document.createElement('input');
+      inputEl.setAttribute('type', 'file');
+      if (isCamera) {
+        inputEl.setAttribute('accept', 'image/*');
+        inputEl.setAttribute('capture', 'camera');
       }
-      if (spec) {
-        var type = getFileExtension(fileData.name);
-        if (!initFormat(spec).includes(type)) {
-          _Message.notice("\u6587\u4EF6 \"" + fileData.name + "\" \u683C\u5F0F\u4E0D\u6B63\u786E");
+      inputEl.style.display = 'none';
+      document.body.appendChild(inputEl);
+      inputEl.addEventListener('change', function (e) {
+        console.log(e.target.files);
+        var fileData = e.target.files[0];
+        console.log('fileData----', fileData);
+        if (fileData.size > (maxFileSize || 50) * 1024 * 1024) {
+          _Message.notice("\u6587\u4EF6 \"" + fileData.name + "\" \u8D85\u8FC7" + maxFileSize + "MB\u9650\u5236");
           return;
         }
-      }
-      var formData = new FormData();
-      formData.append('file', fileData);
-      formData.append('open', true);
-      openLoading();
-      fetch(baseUrl + "/declaration/material/file/files/api", {
-        method: 'POST',
-        body: formData,
-        headers: {
-          Authorization: tokenTY || ''
-        }
-      }).then(function (response) {
-        return response.json();
-      }).then(function (res) {
-        document.body.removeChild(inputEl);
-        if (res.fileId) {
-          console.log('--------res', res);
-          valChange(_extends({}, res, {
-            fileName: fileData.name,
-            fileType: fileData.type
-          }), fileIndex, index, subIndex);
-          _Message.notice('上传成功');
-        } else {
-          _Message.error('上传失败，请重试');
+        if (spec) {
+          var type = getFileExtension(fileData.name);
+          if (!initFormat(spec).includes(type)) {
+            _Message.notice("\u6587\u4EF6 \"" + fileData.name + "\" \u683C\u5F0F\u4E0D\u6B63\u786E");
+            return;
+          }
         }
-        closeLoading();
-      })["catch"](function (err) {
-        console.error(err);
-        _Message.error('上传失败');
-        closeLoading();
+        var formData = new FormData();
+        formData.append('file', fileData);
+        formData.append('open', true);
+        openLoading();
+        fetch(baseUrl + "/declaration/material/file/files/api", {
+          method: 'POST',
+          body: formData,
+          headers: {
+            Authorization: tokenTY || ''
+          }
+        }).then(function (response) {
+          return response.json();
+        }).then(function (res) {
+          document.body.removeChild(inputEl);
+          if (res.fileId) {
+            console.log('--------res', res);
+            valChange(_extends({}, res, {
+              fileName: fileData.name,
+              fileType: fileData.type
+            }), fileIndex, index, subIndex);
+            _Message.notice('上传成功');
+          } else {
+            _Message.error('上传失败，请重试');
+          }
+          closeLoading();
+        })["catch"](function (err) {
+          console.error(err);
+          _Message.error('上传失败');
+          closeLoading();
+        });
       });
-    });
+      inputEl.click();
+    }
   };
 
   // 预览材料

package/es/components/file-list/merge.js

@@ -72,19 +72,97 @@ var Merge = function Merge(_ref) {
   };
 
   // File 文件转 Image 对象
-  var getImageByFile = function getImageByFile(file) {
-    return new Promise(function (resolve) {
-      var reader = new FileReader();
-      reader.onload = function (e) {
-        var img = new Image();
-        img.src = e.target.result;
-        img.onload = function () {
-          return resolve(img);
-        };
-      };
-      reader.readAsDataURL(file);
-    });
-  };
+  // const getImageByFile = (file) => {
+  //   return new Promise((resolve) => {
+  //     const reader = new FileReader();
+  //     reader.onload = (e) => {
+  //       const img = new Image();
+  //       img.src = e.target.result;
+  //       img.onload = () => resolve(img);
+  //     };
+  //     reader.readAsDataURL(file);
+  //   });
+  // };
+  var getImageByFile = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(file, maxSize) {
+      var bitmap, width, height, scale, newWidth, newHeight, canvas, ctx, dataUrl, img, _t;
+      return _regeneratorRuntime.wrap(function (_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (maxSize === void 0) {
+              maxSize = 2000;
+            }
+            _context.prev = 1;
+            _context.next = 2;
+            return createImageBitmap(file, {
+              colorSpaceConversion: 'default'
+            });
+          case 2:
+            bitmap = _context.sent;
+            width = bitmap.width;
+            height = bitmap.height; // 如果图片太大，进行缩放（高清仪图片基本都会触发这里）
+            scale = 1;
+            if (width > maxSize || height > maxSize) {
+              scale = Math.min(maxSize / width, maxSize / height);
+            }
+            newWidth = Math.floor(width * scale);
+            newHeight = Math.floor(height * scale); // 绘制到 Canvas，此时像素已经被浏览器解码为纯 RGB 8-bit
+            canvas = document.createElement('canvas');
+            canvas.width = newWidth;
+            canvas.height = newHeight;
+            ctx = canvas.getContext('2d');
+            ctx.imageSmoothingEnabled = true;
+            ctx.imageSmoothingQuality = 'high';
+            ctx.drawImage(bitmap, 0, 0, newWidth, newHeight);
+
+            // 导出为普通的 JPEG（这一步会彻底丢掉原图的 ICC Profile）
+            dataUrl = canvas.toDataURL('image/jpeg', 0.92); // 转成 Image 对象以便兼容你原有代码逻辑
+            img = new Image();
+            img.src = dataUrl;
+            _context.next = 3;
+            return new Promise(function (resolve, reject) {
+              img.onload = resolve;
+              img.onerror = function () {
+                return reject(new Error('压缩后的 JPEG 加载失败'));
+              };
+            });
+          case 3:
+            // 释放内存
+            bitmap.close();
+            canvas.width = 0;
+            return _context.abrupt("return", img);
+          case 4:
+            _context.prev = 4;
+            _t = _context["catch"](1);
+            // 方案二（回退）：如果 createImageBitmap 不支持或报错（极少见）
+            console.warn('createImageBitmap 失败，使用回退方案', _t);
+            return _context.abrupt("return", new Promise(function (resolve, reject) {
+              var reader = new FileReader();
+              reader.onload = function (e) {
+                var img = new Image();
+                img.onload = function () {
+                  return resolve(img);
+                };
+                img.onerror = function () {
+                  return reject(new Error('回退方案加载失败'));
+                };
+                img.src = e.target.result;
+              };
+              reader.onerror = function () {
+                return reject(new Error('文件读取失败'));
+              };
+              reader.readAsDataURL(file);
+            }));
+          case 5:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[1, 4]]);
+    }));
+    return function getImageByFile(_x, _x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
 
   // 下载文件
   var getBlob = function getBlob(url) {
@@ -108,43 +186,46 @@ var Merge = function Merge(_ref) {
 
   // 核心：多张图片合并PDF
   var imgsToPdf = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
       var pdf, i, fileUrl, _blob, file, img, targetWidth, scale, targetHeight, pdfBlob, blobUrl;
-      return _regeneratorRuntime.wrap(function (_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regeneratorRuntime.wrap(function (_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             // 初始化PDF，纵向、A4
             pdf = new jsPDF({
               orientation: 'portrait',
               unit: 'px',
               format: 'a4'
-            }); // 遍历所有图片
+            });
+            console.log('materialList---', materialList);
+            // 遍历所有图片
             i = 0;
           case 1:
             if (!(i < materialList.length)) {
-              _context.next = 5;
+              _context2.next = 5;
               break;
             }
             fileUrl = materialList[i].fileUrl;
-            _context.next = 2;
+            _context2.next = 2;
             return getBlob(fileUrl);
           case 2:
-            _blob = _context.sent;
-            console.log(_blob);
+            _blob = _context2.sent;
+            console.log('blob----', _blob);
             file = new File([_blob], "img" + i, {
               type: 'image/png'
             });
             console.log(file);
-            _context.next = 3;
+            _context2.next = 3;
             return getImageByFile(file);
           case 3:
-            img = _context.sent;
+            img = _context2.sent;
             // 3. 计算可用宽度（保留边距）
             targetWidth = 400; // 4. 按比例计算高度
             scale = targetWidth / img.width;
             targetHeight = img.height * scale; // 第一张不加新页，后续图片新增一页
             if (i > 0) pdf.addPage();
-
+            console.log('targetWidth', targetWidth);
+            console.log('targetHeight', targetHeight);
             // 图片写入PDF
             pdf.addImage(img, 'PNG',
             // 格式 JPEG/PNG
@@ -154,7 +235,7 @@ var Merge = function Merge(_ref) {
             targetWidth, targetHeight);
           case 4:
             i++;
-            _context.next = 1;
+            _context2.next = 1;
             break;
           case 5:
             // 1. 获取 Blob
@@ -166,19 +247,19 @@ var Merge = function Merge(_ref) {
             setViewPdfUrl(blobUrl);
           case 6:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
     return function imgsToPdf() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   var uploadPdf = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
       var formData;
-      return _regeneratorRuntime.wrap(function (_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regeneratorRuntime.wrap(function (_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             openLoading();
             formData = new FormData();
@@ -201,12 +282,12 @@ var Merge = function Merge(_ref) {
             });
           case 1:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2);
+      }, _callee3);
     }));
     return function uploadPdf() {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   return /*#__PURE__*/React.createElement("div", {

package/lib/components/file-list/item.js

@@ -4,8 +4,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
 var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
+var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
 var _extends3 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _radio = _interopRequireDefault(require("@alifd/next/lib/radio"));
@@ -255,57 +255,87 @@ var FileItem = function FileItem(_ref) {
   }();
   var upload = function upload() {
     if (disabled) return;
-    var inputEl = document.createElement('input');
-    inputEl.setAttribute('type', 'file');
-    inputEl.style.display = 'none';
-    document.body.appendChild(inputEl);
-    inputEl.click();
-    inputEl.addEventListener('change', function (e) {
-      console.log(e.target.files);
-      var fileData = e.target.files[0];
-      console.log('fileData----', fileData);
-      if (fileData.size > (maxFileSize || 50) * 1024 * 1024) {
-        _message["default"].notice("\u6587\u4EF6 \"" + fileData.name + "\" \u8D85\u8FC7" + maxFileSize + "MB\u9650\u5236");
-        return;
+    var ua = navigator.userAgent.toLowerCase();
+    var isAndroidWeChat = /android/.test(ua) && /micromessenger/.test(ua);
+    if (isAndroidWeChat) {
+      _dialog["default"].confirm({
+        title: '请选择',
+        content: '请选择文件上传方式',
+        footerAlign: 'center',
+        okProps: {
+          children: '拍照'
+        },
+        cancelProps: {
+          children: '选择文件'
+        },
+        onOk: function onOk() {
+          return doUpload(true);
+        },
+        onCancel: function onCancel() {
+          return doUpload(false);
+        },
+        onClose: function onClose() {}
+      });
+    } else {
+      doUpload(false);
+    }
+    function doUpload(isCamera) {
+      var inputEl = document.createElement('input');
+      inputEl.setAttribute('type', 'file');
+      if (isCamera) {
+        inputEl.setAttribute('accept', 'image/*');
+        inputEl.setAttribute('capture', 'camera');
       }
-      if (spec) {
-        var type = (0, _file2.getFileExtension)(fileData.name);
-        if (!(0, _file2.initFormat)(spec).includes(type)) {
-          _message["default"].notice("\u6587\u4EF6 \"" + fileData.name + "\" \u683C\u5F0F\u4E0D\u6B63\u786E");
+      inputEl.style.display = 'none';
+      document.body.appendChild(inputEl);
+      inputEl.addEventListener('change', function (e) {
+        console.log(e.target.files);
+        var fileData = e.target.files[0];
+        console.log('fileData----', fileData);
+        if (fileData.size > (maxFileSize || 50) * 1024 * 1024) {
+          _message["default"].notice("\u6587\u4EF6 \"" + fileData.name + "\" \u8D85\u8FC7" + maxFileSize + "MB\u9650\u5236");
           return;
         }
-      }
-      var formData = new FormData();
-      formData.append('file', fileData);
-      formData.append('open', true);
-      openLoading();
-      fetch(baseUrl + "/declaration/material/file/files/api", {
-        method: 'POST',
-        body: formData,
-        headers: {
-          Authorization: tokenTY || ''
-        }
-      }).then(function (response) {
-        return response.json();
-      }).then(function (res) {
-        document.body.removeChild(inputEl);
-        if (res.fileId) {
-          console.log('--------res', res);
-          valChange((0, _extends3["default"])({}, res, {
-            fileName: fileData.name,
-            fileType: fileData.type
-          }), fileIndex, index, subIndex);
-          _message["default"].notice('上传成功');
-        } else {
-          _message["default"].error('上传失败，请重试');
+        if (spec) {
+          var type = (0, _file2.getFileExtension)(fileData.name);
+          if (!(0, _file2.initFormat)(spec).includes(type)) {
+            _message["default"].notice("\u6587\u4EF6 \"" + fileData.name + "\" \u683C\u5F0F\u4E0D\u6B63\u786E");
+            return;
+          }
         }
-        closeLoading();
-      })["catch"](function (err) {
-        console.error(err);
-        _message["default"].error('上传失败');
-        closeLoading();
+        var formData = new FormData();
+        formData.append('file', fileData);
+        formData.append('open', true);
+        openLoading();
+        fetch(baseUrl + "/declaration/material/file/files/api", {
+          method: 'POST',
+          body: formData,
+          headers: {
+            Authorization: tokenTY || ''
+          }
+        }).then(function (response) {
+          return response.json();
+        }).then(function (res) {
+          document.body.removeChild(inputEl);
+          if (res.fileId) {
+            console.log('--------res', res);
+            valChange((0, _extends3["default"])({}, res, {
+              fileName: fileData.name,
+              fileType: fileData.type
+            }), fileIndex, index, subIndex);
+            _message["default"].notice('上传成功');
+          } else {
+            _message["default"].error('上传失败，请重试');
+          }
+          closeLoading();
+        })["catch"](function (err) {
+          console.error(err);
+          _message["default"].error('上传失败');
+          closeLoading();
+        });
       });
-    });
+      inputEl.click();
+    }
   };
 
   // 预览材料