ls-pro-common 3.1.48 → 3.1.50

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/') || url.startsWith('/lesoon-retail/') || url.startsWith('/scm-bms/')) {
+    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.js

@@ -153,13 +153,13 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
    * @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);
     }
   };
@@ -171,7 +171,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
    */
   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:
@@ -187,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,
@@ -221,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')) {
@@ -325,7 +325,6 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       var formValue = getFormValue();
       if (!formValue) return;
       formValue[textNameProp] = txt;
-      console.log('formValue', formValue);
       setFormValue(formValue);
     });
   };
@@ -348,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) {
@@ -600,23 +600,30 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     readOnly: readonly,
     allowClear: allowClear,
     ref: inputRef
-  }, !rowKey ? {} : {
-    value: text
   }, fieldProps));
-  console.log('textNameProp', prop);
+  // 是否在编辑表格下面使用，如果是，则需要使用 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: rowKey ? id : name
-  })), rest.label || rowKey ? /*#__PURE__*/React.createElement(ProFormText, _extends({
+    name: isEditable ? [rowKey, name] : name
+  })), rest.label ?
+  /*#__PURE__*/
+  // 在ProForm中直接使用
+  React.createElement(ProFormText, _extends({
     name: textNameProp
-  }, rest, rowKey ? {
+  }, rest), InputDom) : isEditable ?
+  /*#__PURE__*/
+  // 在EditableTable中使用
+  React.createElement(_Form.Item, _extends({
+    name: [rowKey, textNameProp]
+  }, rest, {
     noStyle: true
-  } : {}), InputDom) :
+  }), InputDom) :
   /*#__PURE__*/
-  // 在ProTable的查询面板中
+  // 在 ProTable 的查询面板中使用
   React.createElement(_Form.Item, _extends({
     name: textNameProp
   }, rest, {

package/lib/http/index.d.ts

@@ -43,34 +43,6 @@ export declare function httpPut(url: string, data?: Record<string, any>, needGat
  * @returns Promise<ApiResponse>
  */
 export declare function httpDelete(url: string, data: any, needGateWay?: boolean, timeout?: number): Promise<any>;
-/**
- * 读取数据字典
- *
- * @param dictCode 字典编码
- * @param showValue 是否显示值
- * @param needGateWay 是否需要网关 默认为true
- * @param timeout 超时时间,默认60000毫秒
- * @param isGet 是否Get请求
- * @param valueIsNumber 返回值是否为数字,默认false
- * @returns Promise<Record<string,string>[]>
- */
-export declare function getDict(dictCodes: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, isGet?: boolean, valueIsNumber?: boolean): Promise<any>;
-/**
- * 加载下拉框的数据源
- *
- * @param url 后端接口
- * @param param 请求参数
- * @param valueField 值字段
- * @param labelField 显示字段
- * @param showValue 显示值
- * @param needGateWay 是否需要网关 默认为true
- * @param timeout
- * @param isGet = true 是否get请求，默认true
- * @param valueIsNumber 返回值是否为数字,默认false
- * @returns
- */
-export declare function fetchOptions(url: string, param: any, valueField: string, labelField: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, isGet?: boolean, valueIsNumber?: boolean): Promise<any>;
-export declare const getResourceRight: (ids: string[]) => Promise<any>;
 /** 上传文件进度回调 */
 export interface UploadProgressCallback {
     (progress: number): void;
@@ -116,4 +88,38 @@ export declare const httpBatchGet: (url: string, params?: Record<string, any>, n
  * @returns
  */
 export declare const httpBatchPost: (url: string, params?: Record<string, any>, needGateWay?: boolean, timeout?: number) => Promise<any>;
+/**
+ * 读取数据字典
+ *
+ * @param dictCode 字典编码
+ * @param showValue 是否显示值
+ * @param needGateWay 是否需要网关 默认为true
+ * @param timeout 超时时间,默认60000毫秒
+ * @param isGet 是否Get请求
+ * @param valueIsNumber 返回值是否为数字,默认false
+ * @returns Promise<Record<string,string>[]>
+ */
+export declare function getDict(dictCodes: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, isGet?: boolean, valueIsNumber?: boolean): Promise<any>;
+/**
+ * 加载下拉框的数据源
+ *
+ * @param url 后端接口
+ * @param param 请求参数
+ * @param valueField 值字段
+ * @param labelField 显示字段
+ * @param showValue 显示值
+ * @param needGateWay 是否需要网关 默认为true
+ * @param timeout
+ * @param isGet = true 是否get请求，默认true
+ * @param valueIsNumber 返回值是否为数字,默认false
+ * @returns
+ */
+export declare function fetchOptions(url: string, param: any, valueField: string, labelField: string, showValue?: boolean, needGateWay?: boolean, timeout?: number, isGet?: boolean, valueIsNumber?: boolean): Promise<any>;
+/**
+ * 获取用户资源Id对应的权限值
+ *
+ * @param ids 资源id
+ * @returns
+ */
+export declare const getResourceRight: (ids: string[]) => Promise<any>;
 export default request;