ls-pro-common 1.0.63 → 1.0.65

package/lib/http/index.js

@@ -17,8 +17,6 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _umiRequest = require("umi-request");
 
 var _utils = require("../utils");
@@ -31,32 +29,37 @@ var request = (0, _umiRequest.extend)({
 
 request.interceptors.request.use(function (url, options) {
   var token = (0, _utils.getCookie)("token");
-  var opts = (0, _objectSpread2.default)({}, options);
-  opts.headers = opts.headers || {}; // 处理 token
+  options.headers = options.headers || {}; // 处理 token
 
   if (token && url.indexOf('noToken=1') === -1) {
-    opts.headers.token = token;
+    options.headers["token"] = token;
   } // 处理门店
 
 
   var shopNo = (0, _utils.getCache)('shopNo', true) || (0, _utils.getCache)('shopNo');
 
   if (shopNo) {
-    opts.headers.shopNo = shopNo;
+    options.headers["shopNo"] = shopNo;
   } // 处理门店
 
 
   var shopCode = (0, _utils.getCache)('shopCode', true) || (0, _utils.getCache)('shopCode');
 
   if (shopCode) {
-    opts.headers.shopCode = shopCode;
+    options.headers["shopCode"] = shopCode;
   } // 处理仓库
 
 
   var storeNo = (0, _utils.getCache)('storeNo', true) || (0, _utils.getCache)('storeNo');
 
   if (storeNo) {
-    opts.headers.storeNo = storeNo;
+    options.headers["storeNo"] = storeNo;
+  }
+
+  var tag = (0, _utils.getCookie)('x-asm-prefer-tag');
+
+  if (tag) {
+    options.headers['x-asm-prefer-tag'] = tag;
   }
 
   url = url.replace('noToken=1', '').replace('&&', '&').replace('?&', '?');
@@ -69,9 +72,10 @@ request.interceptors.request.use(function (url, options) {
     delete param.resCode;
   }
 
+  url = (0, _utils.setUrlQuery)(url, param);
   return {
-    url: (0, _utils.setUrlQuery)(url, param),
-    options: opts
+    url: url,
+    options: options
   };
 });
 /** 请求返回拦截器,统一处理业务异常 */
@@ -154,6 +158,50 @@ request.interceptors.response.use( /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }());
+
+function ajax(url) {
+  var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var type = arguments.length > 2 ? arguments[2] : undefined;
+  var needGateWay = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+  var isJson = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
+
+  if (needGateWay) {
+    url = (0, _utils.toGatewayUrl)(url);
+  }
+
+  var loadText = (0, _utils.getUrlQuery)('_loading', url);
+
+  if (loadText) {
+    (0, _utils.showLoading)(loadText);
+  }
+
+  if (type === 'get') {
+    return request.get(url, {
+      params: params
+    }).finally(function () {
+      return (0, _utils.exitLoading)();
+    });
+  } else if (type === 'delete') {
+    return request.delete(url, {
+      data: params
+    }).finally(function () {
+      return (0, _utils.exitLoading)();
+    });
+  } else if (type === 'put') {
+    return request.put(url, {
+      data: params
+    }).finally(function () {
+      return (0, _utils.exitLoading)();
+    });
+  } else {
+    return request.post(url, {
+      data: params,
+      requestType: isJson ? 'json' : 'form'
+    }).finally(function () {
+      return (0, _utils.exitLoading)();
+    });
+  }
+}
 /**
  * get请求
  * @param url 接口
@@ -162,8 +210,11 @@ request.interceptors.response.use( /*#__PURE__*/function () {
  * @returns Promise<ApiResponse>
  */
 
-function httpGet(_x3) {
-  return _httpGet.apply(this, arguments);
+
+function httpGet(url) {
+  var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  return ajax(url, params, 'get', needGateWay);
 }
 /**
  * post请求
@@ -175,38 +226,11 @@ function httpGet(_x3) {
  */
 
 
-function _httpGet() {
-  _httpGet = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(url) {
-    var params,
-        needGateWay,
-        _args2 = arguments;
-    return _regenerator.default.wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            params = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : {};
-            needGateWay = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : true;
-
-            if (needGateWay) {
-              url = (0, _utils.toGatewayUrl)(url);
-            }
-
-            return _context2.abrupt("return", request.get(url, {
-              params: params
-            }));
-
-          case 4:
-          case "end":
-            return _context2.stop();
-        }
-      }
-    }, _callee2);
-  }));
-  return _httpGet.apply(this, arguments);
-}
-
-function httpPost(_x4) {
-  return _httpPost.apply(this, arguments);
+function httpPost(url) {
+  var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var isJson = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  var needGateWay = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+  return ajax(url, data, 'post', needGateWay, isJson);
 }
 /**
  * put 请求
@@ -217,41 +241,10 @@ function httpPost(_x4) {
  */
 
 
-function _httpPost() {
-  _httpPost = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(url) {
-    var data,
-        isJson,
-        needGateWay,
-        _args3 = arguments;
-    return _regenerator.default.wrap(function _callee3$(_context3) {
-      while (1) {
-        switch (_context3.prev = _context3.next) {
-          case 0:
-            data = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : {};
-            isJson = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : true;
-            needGateWay = _args3.length > 3 && _args3[3] !== undefined ? _args3[3] : true;
-
-            if (needGateWay) {
-              url = (0, _utils.toGatewayUrl)(url);
-            }
-
-            return _context3.abrupt("return", request.post(url, {
-              data: data,
-              requestType: isJson ? 'json' : 'form'
-            }));
-
-          case 5:
-          case "end":
-            return _context3.stop();
-        }
-      }
-    }, _callee3);
-  }));
-  return _httpPost.apply(this, arguments);
-}
-
-function httpPut(_x5) {
-  return _httpPut.apply(this, arguments);
+function httpPut(url) {
+  var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  return ajax(url, data, 'put', needGateWay);
 }
 /**
  * delete 请求
@@ -262,38 +255,9 @@ function httpPut(_x5) {
  */
 
 
-function _httpPut() {
-  _httpPut = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(url) {
-    var data,
-        needGateWay,
-        _args4 = arguments;
-    return _regenerator.default.wrap(function _callee4$(_context4) {
-      while (1) {
-        switch (_context4.prev = _context4.next) {
-          case 0:
-            data = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : {};
-            needGateWay = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : true;
-
-            if (needGateWay) {
-              url = (0, _utils.toGatewayUrl)(url);
-            }
-
-            return _context4.abrupt("return", request.put(url, {
-              data: data
-            }));
-
-          case 4:
-          case "end":
-            return _context4.stop();
-        }
-      }
-    }, _callee4);
-  }));
-  return _httpPut.apply(this, arguments);
-}
-
-function httpDelete(_x6, _x7) {
-  return _httpDelete.apply(this, arguments);
+function httpDelete(url, data) {
+  var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  return ajax(url, data, 'delete', needGateWay);
 }
 /**
  * 读取数据字典
@@ -303,36 +267,14 @@ function httpDelete(_x6, _x7) {
  */
 
 
-function _httpDelete() {
-  _httpDelete = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(url, data) {
-    var needGateWay,
-        _args5 = arguments;
-    return _regenerator.default.wrap(function _callee5$(_context5) {
-      while (1) {
-        switch (_context5.prev = _context5.next) {
-          case 0:
-            needGateWay = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : true;
-
-            if (needGateWay) {
-              url = (0, _utils.toGatewayUrl)(url);
-            }
-
-            return _context5.abrupt("return", request.delete(url, {
-              data: data
-            }));
-
-          case 3:
-          case "end":
-            return _context5.stop();
-        }
-      }
-    }, _callee5);
-  }));
-  return _httpDelete.apply(this, arguments);
-}
-
-function getDict(_x8) {
-  return _getDict.apply(this, arguments);
+function getDict(dictCode) {
+  var showValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  var api = '/lesoon-integration/sysDictDtl/listByProperties';
+  var param = {
+    dictCode: dictCode
+  };
+  return fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay);
 }
 /**
  * 加载下拉框的数据源
@@ -346,60 +288,31 @@ function getDict(_x8) {
  */
 
 
-function _getDict() {
-  _getDict = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(dictCode) {
-    var showValue,
-        needGateWay,
-        api,
-        param,
-        _args6 = arguments;
-    return _regenerator.default.wrap(function _callee6$(_context6) {
-      while (1) {
-        switch (_context6.prev = _context6.next) {
-          case 0:
-            showValue = _args6.length > 1 && _args6[1] !== undefined ? _args6[1] : true;
-            needGateWay = _args6.length > 2 && _args6[2] !== undefined ? _args6[2] : true;
-            api = '/lesoon-integration/sysDictDtl/listByProperties';
-            param = {
-              dictCode: dictCode
-            };
-            return _context6.abrupt("return", fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay));
-
-          case 5:
-          case "end":
-            return _context6.stop();
-        }
-      }
-    }, _callee6);
-  }));
-  return _getDict.apply(this, arguments);
-}
-
-function fetchOptions(_x9, _x10, _x11, _x12) {
+function fetchOptions(_x3, _x4, _x5, _x6) {
   return _fetchOptions.apply(this, arguments);
 }
 
 function _fetchOptions() {
-  _fetchOptions = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(url, param, valueField, labelField) {
+  _fetchOptions = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(url, param, valueField, labelField) {
     var showValue,
         needGateWay,
         _yield$httpGet,
         _yield$httpGet$rows,
         rows,
         data,
-        _args7 = arguments;
+        _args2 = arguments;
 
-    return _regenerator.default.wrap(function _callee7$(_context7) {
+    return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) {
-        switch (_context7.prev = _context7.next) {
+        switch (_context2.prev = _context2.next) {
           case 0:
-            showValue = _args7.length > 4 && _args7[4] !== undefined ? _args7[4] : true;
-            needGateWay = _args7.length > 5 && _args7[5] !== undefined ? _args7[5] : true;
-            _context7.next = 4;
+            showValue = _args2.length > 4 && _args2[4] !== undefined ? _args2[4] : true;
+            needGateWay = _args2.length > 5 && _args2[5] !== undefined ? _args2[5] : true;
+            _context2.next = 4;
             return httpGet(url, param, needGateWay);
 
           case 4:
-            _yield$httpGet = _context7.sent;
+            _yield$httpGet = _context2.sent;
             _yield$httpGet$rows = _yield$httpGet.rows;
             rows = _yield$httpGet$rows === void 0 ? [] : _yield$httpGet$rows;
             data = (rows || []).map(function (o) {
@@ -410,14 +323,14 @@ function _fetchOptions() {
                 status: o.status
               };
             });
-            return _context7.abrupt("return", data);
+            return _context2.abrupt("return", data);
 
           case 9:
           case "end":
-            return _context7.stop();
+            return _context2.stop();
         }
       }
-    }, _callee7);
+    }, _callee2);
   }));
   return _fetchOptions.apply(this, arguments);
 }

package/lib/utils/index.d.ts

@@ -235,3 +235,14 @@ export declare const appPath: (path?: string) => any;
  * @returns
  */
 export declare const deepClone: (obj: any) => any;
+/**
+ * 在主工程中打开模块
+ * @param option {path:模块路由,需要加工程编码, resourceId: 资源Id，两者传一个即可,data:参数}
+ */
+export declare const openPageInMain: (option: {
+    path?: string;
+    resourceId?: string;
+    data?: any;
+}) => void;
+export declare const showLoading: (text?: string) => void;
+export declare const exitLoading: () => void;

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.63",
+  "version": "1.0.65",
   "description": "ls-pro-common",
   "keywords": [
     "antd",  
@@ -12,8 +12,7 @@
     "*.less"
   ],
   "license": "MIT",
-  "main": "lib/index.js",
-  "module": "es/index.js",
+  "main": "lib/index.js",  
   "types": "lib/index.d.ts",
   "files": [
     "lib",
@@ -28,8 +27,8 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.46",
-    "ls-pro-form": "1.52.29",
+    "ls-pro-table": "2.62.48",
+    "ls-pro-form": "1.52.30",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",
     "moment": "^2.27.0",