diff --git a/App.uvue b/App.uvue index ba623235a9c7f54a5e4984fcd10052b86e0006f7..d75df182ac8e6d3fc1df8b1f619263bf88d835cf 100644 --- a/App.uvue +++ b/App.uvue @@ -48,6 +48,7 @@ // } as PerformanceObserverOptions) // 统计上报 - 应用启动 + // #ifdef APP-ANDROID || APP-IOS || WEB uni.report({ name: 'uni-app-launch', options: res, @@ -57,6 +58,7 @@ console.log(err); } }) + // #endif // #ifdef APP if (process.env.NODE_ENV !== 'development') { //真机运行可以注释此条件 uni.getPrivacySetting({ @@ -86,6 +88,7 @@ setLifeCycleNum(state.lifeCycleNum + 100) console.log('App Show') + // #ifdef APP-ANDROID || APP-IOS || WEB // 统计上报 - 应用显示 uni.report({ name: 'uni-app-show', @@ -94,13 +97,15 @@ }, fail(err) { console.log(err); } - }) + }) + // #endif }, onHide: function () { // 自动化测试 setLifeCycleNum(state.lifeCycleNum - 100) console.log('App Hide') + // #ifdef APP-ANDROID || APP-IOS || WEB // 统计上报 - 应用进入后台 uni.report({ name: 'uni-app-hide', @@ -109,7 +114,8 @@ }, fail(err) { console.log(err); } - }) + }) + // #endif }, // #ifdef APP-ANDROID onLastPageBackPress: function () { @@ -134,6 +140,7 @@ console.log('App Exit') }, onError(err : any) { + // #ifdef APP-ANDROID || APP-IOS || WEB // 统计上报 - 应用发生错误 uni.report({ name: 'uni-app-error', @@ -144,6 +151,7 @@ console.log(err); } }) + // #endif }, // #endif methods: { diff --git a/main.uts b/main.uts index efe000a0dd271267f80f81629ddf5262fdcf2f0a..dcf10628cd2a2cb8ed3c2ceecbb70cbddc669f0a 100644 --- a/main.uts +++ b/main.uts @@ -1,6 +1,8 @@ // 仅测试 console.log 时机问题 import './test-main-console.uts' +// #ifdef APP-ANDROID || APP-IOS || WEB import { uniStat } from '@/uni_modules/uni-stat/plugin.uts' +// #endif import App from './App.uvue' import { createSSRApp } from 'vue' @@ -17,7 +19,9 @@ const statOptions = { export function createApp() { const app = createSSRApp(App) - app.use(uniStat, statOptions) + // #ifdef APP-ANDROID || APP-IOS || WEB + app.use(uniStat, statOptions) + // #endif // app.mixin({ // onReady() { // setTimeout(() => { diff --git a/pages.json b/pages.json index 0e71a990c04c4f8270f14ba93d7acf5c2adb6a0d..04dd61be40946f7ab7609baaaac44a6107737bc4 100644 --- a/pages.json +++ b/pages.json @@ -489,7 +489,7 @@ "navigationBarTitleText": "涂鸦" } }, - // #ifndef WEB + // #ifdef APP-ANDROID || APP-IOS { "path": "pages/component/native-view/native-view", "group": "0,2,4", @@ -1151,7 +1151,7 @@ "navigationBarTitleText": "createSelectorQuery | 创建 SelectorQuery 实例" } }, - // #ifndef WEB + // #ifdef APP-ANDROID || APP-IOS { "path": "pages/API/get-native-view/element-getnativeview", "group": "1,30", @@ -1799,12 +1799,14 @@ } }, // #endif + // #ifdef APP-ANDROID || APP-IOS || WEB { "path": "pages/template/schema/schema", "style": { "navigationBarTitleText": "打开schema示例" } }, + // #endif // #ifdef APP-ANDROID { "path": "pages/template/share/share", @@ -1839,6 +1841,7 @@ } }, // #endif + // #ifdef APP-ANDROID || APP-IOS || WEB { "path": "pages/template/custom-long-list/custom-long-list", "style": { @@ -1846,6 +1849,7 @@ "enablePullDownRefresh": false } }, + // #endif { "path": "pages/template/test-background-color-content/test-background-color-content", "style": { diff --git a/pages/component/global-properties/global-properties.uvue b/pages/component/global-properties/global-properties.uvue index ea43891891dfd94a50897f113b2a36416804eb13..136458ed0d32d14283062a713095a3cb0b29aa01 100644 --- a/pages/component/global-properties/global-properties.uvue +++ b/pages/component/global-properties/global-properties.uvue @@ -64,7 +64,7 @@ // #ifdef APP if (!generalTarget.classList.includes('general-class')) { // #endif - // #ifdef WEB + // #ifndef APP if (!Array.from(generalTarget.classList).includes('general-class')) { // #endif this.validateGeneralAttrText = '基础属性 class 验证失败' diff --git a/pages/component/input/input.uvue b/pages/component/input/input.uvue index 9b3dbcaa1ec0f006d387f1cfbee368ed3c3614c8..43cdba6dd5aef094662969e788964193e996e116 100644 --- a/pages/component/input/input.uvue +++ b/pages/component/input/input.uvue @@ -255,15 +255,16 @@ " @click="changePassword"> - - - - 同时存在 v-model 和 value - - - - - + + + + 同时存在 v-model 和 value + + + + + + diff --git a/pages/component/text/text-props.uvue b/pages/component/text/text-props.uvue index 9ff36bafa35222035ff5443d6f13ef02e0a18d18..248c72dd324a7a99e40e6a56bf7b971c0d555616 100644 --- a/pages/component/text/text-props.uvue +++ b/pages/component/text/text-props.uvue @@ -63,8 +63,10 @@ decode 依次为lt gt amp apos nbsp ensp emsp效果 - - < > & ' + + + < > & ' + uni-app x,终极跨平台方案 uni-app x,终极跨平台方案 uni-app x,终极跨平台方案 diff --git a/pages/component/textarea/textarea.uvue b/pages/component/textarea/textarea.uvue index 140b95076b8953288bb8271894395b033239e2b0..21ccac86394b068381909f0a25bc0a87ce2f0e29 100644 --- a/pages/component/textarea/textarea.uvue +++ b/pages/component/textarea/textarea.uvue @@ -138,13 +138,14 @@ - + + + 设置adjust-position