ls-pro-common 1.1.0 → 1.1.1

package/lib/hooks/useSingle/index.js

@@ -100,6 +100,28 @@ function useSingle(inParam) {
   /**@name 编辑表单Ref */
 
   var editFormRef = (0, _react.useRef)();
+  /**@name 查看历史数据 */
+
+  var _useState7 = (0, _react.useState)(0),
+      _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+      ifHistoryData = _useState8[0],
+      setIfHistoryData = _useState8[1];
+  /** 判断是否已审核，只有传入审核状态和状态字段才进行判断 */
+
+
+  var isAudit = (0, _react.useCallback)(function () {
+    var row = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+    if (!auditStatus || !statusField) return false;
+    if (!row && !selectedRows.length) return false;
+
+    if (row) {
+      return Number(row[statusField] || 0) >= auditStatus;
+    }
+
+    return selectedRows.findIndex(function (o) {
+      return Number(o[statusField] || 0) >= auditStatus;
+    }) > -1;
+  }, [auditStatus, statusField, selectedRows]);
   /** 新增按钮事件 */
 
   var onAdd = /*#__PURE__*/function () {
@@ -526,7 +548,7 @@ 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, sumProperties, rest, param, key, _key, sortArr, _key2, result;
+      var current, pageSize, sumProperties, rest, param, key, k, sortArr, _key, result;
 
       return _regenerator.default.wrap(function _callee6$(_context6) {
         while (1) {
@@ -561,9 +583,9 @@ function useSingle(inParam) {
               if (filter && Object.keys(filter).length) {
                 param.where = param.where || {};
 
-                for (_key in filter) {
-                  if (filter[_key] && !param.where[_key]) {
-                    param.where[_key] = filter[_key];
+                for (k in filter) {
+                  if (filter[k] && !param.where[k]) {
+                    param.where[k] = filter[k];
                   }
                 }
 
@@ -576,32 +598,36 @@ function useSingle(inParam) {
               if (!sumProperties && sort && Object.keys(sort).length) {
                 sortArr = [];
 
-                for (_key2 in sort) {
-                  sortArr.push(_key2 + ' ' + (sort[_key2] === 'ascend' ? 'asc' : 'desc'));
+                for (_key in sort) {
+                  sortArr.push(_key + ' ' + (sort[_key] === 'ascend' ? 'asc' : 'desc'));
                 }
 
                 param.sort = sortArr.join(',');
               }
 
+              if (ifHistoryData) {
+                param.history = 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);
               _context6.t0 = beforeLoad;
 
               if (!_context6.t0) {
-                _context6.next = 16;
+                _context6.next = 17;
                 break;
               }
 
-              _context6.next = 14;
+              _context6.next = 15;
               return beforeLoad(param);
 
-            case 14:
+            case 15:
               _context6.t1 = _context6.sent;
               _context6.t0 = _context6.t1 === false;
 
-            case 16:
+            case 17:
               if (!_context6.t0) {
-                _context6.next = 18;
+                _context6.next = 19;
                 break;
               }
 
@@ -611,15 +637,15 @@ function useSingle(inParam) {
                 total: 0
               });
 
-            case 18:
+            case 19:
               if (sumProperties && param.sort) {
                 delete param.sort;
               }
 
-              _context6.next = 21;
+              _context6.next = 22;
               return service.load(param);
 
-            case 21:
+            case 22:
               result = _context6.sent;
               result.data = result.rows || [];
               result.success = true;
@@ -630,7 +656,7 @@ function useSingle(inParam) {
 
               return _context6.abrupt("return", result);
 
-            case 26:
+            case 27:
             case "end":
               return _context6.stop();
           }
@@ -722,6 +748,12 @@ function useSingle(inParam) {
       return _ref7.apply(this, arguments);
     };
   }();
+  /**
+   * 判断按钮状态
+   * @param key
+   * @returns
+   */
+
 
   var btnDisabled = function btnDisabled(key) {
     if (btnStatus && typeof btnStatus(key) === 'boolean') return btnStatus(key);
@@ -737,23 +769,8 @@ function useSingle(inParam) {
       default:
         return false;
     }
-  };
-  /** 判断是否已审核，只有传入审核状态和状态字段才进行判断 */
-
+  }; // 处理内置 table 按钮,新增，编辑，删除，审核，导入，导出
 
-  var isAudit = (0, _react.useCallback)(function () {
-    var row = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-    if (!auditStatus || !statusField) return false;
-    if (!row && !selectedRows.length) return false;
-
-    if (row) {
-      return Number(row[statusField] || 0) >= auditStatus;
-    }
-
-    return selectedRows.findIndex(function (o) {
-      return Number(o[statusField] || 0) >= auditStatus;
-    }) > -1;
-  }, [auditStatus, statusField, selectedRows]); // 处理内置 table 按钮,新增，编辑，删除，审核，导入，导出
 
   var tableTools = (0, _react.useMemo)(function () {
     return [(toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) && canAdd ? /*#__PURE__*/_react.default.createElement(_button.default, {
@@ -803,7 +820,7 @@ function useSingle(inParam) {
       },
       disabled: btnDisabled('export'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.ExportOutlined, null)
-    }, "\u5BFC\u51FA") : false].filter(function (o) {
+    }, "\u5BFC\u51FA") : false].filter(function () {
       return Boolean;
     });
   }, [selectedRows]);
@@ -828,7 +845,9 @@ function useSingle(inParam) {
     resourceId: resourceId,
     checkRight: checkRight,
     loginName: loginName,
-    isAudit: isAudit
+    isAudit: isAudit,
+    ifHistoryData: ifHistoryData,
+    setIfHistoryData: setIfHistoryData
   };
 }
 

package/lib/http/index.js

@@ -25,10 +25,18 @@ var _utils = require("../utils");
 var request = (0, _umiRequest.extend)({
   timeout: 60000
 });
+var httpStatus = {
+  404: '服务不存在',
+  429: '接口限流',
+  502: '网关出错',
+  503: '当前服务器异常',
+  504: '请求超时'
+};
 /** 请求拦截器,统一添加token */
 
 request.interceptors.request.use(function (url, options) {
   var token = (0, _utils.getCookie)("token");
+  console.log('我的拦截', token);
   options.headers = options.headers || {}; // 处理 token
 
   if (token && url.indexOf('noToken=1') === -1) {

package/lib/index.d.ts

@@ -6,6 +6,7 @@ import IconSelector from './components/IconSelector';
 import ImageSelector from './components/ImageSelector';
 import InputMultiLine from './components/InputMultiLine';
 import AreaCascader from './components/AreaCascader';
+import AreaCascaderPanel from './components/AreaCascaderPanel';
 import DescritionCard from './components/DescritionCard';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
@@ -19,4 +20,4 @@ import type { ApiResponse, TableToolbar, BaseApiType, MethodType } from './typin
 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, DescritionCard, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };

package/lib/index.js

@@ -13,6 +13,12 @@ Object.defineProperty(exports, "AreaCascader", {
     return _AreaCascader.default;
   }
 });
+Object.defineProperty(exports, "AreaCascaderPanel", {
+  enumerable: true,
+  get: function get() {
+    return _AreaCascaderPanel.default;
+  }
+});
 Object.defineProperty(exports, "BaseService", {
   enumerable: true,
   get: function get() {
@@ -145,6 +151,8 @@ 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 _BaseService = _interopRequireDefault(require("./service/BaseService"));

package/package.json

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