Bugfix: 输出 web externalClasses功能修复 #1661
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hiyuki
reviewed
Oct 18, 2024
hiyuki
reviewed
Oct 18, 2024
hiyuki
reviewed
Oct 18, 2024
hiyuki
reviewed
Oct 18, 2024
hiyuki
reviewed
Oct 23, 2024
| @@ -5,5 +5,6 @@ module.exports = { | |||
| RESOLVE_IGNORED_ERR: new Error('Resolve ignored!'), | |||
| JSON_JS_EXT: '.json.js', | |||
| MPX_ROOT_VIEW: 'mpx-root-view', // 根节点类名 | |||
| MPX_APP_MODULE_ID: 'mpx-app-scope' // app文件moduleId | |||
| MPX_APP_MODULE_ID: 'mpx-app-scope', // app文件moduleId | |||
| P_MODULE_ID: 'p-module-id' | |||
hiyuki
reviewed
Oct 23, 2024
| const dynamicClass = getAndRemoveAttr(el, ':' + className).val | ||
| if (dynamicClass) { | ||
| attrValue = dynamicClass | ||
| attrName = ':' + className |
There was a problem hiding this comment.
你这还给他覆盖了。。。会出bug。。。
不用getAndRemove，你就检查一下attrsMap中有就行。。。
hiyuki
reviewed
Oct 23, 2024
| const reg = new RegExp('\\b' + className + '\\b', 'g') | ||
| const replacementClassName = dash2hump(className) | ||
| const replacementModuleId = dash2hump(P_MODULE_ID) | ||
| classLikeAttrValue = classLikeAttrValue.replace(reg, `{{${replacementClassName}||''}} {{${replacementModuleId}}}`) |
hiyuki
reviewed
Oct 23, 2024
| name: 'class', | ||
| value: classNames.join(' ') | ||
| name: ':' + classLikeAttrName, | ||
| value: `['${classNames.join(' ')}', ${replacements.join(' ')}, $attrs[${stringify(P_MODULE_ID)}]].join(' ')` |
There was a problem hiding this comment.
[${classname},${replacements}].join(' ')
hiyuki
reviewed
Oct 23, 2024
| if (dynamicClass) replacements.push(dynamicClass) | ||
|
|
||
| } else if (classNames.length) { | ||
| // 静态class拼接 |
hiyuki
reviewed
Oct 23, 2024
| if (staticClass) { | ||
| const classNames = staticClass.split(/\s+/) | ||
| function processWebClass (classLikeAttrName, classLikeAttrValue, el, options) { | ||
| const classNames = classLikeAttrValue.split(/\s+/) | ||
| const replacements = [] | ||
| options.externalClasses.forEach((className) => { |
There was a problem hiding this comment.
classNames = classNames.map((className)=>{
if(extenalClasses.includes(className)) return `($attrs[${stringify(className)}] || '')`
return stringify(className)
})
classNames.push(`($attrs[${stringify(PMID)}] || '')`)
value = `[${classNames}].join(' ')`
hiyuki
reviewed
Oct 24, 2024
| }]) | ||
| } | ||
| } else { |
There was a problem hiding this comment.
没必要拆这么开，
if(classLikeAttrName === 'class') {
const dynamicClass = getAndRemoveAttr(el, ':class').val
if (dynamicClass) classNames.push(dynamicClass)
addAttrs(el, [{
name: ':class',
value: `[${classNames}]`
}])
} else {
addAttrs(el, [{
name: ':' + classLikeAttrName,
value: `[${classNames}].join(' ')`
}])
}
hiyuki
approved these changes
Oct 28, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
调整输出web externalClasses实现逻辑，完全走Mpx内部处理，不再经由vue处理