ls-pro-common 3.1.46 → 3.1.47

package/es/components/Select/Base.js

@@ -8,7 +8,7 @@ import "antd/es/checkbox/style";
 import _Checkbox from "antd/es/checkbox";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["params", "getOptions", "mode", "selectAll", "optionFilterProp", "showReload", "showTotal", "type", "labelField", "valueField", "filterOptions"];
+var _excluded = ["params", "getOptions", "mode", "selectAll", "showReload", "showTotal", "type", "labelField", "valueField", "filterOptions"];
 import React from "react";
 import { useState, useEffect, forwardRef } from 'react';
 import { ReloadOutlined } from '@ant-design/icons';
@@ -21,8 +21,6 @@ export default /*#__PURE__*/forwardRef(function (props, ref) {
     getOptions = props.getOptions,
     mode = props.mode,
     selectAll = props.selectAll,
-    _props$optionFilterPr = props.optionFilterProp,
-    optionFilterProp = _props$optionFilterPr === void 0 ? 'label' : _props$optionFilterPr,
     _props$showReload = props.showReload,
     showReload = _props$showReload === void 0 ? true : _props$showReload,
     _props$showTotal = props.showTotal,
@@ -71,7 +69,8 @@ export default /*#__PURE__*/forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement(_Select, _extends({
     allowClear: true,
     showSearch: true,
-    optionFilterProp: optionFilterProp,
+    showArrow: true,
+    optionFilterProp: "label",
     mode: mode,
     maxTagCount: "responsive",
     ref: ref,

package/es/utils/index.d.ts

@@ -135,11 +135,12 @@ export declare const off: (eventName: string, fn: Function, el: any | undefined)
  * @param bodyParam Post传参数
  * @param param Get传参数
  * @param method 请求方式，默认post
+ * @param isNewPrintCenter 是否是新的打印中心，默认false
  * @returns
  */
-export declare const printView: (templateNo: string, reqUrl: string, bodyParam?: any, param?: any, method?: 'POST' | 'GET') => any;
+export declare const printView: (templateNo: string, reqUrl: string, bodyParam?: any, param?: any, method?: 'POST' | 'GET', isNewPrintCenter?: boolean) => any;
 /**
- * 直接打印
+ * 直接打印，通过打印组件进行打印。
  *
  * @param taskName 打印任务名
  * @param templateNo 打印模板
@@ -149,7 +150,7 @@ export declare const printView: (templateNo: string, reqUrl: string, bodyParam?:
  * @param method 请求方式，默认post
  * @returns
  */
-export declare const printAsync: (taskName: string, templateNo: string, reqUrl: string, bodyParam?: any, param?: any, method?: 'POST' | 'GET') => Promise<any>;
+export declare const printAsync: (taskName: string, templateNo: string, reqUrl: string, bodyParam?: any, param?: any, method?: 'POST' | 'GET', isNewPrintCenter?: boolean) => Promise<any>;
 export declare const isDev: boolean;
 export declare type UserType = {
     id?: string;

package/es/utils/index.js

@@ -313,13 +313,19 @@ export var off = function off(eventName, fn, el) {
  * @param bodyParam Post传参数
  * @param param Get传参数
  * @param method 请求方式，默认post
+ * @param isNewPrintCenter 是否是新的打印中心，默认false
  * @returns
  */
 export var printView = function printView(templateNo, reqUrl) {
   var bodyParam = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var param = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
   var method = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'POST';
-  var printCenterUrl = toGatewayUrl('/petrel-print-center-api/report/remote/print/dataStr');
+  var isNewPrintCenter = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+  var api = '/petrel-print-center-api/report/remote/print/dataStr';
+  if (isNewPrintCenter) {
+    api = '/lesoon-basic-api/basic/ireport/preview/print/dataStr';
+  }
+  var printCenterUrl = toGatewayUrl(api);
   reqUrl = toGatewayUrl(reqUrl);
   if (!reqUrl.includes(location.origin)) {
     reqUrl = location.origin + reqUrl;
@@ -339,7 +345,7 @@ export var printView = function printView(templateNo, reqUrl) {
   return openWin;
 };
 /**
- * 直接打印
+ * 直接打印，通过打印组件进行打印。
  *
  * @param taskName 打印任务名
  * @param templateNo 打印模板
@@ -353,7 +359,12 @@ export var printAsync = function printAsync(taskName, templateNo, reqUrl) {
   var bodyParam = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   var param = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : undefined;
   var method = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'POST';
-  var printCenterUrl = toGatewayUrl('/petrel-print-center-api/report/client/print');
+  var isNewPrintCenter = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
+  var api = '/petrel-print-center-api/report/client/print';
+  if (isNewPrintCenter) {
+    api = '/lesoon-basic-api/basic/report/client/template/print';
+  }
+  var printCenterUrl = toGatewayUrl(api);
   if (!printCenterUrl.includes(location.origin)) {
     printCenterUrl = location.origin + printCenterUrl;
   }

package/es/utils/pasteUpload.d.ts

@@ -4,19 +4,19 @@ 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('图片上传失败');
- *               }
- *             };
+ *                     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} />
- *             ```;
+ *                     <Input.TextArea onPaste={handlePaste} />
+ *                     ```;
  *
  * @param event 粘贴事件对象
  * @param params 附加其它参数 {key:value}
@@ -24,4 +24,4 @@ import { UploadProgressCallback } from '../http';
  * @param onProgress 上传进度回调函数，参数为 0-100 的进度百分比
  * @returns 返回上传结果的 Promise，resolve 时返回上传成功的数据，reject 时返回错误信息
  */
-export declare const pasteUpload: (event: React.ClipboardEvent<any>, params?: Record<string, any>, catalogName?: string, onProgress?: UploadProgressCallback | undefined) => Promise<any>;
+export declare const pasteUpload: (event: React.ClipboardEvent<any> | ClipboardEvent, params?: Record<string, any>, catalogName?: string, onProgress?: UploadProgressCallback | undefined) => Promise<any>;

package/es/utils/pasteUpload.js

@@ -6,19 +6,19 @@ 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('图片上传失败');
- *               }
- *             };
+ *                     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} />
- *             ```;
+ *                     <Input.TextArea onPaste={handlePaste} />
+ *                     ```;
  *
  * @param event 粘贴事件对象
  * @param params 附加其它参数 {key:value}
@@ -32,8 +32,8 @@ export var pasteUpload = /*#__PURE__*/function () {
       catalogName,
       onProgress,
       clipboardData,
-      items,
       file,
+      items,
       i,
       item,
       files,
@@ -54,9 +54,8 @@ export var pasteUpload = /*#__PURE__*/function () {
           }
           return _context.abrupt("return");
         case 6:
-          // 优先从剪贴板 items 中获取文件
+          file = null; // 优先从剪贴板 items 中获取文件
           items = clipboardData.items;
-          file = null;
           if (!items) {
             _context.next = 19;
             break;

package/lib/components/Select/Base.js

@@ -8,7 +8,7 @@ import "antd/es/checkbox/style";
 import _Checkbox from "antd/es/checkbox";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["params", "getOptions", "mode", "selectAll", "optionFilterProp", "showReload", "showTotal", "type", "labelField", "valueField", "filterOptions"];
+var _excluded = ["params", "getOptions", "mode", "selectAll", "showReload", "showTotal", "type", "labelField", "valueField", "filterOptions"];
 import React from "react";
 import { useState, useEffect, forwardRef } from 'react';
 import { ReloadOutlined } from '@ant-design/icons';
@@ -21,8 +21,6 @@ export default /*#__PURE__*/forwardRef(function (props, ref) {
     getOptions = props.getOptions,
     mode = props.mode,
     selectAll = props.selectAll,
-    _props$optionFilterPr = props.optionFilterProp,
-    optionFilterProp = _props$optionFilterPr === void 0 ? 'label' : _props$optionFilterPr,
     _props$showReload = props.showReload,
     showReload = _props$showReload === void 0 ? true : _props$showReload,
     _props$showTotal = props.showTotal,
@@ -71,7 +69,8 @@ export default /*#__PURE__*/forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement(_Select, _extends({
     allowClear: true,
     showSearch: true,
-    optionFilterProp: optionFilterProp,
+    showArrow: true,
+    optionFilterProp: "label",
     mode: mode,
     maxTagCount: "responsive",
     ref: ref,

package/lib/utils/index.d.ts

@@ -135,11 +135,12 @@ export declare const off: (eventName: string, fn: Function, el: any | undefined)
  * @param bodyParam Post传参数
  * @param param Get传参数
  * @param method 请求方式，默认post
+ * @param isNewPrintCenter 是否是新的打印中心，默认false
  * @returns
  */
-export declare const printView: (templateNo: string, reqUrl: string, bodyParam?: any, param?: any, method?: 'POST' | 'GET') => any;
+export declare const printView: (templateNo: string, reqUrl: string, bodyParam?: any, param?: any, method?: 'POST' | 'GET', isNewPrintCenter?: boolean) => any;
 /**
- * 直接打印
+ * 直接打印，通过打印组件进行打印。
  *
  * @param taskName 打印任务名
  * @param templateNo 打印模板
@@ -149,7 +150,7 @@ export declare const printView: (templateNo: string, reqUrl: string, bodyParam?:
  * @param method 请求方式，默认post
  * @returns
  */
-export declare const printAsync: (taskName: string, templateNo: string, reqUrl: string, bodyParam?: any, param?: any, method?: 'POST' | 'GET') => Promise<any>;
+export declare const printAsync: (taskName: string, templateNo: string, reqUrl: string, bodyParam?: any, param?: any, method?: 'POST' | 'GET', isNewPrintCenter?: boolean) => Promise<any>;
 export declare const isDev: boolean;
 export declare type UserType = {
     id?: string;

package/lib/utils/index.js

@@ -313,13 +313,19 @@ export var off = function off(eventName, fn, el) {
  * @param bodyParam Post传参数
  * @param param Get传参数
  * @param method 请求方式，默认post
+ * @param isNewPrintCenter 是否是新的打印中心，默认false
  * @returns
  */
 export var printView = function printView(templateNo, reqUrl) {
   var bodyParam = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var param = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
   var method = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'POST';
-  var printCenterUrl = toGatewayUrl('/petrel-print-center-api/report/remote/print/dataStr');
+  var isNewPrintCenter = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+  var api = '/petrel-print-center-api/report/remote/print/dataStr';
+  if (isNewPrintCenter) {
+    api = '/lesoon-basic-api/basic/ireport/preview/print/dataStr';
+  }
+  var printCenterUrl = toGatewayUrl(api);
   reqUrl = toGatewayUrl(reqUrl);
   if (!reqUrl.includes(location.origin)) {
     reqUrl = location.origin + reqUrl;
@@ -339,7 +345,7 @@ export var printView = function printView(templateNo, reqUrl) {
   return openWin;
 };
 /**
- * 直接打印
+ * 直接打印，通过打印组件进行打印。
  *
  * @param taskName 打印任务名
  * @param templateNo 打印模板
@@ -353,7 +359,12 @@ export var printAsync = function printAsync(taskName, templateNo, reqUrl) {
   var bodyParam = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   var param = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : undefined;
   var method = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'POST';
-  var printCenterUrl = toGatewayUrl('/petrel-print-center-api/report/client/print');
+  var isNewPrintCenter = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
+  var api = '/petrel-print-center-api/report/client/print';
+  if (isNewPrintCenter) {
+    api = '/lesoon-basic-api/basic/report/client/template/print';
+  }
+  var printCenterUrl = toGatewayUrl(api);
   if (!printCenterUrl.includes(location.origin)) {
     printCenterUrl = location.origin + printCenterUrl;
   }

package/lib/utils/pasteUpload.d.ts

@@ -4,19 +4,19 @@ 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('图片上传失败');
- *               }
- *             };
+ *                     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} />
- *             ```;
+ *                     <Input.TextArea onPaste={handlePaste} />
+ *                     ```;
  *
  * @param event 粘贴事件对象
  * @param params 附加其它参数 {key:value}
@@ -24,4 +24,4 @@ import { UploadProgressCallback } from '../http';
  * @param onProgress 上传进度回调函数，参数为 0-100 的进度百分比
  * @returns 返回上传结果的 Promise，resolve 时返回上传成功的数据，reject 时返回错误信息
  */
-export declare const pasteUpload: (event: React.ClipboardEvent<any>, params?: Record<string, any>, catalogName?: string, onProgress?: UploadProgressCallback | undefined) => Promise<any>;
+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

@@ -6,19 +6,19 @@ 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('图片上传失败');
- *               }
- *             };
+ *                     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} />
- *             ```;
+ *                     <Input.TextArea onPaste={handlePaste} />
+ *                     ```;
  *
  * @param event 粘贴事件对象
  * @param params 附加其它参数 {key:value}
@@ -32,8 +32,8 @@ export var pasteUpload = /*#__PURE__*/function () {
       catalogName,
       onProgress,
       clipboardData,
-      items,
       file,
+      items,
       i,
       item,
       files,
@@ -54,9 +54,8 @@ export var pasteUpload = /*#__PURE__*/function () {
           }
           return _context.abrupt("return");
         case 6:
-          // 优先从剪贴板 items 中获取文件
+          file = null; // 优先从剪贴板 items 中获取文件
           items = clipboardData.items;
-          file = null;
           if (!items) {
             _context.next = 19;
             break;

package/package.json

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