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

Merge branch 'dev' of https://github.com/dcloudio/uni-app into v3

......@@ -499,6 +499,15 @@ var eventApi = /*#__PURE__*/Object.freeze({
$emit: $emit
});
function requireNativePlugin (pluginName) {
/* eslint-disable no-undef */
if (typeof weex !== 'undefined') {
return weex.requireModule(pluginName)
}
/* eslint-disable no-undef */
return __requireNativePlugin__(pluginName)
}
function wrapper$1 (webview) {
webview.$processed = true;
......@@ -521,7 +530,9 @@ function wrapper$1 (webview) {
}
const maskColor = webview.__uniapp_mask;
let maskWebview = webview.__uniapp_mask_id === '0' ? {
setStyle ({ mask }) {
setStyle ({
mask
}) {
requireNativePlugin('uni-tabview').setMask({
color: mask
});
......@@ -564,18 +575,11 @@ function getSubNVueById (id) {
return webview
}
function requireNativePlugin (pluginName) {
/* eslint-disable no-undef */
if (typeof weex !== 'undefined') {
return weex.requireModule(pluginName)
}
/* eslint-disable no-undef */
return __requireNativePlugin__(pluginName)
}
var api = /*#__PURE__*/Object.freeze({
requireNativePlugin: requireNativePlugin,
getSubNVueById: getSubNVueById
getSubNVueById: getSubNVueById,
requireNativePlugin: requireNativePlugin
});
const MPPage = Page;
......
export function requireNativePlugin (pluginName) {
/* eslint-disable no-undef */
if (typeof weex !== 'undefined') {
return weex.requireModule(pluginName)
}
/* eslint-disable no-undef */
return __requireNativePlugin__(pluginName)
}
export * from './sub-nvue'
export * from './sub-nvue'
export * from './require-native-plugin'
export function requireNativePlugin (pluginName) {
/* eslint-disable no-undef */
if (typeof weex !== 'undefined') {
return weex.requireModule(pluginName)
}
/* eslint-disable no-undef */
return __requireNativePlugin__(pluginName)
}
import { requireNativePlugin } from './index'
import {
requireNativePlugin
} from './require-native-plugin'
function wrapper (webview) {
webview.$processed = true
......@@ -22,7 +24,9 @@ function wrapper (webview) {
}
const maskColor = webview.__uniapp_mask
let maskWebview = webview.__uniapp_mask_id === '0' ? {
setStyle ({ mask }) {
setStyle ({
mask
}) {
requireNativePlugin('uni-tabview').setMask({
color: mask
})
......@@ -63,4 +67,4 @@ export function getSubNVueById (id) {
wrapper(webview)
}
return webview
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册