fix(h5): 让 h5 支持 dataset，fix #9798

NervJS · Jul 16, 2021 · 485efc3 · 485efc3
1 parent 8e93e44
commit 485efc3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/taro-components/h5/react/utils/reactify-wc.js b/packages/taro-components/h5/react/utils/reactify-wc.js
@@ -78,6 +78,9 @@ function updateProp (ctx, comp, propKey, prevProps, props) {
     }
     return
   }
+  if (/^data-.+/.test(propKey)) {
+    dom.setAttribute(propKey, val)
+  }
   if (comp === SCROLL_VIEW) {
     if (propKey === 'scrollTop') {
       dom.mpScrollTop = val

diff --git a/packages/taro-router/src/router.ts b/packages/taro-router/src/router.ts
@@ -42,11 +42,12 @@ function hidePage (page: PageInstance | null) {
 function showPage (page: PageInstance | null, pageConfig: Route | undefined) {
   if (page != null) {
     page.onShow!()
-    const pageEl = document.getElementById(page.path!)
+    let pageEl = document.getElementById(page.path!)
     if (pageEl) {
       pageEl.style.display = 'block'
     } else {
       page.onLoad(qs())
+      pageEl = document.getElementById(page.path!)
       pageOnReady(pageEl, page, false)
     }
     bindPageScroll(page, pageConfig || {})
@@ -81,9 +82,6 @@ function loadPage (page: PageInstance | null, pageConfig: Route | undefined) {
       pageEl.style.display = 'block'
     } else {
       page.onLoad(qs())
-      requestAnimationFrame(() => {
-        page.onReady!()
-      })
       pageEl = document.getElementById(page.path!)
       pageOnReady(pageEl, page)
     }