ls-pro-common 3.1.47 → 3.1.49

package/es/utils/print.d.ts

@@ -0,0 +1,24 @@
+/**
+ * 打印预览
+ *
+ * @param templateNo 打印模板编码
+ * @param reqUrl 业务请求api
+ * @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', isNewPrintCenter?: boolean) => any;
+/**
+ * 直接打印，通过打印组件进行打印。
+ *
+ * @param taskName 打印任务名
+ * @param templateNo 打印模板
+ * @param reqUrl 业务请求api
+ * @param bodyParam Post传参数
+ * @param param Get传参数
+ * @param method 请求方式，默认post
+ * @returns
+ */
+export declare const printAsync: (taskName: string, templateNo: string, reqUrl: string, bodyParam?: any, param?: any, method?: 'POST' | 'GET', isNewPrintCenter?: boolean) => Promise<any>;

package/es/utils/print.js

@@ -0,0 +1,86 @@
+import { toGatewayUrl } from './url';
+import { getCache } from './cache';
+import { httpPost } from '../http';
+/**
+ * 打印预览
+ *
+ * @param templateNo 打印模板编码
+ * @param reqUrl 业务请求api
+ * @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 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;
+  }
+  var data = {
+    templateNo: templateNo,
+    printType: 1,
+    reqUrl: reqUrl,
+    reqMethodType: method,
+    params: param || {},
+    body: bodyParam || {}
+  };
+  var openWin = window.open();
+  var formStr = "<form style=\"visibility:hidden;\" method=\"POST\" action=\"".concat(printCenterUrl, "\">\n                      <input type=\"hidden\" name=\"clientPrintData\" value='").concat(JSON.stringify(data), "' />\n                  </form>");
+  openWin.document.body.innerHTML = formStr;
+  openWin.document.forms[0].submit();
+  return openWin;
+};
+/**
+ * 直接打印，通过打印组件进行打印。
+ *
+ * @param taskName 打印任务名
+ * @param templateNo 打印模板
+ * @param reqUrl 业务请求api
+ * @param bodyParam Post传参数
+ * @param param Get传参数
+ * @param method 请求方式，默认post
+ * @returns
+ */
+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 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/client/template/print';
+  }
+  var printCenterUrl = toGatewayUrl(api);
+  if (!printCenterUrl.includes(location.origin)) {
+    printCenterUrl = location.origin + printCenterUrl;
+  }
+  reqUrl = toGatewayUrl(reqUrl);
+  if (!reqUrl.includes(location.origin)) {
+    reqUrl = location.origin + reqUrl;
+  }
+  var data = {
+    taskName: taskName,
+    printReqUrl: printCenterUrl,
+    bizVO: {
+      templateNo: templateNo,
+      printType: 1,
+      reqUrl: reqUrl,
+      reqMethodType: method,
+      params: param || {},
+      body: bodyParam || {}
+    },
+    token: getCache('token') || ''
+  };
+  var url = 'http://localhost:10050/client/async/print';
+  return httpPost(url, data, true, false);
+};

package/es/utils/project.d.ts

@@ -0,0 +1,33 @@
+/** 是否本地开发环境 */
+export declare const isDev: boolean;
+/** 是否运行在钉钉下面 */
+export declare const isDingtalk: boolean;
+/**
+ * 判断是否是微前端子应用
+ *
+ * @returns String | undefined
+ */
+export declare const isQiankunSubApp: () => any;
+/** @name 微前端原生路径 */
+export declare const appPath: (path?: string) => any;
+/**
+ * 在主工程中打开模块
+ *
+ * @param option {path:模块路由,需要加工程编码, resourceId: 资源Id，两者传一个即可,data:参数,moduleName:模块名称}
+ */
+export declare const openPageInMain: (option: {
+    [key: string]: any;
+    path?: string | undefined;
+    resourceId?: string | undefined;
+    data?: any;
+    ifRefreshTarget?: boolean | undefined;
+    moduleName?: string | undefined;
+}) => void;
+/** 处理主题 */
+export declare const handleTheme: () => void;
+/**
+ * 微前端主工程注入子工程时，子工程调用此方法设置资源Id，权限等参数
+ *
+ * @param props
+ */
+export declare const setCurrentResCode: (props: any) => void;

package/es/utils/project.js

@@ -0,0 +1,66 @@
+import { getCache } from './cache';
+import { getUrlQuery } from './url';
+/** 是否本地开发环境 */
+export var isDev = location.href.includes('//localhost');
+/** 是否运行在钉钉下面 */
+export var isDingtalk = (window.navigator.userAgent || '').toLowerCase().includes('dingtalk');
+/**
+ * 判断是否是微前端子应用
+ *
+ * @returns String | undefined
+ */
+export var isQiankunSubApp = function isQiankunSubApp() {
+  // @ts-ignore
+  return window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
+};
+/** @name 微前端原生路径 */
+export var appPath = function appPath() {
+  var path = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  if (isQiankunSubApp()) {
+    return isQiankunSubApp();
+  }
+  if (path) return path;
+  //本地开发环境，判断是否hash路由，如果是hash路由，则返回./
+  if (isDev) {
+    return location.hash ? './' : '/';
+  }
+  // 生产环境，返回当前路径
+  var p = location.pathname || '';
+  if (p === '/') return location.origin + '/';
+  return location.origin + '/' + p.split('/')[1] + '/';
+};
+/**
+ * 在主工程中打开模块
+ *
+ * @param option {path:模块路由,需要加工程编码, resourceId: 资源Id，两者传一个即可,data:参数,moduleName:模块名称}
+ */
+export var openPageInMain = function openPageInMain(option) {
+  var win = top || window;
+  win.postMessage({
+    type: 'openPage',
+    param: option
+  });
+};
+/** 处理主题 */
+export var handleTheme = function handleTheme() {
+  var theme = getCache('theme');
+  if (theme) {
+    document.body.classList.add('theme-' + theme);
+  }
+};
+/**
+ * 微前端主工程注入子工程时，子工程调用此方法设置资源Id，权限等参数
+ *
+ * @param props
+ */
+export var setCurrentResCode = function setCurrentResCode(props) {
+  var _props$history;
+  var initialValue = props === null || props === void 0 ? void 0 : (_props$history = props.history) === null || _props$history === void 0 ? void 0 : _props$history.initialEntries;
+  if (Array.isArray(initialValue) && initialValue.length > 0) {
+    var parentParams = initialValue[0];
+    window.__initVal__ = parentParams;
+    window.__currentResCode__ = getUrlQuery('resCode', parentParams);
+    window.__currentRight__ = getUrlQuery('right', parentParams);
+    window.__currentResRight__ = getUrlQuery('resRight', parentParams);
+  }
+};

package/es/utils/url.d.ts

@@ -0,0 +1,26 @@
+/**
+ * 获取 url 参数
+ *
+ * @param name
+ * @param url
+ * @returns
+ */
+export declare const getUrlQuery: (name: string, url?: string) => string;
+export declare const getResourceProps: (name: string) => any;
+/**
+ * 设置url传参
+ *
+ * @param {any} url
+ * @param {any} keyvals
+ * @returns
+ */
+export declare const setUrlQuery: (url: string, keyvals?: Record<string, any>) => string;
+/**
+ * 给 url 添加网关
+ *
+ * @param url 原url，以 / 打头
+ * @param gatewayKey 设置gateway关键字 默认为 'gateway'
+ * @param defaultGateway 默认网关 ''
+ * @returns
+ */
+export declare const toGatewayUrl: (url: string, gatewayKey?: string, defaultGateway?: string) => string;

package/es/utils/url.js

@@ -0,0 +1,113 @@
+import { getCache } from './cache';
+/**
+ * 获取 url 参数
+ *
+ * @param name
+ * @param url
+ * @returns
+ */
+export var getUrlQuery = function getUrlQuery(name) {
+  var url = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : location.search.slice(1) || '';
+  if (!name) return '';
+  var reg = new RegExp('(^|[&|?])' + name + '=([^&]*)(&|$)');
+  var r = url.match(reg);
+  if (r != null) {
+    return decodeURIComponent(decodeURI(r[2]));
+  }
+  return '';
+};
+export var getResourceProps = function getResourceProps(name) {
+  if (!name) return '';
+  var id = window.__currentResCode__ || getUrlQuery('resCode');
+  var obj;
+  // window.lsResourceList 为主工程写入的资源
+  // @ts-ignore
+  var resList = window.lsResourceList || parent.window.lsResourceList || [];
+  if (resList.length === 0) {
+    resList = getCache('allRes') || [];
+    if (!Array.isArray(resList)) {
+      resList = [];
+    }
+  }
+  if (id) {
+    obj = resList.find(function (o) {
+      return o.resourceId === id;
+    });
+  } else if (location.pathname && location.pathname.length > 3) {
+    var url = location.pathname + location.hash;
+    obj = resList.find(function (o) {
+      return o.microUrl && o.microUrl === location.pathname || o.url === url;
+    });
+  }
+  if (!obj) return '';
+  return obj[name] || '';
+};
+/**
+ * 设置url传参
+ *
+ * @param {any} url
+ * @param {any} keyvals
+ * @returns
+ */
+export var setUrlQuery = function setUrlQuery(url) {
+  var keyvals = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var newUrl = url;
+  for (var name in keyvals) {
+    var reg = new RegExp('(^|[&|?])' + name + '=([^&]*)(|$)');
+    var tmp = (newUrl.includes('?') ? '&' : '?') + name + '=' + keyvals[name];
+    if (newUrl.match(reg) != null) {
+      // @ts-ignore
+      newUrl = newUrl.replace(eval(reg), tmp);
+      if (!newUrl.includes('?')) {
+        newUrl = newUrl.replace('&', '?');
+      }
+    } else {
+      newUrl = newUrl + tmp;
+    }
+  }
+  return newUrl;
+};
+/**
+ * 给 url 添加网关
+ *
+ * @param url 原url，以 / 打头
+ * @param gatewayKey 设置gateway关键字 默认为 'gateway'
+ * @param defaultGateway 默认网关 ''
+ * @returns
+ */
+export var toGatewayUrl = function toGatewayUrl(url) {
+  var gatewayKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'gateway';
+  var defaultGateway = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
+  url = url || '';
+  // 如果url带有名称，不需要设置网关
+  if (url.startsWith('http://') || url.startsWith('https://') || url.startsWith('//')) return url;
+  if (url.startsWith('/lesoon/') || url.startsWith('/petrel/')) {
+    return location.origin + url;
+  }
+  // 读取项目的默认网关
+  if (!defaultGateway) {
+    var _top;
+    // @ts-ignore
+    defaultGateway = window.defaultGateway || ((_top = top) === null || _top === void 0 ? void 0 : _top.window.lsMainGateway) || '';
+  }
+  // 取网关的顺序， 1.取url里的传参，2.取资源里的网关， 3. 取项目里设置的默认网关
+  var gateway = getUrlQuery(gatewayKey) || getResourceProps(gatewayKey) || defaultGateway;
+  // 如果没有找到网关，直接从项目配置中取网关
+  if (!gateway) {
+    var projects = JSON.parse(sessionStorage.getItem('lsProjects') || '[]');
+    var projectKey = localStorage.getItem('projectId');
+    if (projectKey && projects.length) {
+      var project = projects.find(function (o) {
+        return o.projectId === projectKey;
+      });
+      if (project) {
+        gateway = project.gatewayUrl || '';
+      }
+    }
+  }
+  // 网关加上域名，避免多次设置
+  if (gateway && !gateway.startsWith('http')) {
+    gateway = location.origin + gateway;
+  }
+  return gateway + url;
+};

package/es/utils/user.d.ts

@@ -0,0 +1,29 @@
+export declare type UserType = {
+    id?: string;
+    userId?: string;
+    userName?: string;
+    loginName?: string;
+    companyId?: string;
+    companyCode?: string;
+    companyName?: string;
+    email?: string;
+    employeeAttr?: string;
+    expireTime?: string;
+    icon?: string;
+    idCard?: string;
+    ifAdmin?: number | string;
+    orgId?: string;
+    orgParentIds?: string;
+    phoneNumber?: string;
+    remarks?: string;
+};
+/** @name 用户信息 */
+export declare const getUserInfo: () => UserType | null;
+/** @name 用户名 */
+export declare const getUserName: () => string | undefined;
+/** @name 登录名 */
+export declare const getLoginName: () => string | undefined;
+/** @name 公司Id */
+export declare const getCompanyId: () => string | undefined;
+/** @name 用户ID */
+export declare const getUserId: () => string | undefined;

package/es/utils/user.js

@@ -0,0 +1,25 @@
+import { getCache } from './cache';
+/** @name 用户信息 */
+export var getUserInfo = function getUserInfo() {
+  return getCache('user');
+};
+/** @name 用户名 */
+export var getUserName = function getUserName() {
+  var _getUserInfo;
+  return (_getUserInfo = getUserInfo()) === null || _getUserInfo === void 0 ? void 0 : _getUserInfo.userName;
+};
+/** @name 登录名 */
+export var getLoginName = function getLoginName() {
+  var _getUserInfo2;
+  return (_getUserInfo2 = getUserInfo()) === null || _getUserInfo2 === void 0 ? void 0 : _getUserInfo2.loginName;
+};
+/** @name 公司Id */
+export var getCompanyId = function getCompanyId() {
+  var _getUserInfo3;
+  return (_getUserInfo3 = getUserInfo()) === null || _getUserInfo3 === void 0 ? void 0 : _getUserInfo3.companyId;
+};
+/** @name 用户ID */
+export var getUserId = function getUserId() {
+  var _getUserInfo4;
+  return (_getUserInfo4 = getUserInfo()) === null || _getUserInfo4 === void 0 ? void 0 : _getUserInfo4.userId;
+};

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,20 +147,31 @@ 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]);
     if (rowKey) {
-      var _formRef$current3, _formRef$current3$set;
+      var _formRef$current3, _formRef$current3$set, _prop$onChange;
       formRef === null || formRef === void 0 ? void 0 : (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : (_formRef$current3$set = _formRef$current3.setFieldsValue) === null || _formRef$current3$set === void 0 ? void 0 : _formRef$current3$set.call(_formRef$current3, _defineProperty({}, rowKey, formValue));
+      (_prop$onChange = prop.onChange) === null || _prop$onChange === void 0 ? void 0 : _prop$onChange.call(prop, formValue[textNameProp]);
     } else {
-      var _formRef$current4, _formRef$current4$set;
+      var _prop$onChange2, _formRef$current4, _formRef$current4$set;
+      (_prop$onChange2 = prop.onChange) === null || _prop$onChange2 === void 0 ? void 0 : _prop$onChange2.call(prop, formValue[name]);
       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;
+      var current, pageSize, restParams, _selectRowRef$current, _rows, data, _tableRef$current2, _tableRef$current2$cl, beforeParam, result, rows, formValue, val, _selectRowRef$current2, arr, pageSelectedRows;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -157,10 +187,10 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
               return o[tableKey];
             })));
             setSelectedKeys(Array.from(new Set(selectedKeys)));
-            setTimeout(function () {
+            requestIdleCallback(function () {
               var _tableRef$current, _tableRef$current$rel;
               (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : (_tableRef$current$rel = _tableRef$current.reload) === null || _tableRef$current$rel === void 0 ? void 0 : _tableRef$current$rel.call(_tableRef$current);
-            }, 0);
+            });
             return _context.abrupt("return", {
               data: _rows,
               total: _rows.length,
@@ -191,9 +221,9 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
             _context.next = 16;
             return beforeLoad(data);
           case 16:
-            _param = _context.sent;
-            if (typeof _param !== 'boolean' && _param !== undefined) {
-              data = _param;
+            beforeParam = _context.sent;
+            if (typeof beforeParam !== 'boolean' && beforeParam !== undefined) {
+              data = beforeParam;
             }
           case 18:
             if (!(method !== 'GET')) {
@@ -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;
@@ -310,6 +347,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
         initName(val, false);
       }
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [rowKey]);
   // 处理返回数据
   var handleValue = function handleValue(row) {
@@ -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,33 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     readOnly: readonly,
     allowClear: allowClear,
     ref: inputRef
-  }, rest.label ? {} : {
-    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]);
+  // 是否在编辑表格下面使用，如果是，则需要使用 rowKey 和 id 来设置 name
+  var isEditable = rowKey && id && id.includes('_');
   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: isEditable ? [rowKey, name] : name
+  })), rest.label ?
+  /*#__PURE__*/
+  // 在ProForm中直接使用
+  React.createElement(ProFormText, _extends({
+    name: textNameProp
+  }, rest), InputDom) : isEditable ?
+  /*#__PURE__*/
+  // 在EditableTable中使用
+  React.createElement(_Form.Item, _extends({
+    name: [rowKey, textNameProp]
+  }, rest, {
+    noStyle: true
+  }), InputDom) :
+  /*#__PURE__*/
+  // 在 ProTable 的查询面板中使用
+  React.createElement(_Form.Item, _extends({
     name: textNameProp
-  }, rest, rest.label ? {} : {
+  }, rest, {
     noStyle: true
   }), InputDom));
 });