Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
ab388226
U
uni-app
项目概览
DCloud
/
uni-app
25 天 前同步成功
通知
702
Star
38704
Fork
3642
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
7
列表
看板
标记
里程碑
合并请求
1
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
7
Issue
7
列表
看板
标记
里程碑
合并请求
1
合并请求
1
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ab388226
编写于
10月 22, 2019
作者:
fxy060608
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of
https://github.com/dcloudio/uni-app
into v3
上级
6b4164fe
a6a8e7cb
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
67 addition
and
34 deletion
+67
-34
packages/vue-cli-plugin-uni-optimize/packages/webpack-optimize-plugin/component.js
...ni-optimize/packages/webpack-optimize-plugin/component.js
+3
-3
packages/webpack-uni-mp-loader/lib/plugin/generate-app.js
packages/webpack-uni-mp-loader/lib/plugin/generate-app.js
+2
-3
packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
.../webpack-uni-pages-loader/lib/platforms/app-plus/index.js
+4
-3
packages/webpack-uni-pages-loader/lib/util.js
packages/webpack-uni-pages-loader/lib/util.js
+3
-1
src/platforms/app-plus/service/api/ui/tab-bar.js
src/platforms/app-plus/service/api/ui/tab-bar.js
+21
-6
src/platforms/app-plus/service/framework/tab-bar.js
src/platforms/app-plus/service/framework/tab-bar.js
+7
-5
src/platforms/h5/view/components/picker/index.vue
src/platforms/h5/view/components/picker/index.vue
+27
-13
未找到文件。
packages/vue-cli-plugin-uni-optimize/packages/webpack-optimize-plugin/component.js
浏览文件 @
ab388226
...
...
@@ -20,12 +20,12 @@ module.exports = function updateComponents(tags) {
autoloadTags
.
root
.
forEach
(
tagName
=>
{
tags
.
add
(
tagName
)
})
tags
=
[...
tags
]
Object
.
keys
(
autoloadTags
.
other
).
forEach
(
tagName
=>
{
if
(
tags
.
include
s
(
tagName
))
{
tags
.
push
(...
autoloadTags
.
other
[
tagName
]
)
if
(
tags
.
ha
s
(
tagName
))
{
autoloadTags
.
other
[
tagName
].
forEach
(
tag
=>
tags
.
add
(
tag
)
)
}
})
tags
=
[...
tags
]
const
importsStr
=
tags
.
map
(
tagName
=>
{
if
(
platformTags
.
indexOf
(
tagName
)
!==
-
1
)
{
return
`import
${
capitalize
(
camelize
(
tagName
))}
from 'uni-platform/view/components/
${
tagName
}
'`
...
...
packages/webpack-uni-mp-loader/lib/plugin/generate-app.js
浏览文件 @
ab388226
...
...
@@ -21,8 +21,7 @@ module.exports = function generateApp (compilation) {
process
.
env
.
NODE_ENV
===
'
production
'
&&
process
.
env
.
UNI_PLATFORM
!==
'
app-plus
'
)
{
const
entryPage
=
Object
.
keys
(
process
.
UNI_ENTRY
)[
1
]
const
targetCssName
=
entryPage
?
(
entryPage
+
ext
)
:
`common/main
${
ext
}
`
const
targetCssName
=
`common/main
${
ext
}
`
if
(
!
compilation
.
assets
[
targetCssName
])
{
compilation
.
assets
[
targetCssName
]
=
{
...
...
@@ -63,7 +62,7 @@ module.exports = function generateApp (compilation) {
)
{
const
source
=
`
!function(){try{var
r=Function("return this")();r&&!r.Math&&Object.assign(r,{Array:Array,Date:Date,Error:Error,Function:Function,Math:Math,Object:Object,RegExp:RegExp,String:String,TypeError:TypeError,setTimeout:setTimeout,clearTimeout:clearTimeout,setInterval:setInterval,clearInterval:clearInterval})}catch(r
){}}();
!function(){try{var
a=Function("return this")();a&&!a.Math&&(Object.assign(a,{Array:Array,Date:Date,Error:Error,Function:Function,Math:Math,Object:Object,RegExp:RegExp,String:String,TypeError:TypeError,setTimeout:setTimeout,clearTimeout:clearTimeout,setInterval:setInterval,clearInterval:clearInterval}),"undefined"!=typeof Reflect&&(a.Reflect=Reflect))}catch(a
){}}();
${
compilation
.
assets
[
runtimeJsPath
].
source
()}
`
compilation
.
assets
[
runtimeJsPath
]
=
{
...
...
packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
浏览文件 @
ab388226
...
...
@@ -400,17 +400,18 @@ module.exports = function (pagesJson, userManifestJson) {
}
else
if
(
isNVueEntryPage
)
{
// 非纯 nvue 项目首页为 nvue 页面
manifestJson
.
plus
.
launchwebview
.
id
=
'
2
'
manifestJson
.
plus
.
launchwebview
.
render
=
'
always
'
}
// 带 tab
if
(
pagesJson
.
tabBar
&&
pagesJson
.
tabBar
.
list
&&
pagesJson
.
tabBar
.
list
.
length
)
{
const
tabBar
=
manifestJson
.
plus
.
tabBar
=
Object
.
assign
({},
pagesJson
.
tabBar
)
const
borderStyles
=
{
black
:
'
rgba(0,0,0,0.
8
)
'
,
white
:
'
rgba(255,255,255,0.
8
)
'
black
:
'
rgba(0,0,0,0.
4
)
'
,
white
:
'
rgba(255,255,255,0.
4
)
'
}
let
borderStyle
=
tabBar
.
borderStyle
if
(
!
borderStyle
)
{
borderStyle
=
borderStyles
.
black
borderStyle
=
'
black
'
}
if
(
borderStyle
in
borderStyles
)
{
tabBar
.
borderStyle
=
borderStyles
[
borderStyle
]
...
...
packages/webpack-uni-pages-loader/lib/util.js
浏览文件 @
ab388226
...
...
@@ -16,7 +16,9 @@ const alipayWindowMap = {
'
backgroundColor
'
:
'
backgroundColor
'
,
'
usingComponents
'
:
'
usingComponents
'
,
'
navigationBarShadow
'
:
'
navigationBarShadow
'
,
'
titleImage
'
:
'
titleImage
'
'
titleImage
'
:
'
titleImage
'
,
'
transparentTitle
'
:
'
transparentTitle
'
,
'
titlePenetrate
'
:
'
titlePenetrate
'
}
const
alipayTabBarMap
=
{
...
...
src/platforms/app-plus/service/api/ui/tab-bar.js
浏览文件 @
ab388226
...
...
@@ -43,12 +43,27 @@ export function setTabBarStyle ({
errMsg
:
'
setTabBarStyle:fail not TabBar page
'
}
}
tabBar
.
setTabBarStyle
({
color
,
selectedColor
,
backgroundColor
,
borderStyle
:
borderStyle
===
'
white
'
?
'
#ffffff
'
:
'
#c6c6c6
'
})
const
style
=
{}
const
borderStyles
=
{
black
:
'
rgba(0,0,0,0.4)
'
,
white
:
'
rgba(255,255,255,0.4)
'
}
if
(
color
)
{
style
.
color
=
color
}
if
(
selectedColor
)
{
style
.
selectedColor
=
selectedColor
}
if
(
backgroundColor
)
{
style
.
backgroundColor
=
backgroundColor
}
if
(
borderStyle
in
borderStyles
)
{
borderStyle
=
borderStyles
[
borderStyle
]
}
if
(
borderStyle
)
{
style
.
borderStyle
=
borderStyle
}
tabBar
.
setTabBarStyle
(
style
)
return
{
errMsg
:
'
setTabBarStyle:ok
'
}
...
...
src/platforms/app-plus/service/framework/tab-bar.js
浏览文件 @
ab388226
...
...
@@ -50,17 +50,19 @@ function setTabBarBadge (type, index, text) {
* 动态设置 tabBar 某一项的内容
*/
function
setTabBarItem
(
index
,
text
,
iconPath
,
selectedIconPath
)
{
const
item
=
{}
const
item
=
{
index
}
if
(
text
!==
undefined
)
{
item
.
text
=
text
}
if
(
iconPath
)
{
item
.
iconPath
=
getRealPath
(
iconPath
)
}
if
(
selectedIconPath
)
{
item
.
selectedIconPath
=
getRealPath
(
selectedIconPath
)
}
tabBar
&&
tabBar
.
setTabBarItem
(
Object
.
assign
({
index
,
text
},
item
))
tabBar
&&
tabBar
.
setTabBarItem
(
item
)
}
/**
* 动态设置 tabBar 的整体样式
...
...
src/platforms/h5/view/components/picker/index.vue
浏览文件 @
ab388226
...
...
@@ -229,17 +229,6 @@ export default {
this
.
valueSync
=
val
}
},
valueSync
(
value
)
{
if
(
this
.
valueChangeSource
)
{
this
.
$trigger
(
'
change
'
,
{},
{
value
}
)
}
},
valueArray
(
val
)
{
if
(
this
.
mode
===
mode
.
TIME
||
this
.
mode
===
mode
.
DATE
)
{
let
getValue
=
...
...
@@ -375,8 +364,19 @@ export default {
valueArray
=
[...
val
]
break
case
mode
.
TIME
:
var
timeValTestFail
=
false
if
(
typeof
this
.
value
!==
'
string
'
)
{
timeValTestFail
=
true
}
else
{
val
.
split
(
'
:
'
).
map
((
val
,
i
)
=>
{
var
valIndex
=
this
.
timeArray
[
i
].
indexOf
(
val
)
if
(
valIndex
===
-
1
)
{
timeValTestFail
=
true
}
})
}
// 处理默认值为当前时间
if
(
t
his
.
value
===
0
)
{
if
(
t
imeValTestFail
)
{
val
=
formatDateTime
({
mode
:
mode
.
TIME
})
...
...
@@ -386,8 +386,19 @@ export default {
.
map
((
val
,
i
)
=>
this
.
timeArray
[
i
].
indexOf
(
val
))
break
case
mode
.
DATE
:
var
dateValTestFail
=
false
if
(
typeof
this
.
value
!==
'
string
'
)
{
dateValTestFail
=
true
}
else
{
val
.
split
(
'
-
'
).
map
((
val
,
i
)
=>
{
var
valIndex
=
this
.
dateArray
[
i
].
indexOf
(
val
)
if
(
valIndex
===
-
1
)
{
dateValTestFail
=
true
}
})
}
// 处理默认值为当前日期
if
(
this
.
value
===
0
)
{
if
(
dateValTestFail
)
{
val
=
formatDateTime
({
mode
:
mode
.
DATE
})
...
...
@@ -422,6 +433,9 @@ export default {
this
.
valueChangeSource
=
'
click
'
let
value
=
this
.
_getValue
()
this
.
valueSync
=
Array
.
isArray
(
value
)
?
value
.
map
(
val
=>
val
)
:
value
this
.
$trigger
(
'
change
'
,
{},
{
value
})
},
_cancel
()
{
this
.
_close
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录