Skip to content

fix(swan): 百度小程序base.swan渲染空白问题修复 #17274

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 1 commit into from
Jun 5, 2025
Merged

fix(swan): 百度小程序base.swan渲染空白问题修复 #17274

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 31 additions & 11 deletions packages/taro-platform-swan/src/template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,38 @@ export class Template extends RecursiveTemplate {
[key: string]: Record<string, string>
}

constructor (options?: TemplateOptions) {
constructor(options?: TemplateOptions) {
super()
this.flattenViewLevel = options?.flattenViewLevel ?? 8
this.flattenCoverLevel = options?.flattenCoverLevel ?? 3
this.flattenTextLevel = options?.flattenTextLevel ?? 3
}

protected buildBaseTemplate () {
protected buildBaseTemplate() {
const rootTmpl = super.buildBaseTemplate()
return rootTmpl.replace(REG_TRACKBY_REPLACEMENT, 's-for="$1.cn trackBy item.sid"')
return this.transformTemplateIsSfor(rootTmpl.replace(REG_TRACKBY_REPLACEMENT, 's-for="$1.cn trackBy item.sid"'))
}

createMiniComponents (components): any {
transformTemplateIsSfor(str) {
Copy link

@coderabbitai coderabbitai bot Jun 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

方法参数缺少类型注解

为了保持代码一致性和类型安全，transformTemplateIsSfor 方法的参数应该添加类型注解。

-transformTemplateIsSfor(str) {
+transformTemplateIsSfor(str: string): string {
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
transformTemplateIsSfor(str) {
transformTemplateIsSfor(str: string): string {
🤖 Prompt for AI Agents 
In packages/taro-platform-swan/src/template.ts at line 55, the method
transformTemplateIsSfor has a parameter without a type annotation. Add an
appropriate TypeScript type annotation to the parameter to ensure type safety
and maintain code consistency.

const regex = /<template\s+([^>]+?)(\/?>)/g
return str.replace(regex, (match, attrs, closingTag) => {
// 检查是否存在 is 属性
const hasIs = /\bis\s*=\s*(['"])/.test(attrs)
// 提取 s-for 属性值
const sForMatch = attrs.match(/\bs-for\s*=\s*(['"])(.*?)\1/)

if (hasIs && sForMatch) {
const sForValue = sForMatch[2]
// 移除 s-for 属性并整理剩余属性
const newAttrs = attrs.replace(/\s*s-for\s*=\s*(['"]).*?\1/, '').trim()
// 构建新的模板结构
return `<block s-for="${sForValue}"><template ${newAttrs}${closingTag}</block>`
}
return match
})
}

createMiniComponents(components): any {
const result = super.createMiniComponents(components)

this.legacyMiniComponents = { ...result }
Expand Down Expand Up @@ -175,10 +194,9 @@ export class Template extends RecursiveTemplate {
const componentsAlias = this.componentsAlias
const contentAlias = componentsAlias['#text']._num

const template =
`<block s-if="item.nn === '${contentAlias}'">{{item.v}}</block>
<text s-else id="{{item.uid||item.sid}}" data-sid="{{item.sid}}" ${this.buildFlattenNodeAttributes('text')}>
<block s-for="item.cn trackBy item.sid">
const template = `<block s-if="i.nn === '${contentAlias}'">{{i.v}}</block>
<text s-else id="{{i.uid||i.sid}}" data-sid="{{i.sid}}" ${this.buildFlattenNodeAttributes('text')}>
<block s-for="i.cn trackBy item.sid">
${indent(child, 4)}
</block>
</text>`
Expand All @@ -192,7 +210,9 @@ export class Template extends RecursiveTemplate {
switch (nodeName) {
case 'view':
// fix issue #6015
return this.buildFlattenView()
return `<block s-for="i.cn trackBy item.sid">
${this.buildFlattenView()}
</block>`

case 'cover-view':
case 'canvas':
Expand Down Expand Up @@ -229,10 +249,10 @@ export class Template extends RecursiveTemplate {

modifyLoopContainer = (children: string, nodeName: string) => {
if (nodeName === 'swiper') {
return children.replace(/s-for="{{i\.cn}}"/, 's-for="xs.f(i.cn) trackBy item.sid"')
return this.transformTemplateIsSfor(children.replace(/s-for="{{i\.cn}}"/, 's-for="xs.f(i.cn) trackBy item.sid"'))
}

return children.replace(REG_TRACKBY_REPLACEMENT, 's-for="$1.cn trackBy item.sid"')
return this.transformTemplateIsSfor(children.replace(REG_TRACKBY_REPLACEMENT, 's-for="$1.cn trackBy item.sid"'))
}

modifyTemplateResult = (res: string, nodeName: string) => {
Expand Down