ls-pro-common 1.0.64 → 1.0.66

package/lib/utils/index.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "dateFormat", {
     return _lsProTable.dateFormat;
   }
 });
-exports.getLoginName = exports.getCookie = exports.getCompanyId = exports.getCache = exports.formatMoney = exports.formatDate = exports.deepClone = exports.debounce = void 0;
+exports.getLoginName = exports.getCookie = exports.getCompanyId = exports.getCache = exports.formatMoney = exports.formatDate = exports.exitLoading = exports.deepClone = exports.debounce = void 0;
 Object.defineProperty(exports, "getResourceProps", {
   enumerable: true,
   get: function get() {
@@ -25,14 +25,14 @@ Object.defineProperty(exports, "getUrlQuery", {
     return _lsProTable.getUrlQuery;
   }
 });
-exports.setTitle = exports.setCookie = exports.setCache = exports.reLogin = exports.rangeToSearch = exports.printView = exports.printAsync = exports.on = exports.off = exports.nowAdd = exports.now = exports.isLogin = exports.isDev = exports.handleSizeCols = exports.getUserName = exports.getUserInfo = void 0;
+exports.setTitle = exports.setCookie = exports.setCache = exports.reLogin = exports.rangeToSearch = exports.printView = exports.printAsync = exports.openPageInMain = exports.on = exports.off = exports.nowAdd = exports.now = exports.isLogin = exports.isDev = exports.handleSizeCols = exports.getUserName = exports.getUserInfo = void 0;
 Object.defineProperty(exports, "setUrlQuery", {
   enumerable: true,
   get: function get() {
     return _lsProTable.setUrlQuery;
   }
 });
-exports.throttle = exports.statusList = exports.showWarn = exports.showSuccess = exports.showError = exports.showConfirm = void 0;
+exports.throttle = exports.statusList = exports.showWarn = exports.showSuccess = exports.showLoading = exports.showError = exports.showConfirm = void 0;
 Object.defineProperty(exports, "toGatewayUrl", {
   enumerable: true,
   get: function get() {
@@ -41,6 +41,10 @@ Object.defineProperty(exports, "toGatewayUrl", {
 });
 exports.yesnoList = exports.treeFind = exports.treeEach = exports.todayAdd = exports.today = void 0;
 
+require("antd/es/spin/style");
+
+var _spin = _interopRequireDefault(require("antd/es/spin"));
+
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 
 require("antd/es/modal/style");
@@ -55,6 +59,8 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
 var _react = _interopRequireDefault(require("react"));
 
+var _reactDom = _interopRequireDefault(require("react-dom"));
+
 var _icons = require("@ant-design/icons");
 
 var _lsProTable = require("ls-pro-table");
@@ -373,7 +379,7 @@ var reLogin = function reLogin() {
     maskClosable: false,
     afterClose: function afterClose() {
       timeout = false;
-      location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURI(location.href);
+      location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);
     }
   });
 };
@@ -823,5 +829,48 @@ var deepClone = function deepClone(obj) {
 
   return target;
 };
+/**
+ * 在主工程中打开模块
+ * @param option {path:模块路由,需要加工程编码, resourceId: 资源Id，两者传一个即可,data:参数}
+ */
+
+
+exports.deepClone = deepClone;
+
+var openPageInMain = function openPageInMain(option) {
+  var win = top || window;
+  win.postMessage({
+    type: 'openPage',
+    param: option
+  });
+};
+
+exports.openPageInMain = openPageInMain;
+
+var showLoading = function showLoading() {
+  var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '处理中...';
+  var loading = document.getElementById('myloading');
+  if (loading) return;
+  var loadWrapper = document.createElement('div');
+  loadWrapper.setAttribute("id", "myloading");
+
+  _reactDom.default.render( /*#__PURE__*/_react.default.createElement(_spin.default, {
+    tip: text
+  }), loadWrapper);
+
+  document.body.appendChild(loadWrapper);
+};
+
+exports.showLoading = showLoading;
+
+var exitLoading = function exitLoading() {
+  var loading = document.getElementById('myloading');
+
+  if (loading) {
+    var _loading$parentNode;
+
+    (_loading$parentNode = loading.parentNode) === null || _loading$parentNode === void 0 ? void 0 : _loading$parentNode.removeChild(loading);
+  }
+};
 
-exports.deepClone = deepClone;
+exports.exitLoading = exitLoading;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.64",
+  "version": "1.0.66",
   "description": "ls-pro-common",
   "keywords": [
     "antd",  
@@ -27,8 +27,8 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.47",
-    "ls-pro-form": "1.52.29",
+    "ls-pro-table": "2.62.49",
+    "ls-pro-form": "1.52.31",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",
     "moment": "^2.27.0",