ls-pro-common 1.0.10 → 1.0.11

package/es/http/index.js

@@ -2,7 +2,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { extend } from 'umi-request';
-import { getCache, getUrlQuery, showError, toGatewayUrl } from '../utils'; //默认超时时间为1分钟
+import { getCache, getUrlQuery, showError } from '../utils'; //默认超时时间为1分钟
 
 var request = extend({
   timeout: 60000
@@ -23,7 +23,7 @@ request.interceptors.request.use(function (url, options) {
   }
 
   return {
-    url: toGatewayUrl(url),
+    url: url,
     options: opts
   };
 });

package/es/utils/index.d.ts

@@ -1,18 +1,4 @@
-export declare const getUrlQuery: (name: string, url?: string) => string;
-/**
- * 设置url传参
- * @param {*} url
- * @param {*} keyvals
- * @returns
- */
-export declare const setUrlQuery: (url: string, keyvals?: Record<string, any>) => string;
-/**
- * 给 url 添加网关
- * @param url 原url，以 / 打头
- * @param defGateway 默认网关 /petrel
- * @returns
- */
-export declare const toGatewayUrl: (url: string, defGateway?: string) => string;
+export { getUrlQuery, setUrlQuery, dateFormat, toGatewayUrl } from 'ls-pro-table/lib/utils';
 /**
  * 设置文档title
  * @param {*} title
@@ -49,13 +35,6 @@ export declare const setCache: (key: string, data: any) => void;
  * @returns 关键字对应的值
  */
 export declare const getCache: any;
-/**
- * 简单日期格式化
- * @param {*} dt 传入时间参数，若不传取当前时间
- * @param {*} showTime 是否返回当前时间,默认返回时间
- * @returns xxxx年-xx月-xx日 [xx时:xx分:xx秒]
- */
-export declare const dateFormat: (dt: Date | undefined | null, showTime?: boolean) => string;
 /** @name 显示错误 */
 export declare const showError: (text: string) => void;
 /** @name 显示警示 */

package/es/utils/index.js

@@ -6,51 +6,7 @@ import _message from "antd/es/message";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import React from "react";
 import { QuestionCircleOutlined } from '@ant-design/icons';
-export var getUrlQuery = function getUrlQuery(name) {
-  var url = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : location.search.substr(1) || '';
-  var reg = new RegExp('(^|[&|?])' + name + '=([^&]*)(&|$)'),
-      r = url.match(reg);
-  if (r != null) return unescape(decodeURI(r[2]));
-  return '';
-};
-/**
- * 设置url传参
- * @param {*} url
- * @param {*} keyvals
- * @returns
- */
-
-export var setUrlQuery = function setUrlQuery(url) {
-  var keyvals = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var newUrl = url;
-
-  for (var name in keyvals) {
-    var reg = new RegExp('(^|)' + name + '=([^&]*)(|$)');
-    var tmp = name + '=' + keyvals[name];
-
-    if (newUrl.match(reg) != null) {
-      // @ts-ignore
-      newUrl = newUrl.replace(eval(reg), tmp);
-    } else {
-      newUrl = newUrl + (newUrl.match('[\?]') ? '&' : '?') + tmp;
-    }
-  }
-
-  return newUrl;
-};
-/**
- * 给 url 添加网关
- * @param url 原url，以 / 打头
- * @param defGateway 默认网关 /petrel
- * @returns
- */
-
-export var toGatewayUrl = function toGatewayUrl(url) {
-  var defGateway = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '/petrel';
-  if (url.startsWith('http://') || url.startsWith('https://') || url.startsWith('//')) return url;
-  var gateway = getUrlQuery('gateway') || location.origin + defGateway;
-  return gateway + url;
-};
+export { getUrlQuery, setUrlQuery, dateFormat, toGatewayUrl } from "ls-pro-table/es/utils";
 /**
  * 设置文档title
  * @param {*} title
@@ -126,24 +82,6 @@ export var getCache = function getCache(key) {
 
   return data;
 };
-/**
- * 简单日期格式化
- * @param {*} dt 传入时间参数，若不传取当前时间
- * @param {*} showTime 是否返回当前时间,默认返回时间
- * @returns xxxx年-xx月-xx日 [xx时:xx分:xx秒]
- */
-
-export var dateFormat = function dateFormat(dt) {
-  var showTime = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-  var ct = dt ? dt : new Date(Date.now());
-  var str = ct.getFullYear() + '-' + ('' + (ct.getMonth() + 1)).padStart(2, '0') + '-' + ('' + ct.getDate()).padStart(2, '0');
-
-  if (showTime) {
-    str += ' ' + (ct.getHours() + '').padStart(2, '0') + ':' + (ct.getMinutes() + '').padStart(2, '0') + ":" + (ct.getSeconds() + '').padStart(2, '0');
-  }
-
-  return str;
-};
 /** @name 显示错误 */
 
 export var showError = function showError(text) {

package/lib/http/index.js

@@ -42,7 +42,7 @@ request.interceptors.request.use(function (url, options) {
   }
 
   return {
-    url: (0, _utils.toGatewayUrl)(url),
+    url: url,
     options: opts
   };
 });

package/lib/utils/index.d.ts

@@ -1,18 +1,4 @@
-export declare const getUrlQuery: (name: string, url?: string) => string;
-/**
- * 设置url传参
- * @param {*} url
- * @param {*} keyvals
- * @returns
- */
-export declare const setUrlQuery: (url: string, keyvals?: Record<string, any>) => string;
-/**
- * 给 url 添加网关
- * @param url 原url，以 / 打头
- * @param defGateway 默认网关 /petrel
- * @returns
- */
-export declare const toGatewayUrl: (url: string, defGateway?: string) => string;
+export { getUrlQuery, setUrlQuery, dateFormat, toGatewayUrl } from 'ls-pro-table/lib/utils';
 /**
  * 设置文档title
  * @param {*} title
@@ -49,13 +35,6 @@ export declare const setCache: (key: string, data: any) => void;
  * @returns 关键字对应的值
  */
 export declare const getCache: any;
-/**
- * 简单日期格式化
- * @param {*} dt 传入时间参数，若不传取当前时间
- * @param {*} showTime 是否返回当前时间,默认返回时间
- * @returns xxxx年-xx月-xx日 [xx时:xx分:xx秒]
- */
-export declare const dateFormat: (dt: Date | undefined | null, showTime?: boolean) => string;
 /** @name 显示错误 */
 export declare const showError: (text: string) => void;
 /** @name 显示警示 */

package/lib/utils/index.js

@@ -5,7 +5,34 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.yesnoList = exports.treeFind = exports.treeEach = exports.toGatewayUrl = exports.statusList = exports.showWarn = exports.showSuccess = exports.showError = exports.showConfirm = exports.setUrlQuery = exports.setTitle = exports.setCookie = exports.setCache = exports.rangeToSearch = exports.isLogin = exports.getUserName = exports.getUserInfo = exports.getUrlQuery = exports.getLoginName = exports.getCookie = exports.getCompanyId = exports.getCache = exports.dateFormat = void 0;
+Object.defineProperty(exports, "dateFormat", {
+  enumerable: true,
+  get: function get() {
+    return _utils.dateFormat;
+  }
+});
+exports.getLoginName = exports.getCookie = exports.getCompanyId = exports.getCache = void 0;
+Object.defineProperty(exports, "getUrlQuery", {
+  enumerable: true,
+  get: function get() {
+    return _utils.getUrlQuery;
+  }
+});
+exports.setTitle = exports.setCookie = exports.setCache = exports.rangeToSearch = exports.isLogin = exports.getUserName = exports.getUserInfo = void 0;
+Object.defineProperty(exports, "setUrlQuery", {
+  enumerable: true,
+  get: function get() {
+    return _utils.setUrlQuery;
+  }
+});
+exports.statusList = exports.showWarn = exports.showSuccess = exports.showError = exports.showConfirm = void 0;
+Object.defineProperty(exports, "toGatewayUrl", {
+  enumerable: true,
+  get: function get() {
+    return _utils.toGatewayUrl;
+  }
+});
+exports.yesnoList = exports.treeFind = exports.treeEach = void 0;
 
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 
@@ -23,66 +50,13 @@ var _react = _interopRequireDefault(require("react"));
 
 var _icons = require("@ant-design/icons");
 
-var getUrlQuery = function getUrlQuery(name) {
-  var url = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : location.search.substr(1) || '';
-  var reg = new RegExp('(^|[&|?])' + name + '=([^&]*)(&|$)'),
-      r = url.match(reg);
-  if (r != null) return unescape(decodeURI(r[2]));
-  return '';
-};
-/**
- * 设置url传参
- * @param {*} url
- * @param {*} keyvals
- * @returns
- */
-
-
-exports.getUrlQuery = getUrlQuery;
-
-var setUrlQuery = function setUrlQuery(url) {
-  var keyvals = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var newUrl = url;
-
-  for (var name in keyvals) {
-    var reg = new RegExp('(^|)' + name + '=([^&]*)(|$)');
-    var tmp = name + '=' + keyvals[name];
-
-    if (newUrl.match(reg) != null) {
-      // @ts-ignore
-      newUrl = newUrl.replace(eval(reg), tmp);
-    } else {
-      newUrl = newUrl + (newUrl.match('[\?]') ? '&' : '?') + tmp;
-    }
-  }
-
-  return newUrl;
-};
-/**
- * 给 url 添加网关
- * @param url 原url，以 / 打头
- * @param defGateway 默认网关 /petrel
- * @returns
- */
-
-
-exports.setUrlQuery = setUrlQuery;
+var _utils = require("ls-pro-table/lib/utils");
 
-var toGatewayUrl = function toGatewayUrl(url) {
-  var defGateway = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '/petrel';
-  if (url.startsWith('http://') || url.startsWith('https://') || url.startsWith('//')) return url;
-  var gateway = getUrlQuery('gateway') || location.origin + defGateway;
-  return gateway + url;
-};
 /**
  * 设置文档title
  * @param {*} title
  * @returns
  */
-
-
-exports.toGatewayUrl = toGatewayUrl;
-
 var setTitle = function setTitle(title) {
   if (!title) return;
   title = title.length > 10 ? title.substring(0, 10) + '...' : title;
@@ -167,31 +141,10 @@ var getCache = function getCache(key) {
 
   return data;
 };
-/**
- * 简单日期格式化
- * @param {*} dt 传入时间参数，若不传取当前时间
- * @param {*} showTime 是否返回当前时间,默认返回时间
- * @returns xxxx年-xx月-xx日 [xx时:xx分:xx秒]
- */
-
-
-exports.getCache = getCache;
-
-var dateFormat = function dateFormat(dt) {
-  var showTime = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-  var ct = dt ? dt : new Date(Date.now());
-  var str = ct.getFullYear() + '-' + ('' + (ct.getMonth() + 1)).padStart(2, '0') + '-' + ('' + ct.getDate()).padStart(2, '0');
-
-  if (showTime) {
-    str += ' ' + (ct.getHours() + '').padStart(2, '0') + ':' + (ct.getMinutes() + '').padStart(2, '0') + ":" + (ct.getSeconds() + '').padStart(2, '0');
-  }
-
-  return str;
-};
 /** @name 显示错误 */
 
 
-exports.dateFormat = dateFormat;
+exports.getCache = getCache;
 
 var showError = function showError(text) {
   _message2.default.error(text);

package/package.json

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