Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/hap-compiler/src/style/mediaquery.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ const featureValidator = {
},
scene(value) {
const reg =
/^(assistantscreen|launcher|globalsearch|calendar|lockscreen|suggestion|voiceassistant|sms|servicecenter|cardesktop)$/
/^(assistantscreen|launcher|globalsearch|calendar|lockscreen|suggestion|voiceassistant|sms|servicecenter|cardesktop|pictorial)$/
if (reg.test(value)) {
return { value }
}
Expand All @@ -125,7 +125,7 @@ const featureValidator = {
feature +
'` 的值 `' +
value +
'` 不正确, 必须为 `assistantscreen | launcher | globalsearch | calendar | lockscreen | suggestion | voiceassistant | sms | servicecenter | cardesktop`'
'` 不正确, 必须为 `assistantscreen | launcher | globalsearch | calendar | lockscreen | suggestion | voiceassistant | sms | servicecenter | cardesktop | pictorial`'
)
}
}
Expand Down
26 changes: 13 additions & 13 deletions packages/hap-compiler/src/style/validator.js
Original file line number Diff line number Diff line change
Expand Up @@ -400,19 +400,19 @@ const validateTime = function (v) {
}
}
// 灵感组件颜色值
const themeColors = [
'uxCardColorBackground',
'uxCardColorAccent',
'uxCardColorTheme',
'uxCardColorContainer',
'uxCardColorPrimary',
'uxCardColorQuaternary',
'uxCardColorSecondary',
'uxCardColorSecondaryVariant',
'uxCardColorTertiary',
'uxCardColorHue',
'uxCardColorHueSecondary'
]
// const themeColors = [
// 'uxCardColorBackground',
// 'uxCardColorAccent',
// 'uxCardColorTheme',
// 'uxCardColorContainer',
// 'uxCardColorPrimary',
// 'uxCardColorQuaternary',
// 'uxCardColorSecondary',
// 'uxCardColorSecondaryVariant',
// 'uxCardColorTertiary',
// 'uxCardColorHue',
// 'uxCardColorHueSecondary'
// ]
const validator = {
/**
* 整数校验
Expand Down
2 changes: 1 addition & 1 deletion packages/hap-compiler/src/template/validator.js
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ const tagNatives = {
def: 0
},
type: {
enum: ['horizontal', 'circular', 'round']
enum: ['horizontal', 'circular', 'round', 'segmented']
}
}
},
Expand Down
Loading