ydb-components-material 0.1.146 → 0.1.148

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

@@ -60,6 +60,7 @@ var FileList = function FileList(_ref) {
     if (stored) {
       try {
         setFileArray(JSON.parse(stored));
+        localStorage.removeItem(tokenTY);
       } catch (e) {}
     } else {
       setFileArray(fileList);

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

@@ -747,15 +747,6 @@ var FileItem = function FileItem(_ref) {
       format: format
     });
   };
-  var invalidHandle = function invalidHandle() {
-    // 分享出去的需要别人签署的文件数据。标识为无效
-    if (file.signId) {
-      saveSignerInfo({
-        uuid: file.signId,
-        invalid: true
-      });
-    }
-  };
   var handleDel = /*#__PURE__*/function () {
     var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
       return _regeneratorRuntime.wrap(function (_context7) {
@@ -910,10 +901,9 @@ var FileItem = function FileItem(_ref) {
           contrId = _JSON$parse.contractId,
           docId = _JSON$parse.documentId,
           nameVal = _JSON$parse.fileName,
-          storedFileId = _JSON$parse.fileId,
           originalUrl = _JSON$parse.fileUrl;
         console.log('docId', docId, contrId, nameVal);
-        localStorage.removeItem(storedFileId);
+        localStorage.removeItem(fileId);
         originalUrlRef.current = originalUrl || '';
         if (docId && contrId && nameVal) {
           openLoading();

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/index.js

@@ -66,6 +66,7 @@ var FileList = function FileList(_ref) {
     if (stored) {
       try {
         setFileArray(JSON.parse(stored));
+        localStorage.removeItem(tokenTY);
       } catch (e) {}
     } else {
       setFileArray(fileList);

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

@@ -753,15 +753,6 @@ var FileItem = function FileItem(_ref) {
       format: format
     });
   };
-  var invalidHandle = function invalidHandle() {
-    // 分享出去的需要别人签署的文件数据。标识为无效
-    if (file.signId) {
-      saveSignerInfo({
-        uuid: file.signId,
-        invalid: true
-      });
-    }
-  };
   var handleDel = /*#__PURE__*/function () {
     var _ref8 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7() {
       return _regenerator["default"].wrap(function (_context7) {
@@ -916,10 +907,9 @@ var FileItem = function FileItem(_ref) {
           contrId = _JSON$parse.contractId,
           docId = _JSON$parse.documentId,
           nameVal = _JSON$parse.fileName,
-          storedFileId = _JSON$parse.fileId,
           originalUrl = _JSON$parse.fileUrl;
         console.log('docId', docId, contrId, nameVal);
-        localStorage.removeItem(storedFileId);
+        localStorage.removeItem(fileId);
         originalUrlRef.current = originalUrl || '';
         if (docId && contrId && nameVal) {
           openLoading();

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

@@ -13,7 +13,7 @@ var _reactBeautifulDnd = require("react-beautiful-dnd");
 var _icons = require("@ant-design/icons");
 var _jspdf = _interopRequireDefault(require("jspdf"));
 require("./merge.scss");
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
 // 1. 引入 useState
 
 var Merge = function Merge(_ref) {
@@ -80,19 +80,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 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(file, maxSize) {
+      var bitmap, width, height, scale, newWidth, newHeight, canvas, ctx, dataUrl, img, _t;
+      return _regenerator["default"].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) {
@@ -116,43 +194,46 @@ var Merge = function Merge(_ref) {
 
   // 核心：多张图片合并PDF
   var imgsToPdf = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
       var pdf, i, fileUrl, _blob, file, img, targetWidth, scale, targetHeight, pdfBlob, blobUrl;
-      return _regenerator["default"].wrap(function (_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator["default"].wrap(function (_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             // 初始化PDF，纵向、A4
             pdf = new _jspdf["default"]({
               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
@@ -162,7 +243,7 @@ var Merge = function Merge(_ref) {
             targetWidth, targetHeight);
           case 4:
             i++;
-            _context.next = 1;
+            _context2.next = 1;
             break;
           case 5:
             // 1. 获取 Blob
@@ -174,19 +255,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 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var _ref4 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
       var formData;
-      return _regenerator["default"].wrap(function (_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regenerator["default"].wrap(function (_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             openLoading();
             formData = new FormData();
@@ -209,12 +290,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/lowcode_es/meta.js

@@ -98,7 +98,7 @@ function fillRealVersion(meta, packageName, version, basicLibraryVersion) {
     packageName = 'ydb-components-material';
   }
   if (version === void 0) {
-    version = '0.1.146';
+    version = '0.1.148';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/lowcode_lib/meta.js

@@ -103,7 +103,7 @@ function fillRealVersion(meta, packageName, version, basicLibraryVersion) {
     packageName = 'ydb-components-material';
   }
   if (version === void 0) {
-    version = '0.1.146';
+    version = '0.1.148';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-components-material",
-  "version": "0.1.146",
+  "version": "0.1.148",
   "description": "ydb-components-material",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -102,10 +102,10 @@
   },
   "componentConfig": {
     "isComponentLibrary": true,
-    "materialSchema": "https://unpkg.com/ydb-components-material@0.1.146/build/lowcode/assets-prod.json"
+    "materialSchema": "https://unpkg.com/ydb-components-material@0.1.148/build/lowcode/assets-prod.json"
   },
   "lcMeta": {
     "type": "component"
   },
-  "homepage": "https://unpkg.com/ydb-components-material@0.1.146/build/index.html"
+  "homepage": "https://unpkg.com/ydb-components-material@0.1.148/build/index.html"
 }