Skip to content

新增几种theme-开头的样式，给ide传媒介查询参数 #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 6, 2025
Merged

新增几种theme-开头的样式，给ide传媒介查询参数 #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06b6581
给ide模拟器传媒介查询参数
Mar 4, 2025
f9662dc
新增几种灵感组件的样式配置
Mar 3, 2025
6374b80
媒介参数传递遗留
Mar 6, 2025
f6f3e3f
修正格式
Mar 6, 2025
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
43 changes: 25 additions & 18 deletions packages/hap-compiler/src/style/validator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,24 @@ const validateTime = function (v) {
}
}
}

// 灵感组件颜色值
const themeColors = [
'uxCardColorTheme',
'uxCardColorAccent',
'uxCardColorPrimary',
'uxCardColorSecondary',
'uxCardColorSecondaryVariant',
'uxCardColorTertiary',
'uxCardColorQuaternary',
'uxCardColorContainer',
'uxCardBackground',
'uxCardColorHue',
'uxCardColorHueSecondary',
'uxIconColorAccent',
'uxIconColorPrimary',
'uxIconColorSecondary',
'uxIconColorBackground'
]
const validator = {
/**
* 整数校验
Expand Down Expand Up @@ -2657,23 +2674,13 @@ const validatorMap = {
// font
fontSrc: validator.fontSrc,
fontFamily: validator.fontFamily,
themeColor: makeEnumValidator([
'uxCardColorTheme',
'uxCardColorAccent',
'uxCardColorPrimary',
'uxCardColorSecondary',
'uxCardColorSecondaryVariant',
'uxCardColorTertiary',
'uxCardColorQuaternary',
'uxCardColorContainer',
'uxCardBackground',
'uxCardColorHue',
'uxCardColorHueSecondary',
'uxIconColorAccent',
'uxIconColorPrimary',
'uxIconColorSecondary',
'uxIconColorBackground'
])
themeColor: makeEnumValidator(themeColors),
themeBackgroundColor: makeEnumValidator(themeColors),
themeLayerColor: makeEnumValidator(themeColors),
themeThumbColor: makeEnumValidator(themeColors),
themeTrackColor: makeEnumValidator(themeColors),
themeSelectColor: makeEnumValidator(themeColors),
themeBlockColor: makeEnumValidator(themeColors)
}

/**
Expand Down
3 changes: 2 additions & 1 deletion packages/hap-server/src/preview/create-router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,8 @@ export default async function createRouter(previewTarget) {
script,
scriptNotFound: !scriptExists(script),
webJsUrl: genWebJsUrl(ctx.conf.options.webVersion),
language: currentLanguage
language: currentLanguage,
mediaQueryParams: JSON.stringify(ctx.conf.options.mediaQueryParams) // 传给页面的媒介查询参数
})
ctx.type = 'text/html'
ctx.body = html
Expand Down
1 change: 1 addition & 0 deletions packages/hap-server/src/preview/views/page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
var base = '/preview'
var type = '{{ type }}'
window.language = `{{language}}`
window.mediaQueryParams = JSON.parse(`{{mediaQueryParams}}`)
;(function preview() {
var routeName = '{{ routeName }}'
Hap.init({
Expand Down