Skip to content

U
uni-app

Velpro187 / uni-app
与 Fork 源项目一致

Fork自 DCloud / uni-app

通知 1
Star 1
Fork 0
U
uni-app

体验新版 GitCode，发现更多精彩内容 >>

提交 812e5eb0 编写于 作者: Q qiang
浏览文件
操作

Merge branch 'dev' into alpha 

# Conflicts:
#	packages/uni-app-plus/dist/index.v3.js
#	packages/uni-h5/dist/index.umd.min.js
上级 f6251eda c0fb6126
展开全部 隐藏空白更改
内联 并排
Showing with 144 addition and 60 deletion
build/webpack.config.js
浏览文件 @ 812e5eb0
...@@ -17,6 +17,11 @@ if (process.env.UNI_VIEW !== 'true') { ...@@ -17,6 +17,11 @@ if (process.env.UNI_VIEW !== 'true') {
commonjs: 'vue-router', commonjs: 'vue-router',
commonjs2: 'vue-router', commonjs2: 'vue-router',
root: 'VueRouter' root: 'VueRouter'
}
externals['@dcloudio/uni-i18n'] = {
commonjs: '@dcloudio/uni-i18n',
commonjs2: '@dcloudio/uni-i18n',
root: '@dcloudio/uni-i18n'
} }
} }
......
packages/uni-app-plus/dist/index.v3.js
浏览文件 @ 812e5eb0
...@@ -64,6 +64,7 @@ var serviceContext = (function () { ...@@ -64,6 +64,7 @@ var serviceContext = (function () {
'chooseImage', 'chooseImage',
'chooseFile', 'chooseFile',
'previewImage', 'previewImage',
'closePreviewImage',
'getImageInfo', 'getImageInfo',
'getVideoInfo', 'getVideoInfo',
'saveImageToPhotosAlbum', 'saveImageToPhotosAlbum',
...@@ -254,7 +255,8 @@ var serviceContext = (function () { ...@@ -254,7 +255,8 @@ var serviceContext = (function () {
'sendNativeEvent', 'sendNativeEvent',
'preloadPage', 'preloadPage',
'unPreloadPage', 'unPreloadPage',
'loadSubPackage' 'loadSubPackage',
'sendHostEvent'
]; ];
const ad = [ const ad = [
...@@ -1642,7 +1644,7 @@ var serviceContext = (function () { ...@@ -1642,7 +1644,7 @@ var serviceContext = (function () {
"uni.chooseVideo.cancel": "取消", "uni.chooseVideo.cancel": "取消",
"uni.chooseVideo.sourceType.album": "从相册选择", "uni.chooseVideo.sourceType.album": "从相册选择",
"uni.chooseVideo.sourceType.camera": "拍摄", "uni.chooseVideo.sourceType.camera": "拍摄",
"uni.chooseFile.notUserActivation": "文件选择器对话框只能在用户激活时显示", "uni.chooseFile.notUserActivation": "文件选择器对话框只能在由用户激活时显示",
"uni.previewImage.cancel": "取消", "uni.previewImage.cancel": "取消",
"uni.previewImage.button.save": "保存图像", "uni.previewImage.button.save": "保存图像",
"uni.previewImage.save.success": "保存图像到相册成功", "uni.previewImage.save.success": "保存图像到相册成功",
...@@ -1678,7 +1680,7 @@ var serviceContext = (function () { ...@@ -1678,7 +1680,7 @@ var serviceContext = (function () {
"uni.chooseVideo.cancel": "取消", "uni.chooseVideo.cancel": "取消",
"uni.chooseVideo.sourceType.album": "從相冊選擇", "uni.chooseVideo.sourceType.album": "從相冊選擇",
"uni.chooseVideo.sourceType.camera": "拍攝", "uni.chooseVideo.sourceType.camera": "拍攝",
"uni.chooseFile.notUserActivation": "文件選擇器對話框只能在用戶激活時顯示", "uni.chooseFile.notUserActivation": "文件選擇器對話框只能在由用戶激活時顯示",
"uni.previewImage.cancel": "取消", "uni.previewImage.cancel": "取消",
"uni.previewImage.button.save": "保存圖像", "uni.previewImage.button.save": "保存圖像",
"uni.previewImage.save.success": "保存圖像到相冊成功", "uni.previewImage.save.success": "保存圖像到相冊成功",
...@@ -1718,6 +1720,26 @@ var serviceContext = (function () { ...@@ -1718,6 +1720,26 @@ var serviceContext = (function () {
} }
} }
function initI18nMessages () {
if (!isEnableLocale()) {
return
}
const localeKeys = Object.keys(__uniConfig.locales);
if (localeKeys.length) {
localeKeys.forEach((locale) => {
const curMessages = messages[locale];
const userMessages = __uniConfig.locales[locale];
if (curMessages) {
Object.assign(curMessages, userMessages);
} else {
messages[locale] = userMessages;
}
});
}
}
initI18nMessages();
const i18n = initVueI18n( const i18n = initVueI18n(
locale, locale,
messages messages
...@@ -1813,7 +1835,7 @@ var serviceContext = (function () { ...@@ -1813,7 +1835,7 @@ var serviceContext = (function () {
} }
function isEnableLocale () { function isEnableLocale () {
return __uniConfig.locales && !!Object.keys(__uniConfig.locales).length return typeof __uniConfig !== 'undefined' && __uniConfig.locales && !!Object.keys(__uniConfig.locales).length
} }
function initNavigationBarI18n (navigationBar) { function initNavigationBarI18n (navigationBar) {
...@@ -1825,14 +1847,14 @@ var serviceContext = (function () { ...@@ -1825,14 +1847,14 @@ var serviceContext = (function () {
} }
} }
function initI18n () { // export function initI18n() {
const localeKeys = Object.keys(__uniConfig.locales || {}); // const localeKeys = Object.keys(__uniConfig.locales || {})
if (localeKeys.length) { // if (localeKeys.length) {
localeKeys.forEach((locale) => // localeKeys.forEach((locale) =>
i18n.add(locale, __uniConfig.locales[locale]) // i18n.add(locale, __uniConfig.locales[locale])
); // )
} // }
} // }
const setClipboardData = { const setClipboardData = {
data: { data: {
...@@ -2362,7 +2384,8 @@ var serviceContext = (function () { ...@@ -2362,7 +2384,8 @@ var serviceContext = (function () {
PUT: 'PUT', PUT: 'PUT',
DELETE: 'DELETE', DELETE: 'DELETE',
TRACE: 'TRACE', TRACE: 'TRACE',
CONNECT: 'CONNECT' CONNECT: 'CONNECT',
PATCH: 'PATCH'
}; };
const dataType = { const dataType = {
JSON: 'json' JSON: 'json'
...@@ -4339,13 +4362,15 @@ var serviceContext = (function () { ...@@ -4339,13 +4362,15 @@ var serviceContext = (function () {
return array.length > 1 ? '.' + array[array.length - 1] : '' return array.length > 1 ? '.' + array[array.length - 1] : ''
} }
const AUDIO_DEFAULT_CATEGORY = 'ambient';
const audios = {}; const audios = {};
const evts = ['play', 'canplay', 'ended', 'stop', 'waiting', 'seeking', 'seeked', 'pause']; const evts = ['play', 'canplay', 'ended', 'stop', 'waiting', 'seeking', 'seeked', 'pause'];
const publishAudioStateChange = (state, res = {}) => publish('onAudioStateChange', Object.assign({ const publishAudioStateChange = (state, res = {}) => publish('onAudioStateChange', Object.assign({
state state
}, res)); }, res));
const initStateChage = audioId => { const initStateChage = audioId => {
const audio = audios[audioId]; const audio = audios[audioId];
...@@ -4384,7 +4409,8 @@ var serviceContext = (function () { ...@@ -4384,7 +4409,8 @@ var serviceContext = (function () {
const audio = audios[audioId] = plus.audio.createPlayer(''); const audio = audios[audioId] = plus.audio.createPlayer('');
audio.src = ''; audio.src = '';
audio.volume = 1; audio.volume = 1;
audio.startTime = 0; audio.startTime = 0;
audio.setSessionCategory(AUDIO_DEFAULT_CATEGORY);
return { return {
errMsg: 'createAudioInstance:ok', errMsg: 'createAudioInstance:ok',
audioId audioId
...@@ -4411,7 +4437,8 @@ var serviceContext = (function () { ...@@ -4411,7 +4437,8 @@ var serviceContext = (function () {
autoplay = false, autoplay = false,
loop = false, loop = false,
obeyMuteSwitch, obeyMuteSwitch,
volume volume,
category = AUDIO_DEFAULT_CATEGORY
}) { }) {
const audio = audios[audioId]; const audio = audios[audioId];
if (audio) { if (audio) {
...@@ -4428,7 +4455,10 @@ var serviceContext = (function () { ...@@ -4428,7 +4455,10 @@ var serviceContext = (function () {
if (typeof volume === 'number') { if (typeof volume === 'number') {
audio.volume = style.volume = volume; audio.volume = style.volume = volume;
} }
audio.setStyles(style); audio.setStyles(style);
if (category) {
audio.setSessionCategory(category);
}
initStateChage(audioId); initStateChage(audioId);
} }
return { return {
...@@ -7220,6 +7250,19 @@ var serviceContext = (function () { ...@@ -7220,6 +7250,19 @@ var serviceContext = (function () {
return { return {
errMsg: 'previewImage:ok' errMsg: 'previewImage:ok'
} }
}
function closePreviewImagePlus () {
try {
plus.nativeUI.closePreviewImage();
return {
errMsg: 'closePreviewImagePlus:ok'
}
} catch (error) {
return {
errMsg: 'closePreviewImagePlus:fail'
}
}
} }
let recorder$1; let recorder$1;
...@@ -8668,6 +8711,25 @@ var serviceContext = (function () { ...@@ -8668,6 +8711,25 @@ var serviceContext = (function () {
}); });
} }
const sendHostEvent = sendNativeEvent;
function navigateToMiniProgram (data, callbackId) {
sendHostEvent(
'navigateToUniMP',
data,
(res) => {
if (res.errMsg && res.errMsg.indexOf(':ok') === -1) {
return invoke$1(callbackId, {
errMsg: res.errMsg
})
}
invoke$1(callbackId, {
errMsg: 'navigateToMiniProgram:ok'
});
}
);
}
const VD_SYNC_VERSION = 2; const VD_SYNC_VERSION = 2;
const PAGE_CREATE = 2; const PAGE_CREATE = 2;
...@@ -10839,6 +10901,11 @@ var serviceContext = (function () { ...@@ -10839,6 +10901,11 @@ var serviceContext = (function () {
pagePath, pagePath,
visible visible
}) { }) {
if (!isTabBarPage()) {
return {
errMsg: 'setTabBarItem:fail not TabBar page'
}
}
tabBar$1.setTabBarItem(index, text, iconPath, selectedIconPath, visible); tabBar$1.setTabBarItem(index, text, iconPath, selectedIconPath, visible);
const route = pagePath && __uniRoutes.find(({ path }) => path === pagePath); const route = pagePath && __uniRoutes.find(({ path }) => path === pagePath);
if (route) { if (route) {
...@@ -11742,6 +11809,7 @@ var serviceContext = (function () { ...@@ -11742,6 +11809,7 @@ var serviceContext = (function () {
getImageInfo: getImageInfo$1, getImageInfo: getImageInfo$1,
getVideoInfo: getVideoInfo$1, getVideoInfo: getVideoInfo$1,
previewImagePlus: previewImagePlus, previewImagePlus: previewImagePlus,
closePreviewImagePlus: closePreviewImagePlus,
operateRecorder: operateRecorder, operateRecorder: operateRecorder,
saveImageToPhotosAlbum: saveImageToPhotosAlbum$1, saveImageToPhotosAlbum: saveImageToPhotosAlbum$1,
saveVideoToPhotosAlbum: saveVideoToPhotosAlbum, saveVideoToPhotosAlbum: saveVideoToPhotosAlbum,
...@@ -11779,6 +11847,8 @@ var serviceContext = (function () { ...@@ -11779,6 +11847,8 @@ var serviceContext = (function () {
onNativeEventReceive: onNativeEventReceive, onNativeEventReceive: onNativeEventReceive,
sendNativeEvent: sendNativeEvent, sendNativeEvent: sendNativeEvent,
loadSubPackage: loadSubPackage$2, loadSubPackage: loadSubPackage$2,
sendHostEvent: sendHostEvent,
navigateToMiniProgram: navigateToMiniProgram,
navigateBack: navigateBack$1, navigateBack: navigateBack$1,
navigateTo: navigateTo$1, navigateTo: navigateTo$1,
reLaunch: reLaunch$1, reLaunch: reLaunch$1,
...@@ -20217,11 +20287,16 @@ var serviceContext = (function () { ...@@ -20217,11 +20287,16 @@ var serviceContext = (function () {
} }
return invokeMethod('previewImagePlus', args) return invokeMethod('previewImagePlus', args)
}
function closePreviewImage (args = {}) {
return invokeMethod('closePreviewImagePlus', args)
} }
var require_context_module_1_15 = /*#__PURE__*/Object.freeze({ var require_context_module_1_15 = /*#__PURE__*/Object.freeze({
__proto__: null, __proto__: null,
previewImage: previewImage$1 previewImage: previewImage$1,
closePreviewImage: closePreviewImage
}); });
const callbacks$8 = { const callbacks$8 = {
...@@ -22969,8 +23044,6 @@ var serviceContext = (function () { ...@@ -22969,8 +23044,6 @@ var serviceContext = (function () {
} }
}; };
initI18n();
// 挂靠在uni上，暂不做全局导出 // 挂靠在uni上，暂不做全局导出
uni$1.__$wx__ = wx; uni$1.__$wx__ = wx;
......
src/core/helpers/constants.js
浏览文件 @ 812e5eb0
...@@ -2,4 +2,4 @@ export const NAVBAR_HEIGHT = 44 ...@@ -2,4 +2,4 @@ export const NAVBAR_HEIGHT = 44
export const TABBAR_HEIGHT = 50 export const TABBAR_HEIGHT = 50
// 576:landscape phones,768:tablets,992:desktops,1200:large desktops // 576:landscape phones,768:tablets,992:desktops,1200:large desktops
export const RESPONSIVE_MIN_WIDTH = 768 export const RESPONSIVE_MIN_WIDTH = 768
export const DC_LOCALE = '__DC_LOCALE' export const UNI_STORAGE_LOCALE = 'UNI_LOCALE'
src/core/helpers/i18n/index.js
浏览文件 @ 812e5eb0
...@@ -4,10 +4,10 @@ import { ...@@ -4,10 +4,10 @@ import {
} from '@dcloudio/uni-i18n' } from '@dcloudio/uni-i18n'
import { import {
isStr isStr
} from 'uni-shared' } from 'uni-shared'
import { import {
DC_LOCALE UNI_STORAGE_LOCALE
} from '../constants' } from '../constants'
import en from './en.json' import en from './en.json'
...@@ -27,7 +27,7 @@ const messages = { ...@@ -27,7 +27,7 @@ const messages = {
let locale let locale
if (__PLATFORM__ === 'h5') { if (__PLATFORM__ === 'h5') {
locale = (window.localStorage && localStorage[DC_LOCALE]) || __uniConfig.locale || navigator.language locale = (window.localStorage && localStorage[UNI_STORAGE_LOCALE]) || __uniConfig.locale || navigator.language
} else if (__PLATFORM__ === 'app-plus') { } else if (__PLATFORM__ === 'app-plus') {
if (typeof weex === 'object') { if (typeof weex === 'object') {
locale = weex.requireModule('plus').getLanguage() locale = weex.requireModule('plus').getLanguage()
...@@ -38,6 +38,26 @@ if (__PLATFORM__ === 'h5') { ...@@ -38,6 +38,26 @@ if (__PLATFORM__ === 'h5') {
locale = __GLOBAL__.getSystemInfoSync().language locale = __GLOBAL__.getSystemInfoSync().language
} }
function initI18nMessages () {
if (!isEnableLocale()) {
return
}
const localeKeys = Object.keys(__uniConfig.locales)
if (localeKeys.length) {
localeKeys.forEach((locale) => {
const curMessages = messages[locale]
const userMessages = __uniConfig.locales[locale]
if (curMessages) {
Object.assign(curMessages, userMessages)
} else {
messages[locale] = userMessages
}
})
}
}
initI18nMessages()
export const i18n = initVueI18n( export const i18n = initVueI18n(
locale, locale,
__PLATFORM__ === 'app-plus' || __PLATFORM__ === 'h5' ? messages : {} __PLATFORM__ === 'app-plus' || __PLATFORM__ === 'h5' ? messages : {}
...@@ -134,7 +154,7 @@ export function defineI18nProperty (obj, names) { ...@@ -134,7 +154,7 @@ export function defineI18nProperty (obj, names) {
} }
function isEnableLocale () { function isEnableLocale () {
return __uniConfig.locales && !!Object.keys(__uniConfig.locales).length return typeof __uniConfig !== 'undefined' && __uniConfig.locales && !!Object.keys(__uniConfig.locales).length
} }
export function initNavigationBarI18n (navigationBar) { export function initNavigationBarI18n (navigationBar) {
...@@ -166,11 +186,11 @@ export function initTabBarI18n (tabBar) { ...@@ -166,11 +186,11 @@ export function initTabBarI18n (tabBar) {
return tabBar return tabBar
} }
export function initI18n () { // export function initI18n() {
const localeKeys = Object.keys(__uniConfig.locales || {}) // const localeKeys = Object.keys(__uniConfig.locales || {})
if (localeKeys.length) { // if (localeKeys.length) {
localeKeys.forEach((locale) => // localeKeys.forEach((locale) =>
i18n.add(locale, __uniConfig.locales[locale]) // i18n.add(locale, __uniConfig.locales[locale])
) // )
} // }
} // }
src/core/helpers/protocol/network/request.js
浏览文件 @ 812e5eb0
...@@ -12,7 +12,8 @@ const method = { ...@@ -12,7 +12,8 @@ const method = {
PUT: 'PUT', PUT: 'PUT',
DELETE: 'DELETE', DELETE: 'DELETE',
TRACE: 'TRACE', TRACE: 'TRACE',
CONNECT: 'CONNECT' CONNECT: 'CONNECT',
PATCH: 'PATCH'
} }
const dataType = { const dataType = {
JSON: 'json' JSON: 'json'
......
src/core/service/api/ui/locale.js
浏览文件 @ 812e5eb0
...@@ -5,7 +5,7 @@ import { ...@@ -5,7 +5,7 @@ import {
i18n i18n
} from 'uni-helpers/i18n' } from 'uni-helpers/i18n'
import { import {
DC_LOCALE UNI_STORAGE_LOCALE
} from 'uni-helpers/constants' } from 'uni-helpers/constants'
export function getLocale () { export function getLocale () {
...@@ -35,7 +35,7 @@ export function setLocale (locale) { ...@@ -35,7 +35,7 @@ export function setLocale (locale) {
weex.requireModule('plus').setLanguage(locale) weex.requireModule('plus').setLanguage(locale)
} }
if (__PLATFORM__ === 'h5') { if (__PLATFORM__ === 'h5') {
window.localStorage && (localStorage[DC_LOCALE] = locale) window.localStorage && (localStorage[UNI_STORAGE_LOCALE] = locale)
} }
callbacks.forEach(callbackId => { callbacks.forEach(callbackId => {
invoke(callbackId, { locale }) invoke(callbackId, { locale })
......
src/platforms/app-plus-nvue/runtime/components/rich-text.js
浏览文件 @ 812e5eb0
...@@ -147,11 +147,7 @@ function normalizeNodes (nodes, ctx, options) { ...@@ -147,11 +147,7 @@ function normalizeNodes (nodes, ctx, options) {
} }
function getRichText (weex) { function getRichText (weex) {
const { const defaultFontSize = 16
scale,
deviceWidth
} = weex.config.env
const defaultFontSize = deviceWidth / scale / 20
return { return {
props: { props: {
nodes: { nodes: {
......
src/platforms/app-plus/service/api/page.js
浏览文件 @ 812e5eb0
...@@ -101,7 +101,7 @@ export function showPage ({ ...@@ -101,7 +101,7 @@ export function showPage ({
animationDuration: 200, animationDuration: 200,
uniNView: { uniNView: {
path: `${(typeof process === 'object' && process.env && process.env.VUE_APP_TEMPLATE_PATH) || ''}/${url}.js`, path: `${(typeof process === 'object' && process.env && process.env.VUE_APP_TEMPLATE_PATH) || ''}/${url}.js`,
defaultFontSize: plus_.screen.resolutionWidth / 20, defaultFontSize: 16,
viewport: plus_.screen.resolutionWidth viewport: plus_.screen.resolutionWidth
} }
} }
......
src/platforms/app-plus/service/framework/config.js
浏览文件 @ 812e5eb0
...@@ -27,7 +27,7 @@ export function registerConfig (config, Vue) { ...@@ -27,7 +27,7 @@ export function registerConfig (config, Vue) {
if (__uniConfig.nvueCompiler === 'uni-app') { if (__uniConfig.nvueCompiler === 'uni-app') {
__uniConfig.viewport = plus.screen.resolutionWidth __uniConfig.viewport = plus.screen.resolutionWidth
__uniConfig.defaultFontSize = __uniConfig.viewport / 20 __uniConfig.defaultFontSize = 16
} }
parseRoutes(__uniConfig) parseRoutes(__uniConfig)
...@@ -90,4 +90,4 @@ export function initEntryPage () { ...@@ -90,4 +90,4 @@ export function initEntryPage () {
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
console.log(`[uni-app] entryPagePath(${entryPagePath + entryPageQuery})`) console.log(`[uni-app] entryPagePath(${entryPagePath + entryPageQuery})`)
} }
} }
src/platforms/app-plus/service/index.js
浏览文件 @ 812e5eb0
...@@ -31,12 +31,6 @@ import { ...@@ -31,12 +31,6 @@ import {
import vuePlugin from './framework/plugins' import vuePlugin from './framework/plugins'
import {
initI18n
} from 'uni-helpers/i18n'
initI18n()
// 挂靠在uni上，暂不做全局导出 // 挂靠在uni上，暂不做全局导出
uni.__$wx__ = wx uni.__$wx__ = wx
......
src/platforms/app-plus/view/components/picker/page.js
浏览文件 @ 812e5eb0
...@@ -101,7 +101,7 @@ export function showPage ({ ...@@ -101,7 +101,7 @@ export function showPage ({
animationDuration: 200, animationDuration: 200,
uniNView: { uniNView: {
path: `${(typeof process === 'object' && process.env && process.env.VUE_APP_TEMPLATE_PATH) || ''}/${url}.js`, path: `${(typeof process === 'object' && process.env && process.env.VUE_APP_TEMPLATE_PATH) || ''}/${url}.js`,
defaultFontSize: plus_.screen.resolutionWidth / 20, defaultFontSize: 16,
viewport: plus_.screen.resolutionWidth viewport: plus_.screen.resolutionWidth
} }
} }
......
src/platforms/h5/service/index.js
浏览文件 @ 812e5eb0
...@@ -10,11 +10,6 @@ import { ...@@ -10,11 +10,6 @@ import {
getCurrentPages getCurrentPages
} }
from 'uni-core/service/plugins/app' from 'uni-core/service/plugins/app'
import {
initI18n
} from 'uni-helpers/i18n'
initI18n()
initOn(UniServiceJSBridge.on, { initOn(UniServiceJSBridge.on, {
getApp, getApp,
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或