diff --git a/packages/uni-app-plus/dist/uni-app-service.es.js b/packages/uni-app-plus/dist/uni-app-service.es.js
index f2a6501f21fc87a2cb1d8afb575a17f2d27b754a..52f08dd529faf8082b7fb7d4d668a66367c59258 100644
--- a/packages/uni-app-plus/dist/uni-app-service.es.js
+++ b/packages/uni-app-plus/dist/uni-app-service.es.js
@@ -16110,11 +16110,7 @@ var serviceContext = (function (vue) {
type: 'loading',
icon: 'loading',
}), callbacks), ShowLoadingProtocol, ShowLoadingOptions);
- const _showToast = ({ title = '', icon = 'success', image = '', duration = 1500, mask = false, position,
- // @ts-ignore ToastType
- type = 'toast',
- // @ts-ignore PlusNativeUIWaitingStyles
- style, }, { resolve, reject }) => {
+ const _showToast = ({ title = '', icon = 'success', image = '', duration = 1500, mask = false, position, type = 'toast', style, }, { resolve, reject }) => {
hide('');
toastType = type;
if (['top', 'center', 'bottom'].includes(String(position))) {
@@ -16171,9 +16167,10 @@ var serviceContext = (function (vue) {
reject(`${error}`);
}
}
- timeout = setTimeout(() => {
- hide('');
- }, duration);
+ if (toastType === 'toast')
+ timeout = setTimeout(() => {
+ hide('');
+ }, duration);
return resolve();
};
const showToast = defineAsyncApi(API_SHOW_TOAST, _showToast, ShowToastProtocol, ShowToastOptions);
diff --git a/packages/uni-mp-alipay/dist/uni.compiler.js b/packages/uni-mp-alipay/dist/uni.compiler.js
index c02bddb6911105ef35fc19059f85d08ae07af412..67958f9f2291e0c8533960830c6e70912c5b8b72 100644
--- a/packages/uni-mp-alipay/dist/uni.compiler.js
+++ b/packages/uni-mp-alipay/dist/uni.compiler.js
@@ -161,6 +161,7 @@ const customElements = [
'mkt',
];
const options = {
+ cdn: 2,
vite: {
inject: {
uni: [path__default["default"].resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-alipay/src/compiler/options.ts b/packages/uni-mp-alipay/src/compiler/options.ts
index 6db1c2d783207204aa37b320c639ad45bcf5f80f..41fc3d4430b3d99e41b895c68cec76c379b78ae6 100644
--- a/packages/uni-mp-alipay/src/compiler/options.ts
+++ b/packages/uni-mp-alipay/src/compiler/options.ts
@@ -53,6 +53,7 @@ export const customElements = [
]
export const options: UniMiniProgramPluginOptions = {
+ cdn: 2,
vite: {
inject: {
uni: [path.resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-baidu/dist/uni.compiler.js b/packages/uni-mp-baidu/dist/uni.compiler.js
index 3535ebbebb74401cd7df8426201506175e91674b..96702ecac796f8ee11c7eb316bb376eb6ceaa84a 100644
--- a/packages/uni-mp-baidu/dist/uni.compiler.js
+++ b/packages/uni-mp-baidu/dist/uni.compiler.js
@@ -87,6 +87,7 @@ const compilerOptions = {
};
const projectConfigFilename = 'project.swan.json';
const options = {
+ cdn: 3,
vite: {
inject: {
uni: [path__default["default"].resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-baidu/src/compiler/options.ts b/packages/uni-mp-baidu/src/compiler/options.ts
index 2e342b70b0ad4b64e1a32c725171be28ca9b4c98..a579db6f740ee205cddcaca211e83408972cc9c7 100644
--- a/packages/uni-mp-baidu/src/compiler/options.ts
+++ b/packages/uni-mp-baidu/src/compiler/options.ts
@@ -38,6 +38,7 @@ export const compilerOptions: CompilerOptions = {
const projectConfigFilename = 'project.swan.json'
export const options: UniMiniProgramPluginOptions = {
+ cdn: 3,
vite: {
inject: {
uni: [path.resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-kuaishou/dist/uni.compiler.js b/packages/uni-mp-kuaishou/dist/uni.compiler.js
index f15073b8605c383298523e96a9d6244e69ec9c62..29c87a483883a95364388d94b7fe9cbefa1669ff 100644
--- a/packages/uni-mp-kuaishou/dist/uni.compiler.js
+++ b/packages/uni-mp-kuaishou/dist/uni.compiler.js
@@ -152,6 +152,7 @@ const miniProgram = {
};
const projectConfigFilename = 'project.config.json';
const options = {
+ cdn: 9,
vite: {
inject: {
uni: [path__default["default"].resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-kuaishou/src/compiler/options.ts b/packages/uni-mp-kuaishou/src/compiler/options.ts
index ca9b3d8aaefc67c8f942c32302448b9d16aaffdf..9b115ad36b6edf69b5185f668849a573d17196b6 100644
--- a/packages/uni-mp-kuaishou/src/compiler/options.ts
+++ b/packages/uni-mp-kuaishou/src/compiler/options.ts
@@ -38,6 +38,7 @@ export const miniProgram: MiniProgramCompilerOptions = {
const projectConfigFilename = 'project.config.json'
export const options: UniMiniProgramPluginOptions = {
+ cdn: 9,
vite: {
inject: {
uni: [path.resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-lark/dist/uni.compiler.js b/packages/uni-mp-lark/dist/uni.compiler.js
index fc17d2173e6cfc37970f784f8a02cdacf0439f22..9f2ed4d6160cd0899cc7f6398283f2517efb15ed 100644
--- a/packages/uni-mp-lark/dist/uni.compiler.js
+++ b/packages/uni-mp-lark/dist/uni.compiler.js
@@ -86,6 +86,7 @@ const miniProgram = {
},
};
const options = {
+ cdn: 4,
vite: {
inject: {
uni: [path__default["default"].resolve(__dirname, 'uni.api.esm.js'), 'default'],
@@ -137,6 +138,7 @@ const uniMiniProgramToutiaoPlugin = {
};
},
};
+options.cdn = 10;
options.template.slot.fallbackContent = false;
// 飞书不支持:
// {{item.text}}
diff --git a/packages/uni-mp-lark/src/compiler/index.ts b/packages/uni-mp-lark/src/compiler/index.ts
index 49489386e295572f40d99d46fb5389e0d9a5e1de..9c2c7314a0b06322f344537dee9abacc1d2e3915 100644
--- a/packages/uni-mp-lark/src/compiler/index.ts
+++ b/packages/uni-mp-lark/src/compiler/index.ts
@@ -19,6 +19,8 @@ const uniMiniProgramToutiaoPlugin: Plugin = {
},
}
+options.cdn = 10
+
options.template.slot.fallbackContent = false
// 飞书不支持:
// {{item.text}}
diff --git a/packages/uni-mp-qq/dist/uni.compiler.js b/packages/uni-mp-qq/dist/uni.compiler.js
index e11cbd81d981adbb66cdf5f06996029dac319a1b..4f3528a1b89a2f5f5f64723605af8bba51e9ea01 100644
--- a/packages/uni-mp-qq/dist/uni.compiler.js
+++ b/packages/uni-mp-qq/dist/uni.compiler.js
@@ -104,6 +104,7 @@ const miniProgram = {
},
};
const options = {
+ cdn: 5,
vite: {
inject: {
uni: [path__default["default"].resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-qq/src/compiler/options.ts b/packages/uni-mp-qq/src/compiler/options.ts
index 26c049d0e23134b9bc65855cf04fe9da50f7124d..8d78074bfc008d69e460748e60f78838ed515d6d 100644
--- a/packages/uni-mp-qq/src/compiler/options.ts
+++ b/packages/uni-mp-qq/src/compiler/options.ts
@@ -36,6 +36,7 @@ export const miniProgram: MiniProgramCompilerOptions = {
}
export const options: UniMiniProgramPluginOptions = {
+ cdn: 5,
vite: {
inject: {
uni: [path.resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-toutiao/dist/uni.compiler.js b/packages/uni-mp-toutiao/dist/uni.compiler.js
index a86e2b454861ef357d98f0ccd47ac7324c0f4783..f2dca6d06c639f8d63ec6f84afbf576b74c84622 100644
--- a/packages/uni-mp-toutiao/dist/uni.compiler.js
+++ b/packages/uni-mp-toutiao/dist/uni.compiler.js
@@ -86,6 +86,7 @@ const miniProgram = {
},
};
const options = {
+ cdn: 4,
vite: {
inject: {
uni: [path__default["default"].resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-toutiao/src/compiler/options.ts b/packages/uni-mp-toutiao/src/compiler/options.ts
index 425b1a8842516cbbd965c141f6186ec128c5f78a..674f5f83145e5b3e21baac7d5b5d307518e0ce3e 100644
--- a/packages/uni-mp-toutiao/src/compiler/options.ts
+++ b/packages/uni-mp-toutiao/src/compiler/options.ts
@@ -39,6 +39,7 @@ export const miniProgram: MiniProgramCompilerOptions = {
}
export const options: UniMiniProgramPluginOptions = {
+ cdn: 4,
vite: {
inject: {
uni: [path.resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-vite/src/plugin/configResolved.ts b/packages/uni-mp-vite/src/plugin/configResolved.ts
index f2e7c99be448e25633ba0a81f2c32f6ea3f2789a..abc5485d0dfd7d9fef8809193897434d86d3b2d2 100644
--- a/packages/uni-mp-vite/src/plugin/configResolved.ts
+++ b/packages/uni-mp-vite/src/plugin/configResolved.ts
@@ -23,11 +23,15 @@ import {
const debugNVueCss = debug('vite:uni:nvue-css')
const cssVars = `page{--status-bar-height:25px;--top-window-height:0px;--window-top:0px;--window-bottom:0px;--window-left:0px;--window-right:0px;--window-magin:0px}`
-const shadowCss = `page::after{position:fixed;content:'';left:-1000px;top:-1000px;-webkit-animation:shadow-preload .1s;-webkit-animation-delay:3s;animation:shadow-preload .1s;animation-delay:3s}@-webkit-keyframes shadow-preload{0%{background-image:url(https://cdn.dcloud.net.cn/img/shadow-grey.png)}100%{background-image:url(https://cdn.dcloud.net.cn/img/shadow-grey.png)}}@keyframes shadow-preload{0%{background-image:url(https://cdn.dcloud.net.cn/img/shadow-grey.png)}100%{background-image:url(https://cdn.dcloud.net.cn/img/shadow-grey.png)}}`
+
+const genShadowCss = (cdn: string) => {
+ return `page::after{position:fixed;content:'';left:-1000px;top:-1000px;-webkit-animation:shadow-preload .1s;-webkit-animation-delay:3s;animation:shadow-preload .1s;animation-delay:3s}@-webkit-keyframes shadow-preload{0%{background-image:url(${cdn}/img/shadow-grey.png)}100%{background-image:url(${cdn}/img/shadow-grey.png)}}@keyframes shadow-preload{0%{background-image:url(${cdn}/img/shadow-grey.png)}100%{background-image:url(${cdn}/img/shadow-grey.png)}}`
+}
const genComponentCustomHiddenCss = (name: string) =>
`[${name.replace(':', '')}="true"]{display: none !important;}`
export function createConfigResolved({
+ cdn,
style: { extname },
template: { component },
}: UniMiniProgramPluginOptions): Plugin['configResolved'] {
@@ -63,7 +67,12 @@ export function createConfigResolved({
genComponentCustomHiddenCss(component.vShow)) ||
''
if (config.isProduction) {
- return cssCode + shadowCss + cssVars + componentCustomHiddenCss
+ return (
+ cssCode +
+ genShadowCss(`https://cdn${cdn || ''}.dcloud.net.cn`) +
+ cssVars +
+ componentCustomHiddenCss
+ )
} else {
return cssCode + cssVars + componentCustomHiddenCss
}
diff --git a/packages/uni-mp-vite/src/plugin/index.ts b/packages/uni-mp-vite/src/plugin/index.ts
index bdc7237407b79b30c16fccde9f816339e3d412a8..31258b2ac04c5d53169bebe81f84b8141470fe32 100644
--- a/packages/uni-mp-vite/src/plugin/index.ts
+++ b/packages/uni-mp-vite/src/plugin/index.ts
@@ -24,6 +24,7 @@ import {
} from '@vue/compiler-sfc'
export interface UniMiniProgramPluginOptions {
+ cdn?: number
vite: {
alias: AliasOptions
copyOptions: CopyOptions
diff --git a/packages/uni-mp-weixin/dist/uni.compiler.js b/packages/uni-mp-weixin/dist/uni.compiler.js
index 2945406c7b37254824032fbe7dd4c40478fbac9a..112fb7b3c107eb9c4942037ca03826eeab24269d 100644
--- a/packages/uni-mp-weixin/dist/uni.compiler.js
+++ b/packages/uni-mp-weixin/dist/uni.compiler.js
@@ -81,6 +81,7 @@ const miniProgram = {
};
const projectConfigFilename = 'project.config.json';
const options = {
+ cdn: 1,
vite: {
inject: {
uni: [path__default["default"].resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-mp-weixin/src/compiler/options.ts b/packages/uni-mp-weixin/src/compiler/options.ts
index af9ff5b6d9183769cc24e995dcd1b87c4a81d719..210d51ae55f885252084fcb185378e814583c882 100644
--- a/packages/uni-mp-weixin/src/compiler/options.ts
+++ b/packages/uni-mp-weixin/src/compiler/options.ts
@@ -37,6 +37,7 @@ export const miniProgram: MiniProgramCompilerOptions = {
const projectConfigFilename = 'project.config.json'
export const options: UniMiniProgramPluginOptions = {
+ cdn: 1,
vite: {
inject: {
uni: [path.resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-quickapp-webview/dist/uni.compiler.js b/packages/uni-quickapp-webview/dist/uni.compiler.js
index 5349c84754ebbe70ce25640f4633b4f6d7df0745..4e8cc3ad19e14439c44ec4b03194e9739d1d945c 100644
--- a/packages/uni-quickapp-webview/dist/uni.compiler.js
+++ b/packages/uni-quickapp-webview/dist/uni.compiler.js
@@ -70,6 +70,7 @@ const miniProgram = {
};
const projectConfigFilename = 'jsconfig.json';
const options = {
+ cdn: process.env.UNI_SUB_PLATFORM === 'quickapp-webview-huawei' ? 200 : 201,
vite: {
inject: {
uni: [path__default["default"].resolve(__dirname, 'uni.api.esm.js'), 'default'],
diff --git a/packages/uni-quickapp-webview/src/compiler/options.ts b/packages/uni-quickapp-webview/src/compiler/options.ts
index 23e94207b5704dbc8ebe0adc36d047b11ed30636..63c89599645ff4971946a6687f51be2f5f10ce22 100644
--- a/packages/uni-quickapp-webview/src/compiler/options.ts
+++ b/packages/uni-quickapp-webview/src/compiler/options.ts
@@ -28,6 +28,7 @@ export const miniProgram: MiniProgramCompilerOptions = {
const projectConfigFilename = 'jsconfig.json'
export const options: UniMiniProgramPluginOptions = {
+ cdn: process.env.UNI_SUB_PLATFORM === 'quickapp-webview-huawei' ? 200 : 201,
vite: {
inject: {
uni: [path.resolve(__dirname, 'uni.api.esm.js'), 'default'],