Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
e8339526
U
uni-app
项目概览
DCloud
/
uni-app
2 个月 前同步成功
通知
716
Star
38705
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,发现更多精彩内容 >>
提交
e8339526
编写于
3月 04, 2020
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' into alpha
上级
0467a4fb
0bafe1b7
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
54 addition
and
46 deletion
+54
-46
packages/vue-cli-plugin-uni/lib/h5/index.js
packages/vue-cli-plugin-uni/lib/h5/index.js
+1
-1
packages/webpack-uni-pages-loader/lib/index-new.js
packages/webpack-uni-pages-loader/lib/index-new.js
+3
-3
src/platforms/app-plus/view/components/cover-view/index.vue
src/platforms/app-plus/view/components/cover-view/index.vue
+17
-22
src/platforms/app-plus/view/mixins/cover.js
src/platforms/app-plus/view/mixins/cover.js
+33
-20
未找到文件。
packages/vue-cli-plugin-uni/lib/h5/index.js
浏览文件 @
e8339526
...
...
@@ -113,7 +113,7 @@ global.onAppShow = function(){};
`
:
''
return
{
devtool
:
process
.
env
.
NODE_ENV
===
'
production
'
?
false
:
'
source-map
'
,
devtool
:
process
.
env
.
NODE_ENV
===
'
production
'
?
false
:
'
cheap-module-eval-
source-map
'
,
resolve
:
{
extensions
:
[
'
.nvue
'
],
alias
:
{
...
...
packages/webpack-uni-pages-loader/lib/index-new.js
浏览文件 @
e8339526
...
...
@@ -17,7 +17,7 @@ const {
}
=
require
(
'
@dcloudio/uni-cli-shared/lib/cache
'
)
const
{
pagesJsonJsFileName
,
//
pagesJsonJsFileName,
initAutoImportComponents
}
=
require
(
'
@dcloudio/uni-cli-shared/lib/pages
'
)
...
...
@@ -41,11 +41,11 @@ module.exports = function (content) {
isAppView
=
params
.
type
===
'
view
'
}
const
pagesJsonJsPath
=
path
.
resolve
(
process
.
env
.
UNI_INPUT_DIR
,
pagesJsonJsFileName
)
//
const pagesJsonJsPath = path.resolve(process.env.UNI_INPUT_DIR, pagesJsonJsFileName)
const
manifestJsonPath
=
path
.
resolve
(
process
.
env
.
UNI_INPUT_DIR
,
'
manifest.json
'
)
const
manifestJson
=
parseManifestJson
(
fs
.
readFileSync
(
manifestJsonPath
,
'
utf8
'
))
this
.
addDependency
(
pagesJsonJsPath
)
//
this.addDependency(pagesJsonJsPath)
this
.
addDependency
(
manifestJsonPath
)
const
pagesJson
=
parsePagesJson
(
content
,
{
...
...
src/platforms/app-plus/view/components/cover-view/index.vue
浏览文件 @
e8339526
<
template
>
<uni-cover-view
v-on=
"$listeners"
>
<div
ref=
"container"
class=
"uni-cover-view"
/>
</uni-cover-view>
</
template
>
<
script
>
import
native
from
'
../../mixins/native
'
import
cover
from
'
../../mixins/cover
'
...
...
@@ -20,20 +12,23 @@ export default {
coverContent
:
''
}
},
watch
:
{},
mounted
()
{
this
.
_updateContent
()
this
.
$watch
(
'
$slot
'
,
this
.
_updateContent
)
},
methods
:
{
_updateContent
(
val
)
{
const
$slots
=
this
.
$slots
.
default
||
[]
$slots
.
forEach
(
node
=>
{
if
(
!
node
.
tag
)
{
this
.
coverContent
+=
node
.
text
||
''
}
})
}
render
(
createElement
)
{
let
coverContent
=
''
const
$slots
=
this
.
$slots
.
default
||
[]
$slots
.
forEach
(
node
=>
{
if
(
!
node
.
tag
)
{
coverContent
+=
node
.
text
||
''
}
})
this
.
coverContent
=
coverContent
return
createElement
(
'
uni-cover-view
'
,
{
on
:
{
on
:
this
.
$listeners
}
},
[
createElement
(
'
div
'
,
{
ref
:
'
container
'
,
staticClass
:
'
uni-cover-view
'
},
[
coverContent
])])
}
}
</
script
>
...
...
src/platforms/app-plus/view/mixins/cover.js
浏览文件 @
e8339526
const
base
=
[
'
padding
'
,
'
borderRadius
'
,
'
borderColor
'
,
'
borderWidth
'
,
'
backgroundColor
'
]
const
text
=
[
'
color
'
,
'
textAlign
'
,
'
lineHeight
'
,
'
fontSize
'
,
'
fontWeight
'
,
'
textOverflow
'
,
'
whiteSpace
'
]
const
base
=
[
'
borderRadius
'
,
'
borderColor
'
,
'
borderWidth
'
,
'
backgroundColor
'
]
const
text
=
[
'
paddingTop
'
,
'
paddingRight
'
,
'
paddingBottom
'
,
'
paddingLeft
'
,
'
color
'
,
'
textAlign
'
,
'
lineHeight
'
,
'
fontSize
'
,
'
fontWeight
'
,
'
textOverflow
'
,
'
whiteSpace
'
]
const
image
=
[]
const
textAlign
=
{
start
:
'
left
'
,
end
:
'
right
'
}
let
index
=
0
...
...
@@ -35,30 +35,42 @@ export default {
tags
()
{
const
position
=
this
.
_getTagPosition
()
const
style
=
this
.
style
return
[
{
tag
:
'
rect
'
,
position
,
rectStyles
:
{
color
:
style
.
backgroundColor
,
radius
:
style
.
borderRadius
,
borderColor
:
style
.
borderColor
,
borderWidth
:
style
.
borderWidth
}
},
t
his
.
coverType
===
'
image
'
?
{
const
tags
=
[{
tag
:
'
rect
'
,
position
,
rectStyles
:
{
color
:
style
.
backgroundColor
,
radius
:
style
.
borderRadius
,
borderColor
:
style
.
borderColor
,
borderWidth
:
style
.
borderWidth
}
}]
if
(
this
.
coverType
===
'
image
'
)
{
t
ags
.
push
(
{
tag
:
'
img
'
,
position
,
src
:
this
.
coverContent
}
:
{
})
}
else
{
const
lineSpacing
=
parseFloat
(
style
.
lineHeight
)
-
parseFloat
(
style
.
fontSize
)
let
width
=
parseFloat
(
position
.
width
)
-
parseFloat
(
style
.
paddingLeft
)
-
parseFloat
(
style
.
paddingRight
)
width
=
width
<
0
?
0
:
width
let
height
=
parseFloat
(
position
.
height
)
-
parseFloat
(
style
.
paddingTop
)
-
lineSpacing
/
2
-
parseFloat
(
style
.
paddingBottom
)
height
=
height
<
0
?
0
:
height
tags
.
push
({
tag
:
'
font
'
,
position
,
position
:
{
top
:
`
${
parseFloat
(
position
.
top
)
+
parseFloat
(
style
.
paddingTop
)
+
lineSpacing
/
2
}
px`
,
left
:
`
${
parseFloat
(
position
.
left
)
+
parseFloat
(
style
.
paddingLeft
)}
px`
,
width
:
`
${
width
}
px`
,
height
:
`
${
height
}
px`
},
textStyles
:
{
align
:
textAlign
[
style
.
textAlign
]
||
style
.
textAlign
,
color
:
style
.
color
,
decoration
:
'
none
'
,
lineSpacing
:
(
parseFloat
(
style
.
lineHeight
)
-
parseFloat
(
style
.
fontSize
))
+
'
px
'
,
margin
:
style
.
padding
,
lineSpacing
:
`
${
lineSpacing
}
px`
,
margin
:
'
0px
'
,
overflow
:
style
.
textOverflow
,
size
:
style
.
fontSize
,
verticalAlign
:
'
top
'
,
...
...
@@ -66,8 +78,9 @@ export default {
whiteSpace
:
style
.
whiteSpace
},
text
:
this
.
coverContent
}
]
})
}
return
tags
}
},
mounted
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录