diff --git a/packages/uni-app-vue/dist/nvue.runtime.esm.dev.js b/packages/uni-app-vue/dist/nvue.runtime.esm.dev.js index 063d19e798b4ef7169bf29172380b766705368d4..b7900027f74afb613403e3d2e234b8c3a72d56af 100644 --- a/packages/uni-app-vue/dist/nvue.runtime.esm.dev.js +++ b/packages/uni-app-vue/dist/nvue.runtime.esm.dev.js @@ -11015,7 +11015,10 @@ export function nvueFactory(exports, document) { styles.push(appContext.provides.__appStyles); } - type.styles.forEach(style => styles.push(style)); + if (isArray(type.styles)) { + type.styles.forEach(style => styles.push(style)); + } + type.__styles = useCssStyles(styles); } @@ -11038,13 +11041,13 @@ export function nvueFactory(exports, document) { } } - var ATTR_HOVER_CLASS = 'hover-class'; - var ATTR_PLACEHOLDER_CLASS = 'placeholder-class'; - var ATTR_PLACEHOLDER_STYLE = 'placeholder-style'; - var ATTR_INDICATOR_CLASS = 'indicator-class'; - var ATTR_INDICATOR_STYLE = 'indicator-style'; - var ATTR_MASK_CLASS = 'mask-class'; - var ATTR_MASK_STYLE = 'mask-style'; + var ATTR_HOVER_CLASS = 'hoverClass'; + var ATTR_PLACEHOLDER_CLASS = 'placeholderClass'; + var ATTR_PLACEHOLDER_STYLE = 'placeholderStyle'; + var ATTR_INDICATOR_CLASS = 'indicatorClass'; + var ATTR_INDICATOR_STYLE = 'indicatorStyle'; + var ATTR_MASK_CLASS = 'maskClass'; + var ATTR_MASK_STYLE = 'maskStyle'; var CLASS_AND_STYLES = { view: { class: [ATTR_HOVER_CLASS], @@ -11080,16 +11083,18 @@ export function nvueFactory(exports, document) { var opts = CLASS_AND_STYLES[el.type]; if (opts) { - if (opts['class'].indexOf(key) !== -1) { - return [camelize(key), parseStylesheet(instance)[value] || {}]; + var camelized = camelize(key); + + if (opts['class'].indexOf(camelized) > -1) { + return [camelized, parseStylesheet(instance)[value] || {}]; } - if (opts['style'].indexOf(key) !== -1) { + if (opts['style'].indexOf(key) > -1) { if (isString(value)) { - return [camelize(key), parseStringStyle(value)]; + return [camelized, parseStringStyle(value)]; } - return [camelize(key), normalizeStyle(value)]; + return [camelized, normalizeStyle(value)]; } } diff --git a/packages/uni-app-vue/dist/nvue.runtime.esm.prod.js b/packages/uni-app-vue/dist/nvue.runtime.esm.prod.js index 2cd03358a2ac893894b38cf049c6d8c9f445e890..abd4df5455896e89587d0e4662d8e8f8f9771d86 100644 --- a/packages/uni-app-vue/dist/nvue.runtime.esm.prod.js +++ b/packages/uni-app-vue/dist/nvue.runtime.esm.prod.js @@ -9190,7 +9190,10 @@ export function nvueFactory(exports, document) { styles.push(appContext.provides.__appStyles); } - type.styles.forEach(style => styles.push(style)); + if (isArray(type.styles)) { + type.styles.forEach(style => styles.push(style)); + } + type.__styles = useCssStyles(styles); } @@ -9213,13 +9216,13 @@ export function nvueFactory(exports, document) { } } - var ATTR_HOVER_CLASS = 'hover-class'; - var ATTR_PLACEHOLDER_CLASS = 'placeholder-class'; - var ATTR_PLACEHOLDER_STYLE = 'placeholder-style'; - var ATTR_INDICATOR_CLASS = 'indicator-class'; - var ATTR_INDICATOR_STYLE = 'indicator-style'; - var ATTR_MASK_CLASS = 'mask-class'; - var ATTR_MASK_STYLE = 'mask-style'; + var ATTR_HOVER_CLASS = 'hoverClass'; + var ATTR_PLACEHOLDER_CLASS = 'placeholderClass'; + var ATTR_PLACEHOLDER_STYLE = 'placeholderStyle'; + var ATTR_INDICATOR_CLASS = 'indicatorClass'; + var ATTR_INDICATOR_STYLE = 'indicatorStyle'; + var ATTR_MASK_CLASS = 'maskClass'; + var ATTR_MASK_STYLE = 'maskStyle'; var CLASS_AND_STYLES = { view: { class: [ATTR_HOVER_CLASS], @@ -9255,16 +9258,18 @@ export function nvueFactory(exports, document) { var opts = CLASS_AND_STYLES[el.type]; if (opts) { - if (opts['class'].indexOf(key) !== -1) { - return [camelize(key), parseStylesheet(instance)[value] || {}]; + var camelized = camelize(key); + + if (opts['class'].indexOf(camelized) > -1) { + return [camelized, parseStylesheet(instance)[value] || {}]; } - if (opts['style'].indexOf(key) !== -1) { + if (opts['style'].indexOf(key) > -1) { if (isString(value)) { - return [camelize(key), parseStringStyle(value)]; + return [camelized, parseStringStyle(value)]; } - return [camelize(key), normalizeStyle(value)]; + return [camelized, normalizeStyle(value)]; } } diff --git a/packages/uni-app-vue/lib/nvue.runtime.esm.js b/packages/uni-app-vue/lib/nvue.runtime.esm.js index b523e8db1f83b96081bdf3ba7093e07e7d97b8fc..adc16d745b6fbf130c8eff9ef5afc610c3a84f2b 100644 --- a/packages/uni-app-vue/lib/nvue.runtime.esm.js +++ b/packages/uni-app-vue/lib/nvue.runtime.esm.js @@ -8897,7 +8897,9 @@ function parseStylesheet({ type, vnode: { appContext } }) { if (appContext) { styles.push(appContext.provides.__appStyles); } - type.styles.forEach(style => styles.push(style)); + if (isArray(type.styles)) { + type.styles.forEach(style => styles.push(style)); + } type.__styles = useCssStyles(styles); } return type.__styles; @@ -8916,13 +8918,13 @@ function patchAttr(el, key, value, instance = null) { el.setAttr(key, value); } } -const ATTR_HOVER_CLASS = 'hover-class'; -const ATTR_PLACEHOLDER_CLASS = 'placeholder-class'; -const ATTR_PLACEHOLDER_STYLE = 'placeholder-style'; -const ATTR_INDICATOR_CLASS = 'indicator-class'; -const ATTR_INDICATOR_STYLE = 'indicator-style'; -const ATTR_MASK_CLASS = 'mask-class'; -const ATTR_MASK_STYLE = 'mask-style'; +const ATTR_HOVER_CLASS = 'hoverClass'; +const ATTR_PLACEHOLDER_CLASS = 'placeholderClass'; +const ATTR_PLACEHOLDER_STYLE = 'placeholderStyle'; +const ATTR_INDICATOR_CLASS = 'indicatorClass'; +const ATTR_INDICATOR_STYLE = 'indicatorStyle'; +const ATTR_MASK_CLASS = 'maskClass'; +const ATTR_MASK_STYLE = 'maskStyle'; const CLASS_AND_STYLES = { view: { class: [ATTR_HOVER_CLASS], @@ -8955,14 +8957,15 @@ function transformAttr(el, key, value, instance) { } const opts = CLASS_AND_STYLES[el.type]; if (opts) { - if (opts['class'].indexOf(key) !== -1) { - return [camelize(key), parseStylesheet(instance)[value] || {}]; + const camelized = camelize(key); + if (opts['class'].indexOf(camelized) > -1) { + return [camelized, parseStylesheet(instance)[value] || {}]; } - if (opts['style'].indexOf(key) !== -1) { + if (opts['style'].indexOf(key) > -1) { if (isString(value)) { - return [camelize(key), parseStringStyle(value)]; + return [camelized, parseStringStyle(value)]; } - return [camelize(key), normalizeStyle(value)]; + return [camelized, normalizeStyle(value)]; } } return [key, value];