fix(getCurrentPageQuery): 对值执行 decodeURIComponent

fjc0k · Aug 28, 2020 · c46cacd · c46cacd
1 parent 69fcf00
commit c46cacd
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/mp/getCurrentPageQuery.ts b/src/mp/getCurrentPageQuery.ts
@@ -1,15 +1,21 @@
 import { ensureInMiniProgram } from './ensureInMiniProgram'
+import { mapValues } from '../utils'
 
 /**
- * 获取当前页面的查询参数。
+ * 获取当前页面的查询参数，已经对每个值执行了 decodeURIComponent。
  *
  * @returns 返回当前页面的查询参数
  */
-export function getCurrentPageQuery<T extends Record<string, string>>(): T {
+export function getCurrentPageQuery<
+  T extends Record<string, string | undefined>
+>(): T {
   return ensureInMiniProgram(() => {
     const pages = getCurrentPages()
     const currentPage = pages[pages.length - 1]
-    const query = currentPage.options || {}
+    const query = mapValues(
+      currentPage.options || {},
+      value => value && decodeURIComponent(value),
+    )
     return (query as any) as T
   })
 }