ph-utils 0.2.21 → 0.2.22

package/lib/web.d.ts

@@ -3,15 +3,14 @@
  * @param form {object} Form 节点对象
  */
 export declare const formJson: <T>(form: HTMLFormElement) => T;
-interface QueryRes {
-    [index: string]: number | boolean | string | string[];
-}
 /**
  * 获取 url query 参数 (get 请求的参数)
  * @param search 如果是 React 应用就需要传递 useLocation().search
  * @returns
  */
-export declare function query(search?: string): QueryRes;
+export declare function query(search?: string): {
+    [index: string]: string;
+};
 interface RandomOpts {
     /** 生成的随机数是整形还是小数形 */
     isInt?: boolean;

package/lib/web.js

@@ -1,7 +1,7 @@
 /**
  * web(浏览器) 端工具类
  */
-import { isBlank, isBoolean, isNumeric } from './index_m';
+import { isBlank } from './index_m';
 /**
  * 解析 Form 表单中的 input 元素的数据为 JSON 格式，key: input-name；value: input-value
  * @param form {object} Form 节点对象
@@ -38,32 +38,21 @@ export function query(search) {
     if (isBlank(search)) {
         search = location.search;
     }
+    const searchParams = new URLSearchParams(search);
     let query = {};
-    /*
-      使用正则表达式解析，主要利用 反向字符集
-    */
-    if (search != null) {
-        search.replace(/([^?&=]+)=([^&]+)/g, (_, k, v) => {
-            let oldValue = query[k];
-            let value = decodeURIComponent(v);
-            if (isBoolean(value)) {
-                value = Boolean(value);
-            }
-            else if (isNumeric(value)) {
-                value = Number(value);
+    for (const [key, value] of searchParams) {
+        let oldValue = query[key];
+        let newValue = value;
+        if (oldValue != null) {
+            if (oldValue instanceof Array) {
+                oldValue.push(value);
+                newValue = oldValue;
             }
-            if (oldValue != null) {
-                if (oldValue instanceof Array) {
-                    oldValue.push(value);
-                    value = oldValue;
-                }
-                else {
-                    value = [value, oldValue];
-                }
+            else {
+                newValue = [value, oldValue];
             }
-            query[k] = value;
-            return v;
-        });
+        }
+        query[key] = newValue;
     }
     return query;
 }

package/package.json

@@ -5,7 +5,7 @@
   "module": "lib/index_m.js",
   "types": "lib/index.d.ts",
   "browser": "lib/index_m.js",
-  "version": "0.2.21",
+  "version": "0.2.22",
   "repository": {
     "type": "git",
     "url": "git+https//gitee.com/towardly/ph.git",