diff --git a/packages/hap-compiler/src/style/mediaquery.js b/packages/hap-compiler/src/style/mediaquery.js index b6c21f3..9a53ed8 100644 --- a/packages/hap-compiler/src/style/mediaquery.js +++ b/packages/hap-compiler/src/style/mediaquery.js @@ -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 } } @@ -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`' ) } } diff --git a/packages/hap-compiler/src/style/validator.js b/packages/hap-compiler/src/style/validator.js index 6ac08f7..1fe92dc 100755 --- a/packages/hap-compiler/src/style/validator.js +++ b/packages/hap-compiler/src/style/validator.js @@ -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 = { /** * 整数校验 diff --git a/packages/hap-compiler/src/template/validator.js b/packages/hap-compiler/src/template/validator.js index a7b2704..6100bda 100644 --- a/packages/hap-compiler/src/template/validator.js +++ b/packages/hap-compiler/src/template/validator.js @@ -550,7 +550,7 @@ const tagNatives = { def: 0 }, type: { - enum: ['horizontal', 'circular', 'round'] + enum: ['horizontal', 'circular', 'round', 'segmented'] } } },