ls-pro-common 1.0.64 → 1.0.65

package/es/utils/index.js

@@ -1,3 +1,5 @@
+import "antd/es/spin/style";
+import _Spin from "antd/es/spin";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import "antd/es/modal/style";
 import _Modal from "antd/es/modal";
@@ -5,6 +7,7 @@ import "antd/es/message/style";
 import _message from "antd/es/message";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import React from "react";
+import ReactDOM from 'react-dom';
 import { QuestionCircleOutlined } from '@ant-design/icons';
 import { dateFormat, toGatewayUrl } from 'ls-pro-table';
 import { httpPost } from '../http';
@@ -271,7 +274,7 @@ export 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);
     }
   });
 };
@@ -669,4 +672,36 @@ export var deepClone = function deepClone(obj) {
   }
 
   return target;
+};
+/**
+ * 在主工程中打开模块
+ * @param option {path:模块路由,需要加工程编码, resourceId: 资源Id，两者传一个即可,data:参数}
+ */
+
+export var openPageInMain = function openPageInMain(option) {
+  var win = top || window;
+  win.postMessage({
+    type: 'openPage',
+    param: option
+  });
+};
+export 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.render( /*#__PURE__*/React.createElement(_Spin, {
+    tip: text
+  }), loadWrapper);
+  document.body.appendChild(loadWrapper);
+};
+export 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);
+  }
 };

package/lib/components/DtlLayout.js

@@ -69,13 +69,15 @@ function DtlLayout(props) {
   };
 
   var btns = (0, _react.useMemo)(function () {
-    var b = [/*#__PURE__*/_react.default.createElement(_button.default, {
-      key: "btnBack",
-      onClick: function onClick() {
-        return props.onExit(false);
-      },
-      icon: /*#__PURE__*/_react.default.createElement(_icons.ArrowLeftOutlined, null)
-    }, btnExitText)]; // 有新增或更改权限且未审核，开放出保存按钮
+    // const b = [
+    //   <Button
+    //     key="btnBack"
+    //     onClick={() => props.onExit(false)}
+    //     icon={<ArrowLeftOutlined />}>
+    //     {btnExitText}
+    //   </Button>
+    // ]
+    var b = []; // 有新增或更改权限且未审核，开放出保存按钮
 
     if ((checkRight(2) || checkRight(4)) && !isAudit()) {
       b.unshift( /*#__PURE__*/_react.default.createElement(_button.default, {
@@ -116,6 +118,12 @@ function DtlLayout(props) {
     className: (0, _classnames.default)('dtl-header', headerClass),
     style: headerStyle
   }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "dtl-back"
+  }, /*#__PURE__*/_react.default.createElement(_icons.LeftOutlined, {
+    onClick: function onClick() {
+      return props.onExit(false);
+    }
+  })), /*#__PURE__*/_react.default.createElement("div", {
     className: "dtl-title"
   }, dtlTitle), /*#__PURE__*/_react.default.createElement("div", {
     className: "dtl-btns"

package/lib/components/common.less

@@ -39,6 +39,52 @@ body {
   --ant-info-color                          : #4997E6;
   --ant-info-color-deprecated-bg            : #f0faff;
   --ant-info-color-deprecated-border        : #ccebff;
+
+
+
+
+
+
+  // --ant-primary-color                       : #3973F6;
+  // --ant-primary-color-hover                 : #6397ff;
+  // --ant-primary-color-active                : #2552cf;
+  // --ant-primary-color-outline               : rgba(57, 115, 246, 0.2);
+  // --ant-primary-1                           : #f0f7ff;
+  // --ant-primary-2                           : #deecff;
+  // --ant-primary-3                           : #b5d3ff;
+  // --ant-primary-4                           : #8cb6ff;
+  // --ant-primary-5                           : #6397ff;
+  // --ant-primary-6                           : #3973F6;
+  // --ant-primary-7                           : #2552cf;
+  // --ant-primary-color-deprecated-pure       : #e4ecfe;
+  // --ant-primary-color-deprecated-l-35       : #e4ecfe;
+  // --ant-primary-color-deprecated-l-20       : #9bb8fa;
+  // --ant-primary-color-deprecated-t-20       : #618ff8;
+  // --ant-primary-color-deprecated-t-50       : #9cb9fb;
+  // --ant-primary-color-deprecated-f-12       : rgba(57, 115, 246, 0.12);
+  // --ant-primary-color-active-deprecated-f-30: rgba(240, 247, 255, 0.3);
+  // --ant-primary-color-active-deprecated-d-02: #e6f2ff;
+  // --ant-success-color                       : #52c41a;
+  // --ant-success-color-hover                 : #73d13d;
+  // --ant-success-color-active                : #389e0d;
+  // --ant-success-color-outline               : rgba(82, 196, 26, 0.2);
+  // --ant-success-color-deprecated-bg         : #f6ffed;
+  // --ant-success-color-deprecated-border     : #b7eb8f;
+  // --ant-error-color                         : #ff4d4f;
+  // --ant-error-color-hover                   : #ff7875;
+  // --ant-error-color-active                  : #d9363e;
+  // --ant-error-color-outline                 : rgba(255, 77, 79, 0.2);
+  // --ant-error-color-deprecated-bg           : #fff2f0;
+  // --ant-error-color-deprecated-border       : #ffccc7;
+  // --ant-warning-color                       : #faad14;
+  // --ant-warning-color-hover                 : #ffc53d;
+  // --ant-warning-color-active                : #d48806;
+  // --ant-warning-color-outline               : rgba(250, 173, 20, 0.2);
+  // --ant-warning-color-deprecated-bg         : #fffbe6;
+  // --ant-warning-color-deprecated-border     : #ffe58f;
+  // --ant-info-color                          : #3973F6;
+  // --ant-info-color-deprecated-bg            : #f0f7ff;
+  // --ant-info-color-deprecated-border        : #b5d3ff;
 }
 
 .dtl-layout {
@@ -58,6 +104,22 @@ body {
     padding      : 5px 14px;
     border-bottom: 1px solid #f0f0f0;
 
+    .dtl-back {
+      display      : flex;
+      align-items  : center;
+      padding-right: 5px;
+
+      >span {
+        padding      : 3px;
+        border-radius: 2px;
+
+        &:hover {
+          background: var(--ant-primary-2);
+          color     : var(--ant-primary-color)
+        }
+      }
+    }
+
     .dtl-title {
       font-size: 14pt;
     }
@@ -131,6 +193,25 @@ body {
   background : #fff;
 }
 
+#myloading {
+  position        : fixed;
+  top             : 0;
+  left            : 0;
+  bottom          : 0;
+  right           : 0;
+  z-index         : 9999;
+  display         : flex;
+  align-items     : center;
+  background-color: rgba(226, 227, 231, 0.9);
+  justify-content : center;
+
+  .load-text {
+    padding         : 4px 20px;
+    background-color: #fff;
+    border-radius   : 4px;
+  }
+}
+
 .ant-btn {
   border-radius: 4px;
   border-color : var(--ant-primary-color);
@@ -215,4 +296,11 @@ a:hover {
     max-height: calc(100vh - 180px);
     overflow-y: auto;
   }
+}
+
+
+.ant-btn {
+  height     : 28px;
+  line-height: 1.2;
+  padding    : 2px 15px;
 }

package/lib/hooks/useSingle/index.d.ts

@@ -8,6 +8,8 @@ export declare type SingleParamType = {
     initItem?: any;
     statusField?: string;
     auditStatus?: number;
+    totalFields?: string[];
+    customTotal?: (param: Record<string, any>) => Promise<any>;
     beforeLoad?: (param: Record<string, any>) => Promise<boolean>;
     beforeRemove?: (rows: any[]) => Promise<any>;
     beforeAudit?: (rows: any[]) => Promise<any>;

package/lib/hooks/useSingle/index.js

@@ -33,7 +33,7 @@ var _http = require("../../http");
 
 var _usePermission2 = _interopRequireDefault(require("../usePermission"));
 
-var _excluded = ["current", "pageSize"];
+var _excluded = ["current", "pageSize", "sumProperties"];
 
 /**
  * 单表基本增删改查 hooks
@@ -60,6 +60,7 @@ function useSingle(inParam) {
       initItem = inParam.initItem,
       statusField = inParam.statusField,
       auditStatus = inParam.auditStatus,
+      totalFields = inParam.totalFields,
       beforeAudit = inParam.beforeAudit,
       beforeLoad = inParam.beforeLoad,
       beforeRemove = inParam.beforeRemove,
@@ -69,7 +70,8 @@ function useSingle(inParam) {
       afterRemove = inParam.afterRemove,
       afterSave = inParam.afterSave,
       afterAudit = inParam.afterAudit,
-      btnStatus = inParam.btnStatus;
+      btnStatus = inParam.btnStatus,
+      customTotal = inParam.customTotal;
   /** @name 选中行数据 */
 
   var _useState = (0, _react.useState)([]),
@@ -526,18 +528,23 @@ function useSingle(inParam) {
     var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(params, sort, filter) {
       var _tableRef$current, _tableRef$current$cle;
 
-      var current, pageSize, rest, param, key, _key, sortArr, _key2, result;
+      var current, pageSize, sumProperties, rest, param, key, _key, sortArr, _key2, result;
 
       return _regenerator.default.wrap(function _callee6$(_context6) {
         while (1) {
           switch (_context6.prev = _context6.next) {
             case 0:
-              current = params.current, pageSize = params.pageSize, rest = (0, _objectWithoutProperties2.default)(params, _excluded);
+              current = params.current, pageSize = params.pageSize, sumProperties = params.sumProperties, rest = (0, _objectWithoutProperties2.default)(params, _excluded);
               param = {}; // 分页
 
               if (current) {
                 param.page = current;
                 param.pageSize = pageSize;
+              } // 合计
+
+
+              if (sumProperties) {
+                param.sumProperties = sumProperties;
               } // 处理查询条件
 
 
@@ -581,20 +588,20 @@ function useSingle(inParam) {
               _context6.t0 = beforeLoad;
 
               if (!_context6.t0) {
-                _context6.next = 15;
+                _context6.next = 16;
                 break;
               }
 
-              _context6.next = 13;
+              _context6.next = 14;
               return beforeLoad(param);
 
-            case 13:
+            case 14:
               _context6.t1 = _context6.sent;
               _context6.t0 = _context6.t1 === false;
 
-            case 15:
+            case 16:
               if (!_context6.t0) {
-                _context6.next = 17;
+                _context6.next = 18;
                 break;
               }
 
@@ -604,17 +611,22 @@ function useSingle(inParam) {
                 total: 0
               });
 
-            case 17:
-              _context6.next = 19;
+            case 18:
+              _context6.next = 20;
               return service.load(param);
 
-            case 19:
+            case 20:
               result = _context6.sent;
               result.data = result.rows || [];
               result.success = true;
+
+              if (sumProperties) {
+                result.data = result.footer;
+              }
+
               return _context6.abrupt("return", result);
 
-            case 23:
+            case 25:
             case "end":
               return _context6.stop();
           }

package/lib/http/index.js

@@ -56,6 +56,12 @@ request.interceptors.request.use(function (url, options) {
     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('?&', '?');
   var param = {
     resCode: (0, _utils.getUrlQuery)('resCode') || (0, _utils.getUrlQuery)('resourceId') || (0, _utils.getResourceProps)('resourceId'),
@@ -152,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 接口
@@ -160,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请求
@@ -173,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 请求
@@ -215,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 请求
@@ -260,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);
 }
 /**
  * 读取数据字典
@@ -301,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);
 }
 /**
  * 加载下拉框的数据源
@@ -344,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) {
@@ -408,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;