Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
touchx
uni-app
提交
173ec5df
U
uni-app
项目概览
touchx
/
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,发现更多精彩内容 >>
提交
173ec5df
编写于
12月 27, 2019
作者:
fxy060608
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of
https://github.com/dcloudio/uni-app
into alpha
上级
953143fc
5a8026cc
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
72 addition
and
41 deletion
+72
-41
packages/uni-app-plus/dist/index.v3.js
packages/uni-app-plus/dist/index.v3.js
+60
-38
packages/vue-cli-plugin-hbuilderx/build/vue-loader.conf.js
packages/vue-cli-plugin-hbuilderx/build/vue-loader.conf.js
+0
-1
packages/webpack-uni-pages-loader/lib/index-new.js
packages/webpack-uni-pages-loader/lib/index-new.js
+7
-1
packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.v3.js
...bpack-uni-pages-loader/lib/platforms/app-plus/index.v3.js
+5
-1
未找到文件。
packages/uni-app-plus/dist/index.v3.js
浏览文件 @
173ec5df
...
...
@@ -10901,23 +10901,23 @@ var serviceContext = (function () {
uploadFile
:
uploadFile$1
});
const
STORAGE_DATA_TYPE
=
'
__TYPE
'
;
const
STORAGE_KEYS
=
'
uni-storage-keys
'
;
function
setStorage$1
({
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
{
...
...
@@ -10935,15 +10935,35 @@ var serviceContext = (function () {
function
getStorage$1
({
key
}
=
{})
{
const
data
=
localStorage
.
getItem
(
key
);
return
data
?
{
data
:
JSON
.
parse
(
data
).
data
,
errMsg
:
'
getStorage:ok
'
}
:
{
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
'
}
}
function
getStorageSync$1
(
key
)
{
const
res
=
getStorage$1
({
...
...
@@ -10955,14 +10975,11 @@ var serviceContext = (function () {
function
removeStorage$1
({
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
);
}
return
{
errMsg
:
'
removeStorage:ok
'
}
...
...
@@ -10975,7 +10992,7 @@ var serviceContext = (function () {
}
function
clearStorage
()
{
localStorage
.
clear
();
localStorage
&&
localStorage
.
clear
();
return
{
errMsg
:
'
clearStorage:ok
'
}
...
...
@@ -10985,18 +11002,23 @@ var serviceContext = (function () {
clearStorage
();
}
function
getStorageInfo
()
{
// TODO 暂时先不做大小的转换
const
keyList
=
localStorage
.
getItem
(
'
uni-storage-keys
'
);
return
keyList
?
{
keys
:
JSON
.
parse
(
keyList
),
currentSize
:
0
,
limitSize
:
0
,
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
'
}
}
...
...
packages/vue-cli-plugin-hbuilderx/build/vue-loader.conf.js
浏览文件 @
173ec5df
...
...
@@ -8,7 +8,6 @@ const {
}
=
require
(
'
@dcloudio/uni-template-compiler/lib/util
'
)
const
TAGS
=
[
'
ad
'
,
'
text
'
,
'
image
'
,
'
input
'
,
...
...
packages/webpack-uni-pages-loader/lib/index-new.js
浏览文件 @
173ec5df
...
...
@@ -86,6 +86,12 @@ module.exports = function (content) {
let
appConfigContent
=
''
jsonFiles
.
forEach
(
jsonFile
=>
{
if
(
jsonFile
)
{
if
(
!
isAppView
&&
jsonFile
.
name
===
'
manifest.json
'
)
{
const
content
=
JSON
.
parse
(
jsonFile
.
content
)
if
(
!
content
.
launch_path
&&
content
.
plus
[
'
uni-app
'
].
nvueLaunchMode
===
'
fast
'
)
{
console
.
log
(
'
Nvue 首页启动模式: fast 详见: https://ask.dcloud.net.cn/article/36749
'
)
}
}
if
(
jsonFile
.
name
===
'
define-pages.js
'
)
{
appConfigContent
=
jsonFile
.
content
}
else
{
...
...
packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.v3.js
浏览文件 @
173ec5df
...
...
@@ -92,6 +92,10 @@ module.exports = function (appJson, manifestJson, {
manifestJson
.
plus
.
launch_path
=
'
__uniappview.html
'
// 首页地址固定
}
// nvue 首页启动模式
manifestJson
.
plus
[
'
uni-app
'
].
nvueLaunchMode
=
manifestJson
.
plus
.
nvueLaunchMode
===
'
fast
'
?
'
fast
'
:
'
normal
'
delete
manifestJson
.
plus
.
nvueLaunchMode
manifest
.
name
=
'
manifest.json
'
manifest
.
content
=
JSON
.
stringify
(
manifest
.
content
)
delete
appJson
.
nvue
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录