Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
erosXXX
uni-app
提交
a9986c41
U
uni-app
项目概览
erosXXX
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a9986c41
编写于
8月 01, 2019
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'nvue-dev' of github.com:dcloudio/uni-app into nvue-dev
上级
5ce8a886
4d0dde01
变更
8
展开全部
隐藏空白更改
内联
并排
Showing
8 changed file
with
1503 addition
and
858 deletion
+1503
-858
build/rollup.config.app.js
build/rollup.config.app.js
+5
-3
lib/apis.js
lib/apis.js
+0
-1
lib/modules.js
lib/modules.js
+214
-0
packages/uni-app-plus-nvue/dist/index.js
packages/uni-app-plus-nvue/dist/index.js
+1266
-850
packages/uni-h5/dist/index.umd.min.js
packages/uni-h5/dist/index.umd.min.js
+1
-1
packages/uni-h5/manifest.json
packages/uni-h5/manifest.json
+16
-0
src/platforms/app-plus-nvue/service/api/route/switch-tab.js
src/platforms/app-plus-nvue/service/api/route/switch-tab.js
+0
-2
src/platforms/app-plus/service/framework/plus-message.js
src/platforms/app-plus/service/framework/plus-message.js
+1
-1
未找到文件。
build/rollup.config.app.js
浏览文件 @
a9986c41
...
...
@@ -23,10 +23,12 @@ if (process.env.UNI_SERVICE === 'legacy') {
output
.
format
=
'
iife
'
output
.
name
=
'
serviceContext
'
output
.
banner
=
`export function createServiceContext(Vue, weex, plus, __uniConfig, __uniRoutes, UniServiceJSBridge){
`export function createServiceContext(Vue, weex, plus, __uniConfig, __uniRoutes, UniServiceJSBridge
,instanceContext
){
var localStorage = plus.storage
var setTimeout = global.setTimeout
var clearTimeout = global.clearTimeout
var setTimeout = instanceContext.setTimeout
var clearTimeout = instanceContext.clearTimeout
var setInterval = instanceContext.setInterval
var clearInterval = instanceContext.clearInterval
`
output
.
footer
=
`
...
...
lib/apis.js
浏览文件 @
a9986c41
...
...
@@ -52,7 +52,6 @@ const media = [
'
getImageInfo
'
,
'
saveImageToPhotosAlbum
'
,
'
compressImage
'
,
'
chooseMessageFile
'
,
'
getRecorderManager
'
,
'
getBackgroundAudioManager
'
,
'
createInnerAudioContext
'
,
...
...
lib/modules.js
0 → 100644
浏览文件 @
a9986c41
module
.
exports
=
{
base
:
{
title
:
'
基础
'
,
api
:
[
'
upx2px
'
,
'
base64ToArrayBuffer
'
,
'
arrayBufferToBase64
'
]
},
network
:
{
title
:
'
网络
'
,
api
:
[
'
request
'
,
'
connectSocket
'
,
'
sendSocketMessage
'
,
'
closeSocket
'
,
'
onSocketOpen
'
,
'
onSocketError
'
,
'
onSocketMessage
'
,
'
onSocketClose
'
,
'
downloadFile
'
,
'
uploadFile
'
]
},
route
:
{
title
:
'
路由
'
,
api
:
[
'
navigateTo
'
,
'
redirectTo
'
,
'
reLaunch
'
,
'
switchTab
'
,
'
navigateBack
'
]
},
storage
:
{
title
:
'
数据缓存
'
,
api
:
[
'
setStorage
'
,
'
setStorageSync
'
,
'
getStorage
'
,
'
getStorageSync
'
,
'
removeStorage
'
,
'
removeStorageSync
'
,
'
clearStorage
'
,
'
clearStorageSync
'
,
'
getStorageInfo
'
,
'
getStorageInfoSync
'
,
]
},
location
:
{
title
:
'
位置
'
,
api
:
[
'
getLocation
'
,
'
openLocation
'
,
'
chooseLocation
'
]
},
media
:
{
title
:
'
媒体
'
,
api
:
[
'
chooseImage
'
,
'
previewImage
'
,
'
getImageInfo
'
,
'
saveImageToPhotosAlbum
'
,
'
compressImage
'
,
'
getRecorderManager
'
,
'
getBackgroundAudioManager
'
,
'
createInnerAudioContext
'
,
'
chooseVideo
'
,
'
saveVideoToPhotosAlbum
'
,
'
createVideoContext
'
,
'
createCameraContext
'
,
'
createLivePlayerContext
'
]
},
device
:
{
title
:
'
设备
'
,
api
:
[
'
getSystemInfo
'
,
'
getSystemInfoSync
'
,
'
canIUse
'
,
'
onMemoryWarning
'
,
'
getNetworkType
'
,
'
onNetworkStatusChange
'
,
'
onAccelerometerChange
'
,
'
startAccelerometer
'
,
'
stopAccelerometer
'
,
'
onCompassChange
'
,
'
startCompass
'
,
'
stopCompass
'
,
'
onGyroscopeChange
'
,
'
startGyroscope
'
,
'
stopGyroscope
'
,
'
makePhoneCall
'
,
'
scanCode
'
,
'
setClipboardData
'
,
'
getClipboardData
'
,
'
setScreenBrightness
'
,
'
getScreenBrightness
'
,
'
setKeepScreenOn
'
,
'
onUserCaptureScreen
'
,
'
vibrateLong
'
,
'
vibrateShort
'
,
'
addPhoneContact
'
,
'
openBluetoothAdapter
'
,
'
startBluetoothDevicesDiscovery
'
,
'
onBluetoothDeviceFound
'
,
'
stopBluetoothDevicesDiscovery
'
,
'
onBluetoothAdapterStateChange
'
,
'
getConnectedBluetoothDevices
'
,
'
getBluetoothDevices
'
,
'
getBluetoothAdapterState
'
,
'
closeBluetoothAdapter
'
,
'
writeBLECharacteristicValue
'
,
'
readBLECharacteristicValue
'
,
'
onBLEConnectionStateChange
'
,
'
onBLECharacteristicValueChange
'
,
'
notifyBLECharacteristicValueChange
'
,
'
getBLEDeviceServices
'
,
'
getBLEDeviceCharacteristics
'
,
'
createBLEConnection
'
,
'
closeBLEConnection
'
,
'
onBeaconServiceChange
'
,
'
onBeaconUpdate
'
,
'
getBeacons
'
,
'
startBeaconDiscovery
'
,
'
stopBeaconDiscovery
'
]
},
ui
:
{
title
:
'
界面
'
,
api
:
[
'
showToast
'
,
'
hideToast
'
,
'
showLoading
'
,
'
hideLoading
'
,
'
showModal
'
,
'
showActionSheet
'
,
'
setNavigationBarTitle
'
,
'
setNavigationBarColor
'
,
'
showNavigationBarLoading
'
,
'
hideNavigationBarLoading
'
,
'
setTabBarItem
'
,
'
setTabBarStyle
'
,
'
hideTabBar
'
,
'
showTabBar
'
,
'
setTabBarBadge
'
,
'
removeTabBarBadge
'
,
'
showTabBarRedDot
'
,
'
hideTabBarRedDot
'
,
'
setBackgroundColor
'
,
'
setBackgroundTextStyle
'
,
'
createAnimation
'
,
'
pageScrollTo
'
,
'
onWindowResize
'
,
'
offWindowResize
'
,
'
loadFontFace
'
,
'
startPullDownRefresh
'
,
'
stopPullDownRefresh
'
,
'
createSelectorQuery
'
,
'
createIntersectionObserver
'
,
'
hideKeyboard
'
]
},
event
:
{
title
:
'
页面通讯
'
,
api
:
[
'
$emit
'
,
'
$on
'
,
'
$once
'
,
'
$off
'
]
},
file
:
{
title
:
'
文件
'
,
api
:
[
'
saveFile
'
,
'
getSavedFileList
'
,
'
getSavedFileInfo
'
,
'
removeSavedFile
'
,
'
getFileInfo
'
,
'
openDocument
'
,
'
getFileSystemManager
'
]
},
canvas
:
{
title
:
'
绘画
'
,
api
:
[
'
createOffscreenCanvas
'
,
'
createCanvasContext
'
,
'
canvasToTempFilePath
'
,
'
canvasPutImageData
'
,
'
canvasGetImageData
'
]
},
third
:
{
title
:
'
第三方服务
'
,
api
:
[
'
getProvider
'
,
'
login
'
,
'
checkSession
'
,
'
getUserInfo
'
,
'
share
'
,
'
showShareMenu
'
,
'
hideShareMenu
'
,
'
requestPayment
'
,
'
subscribePush
'
,
'
unsubscribePush
'
,
'
onPush
'
,
'
offPush
'
,
'
requireNativePlugin
'
]
}
}
packages/uni-app-plus-nvue/dist/index.js
浏览文件 @
a9986c41
此差异已折叠。
点击以展开。
packages/uni-h5/dist/index.umd.min.js
浏览文件 @
a9986c41
此差异已折叠。
点击以展开。
packages/uni-h5/manifest.json
浏览文件 @
a9986c41
...
...
@@ -406,6 +406,22 @@
"/platforms/h5/service/api/device/vibrate.js"
,
[]
],
"onBluetoothDeviceFound"
:
[
"/core/service/api/device/bluetooth.js"
,
[]
],
"onBluetoothAdapterStateChange"
:
[
"/core/service/api/device/bluetooth.js"
,
[]
],
"onBLEConnectionStateChange"
:
[
"/core/service/api/device/bluetooth.js"
,
[]
],
"onBLECharacteristicValueChange"
:
[
"/core/service/api/device/bluetooth.js"
,
[]
],
"hideKeyboard"
:
[
"/platforms/h5/service/api/device/hide-keyboard.js"
,
[]
...
...
src/platforms/app-plus-nvue/service/api/route/switch-tab.js
浏览文件 @
a9986c41
...
...
@@ -37,8 +37,6 @@ export function switchTab ({
currentPage
.
$getAppWebview
().
close
(
'
auto
'
)
}
}
else
{
// TODO 客户端 Bug
currentPage
.
$getAppWebview
().
hide
(
'
none
'
)
// 前一个 tabBar 触发 onHide
currentPage
.
$vm
.
__call_hook
(
'
onHide
'
)
}
...
...
src/platforms/app-plus/service/framework/plus-message.js
浏览文件 @
a9986c41
...
...
@@ -29,7 +29,7 @@ export function consumePlusMessage (type, args) {
*/
export
function
registerPlusMessage
(
type
,
callback
,
keepAlive
=
true
)
{
if
(
callbacks
[
type
])
{
throw
new
Error
(
`
${
type
}
已注册:`
+
(
callbacks
[
type
].
toString
()))
return
console
.
warn
(
`
${
type
}
已注册:`
+
(
callbacks
[
type
].
toString
()))
}
callback
.
keepAlive
=
!!
keepAlive
callbacks
[
type
]
=
callback
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录