ls-pro-common 1.0.4 → 1.0.8

package/lib/utils/index.d.ts

@@ -6,6 +6,13 @@ export declare const getUrlQuery: (name: string, url?: string) => string;
  * @returns
  */
 export declare const setUrlQuery: (url: string, keyvals?: Record<string, any>) => string;
+/**
+ * 给 url 添加网关
+ * @param url 原url，以 / 打头
+ * @param defGateway 默认网关 /petrel
+ * @returns
+ */
+export declare const toGatewayUrl: (url: string, defGateway?: string) => string;
 /**
  * 设置文档title
  * @param {*} title
@@ -41,7 +48,7 @@ export declare const setCache: (key: string, data: any) => void;
  * @param { String } key 关键字
  * @returns 关键字对应的值
  */
-export declare const getCache: (key: string) => string | null;
+export declare const getCache: any;
 /**
  * 简单日期格式化
  * @param {*} dt 传入时间参数，若不传取当前时间
@@ -78,3 +85,40 @@ export declare const yesnoList: {
     text: string;
     label: string;
 }[];
+/**
+ * 遍历树
+ * @param list 树对象
+ * @param fn 回调函数
+ * @param children 树属性字段
+ */
+export declare const treeEach: (list: any[], fn: (item: any, index: any, list: any[]) => void, children?: string) => void;
+/**
+ * 查询数
+ * @param list 树对象
+ * @param key 查询属性
+ * @param val 查询值
+ * @param children 树属性字段
+ * @returns 返回符合条件的第一条对象
+ */
+export declare const treeFind: (list: any[], key: string, val: any, children?: string) => any;
+export declare type UserType = {
+    id?: string;
+    userId?: string;
+    userName?: string;
+    loginName?: string;
+    companyId?: string;
+    email?: string;
+    employeeAttr?: string;
+    expireTime?: string;
+    icon?: string;
+    idCard?: string;
+    ifAdmin?: number | string;
+    orgId?: string;
+    orgParentIds?: string;
+    phoneNumber?: string;
+    remarks?: string;
+};
+export declare const getUserInfo: () => UserType | null;
+export declare const getUserName: () => string | undefined;
+export declare const getLoginName: () => string | undefined;
+export declare const getCompanyId: () => string | undefined;

package/lib/utils/index.js

@@ -5,7 +5,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.yesnoList = exports.statusList = exports.showWarn = exports.showSuccess = exports.showError = exports.showConfirm = exports.setUrlQuery = exports.setTitle = exports.setCookie = exports.setCache = exports.rangeToSearch = exports.isLogin = exports.getUrlQuery = exports.getCookie = exports.getCache = exports.dateFormat = void 0;
+exports.yesnoList = exports.treeFind = exports.treeEach = exports.toGatewayUrl = exports.statusList = exports.showWarn = exports.showSuccess = exports.showError = exports.showConfirm = exports.setUrlQuery = exports.setTitle = exports.setCookie = exports.setCache = exports.rangeToSearch = exports.isLogin = exports.getUserName = exports.getUserInfo = exports.getUrlQuery = exports.getLoginName = exports.getCookie = exports.getCompanyId = exports.getCache = exports.dateFormat = void 0;
+
+var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 
 require("antd/es/modal/style");
 
@@ -56,6 +58,22 @@ var setUrlQuery = function setUrlQuery(url) {
 
   return newUrl;
 };
+/**
+ * 给 url 添加网关
+ * @param url 原url，以 / 打头
+ * @param defGateway 默认网关 /petrel
+ * @returns
+ */
+
+
+exports.setUrlQuery = setUrlQuery;
+
+var toGatewayUrl = function toGatewayUrl(url) {
+  var defGateway = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '/petrel';
+  if (url.startsWith('http://') || url.startsWith('https://') || url.startsWith('//')) return url;
+  var gateway = getUrlQuery('gateway') || location.origin + defGateway;
+  return gateway + url;
+};
 /**
  * 设置文档title
  * @param {*} title
@@ -63,7 +81,7 @@ var setUrlQuery = function setUrlQuery(url) {
  */
 
 
-exports.setUrlQuery = setUrlQuery;
+exports.toGatewayUrl = toGatewayUrl;
 
 var setTitle = function setTitle(title) {
   if (!title) return;
@@ -261,4 +279,97 @@ var yesnoList = [{
   text: '否',
   label: '0→否'
 }];
-exports.yesnoList = yesnoList;
+/**
+ * 遍历树
+ * @param list 树对象
+ * @param fn 回调函数
+ * @param children 树属性字段
+ */
+
+exports.yesnoList = yesnoList;
+
+var treeEach = function treeEach(list, fn) {
+  var children = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "children";
+  list.forEach(function (item, index) {
+    fn(item, index, list); // @ts-ignore
+
+    if (Array.isArray(list[children]) && list[children].length) {
+      // @ts-ignore
+      treeEach(list[children], fn, children);
+    }
+  });
+};
+/**
+ * 查询数
+ * @param list 树对象
+ * @param key 查询属性
+ * @param val 查询值
+ * @param children 树属性字段
+ * @returns 返回符合条件的第一条对象
+ */
+
+
+exports.treeEach = treeEach;
+
+var treeFind = function treeFind(list, key, val) {
+  var children = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "children";
+  var item = null;
+
+  var _iterator = (0, _createForOfIteratorHelper2.default)(list),
+      _step;
+
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var row = _step.value;
+
+      if (row[key] === val) {
+        item = row;
+        break;
+      } else if (row[children] && row[children].length) {
+        item = treeFind(row[children], key, val);
+
+        if (item) {
+          break;
+        }
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+
+  return item;
+};
+
+exports.treeFind = treeFind;
+
+var getUserInfo = function getUserInfo() {
+  return getCache('user');
+};
+
+exports.getUserInfo = getUserInfo;
+
+var getUserName = function getUserName() {
+  var _getUserInfo;
+
+  return (_getUserInfo = getUserInfo()) === null || _getUserInfo === void 0 ? void 0 : _getUserInfo.userName;
+};
+
+exports.getUserName = getUserName;
+
+var getLoginName = function getLoginName() {
+  var _getUserInfo2;
+
+  return (_getUserInfo2 = getUserInfo()) === null || _getUserInfo2 === void 0 ? void 0 : _getUserInfo2.loginName;
+};
+
+exports.getLoginName = getLoginName;
+
+var getCompanyId = function getCompanyId() {
+  var _getUserInfo3;
+
+  return (_getUserInfo3 = getUserInfo()) === null || _getUserInfo3 === void 0 ? void 0 : _getUserInfo3.companyId;
+};
+
+exports.getCompanyId = getCompanyId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.4",
+  "version": "1.0.8",
   "description": "ls-pro-common",
   "keywords": [
     "antd",
@@ -28,8 +28,8 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.11",
-    "ls-pro-form": "1.52.15",
+    "ls-pro-table": "2.62.15",
+    "ls-pro-form": "1.52.19",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",
     "moment": "^2.27.0",

package/es/components/EditModalForm.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="react" />
-import type { ModalFormProps } from 'ls-pro-form';
-export declare type EditModalFormProps<T = Record<string, any>> = ModalFormProps;
-declare function EditModalForm<T = Record<string, any>>({ labelWidth, ...rest }: EditModalFormProps<T>): JSX.Element;
-export default EditModalForm;

package/es/components/EditModalForm.js

@@ -1,29 +0,0 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["labelWidth"];
-import React from "react";
-import { ModalForm } from 'ls-pro-form';
-
-function EditModalForm(_ref) {
-  var labelWidth = _ref.labelWidth,
-      rest = _objectWithoutProperties(_ref, _excluded);
-
-  var defProps = _objectSpread({
-    layout: 'horizontal'
-  }, rest);
-
-  if (labelWidth) {
-    defProps.labelCol = {
-      flex: "0 0 ".concat(labelWidth, "px")
-    };
-    defProps.wrapperCol = {
-      style: {
-        maxWidth: 'calc(100% - 100px)'
-      }
-    };
-  }
-
-  return /*#__PURE__*/React.createElement(React.Fragment, null, rest.visible ? /*#__PURE__*/React.createElement(ModalForm, defProps) : null);
-}
-
-export default EditModalForm;

package/lib/components/EditModalForm.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="react" />
-import type { ModalFormProps } from 'ls-pro-form';
-export declare type EditModalFormProps<T = Record<string, any>> = ModalFormProps;
-declare function EditModalForm<T = Record<string, any>>({ labelWidth, ...rest }: EditModalFormProps<T>): JSX.Element;
-export default EditModalForm;

package/lib/components/EditModalForm.js

@@ -1,42 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
-var _react = _interopRequireDefault(require("react"));
-
-var _lsProForm = require("ls-pro-form");
-
-var _excluded = ["labelWidth"];
-
-function EditModalForm(_ref) {
-  var labelWidth = _ref.labelWidth,
-      rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var defProps = (0, _objectSpread2.default)({
-    layout: 'horizontal'
-  }, rest);
-
-  if (labelWidth) {
-    defProps.labelCol = {
-      flex: "0 0 ".concat(labelWidth, "px")
-    };
-    defProps.wrapperCol = {
-      style: {
-        maxWidth: 'calc(100% - 100px)'
-      }
-    };
-  }
-
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, rest.visible ? /*#__PURE__*/_react.default.createElement(_lsProForm.ModalForm, defProps) : null);
-}
-
-var _default = EditModalForm;
-exports.default = _default;