提交 29cc702c 编写于 作者: fxy060608's avatar fxy060608

feat(app): add __VUE_PROD_DEVTOOLS__

上级 b182de45
......@@ -22,7 +22,6 @@ declare module '@vue/runtime-core' {
__isUnload: boolean
__isVisible: boolean
__isActive?: boolean // tabBar
__isPage: boolean
}
export const callSyncHook: (
......
......@@ -1808,7 +1808,11 @@ var serviceContext = (function (vue) {
pageVm.$vm = pageVm;
pageVm.$page = page;
pageVm.$mpType = 'page';
pageVm.__isTabBar = page.meta.isTabBar;
if (page.meta.isTabBar) {
pageVm.__isTabBar = true;
// TODO preload? 初始化时,状态肯定是激活
pageVm.$.__isActive = true;
}
}
function querySelector(vm, selector) {
......@@ -9544,6 +9548,7 @@ var serviceContext = (function (vue) {
}
function createPage(__pageId, __pagePath, __pageQuery, __pageInstance, pageOptions) {
const pageNode = createPageNode(__pageId, pageOptions, true);
// TODO 需要同步 main.js 中开发者设置的plugin,mixin,config等
const app = vue.createApp(pagesMap.get(__pagePath)(), {
__pageId,
__pagePath,
......
......@@ -8968,7 +8968,7 @@
if (scopeId) {
state.attrs[scopeId] = "";
}
instance = instance.__isPage ? null : instance.parent;
instance = instance.proxy && instance.proxy.$mpType === "page" ? null : instance.parent;
}
});
return {
......
......@@ -27,6 +27,7 @@ export function createPage(
pageOptions: PageNodeOptions
) {
const pageNode = createPageNode(__pageId, pageOptions, true)
// TODO 需要同步 main.js 中开发者设置的plugin,mixin,config等
const app = createApp(pagesMap.get(__pagePath)!(), {
__pageId,
__pagePath,
......
import {
onMounted,
getCurrentInstance,
ComponentInternalInstance,
reactive,
} from 'vue'
import { onMounted, getCurrentInstance, reactive } from 'vue'
interface State {
attrs: Record<string, string>
......@@ -20,7 +15,10 @@ export function useScopedAttrs() {
if (scopeId) {
state.attrs[scopeId] = ''
}
instance = instance.__isPage ? null : instance.parent
instance =
instance.proxy && instance.proxy.$mpType === 'page'
? null
: instance.parent
}
})
......
......@@ -23,5 +23,9 @@ export function initPageVm(
pageVm.$vm = pageVm
pageVm.$page = page
pageVm.$mpType = 'page'
pageVm.__isTabBar = page.meta.isTabBar!
if (page.meta.isTabBar) {
pageVm.__isTabBar = true
// TODO preload? 初始化时,状态肯定是激活
pageVm.$.__isActive = true
}
}
......@@ -612,7 +612,10 @@ function initPageVm(pageVm, page) {
pageVm.$vm = pageVm;
pageVm.$page = page;
pageVm.$mpType = "page";
pageVm.__isTabBar = page.meta.isTabBar;
if (page.meta.isTabBar) {
pageVm.__isTabBar = true;
pageVm.$.__isActive = true;
}
}
function converPx(value) {
if (/^-?\d+[ur]px$/i.test(value)) {
......@@ -1331,8 +1334,11 @@ function beforeInvokeApi(name, args, protocol, options) {
}
}
function normalizeErrMsg(errMsg) {
if (errMsg instanceof Error) {
console.error(errMsg);
if (shared.isString(errMsg)) {
return errMsg;
}
if (errMsg.stack) {
console.error(errMsg.message + "\n" + errMsg.stack);
return errMsg.message;
}
return errMsg;
......@@ -6829,12 +6835,8 @@ function setupPage(comp) {
return setupComponent(comp, {
init: initPage,
setup(instance) {
instance.__isPage = true;
instance.root = instance;
const route = usePageRoute();
if (route.meta.isTabBar) {
instance.__isActive = true;
}
{
return route.query;
}
......
......@@ -1382,7 +1382,10 @@ function initPageVm(pageVm, page) {
pageVm.$vm = pageVm;
pageVm.$page = page;
pageVm.$mpType = "page";
pageVm.__isTabBar = page.meta.isTabBar;
if (page.meta.isTabBar) {
pageVm.__isTabBar = true;
pageVm.$.__isActive = true;
}
}
function querySelector(vm, selector) {
const el = vm.$el.querySelector(selector);
......@@ -2492,8 +2495,11 @@ function wrapperOffApi(name, fn, options) {
};
}
function normalizeErrMsg(errMsg) {
if (errMsg instanceof Error) {
console.error(errMsg);
if (isString(errMsg)) {
return errMsg;
}
if (errMsg.stack) {
console.error(errMsg.message + "\n" + errMsg.stack);
return errMsg.message;
}
return errMsg;
......@@ -7860,7 +7866,7 @@ function useScopedAttrs() {
if (scopeId) {
state2.attrs[scopeId] = "";
}
instance2 = instance2.__isPage ? null : instance2.parent;
instance2 = instance2.proxy && instance2.proxy.$mpType === "page" ? null : instance2.parent;
}
});
return {
......@@ -13496,12 +13502,8 @@ function setupPage(comp) {
return setupComponent(comp, {
init: initPage,
setup(instance2) {
instance2.__isPage = true;
instance2.root = instance2;
const route = usePageRoute();
if (route.meta.isTabBar) {
instance2.__isActive = true;
}
const pageMeta = usePageMeta();
onBeforeMount(() => {
onPageShow(instance2, pageMeta);
......
......@@ -53,13 +53,8 @@ export function setupPage(comp: any) {
return setupComponent(comp, {
init: initPage,
setup(instance) {
instance.__isPage = true // 标记当前组件是页面
instance.root = instance // 组件root指向页面
const route = usePageRoute()
if (route.meta.isTabBar) {
//初始化时,状态肯定是激活
instance.__isActive = true
}
// node环境不触发Page生命周期
if (__NODE_JS__) {
return route.query
......
......@@ -5,6 +5,7 @@ export function createDefine({
platform,
}: VitePluginUniResolvedOptions): UserConfig['define'] {
return {
__VUE_PROD_DEVTOOLS__: false,
'process.env.UNI_PLATFORM': JSON.stringify(platform),
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册