ls-pro-common 1.1.2 → 1.1.4

package/lib/components/Permission.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+export declare type PermissionProps = {
+    rightValue: number;
+};
+declare const Permission: React.FC<PermissionProps>;
+export default Permission;

package/lib/components/Permission.js

@@ -0,0 +1,18 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _usePermission2 = _interopRequireDefault(require("../hooks/usePermission"));
+var Permission = function Permission(_ref) {
+  var children = _ref.children,
+    rightValue = _ref.rightValue;
+  var _usePermission = (0, _usePermission2.default)(),
+    checkRight = _usePermission.checkRight;
+  return checkRight(rightValue) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children) : null;
+};
+var _default = Permission;
+exports.default = _default;

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

@@ -19,8 +19,8 @@ export declare type DtlParamType = SingleParamType & {
     billType?: string;
     /**@name 动态编码规则字段,主从表一起保存传参 */
     codeRuleDynamicField?: string;
-    /**@是否查询历史数据 */
-    ifHistoryData?: 0 | 1;
+    /** 是否查询历史数据,通过主表查询面板用户受控组件传入 */
+    ifHistory?: 0 | 1;
 };
 declare function useDtl(dtlParam: DtlParamType): {
     formRef: import("react").MutableRefObject<ProFormInstance<any> | undefined>;

package/lib/hooks/useDtl/index.js

@@ -40,8 +40,8 @@ function useDtl(dtlParam) {
     btnStatus = dtlParam.btnStatus,
     beforeAudit = dtlParam.beforeAudit,
     afterAudit = dtlParam.afterAudit,
-    _dtlParam$ifHistoryDa = dtlParam.ifHistoryData,
-    ifHistoryData = _dtlParam$ifHistoryDa === void 0 ? 0 : _dtlParam$ifHistoryDa;
+    _dtlParam$ifHistory = dtlParam.ifHistory,
+    ifHistory = _dtlParam$ifHistory === void 0 ? 0 : _dtlParam$ifHistory;
   var _usePermission = (0, _usePermission2.default)(),
     canAdd = _usePermission.canAdd,
     canEdit = _usePermission.canEdit,
@@ -655,8 +655,8 @@ function useDtl(dtlParam) {
             }
             setSelectedRows([]);
             (_tableRef$current3 = tableRef.current) === null || _tableRef$current3 === void 0 ? void 0 : (_tableRef$current3$cl = _tableRef$current3.clearSelected) === null || _tableRef$current3$cl === void 0 ? void 0 : _tableRef$current3$cl.call(_tableRef$current3);
-            if (ifHistoryData === 1) {
-              param.history = 1;
+            if (ifHistory === 1) {
+              param.ifHistory = 1;
             }
             _context8.t0 = beforeLoad;
             if (!_context8.t0) {
@@ -703,8 +703,8 @@ function useDtl(dtlParam) {
   }();
   var onExportDtl = /*#__PURE__*/function () {
     var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(url, param) {
-      var _param$exportColumns;
-      var _result$flag6, result, _result$flag7, _result$flag8;
+      var _param$exportColumns, _param$searchData;
+      var searchArr, _result$flag6, result, _result$flag7, _result$flag8;
       return _regenerator.default.wrap(function _callee9$(_context9) {
         while (1) switch (_context9.prev = _context9.next) {
           case 0:
@@ -722,40 +722,46 @@ function useDtl(dtlParam) {
             (0, _utils.showWarn)('请配置业务接口 bizApi 属性');
             return _context9.abrupt("return", false);
           case 6:
-            _context9.prev = 6;
-            _context9.next = 9;
+            // 处理导出历史数据传参
+            if (ifHistory && !param.searchData || !((_param$searchData = param.searchData) === null || _param$searchData === void 0 ? void 0 : _param$searchData.includes('ifHistory=1'))) {
+              searchArr = (param.searchData || '').split('&');
+              searchArr.push('ifHistory=1');
+              param.searchData = searchArr.join('&');
+            }
+            _context9.prev = 7;
+            _context9.next = 10;
             return (0, _http.httpPost)(url, param);
-          case 9:
+          case 10:
             result = _context9.sent;
             if (!(result.data && typeof result.data === 'string')) {
-              _context9.next = 13;
+              _context9.next = 14;
               break;
             }
             window.open(result.data);
             return _context9.abrupt("return", true);
-          case 13:
+          case 14:
             if (!(((_result$flag6 = result.flag) === null || _result$flag6 === void 0 ? void 0 : _result$flag6.retCode) === '0')) {
-              _context9.next = 18;
+              _context9.next = 19;
               break;
             }
             (0, _utils.showSuccess)(((_result$flag7 = result.flag) === null || _result$flag7 === void 0 ? void 0 : _result$flag7.retMsg) || '导出成功');
             return _context9.abrupt("return", true);
-          case 18:
+          case 19:
             (0, _utils.showError)(((_result$flag8 = result.flag) === null || _result$flag8 === void 0 ? void 0 : _result$flag8.retMsg) || '导出失败,请联系系统管理员');
             return _context9.abrupt("return", false);
-          case 20:
-            _context9.next = 26;
+          case 21:
+            _context9.next = 27;
             break;
-          case 22:
-            _context9.prev = 22;
-            _context9.t0 = _context9["catch"](6);
+          case 23:
+            _context9.prev = 23;
+            _context9.t0 = _context9["catch"](7);
             (0, _utils.showError)(_context9.t0.message);
             return _context9.abrupt("return", false);
-          case 26:
+          case 27:
           case "end":
             return _context9.stop();
         }
-      }, _callee9, null, [[6, 22]]);
+      }, _callee9, null, [[7, 23]]);
     }));
     return function onExportDtl(_x6, _x7) {
       return _ref9.apply(this, arguments);

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

@@ -40,7 +40,7 @@ declare function useSingle(inParam: SingleParamType): {
     setEditItem: import("react").Dispatch<any>;
     onRemove: (row: any) => void;
     onSave: (formData: any) => Promise<boolean>;
-    onLoad: (params: Record<string, any>, sort: Record<string, any>, filter: Record<string, any>) => Promise<any>;
+    onLoad: (params: Record<string, any>, sort: Record<string, any>, filter: Record<string, any>, isHistory: any) => Promise<any>;
     onAdd: (item: any) => Promise<void>;
     onEdit: (item: any) => Promise<void>;
     onExport: (url: string, param: exportParam) => Promise<boolean>;
@@ -49,7 +49,7 @@ declare function useSingle(inParam: SingleParamType): {
     checkRight: (val: number) => boolean;
     loginName: string | undefined;
     isAudit: (row?: any) => boolean;
-    ifHistoryData: 0 | 1;
-    setIfHistoryData: import("react").Dispatch<import("react").SetStateAction<0 | 1>>;
+    ifHistory: 0 | 1;
+    setIfHistory: import("react").Dispatch<import("react").SetStateAction<0 | 1>>;
 };
 export default useSingle;

package/lib/hooks/useSingle/index.js

@@ -77,8 +77,8 @@ function useSingle(inParam) {
   /**@name 查看历史数据 */
   var _useState7 = (0, _react.useState)(0),
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-    ifHistoryData = _useState8[0],
-    setIfHistoryData = _useState8[1];
+    ifHistory = _useState8[0],
+    setIfHistory = _useState8[1];
   /** 判断是否已审核，只有传入审核状态和状态字段才进行判断 */
   var isAudit = (0, _react.useCallback)(function () {
     var row = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
@@ -409,7 +409,7 @@ function useSingle(inParam) {
   }();
   /** 加载数据方法 */
   var onLoad = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(params, sort, filter) {
+    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(params, sort, filter, isHistory) {
       var _tableRef$current, _tableRef$current$cle;
       var current, pageSize, sumProperties, rest, param, key, k, sortArr, _key, result;
       return _regenerator.default.wrap(function _callee6$(_context6) {
@@ -455,8 +455,8 @@ function useSingle(inParam) {
               }
               param.sort = sortArr.join(',');
             }
-            if (ifHistoryData) {
-              param.history = 1;
+            if (ifHistory || isHistory) {
+              param.ifHistory = 1;
             }
             setSelectedRows([]);
             (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : (_tableRef$current$cle = _tableRef$current.clearSelected) === null || _tableRef$current$cle === void 0 ? void 0 : _tableRef$current$cle.call(_tableRef$current);
@@ -500,14 +500,14 @@ function useSingle(inParam) {
         }
       }, _callee6);
     }));
-    return function onLoad(_x5, _x6, _x7) {
+    return function onLoad(_x5, _x6, _x7, _x8) {
       return _ref6.apply(this, arguments);
     };
   }();
   var onExport = /*#__PURE__*/function () {
     var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(url, param) {
-      var _param$exportColumns;
-      var _result$flag4, result, _result$flag5, _result$flag6;
+      var _param$exportColumns, _param$searchData;
+      var searchArr, _result$flag4, result, _result$flag5, _result$flag6;
       return _regenerator.default.wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
@@ -525,43 +525,49 @@ function useSingle(inParam) {
             (0, _utils.showWarn)('请配置业务接口 bizApi 属性');
             return _context7.abrupt("return", false);
           case 6:
-            _context7.prev = 6;
-            _context7.next = 9;
+            // 处理导出历史数据传参，如果组件里没有传入参数，hooks再处理一次
+            if (ifHistory && !param.searchData || !((_param$searchData = param.searchData) === null || _param$searchData === void 0 ? void 0 : _param$searchData.includes('ifHistory=1'))) {
+              searchArr = (param.searchData || '').split('&');
+              searchArr.push('ifHistory=1');
+              param.searchData = searchArr.join('&');
+            }
+            _context7.prev = 7;
+            _context7.next = 10;
             return (0, _http.httpPost)(url, param, true, false);
-          case 9:
+          case 10:
             result = _context7.sent;
             if (!(result.data && typeof result.data === 'string')) {
-              _context7.next = 13;
+              _context7.next = 14;
               break;
             }
             window.open(result.data);
             return _context7.abrupt("return", true);
-          case 13:
+          case 14:
             if (!(((_result$flag4 = result.flag) === null || _result$flag4 === void 0 ? void 0 : _result$flag4.retCode) === '0')) {
-              _context7.next = 18;
+              _context7.next = 19;
               break;
             }
             (0, _utils.showSuccess)(((_result$flag5 = result.flag) === null || _result$flag5 === void 0 ? void 0 : _result$flag5.retMsg) || '导出成功');
             return _context7.abrupt("return", true);
-          case 18:
+          case 19:
             (0, _utils.showError)(((_result$flag6 = result.flag) === null || _result$flag6 === void 0 ? void 0 : _result$flag6.retMsg) || '导出失败,请联系系统管理员');
             return _context7.abrupt("return", false);
-          case 20:
-            _context7.next = 27;
+          case 21:
+            _context7.next = 28;
             break;
-          case 22:
-            _context7.prev = 22;
-            _context7.t0 = _context7["catch"](6);
+          case 23:
+            _context7.prev = 23;
+            _context7.t0 = _context7["catch"](7);
             console.log(_context7.t0);
             (0, _utils.showError)(_context7.t0.message);
             return _context7.abrupt("return", false);
-          case 27:
+          case 28:
           case "end":
             return _context7.stop();
         }
-      }, _callee7, null, [[6, 22]]);
+      }, _callee7, null, [[7, 23]]);
     }));
-    return function onExport(_x8, _x9) {
+    return function onExport(_x9, _x10) {
       return _ref7.apply(this, arguments);
     };
   }();
@@ -655,8 +661,8 @@ function useSingle(inParam) {
     checkRight: checkRight,
     loginName: loginName,
     isAudit: isAudit,
-    ifHistoryData: ifHistoryData,
-    setIfHistoryData: setIfHistoryData
+    ifHistory: ifHistory,
+    setIfHistory: setIfHistory
   };
 }
 ;

package/lib/http/index.js

@@ -20,11 +20,11 @@ var request = (0, _umiRequest.extend)({
   timeout: 60000
 });
 var httpStatus = {
-  404: '服务不存在',
-  429: '服务繁忙',
-  502: '网关出错',
-  503: '当前服务器异常',
-  504: '请求超时'
+  404: '请求的服务不存在',
+  429: '请求的服务繁忙',
+  502: '请求的服务网关出错',
+  503: '请求的服务器异常',
+  504: '请求服务超时'
 };
 /** 请求拦截器,统一添加token */
 request.interceptors.request.use(function (url, options) {
@@ -70,7 +70,7 @@ request.interceptors.request.use(function (url, options) {
 /** 请求返回拦截器,统一处理业务异常 */
 request.interceptors.response.use( /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(response, options) {
-    var noMsg, _data$flag, _data$flag2, _data$flag3, _data$flag4, data, retCode, retMsg, requestId, faultCode, text, _data$flag5, _data$flag6, _data$flag7, _data$flag8, _data, _retCode, _retMsg, status, _requestId, _faultCode;
+    var noMsg, _data$flag, _data$flag2, _data$flag3, _data$flag4, data, retCode, retMsg, requestId, faultCode, text, _text, _data$flag5, _data$flag6, _data$flag7, _data$flag8, _data, _retCode, _retMsg, status, _requestId, _faultCode;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -94,7 +94,13 @@ request.interceptors.response.use( /*#__PURE__*/function () {
             if (faultCode) {
               (0, _utils.httpError)(retMsg, retCode, faultCode, options.url);
             } else {
-              (0, _utils.showError)(retMsg + options.url);
+              text = httpStatus[response.status];
+              if (response.status === 503 && response.statusText === 'no healthy upstream') {
+                text = '请求的服务未启动';
+              } else if (response.status === 503 && response.statusText === 'reached concurrency limit') {
+                text = '请求的服务被限流';
+              }
+              (0, _utils.showError)(text || retMsg);
             }
           }
           _context.next = 18;
@@ -102,13 +108,13 @@ request.interceptors.response.use( /*#__PURE__*/function () {
         case 13:
           _context.prev = 13;
           _context.t0 = _context["catch"](2);
-          text = httpStatus[response.status];
+          _text = httpStatus[response.status];
           if (response.status === 503 && response.statusText === 'no healthy upstream') {
-            text = '服务未启动';
+            _text = '请求的服务未启动';
           } else if (response.status === 503 && response.statusText === 'reached concurrency limit') {
-            text = '请求被限流';
+            _text = '请求的服务被限流';
           }
-          (0, _utils.showError)(text || _context.t0.message || response.statusText);
+          (0, _utils.showError)(_text || _context.t0.message || response.statusText);
         case 18:
           _context.next = 30;
           break;
@@ -122,7 +128,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
         case 23:
           _data = _context.sent;
           _retCode = (_data === null || _data === void 0 ? void 0 : (_data$flag5 = _data.flag) === null || _data$flag5 === void 0 ? void 0 : _data$flag5.retCode) || '0';
-          _retMsg = ((_data$flag6 = _data.flag) === null || _data$flag6 === void 0 ? void 0 : _data$flag6.retMsg) || '访问接口出错';
+          _retMsg = ((_data$flag6 = _data.flag) === null || _data$flag6 === void 0 ? void 0 : _data$flag6.retMsg) || '请求的服务出错';
           status = ((0, _utils.getUrlQuery)('apiStatus') || '0').split(',');
           _requestId = (_data$flag7 = _data.flag) === null || _data$flag7 === void 0 ? void 0 : _data$flag7.requestId;
           _faultCode = (_data$flag8 = _data.flag) === null || _data$flag8 === void 0 ? void 0 : _data$flag8.faultCode;

package/lib/index.d.ts

@@ -8,6 +8,7 @@ import InputMultiLine from './components/InputMultiLine';
 import AreaCascader from './components/AreaCascader';
 import AreaCascaderPanel from './components/AreaCascaderPanel';
 import DescritionCard from './components/DescritionCard';
+import Permission from './components/Permission';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
 import * as utils from './utils';
@@ -19,5 +20,6 @@ import usePermission from './hooks/usePermission';
 import type { ApiResponse, TableToolbar, BaseApiType, MethodType } from './typing';
 import type { DtlLyaoutProps } from './components/DtlLayout';
 import type { DescritionCardProps } from './components/DescritionCard';
-export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps, DescritionCardProps };
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };
+import type { PermissionProps } from './components/Permission';
+export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps, DescritionCardProps, PermissionProps };
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };

package/lib/index.js

@@ -71,6 +71,12 @@ Object.defineProperty(exports, "Page404", {
     return _.default;
   }
 });
+Object.defineProperty(exports, "Permission", {
+  enumerable: true,
+  get: function get() {
+    return _Permission.default;
+  }
+});
 Object.defineProperty(exports, "fetchOptions", {
   enumerable: true,
   get: function get() {
@@ -142,6 +148,7 @@ var _InputMultiLine = _interopRequireDefault(require("./components/InputMultiLin
 var _AreaCascader = _interopRequireDefault(require("./components/AreaCascader"));
 var _AreaCascaderPanel = _interopRequireDefault(require("./components/AreaCascaderPanel"));
 var _DescritionCard = _interopRequireDefault(require("./components/DescritionCard"));
+var _Permission = _interopRequireDefault(require("./components/Permission"));
 var _BaseService = _interopRequireDefault(require("./service/BaseService"));
 var _http = _interopRequireWildcard(require("./http"));
 var utils = _interopRequireWildcard(require("./utils"));

package/lib/utils/index.d.ts

@@ -1,6 +1,7 @@
 import { ModalFuncProps } from 'antd';
 import ReactDOM from 'react-dom';
 import React from 'react';
+export { throttle, debounce } from 'lodash';
 export { getUrlQuery, setUrlQuery, toGatewayUrl, dateFormat, getResourceProps } from 'ls-pro-table';
 /**
  * 设置文档title
@@ -26,13 +27,14 @@ export declare const today: () => string;
  */
 export declare const now: () => string;
 /**
- * 当前日期加减
+ * 时间加减
+ * @param dt 原始时间，传 null 为当前时间
  * @param addDay 添加添数，可为负数
  * @param addMonth 添加月数，可为负数
  * @param addYear 添加年数，可以负责
- * @returns YYYY-MM-DD
+ * @returns YYYY-MM-DD hh:mm:ss
  */
-export declare const todayAdd: (addDay: number, addMonth?: number, addYear?: number) => string;
+export declare const dateAdd: (dt: Date | null, addDay: number, addMonth?: number, addYear?: number) => string;
 /**
  * 当前时间加减
  * @param addDay 添加添数，可为负数
@@ -42,14 +44,13 @@ export declare const todayAdd: (addDay: number, addMonth?: number, addYear?: num
  */
 export declare const nowAdd: (addDay: number, addMonth?: number, addYear?: number) => string;
 /**
- * 时间加减
- * @param dt 原始时间，传 null 为当前时间
+ * 当前日期加减
  * @param addDay 添加添数，可为负数
  * @param addMonth 添加月数，可为负数
  * @param addYear 添加年数，可以负责
- * @returns YYYY-MM-DD hh:mm:ss
+ * @returns YYYY-MM-DD
  */
-export declare const dateAdd: (dt: Date | null, addDay: number, addMonth?: number, addYear?: number) => string;
+export declare const todayAdd: (addDay: number, addMonth?: number, addYear?: number) => string;
 /**
  * 千位符格式化数值
  * @param num 数值
@@ -75,6 +76,7 @@ export declare const setCookie: (key: string, value: string | number, day?: numb
  * @returns
  */
 export declare const isLogin: () => boolean;
+export declare const getFullScreenElement: () => any;
 /**
  * 设置本地缓存
  * @param { String } key 关键字
@@ -101,7 +103,6 @@ export declare const showError: (text: string) => void;
 export declare const showWarn: (text: string) => void;
 /** @name 显示成功 */
 export declare const showSuccess: (text: string) => void;
-export declare const getFullScreenElement: () => any;
 /**
  * 弹框提示
  * @param text 提示信息
@@ -165,20 +166,6 @@ export declare const treeFind: (list: any[], key: string, val: any, children?: s
  * @returns 返回已处理好的表头[{dataIndex:sizeTypeNo,title:'国标码',width:120,children[...]},{dataIndex:'f1',...}...]
  */
 export declare const handleSizeCols: (orgSizeHeader: any[], typeWidth?: number, sizeWidth?: number) => any[];
-/**
- * 函数防抖, 限定的时间内多次操作只执行最后一次
- * @param fn 函数
- * @param delay 限时
- * @returns function
- */
-export declare const debounce: (fn: Function, delay?: number) => () => void;
-/**
- * 函数节流,限时内只触发一次函数
- * @param fn 函数
- * @param delay 限时
- * @returns function
- */
-export declare const throttle: (fn: Function, delay?: number) => (...args: any[]) => void;
 /**
  * 绑定事件
  * @param eventName  事件名