@hzab/utils 1.1.4 → 1.1.5

package/changelog.md

@@ -1,3 +1,7 @@
+# @hzab/utils@1.1.5
+
+fix: objToSearch encode; searchToObj decode
+
 # @hzab/utils@1.1.4
 
 fix: url replace hash 重复拼接问题

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/utils",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "utils",
   "main": "src",
   "scripts": {

package/src/url.ts

@@ -36,19 +36,27 @@ export function replaceSearch(url: string, search: string) {
  * 把对象转为 query 参数
  * @param query
  */
-export function objToSearch(query, hasQuery) {
+export function objToSearch(query, opt) {
   if (!query || typeof query !== "object") {
     console.warn("Warn objToSearch: 请传入正确的对象");
     return;
   }
+  // @deprecated 兼容老的入参写法
+  let hasQuery = opt?.hasQuery;
+  if (typeof opt === "boolean") {
+    hasQuery = opt;
+  }
+  const { isEncode } = opt || {};
   let search = hasQuery ? "?" : "";
   Object.keys(query).forEach((key) => {
     if (search && search != "?") {
       search += "&";
     }
-    search += key;
+    const _key = isEncode ? encodeURIComponent(key) : key;
+    search += _key;
     search += "=";
-    search += query[key];
+    const val = isEncode ? encodeURIComponent(query[key]) : query[key];
+    search += val;
   });
   return search;
 }
@@ -117,7 +125,9 @@ export function searchToObj(url) {
   const res = {};
   _url.split("&")?.forEach((it) => {
     const arr = it.split("=");
-    res[arr[0]] = arr[1];
+    const key = decodeURIComponent(arr[0]);
+    const val = decodeURIComponent(arr[1] ?? "");
+    res[key] = val;
   });
   return res;
 }