@fle-ui/plus-choose-site-goods 1.0.2 → 1.0.3

package/es/index.d.ts

@@ -1,8 +1,9 @@
 import { FC } from 'react';
+import { EnvType } from './utils/serviceEnv';
 import type { ModalProps } from 'antd';
 import './index.less';
 export interface ChooseSiteGoodsProps extends ModalProps {
-    env?: string;
+    env?: EnvType;
     token?: string;
     loginErrFn?: any;
     onClose?: any;

package/es/utils/common.d.ts

@@ -20,5 +20,7 @@ export declare const showTime: ShowTimeType;
 /**
  * 格式化url参数
  */
-export declare const parseQueryString: () => {};
+export declare const parseQueryString: () => {
+    [key: string]: string;
+};
 export {};

package/es/utils/common.js

@@ -1,3 +1,6 @@
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import moment from 'moment';
 export var showMoney = function showMoney(data) {
   return (+data / 100).toFixed(2);
@@ -10,17 +13,19 @@ export var showTime = function showTime(data) {
  * 格式化url参数
  */
 export var parseQueryString = function parseQueryString() {
-  var url = window.location.href;
-  var regUrl = /^[^\?]+\?([\w\W]+)$/; //eslint-disable-line
-  var regPara = /([^&=]+)=([\w\W]*?)(&|$|#)/g;
-  var arrUrl = regUrl.exec(url);
-  var ret = {};
-  if (arrUrl && arrUrl[1]) {
-    var strPara = arrUrl[1];
-    var result;
-    while ((result = regPara.exec(strPara)) != null) {
-      ret[result[1]] = result[2];
+  var urlParams = new URLSearchParams(window.location.search);
+  var params = {};
+  var _iterator = _createForOfIteratorHelper(urlParams),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var param = _step.value;
+      params[param[0]] = param[1];
     }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
   }
-  return ret;
+  return params;
 };

package/es/utils/serviceEnv.d.ts

@@ -1,8 +1,6 @@
+export type EnvType = 'dev' | 'test' | 'qa' | 'prod';
 export declare const baseURLMap: {
-    dev: string;
-    test: string;
-    qa: string;
-    prod: string;
+    [key in EnvType]: string;
 };
-export declare const getApiHost: (env: string) => any;
-export declare const getApiUrl: (env: string, url: string) => string;
+export declare const getApiHost: (env: EnvType) => string;
+export declare const getApiUrl: (env: EnvType, url: string) => string;

package/lib/index.d.ts

@@ -1,8 +1,9 @@
 import { FC } from 'react';
+import { EnvType } from './utils/serviceEnv';
 import type { ModalProps } from 'antd';
 import './index.less';
 export interface ChooseSiteGoodsProps extends ModalProps {
-    env?: string;
+    env?: EnvType;
     token?: string;
     loginErrFn?: any;
     onClose?: any;

package/lib/utils/common.d.ts

@@ -20,5 +20,7 @@ export declare const showTime: ShowTimeType;
 /**
  * 格式化url参数
  */
-export declare const parseQueryString: () => {};
+export declare const parseQueryString: () => {
+    [key: string]: string;
+};
 export {};

package/lib/utils/common.js

@@ -6,6 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.showTime = exports.showMoney = exports.parseQueryString = void 0;
 var _moment = _interopRequireDefault(require("moment"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 var showMoney = function showMoney(data) {
   return (+data / 100).toFixed(2);
 };
@@ -19,18 +22,20 @@ var showTime = function showTime(data) {
  */
 exports.showTime = showTime;
 var parseQueryString = function parseQueryString() {
-  var url = window.location.href;
-  var regUrl = /^[^\?]+\?([\w\W]+)$/; //eslint-disable-line
-  var regPara = /([^&=]+)=([\w\W]*?)(&|$|#)/g;
-  var arrUrl = regUrl.exec(url);
-  var ret = {};
-  if (arrUrl && arrUrl[1]) {
-    var strPara = arrUrl[1];
-    var result;
-    while ((result = regPara.exec(strPara)) != null) {
-      ret[result[1]] = result[2];
+  var urlParams = new URLSearchParams(window.location.search);
+  var params = {};
+  var _iterator = _createForOfIteratorHelper(urlParams),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var param = _step.value;
+      params[param[0]] = param[1];
     }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
   }
-  return ret;
+  return params;
 };
 exports.parseQueryString = parseQueryString;

package/lib/utils/serviceEnv.d.ts

@@ -1,8 +1,6 @@
+export type EnvType = 'dev' | 'test' | 'qa' | 'prod';
 export declare const baseURLMap: {
-    dev: string;
-    test: string;
-    qa: string;
-    prod: string;
+    [key in EnvType]: string;
 };
-export declare const getApiHost: (env: string) => any;
-export declare const getApiUrl: (env: string, url: string) => string;
+export declare const getApiHost: (env: EnvType) => string;
+export declare const getApiUrl: (env: EnvType, url: string) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fle-ui/plus-choose-site-goods",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "@fle-ui/plus-choose-site-goods",
   "keywords": [
     "fle-ui",
@@ -30,7 +30,8 @@
     "@fle-ui/plus-choose-mall-goods": "^2.0.3"
   },
   "peerDependencies": {
-    "react": ">=16.9.0"
+    "antd": ">=4.23.0 || >=5.0.0",
+    "react": ">=17.0.0"
   },
   "browserslist": [
     "last 2 versions",
@@ -43,5 +44,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bae75c1f1724bd05268a3fa9f6c739b60c567cde"
+  "gitHead": "9fa663205bda0aac89fe4f173a006b011aea1968"
 }