@tarojs/runtime 3.3.12 → 3.3.13

package/dist/runtime.esm.js

@@ -4212,9 +4212,9 @@ function format(children, document, styleOptions, parent) {
         .map((child) => {
         // 文本节点
         if (child.type === 'text') {
-            const text = document.createTextNode(child.content);
+            let text = document.createTextNode(child.content);
             if (isFunction$1(options.html.transformText)) {
-                return options.html.transformText(text, child);
+                text = options.html.transformText(text, child);
             }
             parent === null || parent === void 0 ? void 0 : parent.appendChild(text);
             return text;
@@ -5178,8 +5178,11 @@ function createPageConfig(component, pageName, data, pageConfig) {
     let pageElement = null;
     let unmounting = false;
     let prepareMountList = [];
+    let loadResolver;
+    let hasLoaded;
     const config = {
         onLoad(options, cb) {
+            hasLoaded = new Promise(resolve => { loadResolver = resolve; });
             perf.start(PAGE_INIT);
             Current.page = this;
             this.config = pageConfig || {};
@@ -5203,6 +5206,7 @@ function createPageConfig(component, pageName, data, pageConfig) {
                     pageElement = document$2.getElementById(this.$taroPath);
                     ensure(pageElement !== null, '没有找到页面实例。');
                     safeExecute(this.$taroPath, 'onLoad', this.$taroParams);
+                    loadResolver();
                     if (!isBrowser) {
                         pageElement.ctx = this;
                         pageElement.performUpdate(true, cb);
@@ -5241,20 +5245,22 @@ function createPageConfig(component, pageName, data, pageConfig) {
             });
         },
         onShow() {
-            Current.page = this;
-            this.config = pageConfig || {};
-            const router = isBrowser ? this.$taroPath : this.route || this.__route__;
-            Current.router = {
-                params: this.$taroParams,
-                path: addLeadingSlash(router),
-                onReady: getOnReadyEventKey(id),
-                onShow: getOnShowEventKey(id),
-                onHide: getOnHideEventKey(id)
-            };
-            raf(() => {
-                eventCenter.trigger(getOnShowEventKey(id));
+            hasLoaded.then(() => {
+                Current.page = this;
+                this.config = pageConfig || {};
+                const router = isBrowser ? this.$taroPath : this.route || this.__route__;
+                Current.router = {
+                    params: this.$taroParams,
+                    path: addLeadingSlash(router),
+                    onReady: getOnReadyEventKey(id),
+                    onShow: getOnShowEventKey(id),
+                    onHide: getOnHideEventKey(id)
+                };
+                raf(() => {
+                    eventCenter.trigger(getOnShowEventKey(id));
+                });
+                safeExecute(this.$taroPath, 'onShow');
             });
-            safeExecute(this.$taroPath, 'onShow');
         },
         onHide() {
             Current.page = null;