ls-pro-common 3.1.45 → 3.1.47

package/lib/utils/modal.js

@@ -205,7 +205,7 @@ export var reLogin = function reLogin() {
     afterClose: function afterClose() {
       sessionStorage.removeItem('reLogin');
       var win = window.top || window; // 获取顶层窗口，防止iframe加载子工程页面
-      win.location.href = location.pathname === '/' ? '/login/' : '/login/?redirect=' + encodeURIComponent(win.location.href);
+      win.location.href = location.pathname === '/' || location.pathname.startsWith('/login') ? '/login/' : '/login/?redirect=' + encodeURIComponent(win.location.href);
     }
   });
 };

package/lib/utils/pasteUpload.d.ts

@@ -0,0 +1,27 @@
+import { UploadProgressCallback } from '../http';
+/**
+ * 粘贴上传图片,监听粘贴事件,支持从剪贴板中获取图片(如截图工具复制后粘贴)并上传
+ *
+ * @example
+ *   ```tsx // 在 TextArea 组件中使用
+ *                     const handlePaste = async (event: React.ClipboardEvent<HTMLTextAreaElement>) => {
+ *                       event.preventDefault(); // 阻止默认粘贴行为
+ *                       try {
+ *                         const result = await pasteUpload(event, { userId: '123' }, 'imgs');
+ *                         // 处理上传结果
+ *                         console.log('图片URL:', result.rows?.[0]?.shareUrl);
+ *                       } catch (error) {
+ *                         message.error('图片上传失败');
+ *                       }
+ *                     };
+ *
+ *                     <Input.TextArea onPaste={handlePaste} />
+ *                     ```;
+ *
+ * @param event 粘贴事件对象
+ * @param params 附加其它参数 {key:value}
+ * @param catalogName 文件目录名称，默认为 'imgs'
+ * @param onProgress 上传进度回调函数，参数为 0-100 的进度百分比
+ * @returns 返回上传结果的 Promise，resolve 时返回上传成功的数据，reject 时返回错误信息
+ */
+export declare const pasteUpload: (event: React.ClipboardEvent<any> | ClipboardEvent, params?: Record<string, any>, catalogName?: string, onProgress?: UploadProgressCallback | undefined) => Promise<any>;

package/lib/utils/pasteUpload.js

@@ -0,0 +1,117 @@
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { httpUpload } from '../http';
+/**
+ * 粘贴上传图片,监听粘贴事件,支持从剪贴板中获取图片(如截图工具复制后粘贴)并上传
+ *
+ * @example
+ *   ```tsx // 在 TextArea 组件中使用
+ *                     const handlePaste = async (event: React.ClipboardEvent<HTMLTextAreaElement>) => {
+ *                       event.preventDefault(); // 阻止默认粘贴行为
+ *                       try {
+ *                         const result = await pasteUpload(event, { userId: '123' }, 'imgs');
+ *                         // 处理上传结果
+ *                         console.log('图片URL:', result.rows?.[0]?.shareUrl);
+ *                       } catch (error) {
+ *                         message.error('图片上传失败');
+ *                       }
+ *                     };
+ *
+ *                     <Input.TextArea onPaste={handlePaste} />
+ *                     ```;
+ *
+ * @param event 粘贴事件对象
+ * @param params 附加其它参数 {key:value}
+ * @param catalogName 文件目录名称，默认为 'imgs'
+ * @param onProgress 上传进度回调函数，参数为 0-100 的进度百分比
+ * @returns 返回上传结果的 Promise，resolve 时返回上传成功的数据，reject 时返回错误信息
+ */
+export var pasteUpload = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(event) {
+    var params,
+      catalogName,
+      onProgress,
+      clipboardData,
+      file,
+      items,
+      i,
+      item,
+      files,
+      uploadUrl,
+      _httpUpload,
+      promise,
+      _args = arguments;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          params = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
+          catalogName = _args.length > 2 && _args[2] !== undefined ? _args[2] : 'imgs';
+          onProgress = _args.length > 3 ? _args[3] : undefined;
+          clipboardData = event.clipboardData;
+          if (clipboardData) {
+            _context.next = 6;
+            break;
+          }
+          return _context.abrupt("return");
+        case 6:
+          file = null; // 优先从剪贴板 items 中获取文件
+          items = clipboardData.items;
+          if (!items) {
+            _context.next = 19;
+            break;
+          }
+          i = 0;
+        case 10:
+          if (!(i < items.length)) {
+            _context.next = 19;
+            break;
+          }
+          item = items[i]; // 检查是否为图片类型
+          if (!(item.kind === 'file' && item.type.startsWith('image/'))) {
+            _context.next = 16;
+            break;
+          }
+          file = item.getAsFile();
+          if (!file) {
+            _context.next = 16;
+            break;
+          }
+          return _context.abrupt("break", 19);
+        case 16:
+          i++;
+          _context.next = 10;
+          break;
+        case 19:
+          // 如果 items 中没有找到，尝试从 files 属性获取
+          if (!file && clipboardData.files && clipboardData.files.length > 0) {
+            files = Array.from(clipboardData.files); // 查找第一个图片文件
+            file = files.find(function (f) {
+              return f.type.startsWith('image/');
+            }) || null;
+          }
+          if (file) {
+            _context.next = 22;
+            break;
+          }
+          return _context.abrupt("return");
+        case 22:
+          if (file.type.startsWith('image/')) {
+            _context.next = 24;
+            break;
+          }
+          return _context.abrupt("return");
+        case 24:
+          // 构建上传 URL
+          uploadUrl = "/petrel/petrel-file-center-api/lesoon/oss/file/upload/RETAIL-PUBLIC?catalogName=".concat(catalogName); // 调用上传接口
+          _httpUpload = httpUpload(uploadUrl, file, params, 'file', false, onProgress), promise = _httpUpload.promise;
+          return _context.abrupt("return", promise);
+        case 27:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function pasteUpload(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();

package/package.json

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