diff --git a/packages/hap-compiler/src/style/validator.js b/packages/hap-compiler/src/style/validator.js index a4874cfd..6ac08f77 100755 --- a/packages/hap-compiler/src/style/validator.js +++ b/packages/hap-compiler/src/style/validator.js @@ -403,13 +403,15 @@ const validateTime = function (v) { const themeColors = [ 'uxCardColorBackground', 'uxCardColorAccent', + 'uxCardColorTheme', 'uxCardColorContainer', - 'uxCardColorHue', - 'uxCardColorHueSecondary', 'uxCardColorPrimary', 'uxCardColorQuaternary', + 'uxCardColorSecondary', 'uxCardColorSecondaryVariant', - 'uxCardColorTertiary' + 'uxCardColorTertiary', + 'uxCardColorHue', + 'uxCardColorHueSecondary' ] const validator = { /** @@ -2702,12 +2704,12 @@ const validatorMap = { // font fontSrc: validator.fontSrc, fontFamily: validator.fontFamily, - themeColor: makeEnumValidator(themeColors), + /* themeColor: makeEnumValidator(themeColors), themeBackgroundColor: makeEnumValidator(themeColors), themeLayerColor: makeEnumValidator(themeColors), themeTrackColor: makeEnumValidator(themeColors), themeSelectedColor: makeEnumValidator(themeColors), - themeBlockColor: makeEnumValidator(themeColors), + themeBlockColor: makeEnumValidator(themeColors), */ letterSpacing: validator.letterSpacing } diff --git a/packages/hap-packager/src/common/shared.js b/packages/hap-packager/src/common/shared.js index a91973fb..f9a55b15 100644 --- a/packages/hap-packager/src/common/shared.js +++ b/packages/hap-packager/src/common/shared.js @@ -234,9 +234,10 @@ function populateWidgetFields(widgetsObj) { conf.minPlatformVersion = conf.minCardPlatformVersion } else if (!conf.minPlatformVersion) { // 没写 minCardPlatformVersion 和 minPlatformVersion 字段 - colorconsole.throw( + // 不填minCardPlatformVersion也能编译 + /* colorconsole.throw( `manifest.json 文件 widgets 字段下,${routePath} 缺少 minCardPlatformVersion 字段` - ) + ) */ } } if (conf.type === 'lite' && !conf.minCardPlatformVersion) {