Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
72aec342
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,发现更多精彩内容 >>
提交
72aec342
编写于
5月 13, 2022
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' into alpha
上级
c0210ade
aaf5a355
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
54 addition
and
8 deletion
+54
-8
packages/vue-cli-plugin-hbuilderx/packages/weex-styler/lib/shorthand-parser.js
...in-hbuilderx/packages/weex-styler/lib/shorthand-parser.js
+24
-7
packages/vue-cli-plugin-hbuilderx/packages/weex-styler/test/shorthand-parser.spec.js
...ilderx/packages/weex-styler/test/shorthand-parser.spec.js
+30
-0
src/platforms/app-plus/view/elements/hover.js
src/platforms/app-plus/view/elements/hover.js
+0
-1
未找到文件。
packages/vue-cli-plugin-hbuilderx/packages/weex-styler/lib/shorthand-parser.js
浏览文件 @
72aec342
...
...
@@ -16,15 +16,32 @@ function clearImportant (value) {
}
function
transition
(
declaration
)
{
var
CHUNK_REGEXP
=
/^
(
\S
*
)?\s
*
(\d
*
\.?\d
+
(?:
ms|s
)?)?\s
*
(\S
*
)?\s
*
(\d
*
\.?\d
+
(?:
ms|s
)?)?
$
/
var
CHUNK_REGEXP
=
/^
(
[
a-z-_
]\S
*
)(\s
+
[\d
.
]
+m
?
s
)?(\s
+
[
a-z-_
]\S
*
)?(\s
+
[\d
.
]
+m
?
s
)?
/
var
{
value
,
important
}
=
clearImportant
(
declaration
.
value
)
var
match
=
value
.
match
(
CHUNK_REGEXP
)
var
result
=
[]
var
values
=
value
.
replace
(
/
(\d)\s
*,
\s
*/g
,
'
$1#
'
).
split
(
'
,
'
)
var
position
=
declaration
.
position
match
[
1
]
&&
result
.
push
(
generateDeclaration
(
'
transition-property
'
,
match
[
1
],
important
,
position
))
match
[
2
]
&&
result
.
push
(
generateDeclaration
(
'
transition-duration
'
,
match
[
2
],
important
,
position
))
match
[
3
]
&&
result
.
push
(
generateDeclaration
(
'
transition-timing-function
'
,
match
[
3
],
important
,
position
))
match
[
4
]
&&
result
.
push
(
generateDeclaration
(
'
transition-delay
'
,
match
[
4
],
important
,
position
))
var
result
=
[]
var
map
=
{
'
transition-property
'
:
[],
'
transition-duration
'
:
[],
'
transition-timing-function
'
:
[],
'
transition-delay
'
:
[]
}
if
(
values
.
length
)
{
for
(
var
i1
=
0
;
i1
<
values
.
length
;
i1
++
)
{
var
match
=
values
[
i1
].
trim
().
match
(
CHUNK_REGEXP
)
if
(
!
match
)
{
return
[]
}
map
[
'
transition-property
'
].
push
(
match
[
1
]
||
'
all
'
)
map
[
'
transition-duration
'
].
push
((
match
[
2
]
||
'
0s
'
).
trim
())
map
[
'
transition-timing-function
'
].
push
((
match
[
3
]
||
'
ease
'
).
trim
().
replace
(
/#/g
,
'
,
'
))
map
[
'
transition-delay
'
].
push
((
match
[
4
]
||
'
0s
'
).
trim
())
}
for
(
var
key
in
map
)
{
result
.
push
(
generateDeclaration
(
key
,
map
[
key
].
join
(
'
,
'
),
important
,
position
))
}
}
return
result
}
...
...
packages/vue-cli-plugin-hbuilderx/packages/weex-styler/test/shorthand-parser.spec.js
浏览文件 @
72aec342
...
...
@@ -43,6 +43,36 @@ describe('shorthand-parser', function () {
position
:
{}
}
])
expect
(
shorthandParser
([{
type
:
'
declaration
'
,
property
:
'
transition
'
,
value
:
'
width 2s ease-in-out, height 1s 1s, top cubic-bezier(0.1, 0.7, 1.0, 0.1)
'
,
position
:
{}
}])).
eql
([{
type
:
'
declaration
'
,
property
:
'
transition-property
'
,
value
:
'
width, height, top
'
,
position
:
{}
},
{
type
:
'
declaration
'
,
property
:
'
transition-duration
'
,
value
:
'
2s, 1s, 0s
'
,
position
:
{}
},
{
type
:
'
declaration
'
,
property
:
'
transition-timing-function
'
,
value
:
'
ease-in-out, ease, cubic-bezier(0.1, 0.7, 1.0, 0.1)
'
,
position
:
{}
},
{
type
:
'
declaration
'
,
property
:
'
transition-delay
'
,
value
:
'
0s, 1s, 0s
'
,
position
:
{}
}])
})
it
(
'
parse margin
'
,
function
()
{
...
...
src/platforms/app-plus/view/elements/hover.js
浏览文件 @
72aec342
...
...
@@ -2,7 +2,6 @@ import UniAnimationElement from './animation'
export
default
class
UniHoverElement
extends
UniAnimationElement
{
setAttribute
(
key
,
value
)
{
console
.
log
(
'
setAttribute:
'
,
key
,
value
)
if
(
key
===
'
hover-class
'
)
{
this
.
_updateHoverClass
(
value
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录