Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小浣熊撸代码
uni-app
提交
f34dc72f
U
uni-app
项目概览
小浣熊撸代码
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f34dc72f
编写于
4月 15, 2021
作者:
D
DCloud_LXH
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chore: getSystemInfoSync
上级
853a81b2
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
26 addition
and
6 deletion
+26
-6
packages/uni-api/src/helpers/api/callback.ts
packages/uni-api/src/helpers/api/callback.ts
+4
-1
packages/uni-api/src/helpers/api/index.ts
packages/uni-api/src/helpers/api/index.ts
+2
-1
packages/uni-api/src/helpers/protocol.ts
packages/uni-api/src/helpers/protocol.ts
+2
-2
packages/uni-api/src/index.ts
packages/uni-api/src/index.ts
+1
-0
packages/uni-api/src/protocols/ui/tabBar.ts
packages/uni-api/src/protocols/ui/tabBar.ts
+1
-2
packages/uni-h5/src/service/api/base/getBaseSystemInfo.ts
packages/uni-h5/src/service/api/base/getBaseSystemInfo.ts
+2
-0
packages/uni-h5/src/service/api/device/getSystemInfoSync.ts
packages/uni-h5/src/service/api/device/getSystemInfoSync.ts
+5
-0
packages/uni-shared/src/utils.ts
packages/uni-shared/src/utils.ts
+9
-0
未找到文件。
packages/uni-api/src/helpers/api/callback.ts
浏览文件 @
f34dc72f
...
...
@@ -81,7 +81,10 @@ export const API_SUCCESS = 'success'
export
const
API_FAIL
=
'
fail
'
export
const
API_COMPLETE
=
'
complete
'
type
CALLBACK_TYPES
=
typeof
API_SUCCESS
|
typeof
API_FAIL
|
typeof
API_COMPLETE
export
type
CALLBACK_TYPES
=
|
typeof
API_SUCCESS
|
typeof
API_FAIL
|
typeof
API_COMPLETE
type
ApiCallbacks
=
{
[
key
in
CALLBACK_TYPES
]?:
Function
...
...
packages/uni-api/src/helpers/api/index.ts
浏览文件 @
f34dc72f
...
...
@@ -15,6 +15,7 @@ import {
createKeepAliveApiCallback
,
removeKeepAliveApiCallback
,
}
from
'
./callback
'
import
type
{
CALLBACK_TYPES
}
from
'
./callback
'
import
{
promisify
}
from
'
./promise
'
function
formatApiArgs
<
T
extends
ApiLike
>
(
...
...
@@ -219,7 +220,7 @@ export function defineSyncApi<T extends ApiLike>(
export
function
defineAsyncApi
<
T
extends
AsyncApiLike
,
P
=
AsyncApiOptions
<
T
>>
(
name
:
string
,
fn
:
(
args
:
Omit
<
P
,
'
success
'
|
'
fail
'
|
'
complete
'
>
,
args
:
Omit
<
P
,
CALLBACK_TYPES
>
,
res
:
{
resolve
:
(
res
?:
AsyncApiRes
<
P
>
)
=>
void
reject
:
(
err
?:
string
)
=>
void
...
...
packages/uni-api/src/helpers/protocol.ts
浏览文件 @
f34dc72f
...
...
@@ -23,8 +23,8 @@ export const HTTP_METHODS = [
'
CONNECT
'
,
]
export
function
elemInArray
(
str
:
string
,
arr
:
string
[])
{
if
(
arr
.
indexOf
(
str
)
===
-
1
)
{
export
function
elemInArray
<
T
=
string
>
(
str
:
T
,
arr
:
T
[])
{
if
(
!
str
||
arr
.
indexOf
(
str
)
===
-
1
)
{
return
arr
[
0
]
}
return
str
...
...
packages/uni-api/src/index.ts
浏览文件 @
f34dc72f
...
...
@@ -23,6 +23,7 @@ export * from './protocols/location/openLocation'
export
*
from
'
./protocols/media/chooseImage
'
export
*
from
'
./protocols/media/chooseVideo
'
export
*
from
'
./protocols/media/chooseFile
'
export
*
from
'
./protocols/media/getImageInfo
'
export
*
from
'
./protocols/network/request
'
...
...
packages/uni-api/src/protocols/ui/tabBar.ts
浏览文件 @
f34dc72f
import
{
extend
}
from
'
@vue/shared
'
import
{
getLen
}
from
'
@dcloudio/uni-shared
'
import
{
getLen
,
removeLeadingSlash
}
from
'
@dcloudio/uni-shared
'
import
{
getRealPath
}
from
'
@dcloudio/uni-platform
'
import
{
getCurrentPageMeta
}
from
'
@dcloudio/uni-core
'
import
{
removeLeadingSlash
}
from
'
@dcloudio/uni-shared
'
const
IndexProtocol
:
ApiProtocol
<
API_TYPE_SET_TAB_BAR_ITEM
>
=
{
index
:
{
...
...
packages/uni-h5/src/service/api/base/getBaseSystemInfo.ts
浏览文件 @
f34dc72f
...
...
@@ -10,6 +10,8 @@ export const isMac = /Macintosh|Mac/i.test(ua)
export
const
isLinux
=
/Linux|X11/i
.
test
(
ua
)
export
const
isIPadOS
=
isMac
&&
navigator
.
maxTouchPoints
>
0
export
function
getScreenFix
()
{
return
(
/^Apple/
.
test
(
navigator
.
vendor
)
&&
typeof
window
.
orientation
===
'
number
'
...
...
packages/uni-h5/src/service/api/device/getSystemInfoSync.ts
浏览文件 @
f34dc72f
...
...
@@ -11,6 +11,7 @@ import {
isWindows
,
isMac
,
isLinux
,
isIPadOS
,
isLandscape
,
getScreenFix
,
getScreenWidth
,
...
...
@@ -88,6 +89,10 @@ export const getSystemInfoSync = defineSyncApi<typeof uni.getSystemInfoSync>(
break
}
}
}
else
if
(
isIPadOS
)
{
model
=
'
iPad
'
osname
=
'
iOS
'
osversion
=
typeof
window
.
BigInt
===
'
function
'
?
'
14.0
'
:
'
13.0
'
}
else
if
(
isWindows
||
isMac
||
isLinux
)
{
model
=
'
PC
'
osname
=
'
PC
'
...
...
packages/uni-shared/src/utils.ts
浏览文件 @
f34dc72f
...
...
@@ -13,3 +13,12 @@ export const invokeArrayFns = (fns: Function[], arg?: any) => {
}
return
ret
}
export
function
updateElementStyle
(
element
:
HTMLElement
,
styles
:
Partial
<
CSSStyleDeclaration
>
)
{
for
(
const
attrName
in
styles
)
{
element
.
style
[
attrName
]
=
styles
[
attrName
]
!
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录