ls-pro-common 1.0.56 → 1.0.59

package/es/hooks/useSingle/index.js

@@ -8,7 +8,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["current", "pageSize"];
 import React from "react";
 import { useState, useRef, useMemo, useCallback } from 'react';
-import { PlusCircleOutlined, EditOutlined, DeleteOutlined, ImportOutlined, ExportOutlined, CheckOutlined } from '@ant-design/icons';
+import { PlusCircleOutlined, EditOutlined, DeleteOutlined, ImportOutlined, ExportOutlined, AuditOutlined } from '@ant-design/icons';
 import { showConfirm, showWarn, showSuccess, showError } from '../../utils';
 import { httpPost } from '../../http';
 import usePermission from '../usePermission';
@@ -582,7 +582,7 @@ function useSingle(inParam) {
 
             case 19:
               result = _context6.sent;
-              result.data = result.rows;
+              result.data = result.rows || [];
               result.success = true;
               return _context6.abrupt("return", result);
 
@@ -629,7 +629,7 @@ function useSingle(inParam) {
             case 6:
               _context7.prev = 6;
               _context7.next = 9;
-              return httpPost(url, param);
+              return httpPost(url, param, true, false);
 
             case 9:
               result = _context7.sent;
@@ -740,7 +740,7 @@ function useSingle(inParam) {
         return onAudit(null);
       },
       disabled: btnDisabled('audit'),
-      icon: /*#__PURE__*/React.createElement(CheckOutlined, null)
+      icon: /*#__PURE__*/React.createElement(AuditOutlined, null)
     }, "\u5BA1\u6838") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) && checkRight(128) ? /*#__PURE__*/React.createElement(_Button, {
       key: "import",
       onClick: function onClick() {
@@ -760,7 +760,7 @@ function useSingle(inParam) {
       disabled: btnDisabled('export'),
       icon: /*#__PURE__*/React.createElement(ExportOutlined, null)
     }, "\u5BFC\u51FA") : false].filter(function (o) {
-      return o !== false;
+      return Boolean;
     });
   }, [selectedRows]);
   return {

package/es/http/index.js

@@ -40,7 +40,7 @@ request.interceptors.request.use(function (url, options) {
 
 request.interceptors.response.use( /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(response, options) {
-    var noMsg, _data$flag, data, _data$flag2, _data$flag3, _data, retCode, retMsg, status;
+    var noMsg, _data$flag, _data$flag2, data, _data$flag3, _data$flag4, _data$flag5, _data, retCode, retMsg, status;
 
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
@@ -59,7 +59,13 @@ request.interceptors.response.use( /*#__PURE__*/function () {
 
           case 5:
             data = _context.sent;
-            showError(options.url + ((_data$flag = data.flag) === null || _data$flag === void 0 ? void 0 : _data$flag.retMsg));
+
+            if (((_data$flag = data.flag) === null || _data$flag === void 0 ? void 0 : _data$flag.retCode) === 'timeout' || ((_data$flag2 = data.flag) === null || _data$flag2 === void 0 ? void 0 : _data$flag2.retCode) === '4011') {
+              reLogin();
+            } else {
+              showError(options.url + ((_data$flag3 = data.flag) === null || _data$flag3 === void 0 ? void 0 : _data$flag3.retMsg));
+            }
+
             _context.next = 12;
             break;
 
@@ -83,8 +89,8 @@ request.interceptors.response.use( /*#__PURE__*/function () {
 
           case 17:
             _data = _context.sent;
-            retCode = (_data === null || _data === void 0 ? void 0 : (_data$flag2 = _data.flag) === null || _data$flag2 === void 0 ? void 0 : _data$flag2.retCode) || '0';
-            retMsg = ((_data$flag3 = _data.flag) === null || _data$flag3 === void 0 ? void 0 : _data$flag3.retMsg) || '访问接口出错';
+            retCode = (_data === null || _data === void 0 ? void 0 : (_data$flag4 = _data.flag) === null || _data$flag4 === void 0 ? void 0 : _data$flag4.retCode) || '0';
+            retMsg = ((_data$flag5 = _data.flag) === null || _data$flag5 === void 0 ? void 0 : _data$flag5.retMsg) || '访问接口出错';
             status = (getUrlQuery('apiStatus') || '0').split(',');
 
             if (retCode && !status.includes(retCode)) {

package/es/utils/index.d.ts

@@ -107,7 +107,7 @@ export declare const reLogin: () => void;
  * @param endSuffix
  * @returns
  */
-export declare const rangeToSearch: (values: any, startField: string, endField: string, endSuffix?: string) => any;
+export declare const rangeToSearch: (values: any, startField: string, endField: string, endSuffix?: string, startSuffex?: string) => any;
 /** @name 状态列表 */
 export declare const statusList: {
     value: number;
@@ -174,3 +174,9 @@ export declare const getLoginName: () => string | undefined;
 export declare const getCompanyId: () => string | undefined;
 /** @name 微前端原生路径 */
 export declare const appPath: (path?: string) => any;
+/**
+ * 深度复制对象
+ * @param obj
+ * @returns
+ */
+export declare const deepClone: (obj: any) => any;

package/es/utils/index.js

@@ -260,8 +260,9 @@ export var reLogin = function reLogin() {
 
 export var rangeToSearch = function rangeToSearch(values, startField, endField) {
   var endSuffix = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
+  var startSuffex = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : '';
   var data = {};
-  Array.isArray(values) && values[0] && (data[startField] = values[0]);
+  Array.isArray(values) && values[0] && (data[startField] = values[0] + startSuffex);
   Array.isArray(values) && values[1] && (data[endField] = values[1] + endSuffix);
   return data;
 };
@@ -476,4 +477,30 @@ export var appPath = function appPath() {
   }
 
   return path ? path : './';
+};
+/**
+ * 深度复制对象
+ * @param obj
+ * @returns
+ */
+
+export var deepClone = function deepClone(obj) {
+  var otype = Object.prototype.toString.call(obj);
+  var target = obj;
+
+  if (otype === '[object Array]') {
+    target = [];
+
+    for (var i = 0; i < obj.length; i++) {
+      target.push(deepClone(obj[i]));
+    }
+  } else if (otype === '[object Object]') {
+    target = {};
+
+    for (var key in obj) {
+      target[key] = deepClone(obj[key]);
+    }
+  }
+
+  return target;
 };

package/lib/hooks/useSingle/index.js

@@ -603,7 +603,7 @@ function useSingle(inParam) {
 
             case 19:
               result = _context6.sent;
-              result.data = result.rows;
+              result.data = result.rows || [];
               result.success = true;
               return _context6.abrupt("return", result);
 
@@ -650,7 +650,7 @@ function useSingle(inParam) {
             case 6:
               _context7.prev = 6;
               _context7.next = 9;
-              return (0, _http.httpPost)(url, param);
+              return (0, _http.httpPost)(url, param, true, false);
 
             case 9:
               result = _context7.sent;
@@ -761,7 +761,7 @@ function useSingle(inParam) {
         return onAudit(null);
       },
       disabled: btnDisabled('audit'),
-      icon: /*#__PURE__*/_react.default.createElement(_icons.CheckOutlined, null)
+      icon: /*#__PURE__*/_react.default.createElement(_icons.AuditOutlined, null)
     }, "\u5BA1\u6838") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) && checkRight(128) ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "import",
       onClick: function onClick() {
@@ -781,7 +781,7 @@ function useSingle(inParam) {
       disabled: btnDisabled('export'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.ExportOutlined, null)
     }, "\u5BFC\u51FA") : false].filter(function (o) {
-      return o !== false;
+      return Boolean;
     });
   }, [selectedRows]);
   return {

package/lib/http/index.js

@@ -59,7 +59,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, _data$flag2, _data$flag3, _data, retCode, retMsg, status;
+    var noMsg, _data$flag, _data$flag2, data, _data$flag3, _data$flag4, _data$flag5, _data, retCode, retMsg, status;
 
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
@@ -78,7 +78,13 @@ request.interceptors.response.use( /*#__PURE__*/function () {
 
           case 5:
             data = _context.sent;
-            (0, _utils.showError)(options.url + ((_data$flag = data.flag) === null || _data$flag === void 0 ? void 0 : _data$flag.retMsg));
+
+            if (((_data$flag = data.flag) === null || _data$flag === void 0 ? void 0 : _data$flag.retCode) === 'timeout' || ((_data$flag2 = data.flag) === null || _data$flag2 === void 0 ? void 0 : _data$flag2.retCode) === '4011') {
+              (0, _utils.reLogin)();
+            } else {
+              (0, _utils.showError)(options.url + ((_data$flag3 = data.flag) === null || _data$flag3 === void 0 ? void 0 : _data$flag3.retMsg));
+            }
+
             _context.next = 12;
             break;
 
@@ -102,8 +108,8 @@ request.interceptors.response.use( /*#__PURE__*/function () {
 
           case 17:
             _data = _context.sent;
-            retCode = (_data === null || _data === void 0 ? void 0 : (_data$flag2 = _data.flag) === null || _data$flag2 === void 0 ? void 0 : _data$flag2.retCode) || '0';
-            retMsg = ((_data$flag3 = _data.flag) === null || _data$flag3 === void 0 ? void 0 : _data$flag3.retMsg) || '访问接口出错';
+            retCode = (_data === null || _data === void 0 ? void 0 : (_data$flag4 = _data.flag) === null || _data$flag4 === void 0 ? void 0 : _data$flag4.retCode) || '0';
+            retMsg = ((_data$flag5 = _data.flag) === null || _data$flag5 === void 0 ? void 0 : _data$flag5.retMsg) || '访问接口出错';
             status = ((0, _utils.getUrlQuery)('apiStatus') || '0').split(',');
 
             if (retCode && !status.includes(retCode)) {

package/lib/utils/index.d.ts

@@ -107,7 +107,7 @@ export declare const reLogin: () => void;
  * @param endSuffix
  * @returns
  */
-export declare const rangeToSearch: (values: any, startField: string, endField: string, endSuffix?: string) => any;
+export declare const rangeToSearch: (values: any, startField: string, endField: string, endSuffix?: string, startSuffex?: string) => any;
 /** @name 状态列表 */
 export declare const statusList: {
     value: number;
@@ -174,3 +174,9 @@ export declare const getLoginName: () => string | undefined;
 export declare const getCompanyId: () => string | undefined;
 /** @name 微前端原生路径 */
 export declare const appPath: (path?: string) => any;
+/**
+ * 深度复制对象
+ * @param obj
+ * @returns
+ */
+export declare const deepClone: (obj: any) => any;

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 = void 0;
+exports.getLoginName = exports.getCookie = exports.getCompanyId = exports.getCache = exports.formatMoney = exports.formatDate = exports.deepClone = void 0;
 Object.defineProperty(exports, "getResourceProps", {
   enumerable: true,
   get: function get() {
@@ -361,8 +361,9 @@ exports.reLogin = reLogin;
 
 var rangeToSearch = function rangeToSearch(values, startField, endField) {
   var endSuffix = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
+  var startSuffex = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : '';
   var data = {};
-  Array.isArray(values) && values[0] && (data[startField] = values[0]);
+  Array.isArray(values) && values[0] && (data[startField] = values[0] + startSuffex);
   Array.isArray(values) && values[1] && (data[endField] = values[1] + endSuffix);
   return data;
 };
@@ -605,5 +606,34 @@ var appPath = function appPath() {
 
   return path ? path : './';
 };
+/**
+ * 深度复制对象
+ * @param obj
+ * @returns
+ */
+
+
+exports.appPath = appPath;
+
+var deepClone = function deepClone(obj) {
+  var otype = Object.prototype.toString.call(obj);
+  var target = obj;
+
+  if (otype === '[object Array]') {
+    target = [];
+
+    for (var i = 0; i < obj.length; i++) {
+      target.push(deepClone(obj[i]));
+    }
+  } else if (otype === '[object Object]') {
+    target = {};
+
+    for (var key in obj) {
+      target[key] = deepClone(obj[key]);
+    }
+  }
+
+  return target;
+};
 
-exports.appPath = appPath;
+exports.deepClone = deepClone;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.56",
+  "version": "1.0.59",
   "description": "ls-pro-common",
   "keywords": [
     "antd",  
@@ -28,7 +28,7 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.42",
+    "ls-pro-table": "2.62.44",
     "ls-pro-form": "1.52.29",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",