ls-pro-common 3.1.46 → 3.1.48

package/es/components/InputTable.d.ts

@@ -14,7 +14,7 @@ export declare type InputTableProps = ProFormItemProps<InputProps> & {
     /** @name 是否支持多选 */
     multiple?: boolean;
     /** @name 表单项name, 跟 form.item 的 name一致 */
-    name: string;
+    name?: string;
     /** @name 返回的值字段，表格中valueField配置的字段时返回给name */
     valueField: string;
     /** @name 返回输入框显示的字段，textField字段值返回给textName */
@@ -74,7 +74,7 @@ declare const InputTable: React.ForwardRefExoticComponent<{
     /** @name 是否支持多选 */
     multiple?: boolean | undefined;
     /** @name 表单项name, 跟 form.item 的 name一致 */
-    name: string;
+    name?: string | undefined;
     /** @name 返回的值字段，表格中valueField配置的字段时返回给name */
     valueField: string;
     /** @name 返回输入框显示的字段，textField字段值返回给textName */

package/es/components/InputTable.js

@@ -1,3 +1,5 @@
+import "antd/es/form/style";
+import _Form from "antd/es/form";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
 import "antd/es/popover/style";
@@ -11,7 +13,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "labelWidth", "textField", "onSelectChange", "beforeLoad", "afterLoad", "isV2", "allowClear", "keepSelect", "fieldProps", "searchField", "fillMap", "loadOnShow", "triggerCheck", "getPopupContainer", "placement", "arrowPointAtCenter", "rowKey", "method", "changeOnSelect", "record"],
+var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "labelWidth", "textField", "onSelectChange", "beforeLoad", "afterLoad", "isV2", "allowClear", "keepSelect", "fieldProps", "searchField", "fillMap", "loadOnShow", "triggerCheck", "getPopupContainer", "placement", "arrowPointAtCenter", "method", "changeOnSelect", "rowKey", "record", "id"],
   _excluded2 = ["current", "pageSize"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useRef, useState, useEffect, useContext, useMemo, useImperativeHandle } from 'react';
@@ -43,7 +45,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
   var columns = prop.columns,
     url = prop.url,
     textName = prop.textName,
-    name = prop.name,
+    itemName = prop.name,
     tableConfig = prop.tableConfig,
     _prop$tableHeight = prop.tableHeight,
     tableHeight = _prop$tableHeight === void 0 ? 400 : _prop$tableHeight,
@@ -80,12 +82,13 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     placement = _prop$placement === void 0 ? 'bottom' : _prop$placement,
     _prop$arrowPointAtCen = prop.arrowPointAtCenter,
     arrowPointAtCenter = _prop$arrowPointAtCen === void 0 ? true : _prop$arrowPointAtCen,
-    rowKey = prop.rowKey,
     _prop$method = prop.method,
     method = _prop$method === void 0 ? 'GET' : _prop$method,
     _prop$changeOnSelect = prop.changeOnSelect,
     changeOnSelect = _prop$changeOnSelect === void 0 ? true : _prop$changeOnSelect,
+    rowKey = prop.rowKey,
     record = prop.record,
+    id = prop.id,
     rest = _objectWithoutProperties(prop, _excluded);
   if (!valueField && isDev) {
     console.error('valueField 属性必须设置');
@@ -93,10 +96,21 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
   if (!url && isDev) {
     console.error('url 属性必须设置');
   }
+  var tableKey = (tableConfig === null || tableConfig === void 0 ? void 0 : tableConfig.rowKey) || valueField || 'id';
+  // 处理表单name， 如果不传入通过id来处理。在表格中，自动会添加Id
+  var name = useMemo(function () {
+    if (itemName) return itemName;
+    if (id) {
+      if (id.includes('_')) {
+        return id.slice(id.indexOf('_') + 1);
+      }
+      return id;
+    }
+    return '';
+  }, [itemName, id]);
   if (!name && isDev) {
     console.error('name 属性必须设置');
   }
-  var tableKey = (tableConfig === null || tableConfig === void 0 ? void 0 : tableConfig.rowKey) || valueField || 'id';
   //显示输入框绑定的name,如果不设置textName,设置为$name__text
   var textNameProp = useMemo(function () {
     return textName ? textName : name + '__text';
@@ -120,6 +134,11 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     if (col) return col.searchField || col.dataIndex;
     return textField || valueField;
   }, [columns, searchField, valueField, textField]);
+  /**
+   * 获取表单值
+   *
+   * @returns
+   */
   var getFormValue = function getFormValue() {
     var _formRef$current2, _formRef$current2$get;
     if (rowKey) {
@@ -128,6 +147,11 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     }
     return formRef === null || formRef === void 0 ? void 0 : (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : (_formRef$current2$get = _formRef$current2.getFieldsValue) === null || _formRef$current2$get === void 0 ? void 0 : _formRef$current2$get.call(_formRef$current2);
   };
+  /**
+   * 设置表单值
+   *
+   * @param formValue
+   */
   var setFormValue = function setFormValue(formValue) {
     var _prop$onChange;
     (_prop$onChange = prop.onChange) === null || _prop$onChange === void 0 ? void 0 : _prop$onChange.call(prop, formValue[name]);
@@ -139,6 +163,12 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       formRef === null || formRef === void 0 ? void 0 : (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : (_formRef$current4$set = _formRef$current4.setFieldsValue) === null || _formRef$current4$set === void 0 ? void 0 : _formRef$current4$set.call(_formRef$current4, formValue);
     }
   };
+  /**
+   * 加载面板数据
+   *
+   * @param param
+   * @returns
+   */
   var loadData = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(param) {
       var current, pageSize, restParams, _selectRowRef$current, _rows, data, _tableRef$current2, _tableRef$current2$cl, _param, result, rows, formValue, val, _selectRowRef$current2, arr, pageSelectedRows;
@@ -254,6 +284,13 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       return _ref.apply(this, arguments);
     };
   }();
+  /**
+   * 如果初始有值时，调用此方法初始化名称
+   *
+   * @param val
+   * @param updateTxt
+   * @returns
+   */
   var initName = function initName(val) {
     var updateTxt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     if (!val) return;
@@ -288,6 +325,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       var formValue = getFormValue();
       if (!formValue) return;
       formValue[textNameProp] = txt;
+      console.log('formValue', formValue);
       setFormValue(formValue);
     });
   };
@@ -433,6 +471,19 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       (_tableRef$current5 = tableRef.current) === null || _tableRef$current5 === void 0 ? void 0 : (_tableRef$current5$re = _tableRef$current5.reload) === null || _tableRef$current5$re === void 0 ? void 0 : _tableRef$current5$re.call(_tableRef$current5);
     }
   }, [visible, loadOnShow]);
+  // 处理有值时，可清空
+  useEffect(function () {
+    if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
+    try {
+      var el = inputRef.current.input.parentNode;
+      if (!el) return;
+      if (text) {
+        el.classList.add('ant-input-has-value');
+      } else {
+        el.classList.remove('ant-input-has-value');
+      }
+    } catch (e) {}
+  }, [text, rest, fieldProps]);
   var tableDom = /*#__PURE__*/React.createElement(ProTable, _extends({
     className: "ls-input-table",
     columns: columns,
@@ -549,31 +600,26 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     readOnly: readonly,
     allowClear: allowClear,
     ref: inputRef
-  }, rest.label ? {} : {
+  }, !rowKey ? {} : {
     value: text
   }, fieldProps));
-  // 处理有值时，可清空
-  useEffect(function () {
-    if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
-    try {
-      var el = inputRef.current.input.parentNode;
-      if (!el) return;
-      if (text) {
-        el.classList.add('ant-input-has-value');
-      } else {
-        el.classList.remove('ant-input-has-value');
-      }
-    } catch (e) {}
-  }, [text, rest, fieldProps]);
+  console.log('textNameProp', prop);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'none'
     }
   }, /*#__PURE__*/React.createElement(ProFormText, {
-    name: name
-  })), /*#__PURE__*/React.createElement(ProFormText, _extends({
+    name: rowKey ? id : name
+  })), rest.label || rowKey ? /*#__PURE__*/React.createElement(ProFormText, _extends({
+    name: textNameProp
+  }, rest, rowKey ? {
+    noStyle: true
+  } : {}), InputDom) :
+  /*#__PURE__*/
+  // 在ProTable的查询面板中
+  React.createElement(_Form.Item, _extends({
     name: textNameProp
-  }, rest, rest.label ? {} : {
+  }, rest, {
     noStyle: true
   }), InputDom));
 });

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/InputTable.d.ts

@@ -14,7 +14,7 @@ export declare type InputTableProps = ProFormItemProps<InputProps> & {
     /** @name 是否支持多选 */
     multiple?: boolean;
     /** @name 表单项name, 跟 form.item 的 name一致 */
-    name: string;
+    name?: string;
     /** @name 返回的值字段，表格中valueField配置的字段时返回给name */
     valueField: string;
     /** @name 返回输入框显示的字段，textField字段值返回给textName */
@@ -74,7 +74,7 @@ declare const InputTable: React.ForwardRefExoticComponent<{
     /** @name 是否支持多选 */
     multiple?: boolean | undefined;
     /** @name 表单项name, 跟 form.item 的 name一致 */
-    name: string;
+    name?: string | undefined;
     /** @name 返回的值字段，表格中valueField配置的字段时返回给name */
     valueField: string;
     /** @name 返回输入框显示的字段，textField字段值返回给textName */

package/lib/components/InputTable.js

@@ -1,3 +1,5 @@
+import "antd/es/form/style";
+import _Form from "antd/es/form";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
 import "antd/es/popover/style";
@@ -11,7 +13,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "labelWidth", "textField", "onSelectChange", "beforeLoad", "afterLoad", "isV2", "allowClear", "keepSelect", "fieldProps", "searchField", "fillMap", "loadOnShow", "triggerCheck", "getPopupContainer", "placement", "arrowPointAtCenter", "rowKey", "method", "changeOnSelect", "record"],
+var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "labelWidth", "textField", "onSelectChange", "beforeLoad", "afterLoad", "isV2", "allowClear", "keepSelect", "fieldProps", "searchField", "fillMap", "loadOnShow", "triggerCheck", "getPopupContainer", "placement", "arrowPointAtCenter", "method", "changeOnSelect", "rowKey", "record", "id"],
   _excluded2 = ["current", "pageSize"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useRef, useState, useEffect, useContext, useMemo, useImperativeHandle } from 'react';
@@ -43,7 +45,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
   var columns = prop.columns,
     url = prop.url,
     textName = prop.textName,
-    name = prop.name,
+    itemName = prop.name,
     tableConfig = prop.tableConfig,
     _prop$tableHeight = prop.tableHeight,
     tableHeight = _prop$tableHeight === void 0 ? 400 : _prop$tableHeight,
@@ -80,12 +82,13 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     placement = _prop$placement === void 0 ? 'bottom' : _prop$placement,
     _prop$arrowPointAtCen = prop.arrowPointAtCenter,
     arrowPointAtCenter = _prop$arrowPointAtCen === void 0 ? true : _prop$arrowPointAtCen,
-    rowKey = prop.rowKey,
     _prop$method = prop.method,
     method = _prop$method === void 0 ? 'GET' : _prop$method,
     _prop$changeOnSelect = prop.changeOnSelect,
     changeOnSelect = _prop$changeOnSelect === void 0 ? true : _prop$changeOnSelect,
+    rowKey = prop.rowKey,
     record = prop.record,
+    id = prop.id,
     rest = _objectWithoutProperties(prop, _excluded);
   if (!valueField && isDev) {
     console.error('valueField 属性必须设置');
@@ -93,10 +96,21 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
   if (!url && isDev) {
     console.error('url 属性必须设置');
   }
+  var tableKey = (tableConfig === null || tableConfig === void 0 ? void 0 : tableConfig.rowKey) || valueField || 'id';
+  // 处理表单name， 如果不传入通过id来处理。在表格中，自动会添加Id
+  var name = useMemo(function () {
+    if (itemName) return itemName;
+    if (id) {
+      if (id.includes('_')) {
+        return id.slice(id.indexOf('_') + 1);
+      }
+      return id;
+    }
+    return '';
+  }, [itemName, id]);
   if (!name && isDev) {
     console.error('name 属性必须设置');
   }
-  var tableKey = (tableConfig === null || tableConfig === void 0 ? void 0 : tableConfig.rowKey) || valueField || 'id';
   //显示输入框绑定的name,如果不设置textName,设置为$name__text
   var textNameProp = useMemo(function () {
     return textName ? textName : name + '__text';
@@ -120,6 +134,11 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     if (col) return col.searchField || col.dataIndex;
     return textField || valueField;
   }, [columns, searchField, valueField, textField]);
+  /**
+   * 获取表单值
+   *
+   * @returns
+   */
   var getFormValue = function getFormValue() {
     var _formRef$current2, _formRef$current2$get;
     if (rowKey) {
@@ -128,6 +147,11 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     }
     return formRef === null || formRef === void 0 ? void 0 : (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : (_formRef$current2$get = _formRef$current2.getFieldsValue) === null || _formRef$current2$get === void 0 ? void 0 : _formRef$current2$get.call(_formRef$current2);
   };
+  /**
+   * 设置表单值
+   *
+   * @param formValue
+   */
   var setFormValue = function setFormValue(formValue) {
     var _prop$onChange;
     (_prop$onChange = prop.onChange) === null || _prop$onChange === void 0 ? void 0 : _prop$onChange.call(prop, formValue[name]);
@@ -139,6 +163,12 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       formRef === null || formRef === void 0 ? void 0 : (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : (_formRef$current4$set = _formRef$current4.setFieldsValue) === null || _formRef$current4$set === void 0 ? void 0 : _formRef$current4$set.call(_formRef$current4, formValue);
     }
   };
+  /**
+   * 加载面板数据
+   *
+   * @param param
+   * @returns
+   */
   var loadData = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(param) {
       var current, pageSize, restParams, _selectRowRef$current, _rows, data, _tableRef$current2, _tableRef$current2$cl, _param, result, rows, formValue, val, _selectRowRef$current2, arr, pageSelectedRows;
@@ -254,6 +284,13 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       return _ref.apply(this, arguments);
     };
   }();
+  /**
+   * 如果初始有值时，调用此方法初始化名称
+   *
+   * @param val
+   * @param updateTxt
+   * @returns
+   */
   var initName = function initName(val) {
     var updateTxt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     if (!val) return;
@@ -288,6 +325,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       var formValue = getFormValue();
       if (!formValue) return;
       formValue[textNameProp] = txt;
+      console.log('formValue', formValue);
       setFormValue(formValue);
     });
   };
@@ -433,6 +471,19 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       (_tableRef$current5 = tableRef.current) === null || _tableRef$current5 === void 0 ? void 0 : (_tableRef$current5$re = _tableRef$current5.reload) === null || _tableRef$current5$re === void 0 ? void 0 : _tableRef$current5$re.call(_tableRef$current5);
     }
   }, [visible, loadOnShow]);
+  // 处理有值时，可清空
+  useEffect(function () {
+    if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
+    try {
+      var el = inputRef.current.input.parentNode;
+      if (!el) return;
+      if (text) {
+        el.classList.add('ant-input-has-value');
+      } else {
+        el.classList.remove('ant-input-has-value');
+      }
+    } catch (e) {}
+  }, [text, rest, fieldProps]);
   var tableDom = /*#__PURE__*/React.createElement(ProTable, _extends({
     className: "ls-input-table",
     columns: columns,
@@ -549,31 +600,26 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     readOnly: readonly,
     allowClear: allowClear,
     ref: inputRef
-  }, rest.label ? {} : {
+  }, !rowKey ? {} : {
     value: text
   }, fieldProps));
-  // 处理有值时，可清空
-  useEffect(function () {
-    if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
-    try {
-      var el = inputRef.current.input.parentNode;
-      if (!el) return;
-      if (text) {
-        el.classList.add('ant-input-has-value');
-      } else {
-        el.classList.remove('ant-input-has-value');
-      }
-    } catch (e) {}
-  }, [text, rest, fieldProps]);
+  console.log('textNameProp', prop);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'none'
     }
   }, /*#__PURE__*/React.createElement(ProFormText, {
-    name: name
-  })), /*#__PURE__*/React.createElement(ProFormText, _extends({
+    name: rowKey ? id : name
+  })), rest.label || rowKey ? /*#__PURE__*/React.createElement(ProFormText, _extends({
+    name: textNameProp
+  }, rest, rowKey ? {
+    noStyle: true
+  } : {}), InputDom) :
+  /*#__PURE__*/
+  // 在ProTable的查询面板中
+  React.createElement(_Form.Item, _extends({
     name: textNameProp
-  }, rest, rest.label ? {} : {
+  }, rest, {
     noStyle: true
   }), InputDom));
 });

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;