提交 0601fa17 编写于 作者: Q qiang

Merge branch 'dev' into alpha

......@@ -17,10 +17,11 @@ function init() {
index = res.findIndex(function (fn) { return fn.toString().includes('onReady'); });
onReadyFn = res[index];
}
res.splice(index, 1);
res.push(onReadyFn);
if (index !== -1) {
res.splice(index, 1);
res.push(onReadyFn);
}
}
console.log('Merge mounted:', res);
return res;
};
}
......
......@@ -10,7 +10,8 @@ const {
getNVueMainEntry,
nvueJsPreprocessOptions,
nvueHtmlPreprocessOptions,
getTemplatePath
getTemplatePath,
uts
} = require('@dcloudio/uni-cli-shared')
const fileLoader = require('@dcloudio/uni-cli-shared/lib/file-loader')
const {
......@@ -179,6 +180,13 @@ const rules = [webpack.version[0] > 4 ? {
{
resourceQuery: /vue&type=template/,
use: [htmlPreprocessorLoader]
},
{
type: 'javascript/auto',
resourceQuery: /uts-proxy/,
use: [{
loader: require.resolve('@dcloudio/uni-cli-shared/lib/uts/uts-loader.js')
}]
}
].concat(cssLoaders)
......@@ -220,8 +228,10 @@ if (process.env.UNI_USING_V3_NATIVE) {
return ''
}
}]
plugins.push(new CopyWebpackPlugin(CopyWebpackPluginVersion > 5 ? { patterns } : patterns))
} catch (e) { }
plugins.push(new CopyWebpackPlugin(CopyWebpackPluginVersion > 5 ? {
patterns
} : patterns))
} catch (e) {}
}
if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
......@@ -321,7 +331,9 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
}
})
}
plugins.push(new CopyWebpackPlugin(CopyWebpackPluginVersion > 5 ? { patterns } : patterns))
plugins.push(new CopyWebpackPlugin(CopyWebpackPluginVersion > 5 ? {
patterns
} : patterns))
}
try {
......@@ -334,7 +346,7 @@ try {
dir: process.env.UNI_INPUT_DIR
}))
}
} catch (e) { }
} catch (e) {}
module.exports = function () {
return {
......@@ -361,7 +373,9 @@ module.exports = function () {
}
})
]
}, webpack.version[0] > 4 ? {} : { namedModules: false }),
}, webpack.version[0] > 4 ? {} : {
namedModules: false
}),
output: {
path: process.env.UNI_OUTPUT_DIR,
filename: '[name].js'
......@@ -382,12 +396,16 @@ module.exports = function () {
'?' +
JSON.stringify({
type: 'stat'
})
}),
'@vue/composition-api': require.resolve('@dcloudio/vue-cli-plugin-uni/packages/@vue/composition-api')
},
modules: [
'node_modules',
path.resolve(process.env.UNI_CLI_CONTEXT, 'node_modules'),
path.resolve(process.env.UNI_INPUT_DIR, 'node_modules')
],
plugins: [
new uts.UTSResolverPlugin()
]
},
resolveLoader: {
......@@ -447,4 +465,4 @@ module.exports = function () {
zlib: false
}
}
}
}
......@@ -130,8 +130,14 @@ export function startSoterAuthentication ({
}
const realAuthMode = enrolledRequestAuthMode[0]
if (realAuthMode === 'fingerPrint') {
let waiting = null
let waitingTimer
const waitingTitle =
authContent || t('uni.startSoterAuthentication.authContent')
if (plus.os.name.toLowerCase() === 'android') {
plus.nativeUI.showWaiting(authContent || t('uni.startSoterAuthentication.authContent')).onclose = function () {
waiting = plus.nativeUI.showWaiting(waitingTitle)
waiting.onclose = function () {
plus.fingerprint.cancel()
}
}
......@@ -145,6 +151,13 @@ export function startSoterAuthentication ({
}, (e) => {
switch (e.code) {
case e.AUTHENTICATE_MISMATCH:
if (waiting) {
clearTimeout(waitingTimer)
waiting.setTitle('无法识别')
waitingTimer = setTimeout(() => {
waiting && waiting.setTitle(waitingTitle)
}, 1000)
}
// 微信小程序没有这个回调,如果要实现此处回调需要多次触发需要用事件publish实现
// invoke(callbackId, {
// authMode: realAuthMode,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册