Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
m0_68066342
uni-app
提交
8094141e
U
uni-app
项目概览
m0_68066342
/
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,发现更多精彩内容 >>
提交
8094141e
编写于
12月 26, 2019
作者:
fxy060608
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of
https://github.com/dcloudio/uni-app
into alpha
上级
bff889c4
96df6739
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
61 addition
and
39 deletion
+61
-39
packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.v3.js
...bpack-uni-pages-loader/lib/platforms/app-plus/index.v3.js
+1
-1
src/core/service/api/storage/storage.js
src/core/service/api/storage/storage.js
+60
-38
未找到文件。
packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.v3.js
浏览文件 @
8094141e
...
...
@@ -24,7 +24,7 @@ function getTabBarPages (appJson) {
}
function
isTabBarPage
(
pathName
,
tabBarPages
)
{
return
tabBarPages
.
find
(
item
=>
item
.
pagePath
===
pathName
)
return
tabBarPages
&&
tabBarPages
.
find
(
item
=>
item
.
pagePath
===
pathName
)
}
function
parseEntryPagePath
(
appJson
,
manifestJson
)
{
...
...
src/core/service/api/storage/storage.js
浏览文件 @
8094141e
const
STORAGE_DATA_TYPE
=
'
__TYPE
'
const
STORAGE_KEYS
=
'
uni-storage-keys
'
export
function
setStorage
({
key
,
data
}
=
{})
{
const
value
=
{
type
:
typeof
data
===
'
object
'
?
'
object
'
:
'
string
'
,
const
type
=
typeof
data
const
value
=
type
===
'
string
'
?
data
:
JSON
.
stringify
({
type
,
data
:
data
}
localStorage
.
setItem
(
key
,
JSON
.
stringify
(
value
))
const
keyList
=
localStorage
.
getItem
(
'
uni-storage-keys
'
)
if
(
!
keyList
)
{
localStorage
.
setItem
(
'
uni-storage-keys
'
,
JSON
.
stringify
([
key
]))
}
else
{
const
keys
=
JSON
.
parse
(
keyList
)
if
(
keys
.
indexOf
(
key
)
<
0
)
{
keys
.
push
(
key
)
localStorage
.
setItem
(
'
uni-storage-keys
'
,
JSON
.
stringify
(
keys
))
})
try
{
localStorage
.
setItem
(
key
,
value
)
}
catch
(
error
)
{
return
{
errMsg
:
`setStorage:fail
${
error
}
`
}
}
return
{
...
...
@@ -32,13 +32,33 @@ export function setStorageSync (key, data) {
export
function
getStorage
({
key
}
=
{})
{
const
data
=
localStorage
.
getItem
(
key
)
return
data
?
{
data
:
JSON
.
parse
(
data
).
data
,
const
value
=
localStorage
&&
localStorage
.
getItem
(
key
)
if
(
typeof
value
!==
'
string
'
)
{
return
{
data
:
''
,
errMsg
:
'
getStorage:fail
'
}
}
let
data
=
value
try
{
const
object
=
JSON
.
parse
(
value
)
// 兼容App端历史格式
const
type
=
localStorage
.
getItem
(
key
+
STORAGE_DATA_TYPE
)
if
(
!
type
)
{
const
keys
=
Object
.
keys
(
object
)
if
(
keys
.
length
===
2
&&
'
type
'
in
object
&&
'
data
'
in
object
)
{
data
=
object
.
data
}
else
if
(
keys
.
length
===
1
&&
'
type
'
in
object
)
{
data
=
''
}
}
else
if
(
type
!==
'
String
'
)
{
data
=
object
data
=
typeof
data
===
'
string
'
?
JSON
.
parse
(
data
)
:
data
}
}
catch
(
error
)
{
}
return
{
data
,
errMsg
:
'
getStorage:ok
'
}
:
{
data
:
''
,
errMsg
:
'
getStorage:fail
'
}
}
...
...
@@ -52,14 +72,11 @@ export function getStorageSync (key) {
export
function
removeStorage
({
key
}
=
{})
{
const
keyList
=
localStorage
.
getItem
(
'
uni-storage-keys
'
)
if
(
keyList
)
{
const
keys
=
JSON
.
parse
(
keyList
)
const
index
=
keys
.
indexOf
(
key
)
keys
.
splice
(
index
,
1
)
localStorage
.
setItem
(
'
uni-storage-keys
'
,
JSON
.
stringify
(
keys
))
if
(
localStorage
)
{
// 兼容App端历史格式
localStorage
.
removeItem
(
key
+
STORAGE_DATA_TYPE
)
localStorage
.
removeItem
(
key
)
}
localStorage
.
removeItem
(
key
)
return
{
errMsg
:
'
removeStorage:ok
'
}
...
...
@@ -72,7 +89,7 @@ export function removeStorageSync (key) {
}
export
function
clearStorage
()
{
localStorage
.
clear
()
localStorage
&&
localStorage
.
clear
()
return
{
errMsg
:
'
clearStorage:ok
'
}
...
...
@@ -82,18 +99,23 @@ export function clearStorageSync () {
clearStorage
()
}
export
function
getStorageInfo
()
{
// TODO 暂时先不做大小的转换
const
keyList
=
localStorage
.
getItem
(
'
uni-storage-keys
'
)
return
keyList
?
{
keys
:
JSON
.
parse
(
keyList
),
currentSize
:
0
,
limitSize
:
0
,
export
function
getStorageInfo
()
{
const
length
=
(
localStorage
&&
(
localStorage
.
length
||
localStorage
.
getLength
()))
||
0
const
keys
=
[]
let
currentSize
=
0
for
(
let
index
=
0
;
index
<
length
;
index
++
)
{
const
key
=
localStorage
.
key
(
index
)
if
(
key
!==
STORAGE_KEYS
&&
key
.
indexOf
(
STORAGE_DATA_TYPE
)
+
STORAGE_DATA_TYPE
.
length
!==
key
.
length
)
{
const
value
=
localStorage
.
getItem
(
key
)
currentSize
+=
key
.
length
+
value
.
length
keys
.
push
(
key
)
}
}
return
{
keys
,
currentSize
:
Math
.
ceil
(
currentSize
*
2
/
1024
),
limitSize
:
Number
.
MAX_VALUE
,
errMsg
:
'
getStorageInfo:ok
'
}
:
{
keys
:
''
,
currentSize
:
0
,
limitSize
:
0
,
errMsg
:
'
getStorageInfo:fail
'
}
}
...
...
@@ -101,4 +123,4 @@ export function getStorageInfoSync () {
const
res
=
getStorageInfo
()
delete
res
.
errMsg
return
res
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录