|
1 | 1 | import { normalizeStyles as normalizeStyles$1, addLeadingSlash, invokeArrayFns, ON_HIDE, ON_SHOW, parseQuery, EventChannel, once, parseUrl, Emitter, ON_UNHANDLE_REJECTION, ON_PAGE_NOT_FOUND, ON_ERROR, removeLeadingSlash, getLen, ON_UNLOAD, ON_READY, ON_PAGE_SCROLL, ON_PULL_DOWN_REFRESH, ON_REACH_BOTTOM, ON_RESIZE, ON_BACK_PRESS, ON_LAUNCH } from "@dcloudio/uni-shared";
|
2 | 2 | import { extend, isString, isPlainObject, isFunction as isFunction$1, isArray, isPromise, hasOwn, remove, invokeArrayFns as invokeArrayFns$1, capitalize, toTypeString, toRawType, parseStringStyle } from "@vue/shared";
|
3 |
| -import { createVNode, render, ref, onMounted, onBeforeUnmount, getCurrentInstance, injectHook, defineComponent, warn, isInSSRComponentSetup, watchEffect, watch, computed, camelize, onUnmounted, reactive, provide, inject, nextTick, openBlock, createElementBlock, createElementVNode, normalizeClass, normalizeStyle, Fragment, toDisplayString, createCommentVNode, renderList, resolveComponent, withDirectives, vModelText, vShow } from "vue"; |
| 3 | +import { ref, onMounted, onBeforeUnmount, getCurrentInstance, injectHook, createVNode, render, defineComponent, warn, isInSSRComponentSetup, watchEffect, watch, computed, camelize, onUnmounted, reactive, provide, inject, nextTick, openBlock, createElementBlock, createElementVNode, normalizeClass, normalizeStyle, Fragment, toDisplayString, createCommentVNode, renderList, resolveComponent, withDirectives, vModelText, vShow } from "vue"; |
4 | 4 | function get$pageByPage(page) {
|
5 | 5 | return page.vm.$basePage;
|
6 | 6 | }
|
@@ -615,34 +615,8 @@ var vueApp;
|
615 | 615 | function getVueApp() {
|
616 | 616 | return vueApp;
|
617 | 617 | }
|
618 |
| -function initVueApp(appVm) { |
619 |
| - var internalInstance = appVm.$; |
620 |
| - Object.defineProperty(internalInstance.ctx, "$children", { |
621 |
| - get() { |
622 |
| - return getAllPages().map((page) => page.$vm); |
623 |
| - } |
624 |
| - }); |
625 |
| - var appContext = internalInstance.appContext; |
626 |
| - vueApp = extend(appContext.app, { |
627 |
| - mountPage(pageComponent, pageProps, pageContainer) { |
628 |
| - var vnode = createVNode(pageComponent, pageProps); |
629 |
| - vnode.appContext = appContext; |
630 |
| - vnode.__page_container__ = pageContainer; |
631 |
| - render(vnode, pageContainer); |
632 |
| - var publicThis = vnode.component.proxy; |
633 |
| - publicThis.__page_container__ = pageContainer; |
634 |
| - return publicThis; |
635 |
| - }, |
636 |
| - unmountPage: (pageInstance) => { |
637 |
| - var { |
638 |
| - __page_container__ |
639 |
| - } = pageInstance; |
640 |
| - if (__page_container__) { |
641 |
| - __page_container__.isUnmounted = true; |
642 |
| - render(null, __page_container__); |
643 |
| - } |
644 |
| - } |
645 |
| - }); |
| 618 | +function setVueApp(app) { |
| 619 | + vueApp = app; |
646 | 620 | }
|
647 | 621 | function getPage$BasePage(page) {
|
648 | 622 | return page.$basePage;
|
@@ -2039,15 +2013,19 @@ function registerDialogPage(_ref2, dialogPage, onCreated) {
|
2039 | 2013 | return nativePage;
|
2040 | 2014 | }
|
2041 | 2015 | function createVuePage(__pageId, __pagePath, __pageQuery, __pageInstance, pageOptions, nativePage) {
|
2042 |
| - var pageNode = nativePage.document.body; |
| 2016 | + var document = nativePage.document; |
| 2017 | + var body = document.body; |
2043 | 2018 | var app = getVueApp();
|
2044 | 2019 | var component = pagesMap.get(__pagePath)();
|
2045 |
| - var mountPage = (component2) => app.mountPage(component2, { |
2046 |
| - __pageId, |
2047 |
| - __pagePath, |
2048 |
| - __pageQuery, |
2049 |
| - __pageInstance |
2050 |
| - }, pageNode); |
| 2020 | + var mountPage = (component2) => ( |
| 2021 | + // TODO x |
| 2022 | + app.mountPage(component2, { |
| 2023 | + __pageId, |
| 2024 | + __pagePath, |
| 2025 | + __pageQuery, |
| 2026 | + __pageInstance |
| 2027 | + }, body, document) |
| 2028 | + ); |
2051 | 2029 | if (isPromise(component)) {
|
2052 | 2030 | return component.then((component2) => mountPage(component2));
|
2053 | 2031 | }
|
@@ -2509,6 +2487,36 @@ function onLaunchWebviewReady() {
|
2509 | 2487 | function initSubscribeHandlers() {
|
2510 | 2488 | subscribeWebviewReady();
|
2511 | 2489 | }
|
| 2490 | +function initVueApp(appVm) { |
| 2491 | + var internalInstance = appVm.$; |
| 2492 | + Object.defineProperty(internalInstance.ctx, "$children", { |
| 2493 | + get() { |
| 2494 | + return getAllPages().map((page) => page.$vm); |
| 2495 | + } |
| 2496 | + }); |
| 2497 | + var appContext = internalInstance.appContext; |
| 2498 | + var vueApp2 = extend(appContext.app, { |
| 2499 | + mountPage(pageComponent, pageProps, pageContainer, document) { |
| 2500 | + var vnode = createVNode(pageComponent, pageProps); |
| 2501 | + vnode.appContext = appContext; |
| 2502 | + vnode.__page_container__ = pageContainer; |
| 2503 | + render(document, vnode, pageContainer); |
| 2504 | + var publicThis = vnode.component.proxy; |
| 2505 | + publicThis.__page_container__ = pageContainer; |
| 2506 | + return publicThis; |
| 2507 | + }, |
| 2508 | + unmountPage: (pageInstance, document) => { |
| 2509 | + var { |
| 2510 | + __page_container__ |
| 2511 | + } = pageInstance; |
| 2512 | + if (__page_container__) { |
| 2513 | + __page_container__.isUnmounted = true; |
| 2514 | + render(document, null, __page_container__); |
| 2515 | + } |
| 2516 | + } |
| 2517 | + }); |
| 2518 | + setVueApp(vueApp2); |
| 2519 | +} |
2512 | 2520 | function asyncGeneratorStep(n, t, e, r, o, a, c) {
|
2513 | 2521 | try {
|
2514 | 2522 | var i = n[a](c), u = i.value;
|
|
0 commit comments