ls-pro-common 1.0.13 → 1.0.16

package/es/components/404.d.ts

@@ -0,0 +1,3 @@
+import './common.less';
+declare const _default: () => JSX.Element;
+export default _default;

package/es/components/404.js

@@ -0,0 +1,9 @@
+import React from "react";
+import './common.less';
+export default (function () {
+  return /*#__PURE__*/React.createElement("div", {
+    className: "page404"
+  }, /*#__PURE__*/React.createElement("img", {
+    src: "./404.jpg"
+  }), " \u60A8\u8BBF\u95EE\u7684\u8D44\u6E90\u4E0D\u5B58\u5728~~");
+});

package/es/components/Loading.d.ts

@@ -0,0 +1,3 @@
+import './common.less';
+declare const _default: () => JSX.Element;
+export default _default;

package/es/components/Loading.js

@@ -0,0 +1,9 @@
+import "antd/es/spin/style";
+import _Spin from "antd/es/spin";
+import React from 'react';
+import './common.less';
+export default (function () {
+  return /*#__PURE__*/React.createElement("div", {
+    className: "loading"
+  }, /*#__PURE__*/React.createElement(_Spin, null), "\u52A0\u8F7D\u4E2D... ");
+});

package/es/components/common.less

@@ -61,4 +61,25 @@
     .flex {
         width: 0;
     }
+}
+
+.page404 {
+    width         : 100%;
+    height        : 100%;
+    text-align    : center;
+    padding-top   : 20%;
+    vertical-align: middle;
+
+    img {
+        vertical-align: middle;
+        padding-right : 20px;
+    }
+}
+
+.loading {
+    height     : 100%;
+    width      : 100%;
+    text-align : center;
+    padding-top: 20%;
+    background : #fff;
 }

package/es/http/index.d.ts

@@ -20,10 +20,10 @@ export declare function httpPost(url: string, data?: Record<string, any>, isJson
  * put 请求
  * @param url 接口
  * @param data 参数{key:value}
-  * @param needGateWay 是否需要网关 默认为true
+ * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-export declare function httpPut(url: string, data?: Record<string, any>): Promise<any>;
+export declare function httpPut(url: string, data?: Record<string, any>, needGateWay?: boolean): Promise<any>;
 /**
  * delete 请求
  * @param url 接口
@@ -31,7 +31,7 @@ export declare function httpPut(url: string, data?: Record<string, any>): Promis
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-export declare function httpDelete(url: string, data: any): Promise<any>;
+export declare function httpDelete(url: string, data: any, needGateWay?: boolean): Promise<any>;
 /**
  * 读取数据字典
  * @param dictCode 字典编码

package/es/http/index.js

@@ -137,7 +137,7 @@ export function httpPost(_x4) {
  * put 请求
  * @param url 接口
  * @param data 参数{key:value}
-  * @param needGateWay 是否需要网关 默认为true
+ * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
 
@@ -188,17 +188,24 @@ export function httpPut(_x5) {
 function _httpPut() {
   _httpPut = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(url) {
     var data,
+        needGateWay,
         _args4 = arguments;
     return _regeneratorRuntime.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 = toGatewayUrl(url);
+            }
+
             return _context4.abrupt("return", request.put(url, {
               data: data
             }));
 
-          case 2:
+          case 4:
           case "end":
             return _context4.stop();
         }
@@ -220,15 +227,23 @@ export function httpDelete(_x6, _x7) {
 
 function _httpDelete() {
   _httpDelete = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(url, data) {
+    var needGateWay,
+        _args5 = arguments;
     return _regeneratorRuntime.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 = toGatewayUrl(url);
+            }
+
             return _context5.abrupt("return", request.delete(url, {
               data: data
             }));
 
-          case 1:
+          case 3:
           case "end":
             return _context5.stop();
         }

package/es/utils/index.d.ts

@@ -27,11 +27,13 @@ export declare const isLogin: () => boolean;
  * 设置本地缓存
  * @param { String } key 关键字
  * @param { Object } data 值
+ * @param { Boolean } session 保存到 sessionStorage 还是 localStorage,默认 localStorage
  */
-export declare const setCache: (key: string, data: any) => void;
+export declare const setCache: (key: string, data: any, session?: boolean) => void;
 /**
  * 读取本地缓存
  * @param { String } key 关键字
+ * @param { boolean } session 从 sessionStorage 取数还是从 localStorage 中取数 默认从 localStorage
  * @returns 关键字对应的值
  */
 export declare const getCache: any;

package/es/utils/index.js

@@ -58,23 +58,28 @@ export var isLogin = function isLogin() {
  * 设置本地缓存
  * @param { String } key 关键字
  * @param { Object } data 值
+ * @param { Boolean } session 保存到 sessionStorage 还是 localStorage,默认 localStorage
  */
 
 export var setCache = function setCache(key, data) {
+  var session = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+
   if (_typeof(data) === 'object') {
     data = JSON.stringify(data);
   }
 
-  localStorage.setItem(key, data);
+  session ? sessionStorage.setItem(key, data) : localStorage.setItem(key, data);
 };
 /**
  * 读取本地缓存
  * @param { String } key 关键字
+ * @param { boolean } session 从 sessionStorage 取数还是从 localStorage 中取数 默认从 localStorage
  * @returns 关键字对应的值
  */
 
 export var getCache = function getCache(key) {
-  var data = localStorage.getItem(key);
+  var session = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var data = session ? sessionStorage.getItem(key) : localStorage.getItem(key);
 
   if (data && (data.startsWith('{') || data.startsWith('['))) {
     data = JSON.parse(data);

package/lib/components/404.d.ts

@@ -0,0 +1,3 @@
+import './common.less';
+declare const _default: () => JSX.Element;
+export default _default;

package/lib/components/404.js

@@ -0,0 +1,22 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+require("./common.less");
+
+var _default = function _default() {
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: "page404"
+  }, /*#__PURE__*/_react.default.createElement("img", {
+    src: "./404.jpg"
+  }), " \u60A8\u8BBF\u95EE\u7684\u8D44\u6E90\u4E0D\u5B58\u5728~~");
+};
+
+exports.default = _default;

package/lib/components/Loading.d.ts

@@ -0,0 +1,3 @@
+import './common.less';
+declare const _default: () => JSX.Element;
+export default _default;

package/lib/components/Loading.js

@@ -0,0 +1,24 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+require("antd/es/spin/style");
+
+var _spin = _interopRequireDefault(require("antd/es/spin"));
+
+var _react = _interopRequireDefault(require("react"));
+
+require("./common.less");
+
+var _default = function _default() {
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: "loading"
+  }, /*#__PURE__*/_react.default.createElement(_spin.default, null), "\u52A0\u8F7D\u4E2D... ");
+};
+
+exports.default = _default;

package/lib/components/common.less

@@ -61,4 +61,25 @@
     .flex {
         width: 0;
     }
+}
+
+.page404 {
+    width         : 100%;
+    height        : 100%;
+    text-align    : center;
+    padding-top   : 20%;
+    vertical-align: middle;
+
+    img {
+        vertical-align: middle;
+        padding-right : 20px;
+    }
+}
+
+.loading {
+    height     : 100%;
+    width      : 100%;
+    text-align : center;
+    padding-top: 20%;
+    background : #fff;
 }

package/lib/http/index.d.ts

@@ -20,10 +20,10 @@ export declare function httpPost(url: string, data?: Record<string, any>, isJson
  * put 请求
  * @param url 接口
  * @param data 参数{key:value}
-  * @param needGateWay 是否需要网关 默认为true
+ * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-export declare function httpPut(url: string, data?: Record<string, any>): Promise<any>;
+export declare function httpPut(url: string, data?: Record<string, any>, needGateWay?: boolean): Promise<any>;
 /**
  * delete 请求
  * @param url 接口
@@ -31,7 +31,7 @@ export declare function httpPut(url: string, data?: Record<string, any>): Promis
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-export declare function httpDelete(url: string, data: any): Promise<any>;
+export declare function httpDelete(url: string, data: any, needGateWay?: boolean): Promise<any>;
 /**
  * 读取数据字典
  * @param dictCode 字典编码

package/lib/http/index.js

@@ -157,7 +157,7 @@ function httpPost(_x4) {
  * put 请求
  * @param url 接口
  * @param data 参数{key:value}
-  * @param needGateWay 是否需要网关 默认为true
+ * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
 
@@ -210,17 +210,24 @@ 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 2:
+          case 4:
           case "end":
             return _context4.stop();
         }
@@ -243,15 +250,23 @@ 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 1:
+          case 3:
           case "end":
             return _context5.stop();
         }

package/lib/utils/index.d.ts

@@ -27,11 +27,13 @@ export declare const isLogin: () => boolean;
  * 设置本地缓存
  * @param { String } key 关键字
  * @param { Object } data 值
+ * @param { Boolean } session 保存到 sessionStorage 还是 localStorage,默认 localStorage
  */
-export declare const setCache: (key: string, data: any) => void;
+export declare const setCache: (key: string, data: any, session?: boolean) => void;
 /**
  * 读取本地缓存
  * @param { String } key 关键字
+ * @param { boolean } session 从 sessionStorage 取数还是从 localStorage 中取数 默认从 localStorage
  * @returns 关键字对应的值
  */
 export declare const getCache: any;

package/lib/utils/index.js

@@ -117,21 +117,25 @@ var isLogin = function isLogin() {
  * 设置本地缓存
  * @param { String } key 关键字
  * @param { Object } data 值
+ * @param { Boolean } session 保存到 sessionStorage 还是 localStorage,默认 localStorage
  */
 
 
 exports.isLogin = isLogin;
 
 var setCache = function setCache(key, data) {
+  var session = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+
   if ((0, _typeof2.default)(data) === 'object') {
     data = JSON.stringify(data);
   }
 
-  localStorage.setItem(key, data);
+  session ? sessionStorage.setItem(key, data) : localStorage.setItem(key, data);
 };
 /**
  * 读取本地缓存
  * @param { String } key 关键字
+ * @param { boolean } session 从 sessionStorage 取数还是从 localStorage 中取数 默认从 localStorage
  * @returns 关键字对应的值
  */
 
@@ -139,7 +143,8 @@ var setCache = function setCache(key, data) {
 exports.setCache = setCache;
 
 var getCache = function getCache(key) {
-  var data = localStorage.getItem(key);
+  var session = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var data = session ? sessionStorage.getItem(key) : localStorage.getItem(key);
 
   if (data && (data.startsWith('{') || data.startsWith('['))) {
     data = JSON.parse(data);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "description": "ls-pro-common",
   "keywords": [
     "antd",
@@ -28,7 +28,7 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.19",
+    "ls-pro-table": "2.62.20",
     "ls-pro-form": "1.52.20",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",