ls-pro-common 1.0.39 → 1.0.42

package/es/hooks/useDtl/index.js

@@ -613,7 +613,8 @@ function useDtl(dtlParam) {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(params, sort, filter) {
       var _tableRef$current, _tableRef$current$cle;
 
-      var current, pageSize, rest, param, key, result;
+      var current, pageSize, rest, param, key, sortArr, _key, _key2, result;
+
       return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) {
           switch (_context7.prev = _context7.next) {
@@ -645,9 +646,28 @@ function useDtl(dtlParam) {
                 Object.assign(param.where, rest);
               }
 
-              for (key in param.where) {
-                if (param.where[key] === '') {
-                  delete param.where[key];
+              if (filter && Object.keys(filter).length) {
+                for (key in filter) {
+                  if (filter[key] && !param.where[key]) {
+                    param.where[key] = filter[key];
+                  }
+                }
+              } //处理排序
+
+
+              if (sort && Object.keys(sort).length) {
+                sortArr = [];
+
+                for (_key in sort) {
+                  sortArr.push(_key + ' ' + sort[_key] === 'ascend' ? 'asc' : 'desc');
+                }
+
+                param.sort = sortArr.join(',');
+              }
+
+              for (_key2 in param.where) {
+                if (param.where[_key2] === '') {
+                  delete param.where[_key2];
                 }
               }
 
@@ -656,20 +676,20 @@ function useDtl(dtlParam) {
               _context7.t0 = beforeLoad;
 
               if (!_context7.t0) {
-                _context7.next = 17;
+                _context7.next = 19;
                 break;
               }
 
-              _context7.next = 15;
+              _context7.next = 17;
               return beforeLoad(param);
 
-            case 15:
+            case 17:
               _context7.t1 = _context7.sent;
               _context7.t0 = _context7.t1 === false;
 
-            case 17:
+            case 19:
               if (!_context7.t0) {
-                _context7.next = 19;
+                _context7.next = 21;
                 break;
               }
 
@@ -678,17 +698,17 @@ function useDtl(dtlParam) {
                 success: true
               });
 
-            case 19:
-              _context7.next = 21;
+            case 21:
+              _context7.next = 23;
               return dtlService.load(param);
 
-            case 21:
+            case 23:
               result = _context7.sent;
               result.data = result.rows;
               result.success = true;
               return _context7.abrupt("return", result);
 
-            case 25:
+            case 27:
             case "end":
               return _context7.stop();
           }

package/es/hooks/useSingle/index.js

@@ -498,18 +498,20 @@ function useSingle(inParam) {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(params, sort, filter) {
       var _tableRef$current, _tableRef$current$cle;
 
-      var current, pageSize, rest, param, key, result;
+      var current, pageSize, rest, param, key, _key, sortArr, _key2, result;
+
       return _regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) {
           switch (_context6.prev = _context6.next) {
             case 0:
               current = params.current, pageSize = params.pageSize, rest = _objectWithoutProperties(params, _excluded);
-              param = {};
+              param = {}; // 分页
 
               if (current) {
                 param.page = current;
                 param.pageSize = pageSize;
-              }
+              } // 处理查询条件
+
 
               for (key in rest) {
                 if (rest[key] === '') {
@@ -521,25 +523,50 @@ function useSingle(inParam) {
                 param.where = rest;
               }
 
+              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];
+                  }
+                }
+
+                if (!Object.keys(param.where).length) {
+                  delete param.where;
+                }
+              } //处理排序
+
+
+              if (sort && Object.keys(sort).length) {
+                sortArr = [];
+
+                for (_key2 in sort) {
+                  sortArr.push(_key2 + ' ' + (sort[_key2] === 'ascend' ? 'asc' : 'desc'));
+                }
+
+                param.sort = sortArr.join(',');
+              }
+
               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 = 13;
+                _context6.next = 15;
                 break;
               }
 
-              _context6.next = 11;
+              _context6.next = 13;
               return beforeLoad(param);
 
-            case 11:
+            case 13:
               _context6.t1 = _context6.sent;
               _context6.t0 = _context6.t1 === false;
 
-            case 13:
+            case 15:
               if (!_context6.t0) {
-                _context6.next = 15;
+                _context6.next = 17;
                 break;
               }
 
@@ -549,17 +576,17 @@ function useSingle(inParam) {
                 total: 0
               });
 
-            case 15:
-              _context6.next = 17;
+            case 17:
+              _context6.next = 19;
               return service.load(param);
 
-            case 17:
+            case 19:
               result = _context6.sent;
               result.data = result.rows;
               result.success = true;
               return _context6.abrupt("return", result);
 
-            case 21:
+            case 23:
             case "end":
               return _context6.stop();
           }

package/es/http/index.js

@@ -1,15 +1,12 @@
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import "antd/es/modal/style";
-import _Modal from "antd/es/modal";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { extend } from 'umi-request';
-import { getCache, getUrlQuery, setUrlQuery, getResourceProps, showError, toGatewayUrl } from '../utils';
-//默认超时时间为1分钟
+import { getCache, getUrlQuery, setUrlQuery, getResourceProps, showError, toGatewayUrl, reLogin } from '../utils'; //默认超时时间为1分钟
+
 var request = extend({
   timeout: 60000
 });
-var showLogin = false;
 /** 请求拦截器,统一添加token */
 
 request.interceptors.request.use(function (url, options) {
@@ -27,7 +24,7 @@ request.interceptors.request.use(function (url, options) {
 
   var param = {
     resCode: getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId'),
-    t: Date.now()
+    _t1: Date.now()
   };
   return {
     url: setUrlQuery(url, param),
@@ -72,18 +69,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
 
             if (retCode && !status.includes(retCode)) {
               if (retCode === 'timeout' || retCode === '4011') {
-                if (!showLogin) {
-                  showLogin = true;
-
-                  _Modal.warning({
-                    title: '登录状态已过期,请重新登录',
-                    okText: '重新登录',
-                    afterClose: function afterClose() {
-                      location.href = '/login?redirect=' + encodeURI(location.href);
-                      showLogin = false;
-                    }
-                  });
-                }
+                reLogin();
               } else {
                 showError(retMsg);
               }

package/es/utils/index.d.ts

@@ -85,7 +85,7 @@ export declare const setCache: (key: string, data: any, session?: boolean) => vo
  * @param { boolean } session 从 sessionStorage 取数还是从 localStorage 中取数 默认从 localStorage
  * @returns 关键字对应的值
  */
-export declare const getCache: any;
+export declare const getCache: (key: string, session?: boolean) => string | null;
 /** @name 显示错误 */
 export declare const showError: (text: string) => void;
 /** @name 显示警示 */
@@ -94,6 +94,11 @@ export declare const showWarn: (text: string) => void;
 export declare const showSuccess: (text: string) => void;
 /** @name 显示确认 */
 export declare const showConfirm: (text: string, title?: string) => Promise<unknown>;
+/**
+ * token过期重新登录
+ * @returns
+ */
+export declare const reLogin: () => void;
 /**
  * 日期组选择转换
  * @param values 选择的值

package/es/utils/index.js

@@ -229,6 +229,26 @@ export var showConfirm = function showConfirm(text) {
     });
   });
 };
+var timeout = false;
+/**
+ * token过期重新登录
+ * @returns
+ */
+
+export var reLogin = function reLogin() {
+  if (timeout) return;
+  timeout = true;
+
+  _Modal.warning({
+    title: '登录状态已过期,请重新登录',
+    okText: '重新登录',
+    maskClosable: false,
+    afterClose: function afterClose() {
+      timeout = false;
+      location.href = '/login?redirect=' + encodeURI(location.href);
+    }
+  });
+};
 /**
  * 日期组选择转换
  * @param values 选择的值

package/lib/hooks/useDtl/index.js

@@ -634,7 +634,8 @@ function useDtl(dtlParam) {
     var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(params, sort, filter) {
       var _tableRef$current, _tableRef$current$cle;
 
-      var current, pageSize, rest, param, key, result;
+      var current, pageSize, rest, param, key, sortArr, _key, _key2, result;
+
       return _regenerator.default.wrap(function _callee7$(_context7) {
         while (1) {
           switch (_context7.prev = _context7.next) {
@@ -666,9 +667,28 @@ function useDtl(dtlParam) {
                 Object.assign(param.where, rest);
               }
 
-              for (key in param.where) {
-                if (param.where[key] === '') {
-                  delete param.where[key];
+              if (filter && Object.keys(filter).length) {
+                for (key in filter) {
+                  if (filter[key] && !param.where[key]) {
+                    param.where[key] = filter[key];
+                  }
+                }
+              } //处理排序
+
+
+              if (sort && Object.keys(sort).length) {
+                sortArr = [];
+
+                for (_key in sort) {
+                  sortArr.push(_key + ' ' + sort[_key] === 'ascend' ? 'asc' : 'desc');
+                }
+
+                param.sort = sortArr.join(',');
+              }
+
+              for (_key2 in param.where) {
+                if (param.where[_key2] === '') {
+                  delete param.where[_key2];
                 }
               }
 
@@ -677,20 +697,20 @@ function useDtl(dtlParam) {
               _context7.t0 = beforeLoad;
 
               if (!_context7.t0) {
-                _context7.next = 17;
+                _context7.next = 19;
                 break;
               }
 
-              _context7.next = 15;
+              _context7.next = 17;
               return beforeLoad(param);
 
-            case 15:
+            case 17:
               _context7.t1 = _context7.sent;
               _context7.t0 = _context7.t1 === false;
 
-            case 17:
+            case 19:
               if (!_context7.t0) {
-                _context7.next = 19;
+                _context7.next = 21;
                 break;
               }
 
@@ -699,17 +719,17 @@ function useDtl(dtlParam) {
                 success: true
               });
 
-            case 19:
-              _context7.next = 21;
+            case 21:
+              _context7.next = 23;
               return dtlService.load(param);
 
-            case 21:
+            case 23:
               result = _context7.sent;
               result.data = result.rows;
               result.success = true;
               return _context7.abrupt("return", result);
 
-            case 25:
+            case 27:
             case "end":
               return _context7.stop();
           }

package/lib/hooks/useSingle/index.js

@@ -519,18 +519,20 @@ 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, result;
+      var current, pageSize, 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);
-              param = {};
+              param = {}; // 分页
 
               if (current) {
                 param.page = current;
                 param.pageSize = pageSize;
-              }
+              } // 处理查询条件
+
 
               for (key in rest) {
                 if (rest[key] === '') {
@@ -542,25 +544,50 @@ function useSingle(inParam) {
                 param.where = rest;
               }
 
+              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];
+                  }
+                }
+
+                if (!Object.keys(param.where).length) {
+                  delete param.where;
+                }
+              } //处理排序
+
+
+              if (sort && Object.keys(sort).length) {
+                sortArr = [];
+
+                for (_key2 in sort) {
+                  sortArr.push(_key2 + ' ' + (sort[_key2] === 'ascend' ? 'asc' : 'desc'));
+                }
+
+                param.sort = sortArr.join(',');
+              }
+
               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 = 13;
+                _context6.next = 15;
                 break;
               }
 
-              _context6.next = 11;
+              _context6.next = 13;
               return beforeLoad(param);
 
-            case 11:
+            case 13:
               _context6.t1 = _context6.sent;
               _context6.t0 = _context6.t1 === false;
 
-            case 13:
+            case 15:
               if (!_context6.t0) {
-                _context6.next = 15;
+                _context6.next = 17;
                 break;
               }
 
@@ -570,17 +597,17 @@ function useSingle(inParam) {
                 total: 0
               });
 
-            case 15:
-              _context6.next = 17;
+            case 17:
+              _context6.next = 19;
               return service.load(param);
 
-            case 17:
+            case 19:
               result = _context6.sent;
               result.data = result.rows;
               result.success = true;
               return _context6.abrupt("return", result);
 
-            case 21:
+            case 23:
             case "end":
               return _context6.stop();
           }

package/lib/http/index.js

@@ -15,10 +15,6 @@ exports.httpPut = httpPut;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-require("antd/es/modal/style");
-
-var _modal = _interopRequireDefault(require("antd/es/modal"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -31,7 +27,6 @@ var _utils = require("../utils");
 var request = (0, _umiRequest.extend)({
   timeout: 60000
 });
-var showLogin = false;
 /** 请求拦截器,统一添加token */
 
 request.interceptors.request.use(function (url, options) {
@@ -48,7 +43,7 @@ request.interceptors.request.use(function (url, options) {
 
   var param = {
     resCode: (0, _utils.getUrlQuery)('resCode') || (0, _utils.getUrlQuery)('resourceId') || (0, _utils.getResourceProps)('resourceId'),
-    t: Date.now()
+    _t1: Date.now()
   };
   return {
     url: (0, _utils.setUrlQuery)(url, param),
@@ -93,18 +88,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
 
             if (retCode && !status.includes(retCode)) {
               if (retCode === 'timeout' || retCode === '4011') {
-                if (!showLogin) {
-                  showLogin = true;
-
-                  _modal.default.warning({
-                    title: '登录状态已过期,请重新登录',
-                    okText: '重新登录',
-                    afterClose: function afterClose() {
-                      location.href = '/login?redirect=' + encodeURI(location.href);
-                      showLogin = false;
-                    }
-                  });
-                }
+                (0, _utils.reLogin)();
               } else {
                 (0, _utils.showError)(retMsg);
               }

package/lib/utils/index.d.ts

@@ -85,7 +85,7 @@ export declare const setCache: (key: string, data: any, session?: boolean) => vo
  * @param { boolean } session 从 sessionStorage 取数还是从 localStorage 中取数 默认从 localStorage
  * @returns 关键字对应的值
  */
-export declare const getCache: any;
+export declare const getCache: (key: string, session?: boolean) => string | null;
 /** @name 显示错误 */
 export declare const showError: (text: string) => void;
 /** @name 显示警示 */
@@ -94,6 +94,11 @@ export declare const showWarn: (text: string) => void;
 export declare const showSuccess: (text: string) => void;
 /** @name 显示确认 */
 export declare const showConfirm: (text: string, title?: string) => Promise<unknown>;
+/**
+ * token过期重新登录
+ * @returns
+ */
+export declare const reLogin: () => void;
 /**
  * 日期组选择转换
  * @param values 选择的值

package/lib/utils/index.js

@@ -25,7 +25,7 @@ Object.defineProperty(exports, "getUrlQuery", {
     return _utils.getUrlQuery;
   }
 });
-exports.setTitle = exports.setCookie = exports.setCache = exports.rangeToSearch = 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.nowAdd = exports.now = exports.isLogin = exports.isDev = exports.handleSizeCols = exports.getUserName = exports.getUserInfo = void 0;
 Object.defineProperty(exports, "setUrlQuery", {
   enumerable: true,
   get: function get() {
@@ -325,6 +325,28 @@ var showConfirm = function showConfirm(text) {
     });
   });
 };
+
+exports.showConfirm = showConfirm;
+var timeout = false;
+/**
+ * token过期重新登录
+ * @returns
+ */
+
+var reLogin = function reLogin() {
+  if (timeout) return;
+  timeout = true;
+
+  _modal.default.warning({
+    title: '登录状态已过期,请重新登录',
+    okText: '重新登录',
+    maskClosable: false,
+    afterClose: function afterClose() {
+      timeout = false;
+      location.href = '/login?redirect=' + encodeURI(location.href);
+    }
+  });
+};
 /**
  * 日期组选择转换
  * @param values 选择的值
@@ -335,7 +357,7 @@ var showConfirm = function showConfirm(text) {
  */
 
 
-exports.showConfirm = showConfirm;
+exports.reLogin = reLogin;
 
 var rangeToSearch = function rangeToSearch(values, startField, endField) {
   var endSuffix = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.39",
+  "version": "1.0.42",
   "description": "ls-pro-common",
   "keywords": [
     "antd",  
@@ -28,8 +28,8 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.31",
-    "ls-pro-form": "1.52.26",
+    "ls-pro-table": "2.62.34",
+    "ls-pro-form": "1.52.27",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",
     "moment": "^2.27.0",