ls-pro-common 1.1.2 → 1.1.4

package/lib/utils/index.js

@@ -11,7 +11,13 @@ Object.defineProperty(exports, "dateFormat", {
     return _lsProTable.dateFormat;
   }
 });
-exports.getLoginName = exports.getFullScreenElement = exports.getCookie = exports.getCompanyId = exports.getCache = exports.formatMoney = exports.formatDate = exports.exitLoading = exports.exitAlert = exports.deepClone = exports.debounce = void 0;
+Object.defineProperty(exports, "debounce", {
+  enumerable: true,
+  get: function get() {
+    return _lodash.debounce;
+  }
+});
+exports.getLoginName = exports.getFullScreenElement = exports.getCookie = exports.getCompanyId = exports.getCache = exports.formatMoney = exports.formatDate = exports.exitLoading = exports.exitAlert = exports.deepClone = void 0;
 Object.defineProperty(exports, "getResourceProps", {
   enumerable: true,
   get: function get() {
@@ -31,7 +37,13 @@ Object.defineProperty(exports, "setUrlQuery", {
     return _lsProTable.setUrlQuery;
   }
 });
-exports.throttle = exports.statusList = exports.showWarn = exports.showSuccess = exports.showLoading = exports.showError = exports.showConfirm = exports.showAlert = void 0;
+exports.statusList = exports.showWarn = exports.showSuccess = exports.showLoading = exports.showError = exports.showConfirm = exports.showAlert = void 0;
+Object.defineProperty(exports, "throttle", {
+  enumerable: true,
+  get: function get() {
+    return _lodash.throttle;
+  }
+});
 Object.defineProperty(exports, "toGatewayUrl", {
   enumerable: true,
   get: function get() {
@@ -53,7 +65,7 @@ var _icons = require("@ant-design/icons");
 var _lsProTable = require("ls-pro-table");
 var _http = require("../http");
 var _react = _interopRequireDefault(require("react"));
-var _this = void 0;
+var _lodash = require("lodash");
 /**
  * 设置文档title
  * @param {*} title
@@ -88,17 +100,30 @@ var now = function now() {
   return (0, _lsProTable.dateFormat)(null, true);
 };
 /**
- * 当前日期加减
+ * 时间加减
+ * @param dt 原始时间，传 null 为当前时间
  * @param addDay 添加添数，可为负数
  * @param addMonth 添加月数，可为负数
  * @param addYear 添加年数，可以负责
- * @returns YYYY-MM-DD
+ * @returns YYYY-MM-DD hh:mm:ss
  */
 exports.now = now;
-var todayAdd = function todayAdd(addDay) {
-  var addMonth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-  var addYear = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-  return nowAdd(addDay, addMonth, addYear).split(' ')[0];
+var dateAdd = function dateAdd(dt, addDay) {
+  var addMonth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  var addYear = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+  if (!dt) {
+    dt = new Date();
+  }
+  if (addDay) {
+    dt.setDate(dt.getDate() + addDay);
+  }
+  if (addMonth) {
+    dt.setMonth(dt.getMonth() + addMonth);
+  }
+  if (addYear) {
+    dt.setFullYear(dt.getFullYear() + addYear);
+  }
+  return (0, _lsProTable.dateFormat)(dt, true);
 };
 /**
  * 当前时间加减
@@ -107,37 +132,24 @@ var todayAdd = function todayAdd(addDay) {
  * @param addYear 添加年数，可以负责
  * @returns YYYY-MM-DD hh:mm:ss
  */
-exports.todayAdd = todayAdd;
+exports.dateAdd = dateAdd;
 var nowAdd = function nowAdd(addDay) {
   var addMonth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var addYear = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
   return dateAdd(null, addDay, addMonth, addYear);
 };
 /**
- * 时间加减
- * @param dt 原始时间，传 null 为当前时间
+ * 当前日期加减
  * @param addDay 添加添数，可为负数
  * @param addMonth 添加月数，可为负数
  * @param addYear 添加年数，可以负责
- * @returns YYYY-MM-DD hh:mm:ss
+ * @returns YYYY-MM-DD
  */
 exports.nowAdd = nowAdd;
-var dateAdd = function dateAdd(dt, addDay) {
-  var addMonth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-  var addYear = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
-  if (!dt) {
-    dt = new Date();
-  }
-  if (addDay) {
-    dt.setDate(dt.getDate() + addDay);
-  }
-  if (addMonth) {
-    dt.setMonth(dt.getMonth() + addMonth);
-  }
-  if (addYear) {
-    dt.setFullYear(dt.getFullYear() + addYear);
-  }
-  return (0, _lsProTable.dateFormat)(dt, true);
+var todayAdd = function todayAdd(addDay) {
+  var addMonth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  var addYear = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  return nowAdd(addDay, addMonth, addYear).split(' ')[0];
 };
 /**
  * 千位符格式化数值
@@ -145,7 +157,7 @@ var dateAdd = function dateAdd(dt, addDay) {
  * @param dec 小数位数,默认为2位小数
  * @returns xx,xxx.xx
  */
-exports.dateAdd = dateAdd;
+exports.todayAdd = todayAdd;
 var formatMoney = function formatMoney(num) {
   var dec = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
   if (typeof num !== 'number') {
@@ -167,8 +179,8 @@ var formatMoney = function formatMoney(num) {
  */
 exports.formatMoney = formatMoney;
 var getCookie = function getCookie(name) {
-  var arr,
-    reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
+  var arr;
+  var reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
   if (arr = document.cookie.match(reg)) return arr[2];else return null;
 };
 /**
@@ -204,19 +216,28 @@ exports.setCookie = setCookie;
 var isLogin = function isLogin() {
   return !!getCookie('online');
 };
+exports.isLogin = isLogin;
+var getFullScreenElement = function getFullScreenElement() {
+  //@ts-ignore
+  return document.fullscreenElement || document.mozFullScreenElement || document.msFullScreenElement || document.webkitFullscreenElement || undefined;
+};
 /**
  * 设置本地缓存
  * @param { String } key 关键字
  * @param { Object } data 值
  * @param { Boolean } session 保存到 sessionStorage 还是 localStorage,默认 localStorage
  */
-exports.isLogin = isLogin;
+exports.getFullScreenElement = getFullScreenElement;
 var setCache = function setCache(key, data) {
   var session = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   if ((0, _typeof2.default)(data) === 'object') {
     data = JSON.stringify(data);
   }
-  session ? sessionStorage.setItem(key, data) : localStorage.setItem(key, data);
+  if (session) {
+    sessionStorage.setItem(key, data);
+  } else {
+    localStorage.setItem(key, data);
+  }
 };
 /**
  * 读取本地缓存
@@ -242,9 +263,17 @@ exports.getCache = getCache;
 var clearCache = function clearCache(key) {
   var session = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   if (key) {
-    session ? sessionStorage.removeItem(key) : localStorage.removeItem(key);
+    if (session) {
+      sessionStorage.removeItem(key);
+    } else {
+      localStorage.removeItem(key);
+    }
   } else {
-    session ? sessionStorage.clear() : localStorage.clear();
+    if (session) {
+      sessionStorage.clear();
+    } else {
+      localStorage.clear();
+    }
   }
 };
 exports.clearCache = clearCache;
@@ -280,11 +309,6 @@ var showSuccess = function showSuccess(text) {
     }
   });
 };
-exports.showSuccess = showSuccess;
-var getFullScreenElement = function getFullScreenElement() {
-  //@ts-ignore
-  return document.fullscreenElement || document.mozFullScreenElement || document.msFullScreenElement || document.webkitFullscreenElement || undefined;
-};
 /**
  * 弹框提示
  * @param text 提示信息
@@ -293,7 +317,7 @@ var getFullScreenElement = function getFullScreenElement() {
  * @param opts 附加参数
  * @returns Promise<Boolean>
  */
-exports.getFullScreenElement = getFullScreenElement;
+exports.showSuccess = showSuccess;
 var showAlert = function showAlert(text) {
   var title = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '系统提示';
   var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'error';
@@ -375,8 +399,12 @@ var rangeToSearch = function rangeToSearch(values, startField, endField) {
   var endSuffix = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
   var startSuffex = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : '';
   var data = {};
-  Array.isArray(values) && values[0] && (data[startField] = values[0] + startSuffex);
-  Array.isArray(values) && values[1] && (data[endField] = values[1] + endSuffix);
+  if (Array.isArray(values) && values[0]) {
+    data[startField] = values[0] + startSuffex;
+  }
+  if (Array.isArray(values) && values[1]) {
+    data[endField] = values[1] + endSuffix;
+  }
   return data;
 };
 /** @name 状态列表 */
@@ -534,50 +562,13 @@ var handleSizeCols = function handleSizeCols(orgSizeHeader) {
   });
   return headers;
 };
-/**
- * 函数防抖, 限定的时间内多次操作只执行最后一次
- * @param fn 函数
- * @param delay 限时
- * @returns function
- */
-exports.handleSizeCols = handleSizeCols;
-var debounce = function debounce(fn) {
-  var delay = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 500;
-  var t = null;
-  return function () {
-    clearTimeout(t);
-    t = setTimeout(fn, delay);
-  };
-};
-/**
- * 函数节流,限时内只触发一次函数
- * @param fn 函数
- * @param delay 限时
- * @returns function
- */
-exports.debounce = debounce;
-var throttle = function throttle(fn) {
-  var delay = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 500;
-  var t = Date.now();
-  return function () {
-    var me = _this;
-    var now = Date.now();
-    if (now - t > delay) {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-      fn.apply(me, args);
-      t = now;
-    }
-  };
-};
 /**
  * 绑定事件
  * @param eventName  事件名
  * @param fn  调用函数
  * @param el  源对象，默认为window
  */
-exports.throttle = throttle;
+exports.handleSizeCols = handleSizeCols;
 var on = function on(eventName, fn, el) {
   if (!el) {
     el = window;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "ls-pro-common",
   "keywords": [
     "antd",  
@@ -27,7 +27,7 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.80.0",
+    "ls-pro-table": "2.80.2",
     "ls-pro-form": "1.52.34",
     "ls-pro-descriptions":"^1.10.33",
     "@babel/runtime": "^7.16.3",