Skip to content

Commit fdd453e

Browse files
author
caojuan1
committed
Merge branch 'main' of https://github.com/hapjs-platform/hap-toolkit into main
2 parents 415f60d + 8c2ade7 commit fdd453e

File tree

4 files changed

+39
-32
lines changed

4 files changed

+39
-32
lines changed

‎__tests__/examples/__snapshots__/sample.test.js.snap

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12386,23 +12386,23 @@ exports[`hap-toolkit compile native: <CWD>/packages/hap-dsl-xvm/lib/loaders/styl
1238612386
\\"@KEYFRAMES\\": {
1238712387
\\"translate\\": [
1238812388
{
12389-
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"0px\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"0px\\\\\\"}\\",
12389+
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"0px\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"0px\\\\\\",\\\\\\"translateZ\\\\\\":\\\\\\"0px\\\\\\"}\\",
1239012390
\\"time\\": 0
1239112391
},
1239212392
{
12393-
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"0%\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"100%\\\\\\"}\\",
12393+
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"0%\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"100%\\\\\\",\\\\\\"translateZ\\\\\\":\\\\\\"0%\\\\\\"}\\",
1239412394
\\"time\\": 25
1239512395
},
1239612396
{
12397-
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"100%\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"100%\\\\\\"}\\",
12397+
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"100%\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"100%\\\\\\",\\\\\\"translateZ\\\\\\":\\\\\\"100%\\\\\\"}\\",
1239812398
\\"time\\": 50
1239912399
},
1240012400
{
12401-
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"100%\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"0%\\\\\\"}\\",
12401+
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"100%\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"0%\\\\\\",\\\\\\"translateZ\\\\\\":\\\\\\"100%\\\\\\"}\\",
1240212402
\\"time\\": 75
1240312403
},
1240412404
{
12405-
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"0%\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"0%\\\\\\"}\\",
12405+
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"0%\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"0%\\\\\\",\\\\\\"translateZ\\\\\\":\\\\\\"0%\\\\\\"}\\",
1240612406
\\"time\\": 100
1240712407
}
1240812408
]

‎packages/hap-compiler/src/style/validator.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2429,15 +2429,18 @@ const backgroundValidatorMap = {
24292429
}
24302430

24312431
const transformValidatorMap = {
2432-
translate: makeAbbrAttrValidator('arraylength', ['translateX', 'translateY']),
2432+
translate: makeAbbrAttrValidator('arraylength', ['translateX', 'translateY', 'translateZ']),
24332433
translateX: validator.length,
24342434
translateY: validator.length,
2435-
scale: makeAbbrAttrValidator('arraynumber', ['scaleX', 'scaleY']),
2435+
translateZ: validator.length,
2436+
scale: makeAbbrAttrValidator('arraynumber', ['scaleX', 'scaleY', 'scaleZ']),
24362437
scaleX: validator.number,
24372438
scaleY: validator.number,
2439+
scaleZ: validator.number,
24382440
rotate: validator.angle,
24392441
rotateX: validator.angle,
2440-
rotateY: validator.angle
2442+
rotateY: validator.angle,
2443+
rotateZ: validator.angle
24412444
}
24422445

24432446
// css filter 支持的滤镜，现在只支持blur函数

‎packages/hap-dsl-xvm/test/unit/ux/__snapshots__/style.test.js.snap

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4324,11 +4324,11 @@ exports[`Style编译测试 comile style: ../../../lib/loaders/style-loader.js?in
43244324
\\"@KEYFRAMES\\": {
43254325
\\"box__rotate1\\": [
43264326
{
4327-
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":0,\\\\\\"scaleY\\\\\\":0}\\",
4327+
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":0,\\\\\\"scaleY\\\\\\":0,\\\\\\"scaleZ\\\\\\":0}\\",
43284328
\\"time\\": 0
43294329
},
43304330
{
4331-
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":1,\\\\\\"scaleY\\\\\\":1}\\",
4331+
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":1,\\\\\\"scaleY\\\\\\":1,\\\\\\"scaleZ\\\\\\":1}\\",
43324332
\\"time\\": 100
43334333
}
43344334
],
@@ -8147,28 +8147,30 @@ exports[`Style编译测试 comile style: ../../../lib/loaders/style-loader.js?in
81478147
exports[`Style编译测试 comile style: ../../../lib/loaders/style-loader.js?index=0&type=style!../../../lib/loaders/fragment-loader.js?index=0&type=style!./TestStyle/Scale/testscale.ux?uxType=page 1`] = `
81488148
"module.exports = {
81498149
\\".A1\\": {
8150-
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":1,\\\\\\"scaleY\\\\\\":1}\\"
8150+
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":1,\\\\\\"scaleY\\\\\\":1,\\\\\\"scaleZ\\\\\\":1}\\"
81518151
},
81528152
\\".A2\\": {
8153-
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":1,\\\\\\"scaleY\\\\\\":0.5}\\"
8153+
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":1,\\\\\\"scaleY\\\\\\":0.5,\\\\\\"scaleZ\\\\\\":1}\\"
81548154
},
81558155
\\".B1\\": {
8156-
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":1,\\\\\\"scaleY\\\\\\":1}\\"
8156+
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":1,\\\\\\"scaleY\\\\\\":1,\\\\\\"scaleZ\\\\\\":1}\\"
81578157
},
81588158
\\".B2\\": {
8159-
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":0.5,\\\\\\"scaleY\\\\\\":0.5}\\"
8159+
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":0.5,\\\\\\"scaleY\\\\\\":0.5,\\\\\\"scaleZ\\\\\\":0.5}\\"
81608160
},
81618161
\\".C1\\": {
8162-
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":-1,\\\\\\"scaleY\\\\\\":-1}\\"
8162+
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":-1,\\\\\\"scaleY\\\\\\":-1,\\\\\\"scaleZ\\\\\\":-1}\\"
81638163
},
81648164
\\".C2\\": {
8165-
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":1,\\\\\\"scaleY\\\\\\":-1}\\"
8165+
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":1,\\\\\\"scaleY\\\\\\":-1,\\\\\\"scaleZ\\\\\\":1}\\"
81668166
},
81678167
\\".a1\\": {},
81688168
\\".a2\\": {},
81698169
\\".b1\\": {},
81708170
\\".b2\\": {},
8171-
\\".c1\\": {}
8171+
\\".c1\\": {
8172+
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":1,\\\\\\"scaleY\\\\\\":2,\\\\\\"scaleZ\\\\\\":3}\\"
8173+
}
81728174
}"
81738175
`;
81748176

@@ -9357,7 +9359,7 @@ exports[`Style编译测试 comile style: ../../../lib/loaders/style-loader.js?in
93579359
\\".D3\\": {},
93589360
\\".D4\\": {},
93599361
\\".E1\\": {
9360-
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"20dp\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"20dp\\\\\\"}\\"
9362+
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"20dp\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"20dp\\\\\\",\\\\\\"translateZ\\\\\\":\\\\\\"20dp\\\\\\"}\\"
93619363
},
93629364
\\".E2\\": {
93639365
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"20dp\\\\\\"}\\"
@@ -9489,11 +9491,11 @@ exports[`Style编译测试 comile style: ../../../lib/loaders/style-loader.js?in
94899491
\\"@KEYFRAMES\\": {
94909492
\\"multiVal\\": [
94919493
{
9492-
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":0,\\\\\\"scaleY\\\\\\":0,\\\\\\"translateX\\\\\\":\\\\\\"0px\\\\\\",\\\\\\"rotate\\\\\\":\\\\\\"0deg\\\\\\"}\\",
9494+
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":0,\\\\\\"scaleY\\\\\\":0,\\\\\\"scaleZ\\\\\\":0,\\\\\\"translateX\\\\\\":\\\\\\"0px\\\\\\",\\\\\\"rotate\\\\\\":\\\\\\"0deg\\\\\\"}\\",
94939495
\\"time\\": 0
94949496
},
94959497
{
9496-
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":1,\\\\\\"scaleY\\\\\\":1,\\\\\\"translateX\\\\\\":\\\\\\"100px\\\\\\",\\\\\\"rotate\\\\\\":\\\\\\"150deg\\\\\\"}\\",
9498+
\\"transform\\": \\"{\\\\\\"scaleX\\\\\\":1,\\\\\\"scaleY\\\\\\":1,\\\\\\"scaleZ\\\\\\":1,\\\\\\"translateX\\\\\\":\\\\\\"100px\\\\\\",\\\\\\"rotate\\\\\\":\\\\\\"150deg\\\\\\"}\\",
94979499
\\"time\\": 100
94989500
}
94999501
]
@@ -9601,34 +9603,36 @@ exports[`Style编译测试 comile style: ../../../lib/loaders/style-loader.js?in
96019603
exports[`Style编译测试 comile style: ../../../lib/loaders/style-loader.js?index=0&type=style!../../../lib/loaders/fragment-loader.js?index=0&type=style!./TestStyle/Translate/testtranslate.ux?uxType=page 1`] = `
96029604
"module.exports = {
96039605
\\".A1\\": {
9604-
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"100px\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"0px\\\\\\"}\\"
9606+
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"100px\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"0px\\\\\\",\\\\\\"translateZ\\\\\\":\\\\\\"100px\\\\\\"}\\"
96059607
},
96069608
\\".A2\\": {
9607-
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"100px\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"100px\\\\\\"}\\"
9609+
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"100px\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"100px\\\\\\",\\\\\\"translateZ\\\\\\":\\\\\\"100px\\\\\\"}\\"
96089610
},
96099611
\\".B1\\": {
9610-
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"100px\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"100px\\\\\\"}\\"
9612+
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"100px\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"100px\\\\\\",\\\\\\"translateZ\\\\\\":\\\\\\"100px\\\\\\"}\\"
96119613
},
96129614
\\".B2\\": {
9613-
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"-100px\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"100px\\\\\\"}\\"
9615+
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"-100px\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"100px\\\\\\",\\\\\\"translateZ\\\\\\":\\\\\\"-100px\\\\\\"}\\"
96149616
},
96159617
\\".B3\\": {
9616-
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"-100%\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"100px\\\\\\"}\\"
9618+
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"-100%\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"100px\\\\\\",\\\\\\"translateZ\\\\\\":\\\\\\"-100%\\\\\\"}\\"
96179619
},
96189620
\\".C1\\": {
9619-
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"-100%\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"100%\\\\\\"}\\"
9621+
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"-100%\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"100%\\\\\\",\\\\\\"translateZ\\\\\\":\\\\\\"-100%\\\\\\"}\\"
96209622
},
96219623
\\".a1\\": {
9622-
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"100%\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"0px\\\\\\"}\\"
9624+
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"100%\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"0px\\\\\\",\\\\\\"translateZ\\\\\\":\\\\\\"100%\\\\\\"}\\"
96239625
},
96249626
\\".a2\\": {
9625-
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"100px\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"100px\\\\\\"}\\"
9627+
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"100px\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"100px\\\\\\",\\\\\\"translateZ\\\\\\":\\\\\\"100px\\\\\\"}\\"
96269628
},
96279629
\\".b1\\": {
9628-
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"-100px\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"-100px\\\\\\"}\\"
9630+
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"-100px\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"-100px\\\\\\",\\\\\\"translateZ\\\\\\":\\\\\\"-100px\\\\\\"}\\"
96299631
},
96309632
\\".b2\\": {},
9631-
\\".c1\\": {}
9633+
\\".c1\\": {
9634+
\\"transform\\": \\"{\\\\\\"translateX\\\\\\":\\\\\\"100px\\\\\\",\\\\\\"translateY\\\\\\":\\\\\\"20px\\\\\\",\\\\\\"translateZ\\\\\\":\\\\\\"30px\\\\\\"}\\"
9635+
}
96329636
}"
96339637
`;
96349638

‎packages/integration-tests/hap.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ describe('hap-toolkit', () => {
111111
await run('npm', ['run', 'build'], [], { cwd: targetdir })
112112
const rpks = await lsfiles('*.rpk', { cwd: path.resolve(targetdir, 'dist') })
113113
expect(rpks.length).toBe(1)
114-
const pages = JSON.parse(fse.readFileSync(path.resolve(targetdir, 'src/manifest.json'))).router
115-
.pages
114+
const pages = JSON.parse(fse.readFileSync(path.resolve(targetdir, 'src/manifest.json')))
115+
.router.pages
116116
for (let i = 0, len = pages.length; i < len; i++) {
117117
const cssJsons = await lsfiles('index.css.json', {
118118
cwd: path.resolve(targetdir, 'build', pages[i])

0 commit comments

Comments
 (0)