theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: improve the fix for #4138

Browse Source
This commit is contained in:
Evan You 2021-07-19 10:43:14 -04:00
parent a8c3a8ad61
commit 47ba33e27b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/shared/src/normalizeProp.ts
View File

@ -3,14 +3,16 @@ import { isNoUnitNumericStyleProp } from './domAttrConfig'
export type NormalizedStyle = Record<string, string | number> export type NormalizedStyle = Record<string, string | number>
export function normalizeStyle(value: unknown): NormalizedStyle | undefined { export function normalizeStyle(
value: unknown
): NormalizedStyle | string | undefined {
if (isArray(value)) { if (isArray(value)) {
const res: NormalizedStyle = {} const res: NormalizedStyle = {}
for (let i = 0; i < value.length; i++) { for (let i = 0; i < value.length; i++) {
const item = value[i] const item = value[i]
const normalized = normalizeStyle( const normalized = isString(item)
isString(item) ? parseStringStyle(item) : item ? parseStringStyle(item)
) : (normalizeStyle(item) as NormalizedStyle)
if (normalized) { if (normalized) {
for (const key in normalized) { for (const key in normalized) {
res[key] = normalized[key] res[key] = normalized[key]
@ -19,7 +21,7 @@ export function normalizeStyle(value: unknown): NormalizedStyle | undefined {
} }
return res return res
} else if (isString(value)) { } else if (isString(value)) {
return parseStringStyle(value) return value
} else if (isObject(value)) { } else if (isObject(value)) {
return value return value
} }