Skip to content
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.

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

fix(template): 修复 comp 和 custom-wrapper 没有重新引用 wxs 文件导致的 wxs 函数失效的问题 #14665

Merged
merged 4 commits into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion packages/shared/src/template.ts
Original file line number Diff line number Diff line change
Expand Up @@ -501,12 +501,14 @@ export class BaseTemplate {

public buildBaseComponentTemplate = (ext: string) => {
const data = !this.isSupportRecursive && this.supportXS
? this.dataKeymap('i:i,c:1,l:l')
? this.dataKeymap(`i:i,c:1,l:xs.f('',i.${Shortcuts.NodeName})`)
: this.isSupportRecursive
? this.dataKeymap('i:i')
: this.dataKeymap('i:i,c:1')

// 此处需要重新引入 xs 函数,否则会出现 ws.f() 在 comp.wxml 和 custom-wrapper.wxml 中永远返回 undefined 的问题 #14599
return `<import src="./base${ext}" />
${this.buildXsTemplate()}
<template is="{{'tmpl_0_' + i.nn}}" data="{{${data}}}" />`
}

Expand All @@ -518,7 +520,9 @@ export class BaseTemplate {
? this.dataKeymap('i:item')
: this.dataKeymap('i:item,c:1')

// 此处需要重新引入 xs 函数,否则会出现 ws.f() 在 comp.wxml 和 custom-wrapper.wxml 中永远返回 undefined 的问题 #14599
return `<import src="./base${ext}" />
${this.buildXsTemplate()}
<block ${Adapter.for}="{{i.${Shortcuts.Childnodes}}}" ${Adapter.key}="sid">
<template is="{{'tmpl_0_' + item.nn}}" data="{{${data}}}" />
</block>`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1305,7 +1305,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/about/index.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1305,7 +1305,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1465,7 +1465,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
Expand Down Expand Up @@ -3039,7 +3040,8 @@ require("./taro");

/** filePath: output/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: output/pages/index/index.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
Expand Down Expand Up @@ -4727,7 +4729,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/irrelevant.txt **/
I m irrelevant.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1307,7 +1307,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
Expand Down Expand Up @@ -2899,7 +2900,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1500,7 +1500,8 @@ h�hځ��r������Nb2��х��K~��>;;ːL�1

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/custom-tab-bar/index.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 7 ], {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,8 @@ require("./taro");

/** filePath: dist/comp.jxml **/
<import src="./base.jxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<jds src="./utils.jds" module="xs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
/*! For license information please see index.js.LICENSE.txt */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1305,7 +1305,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1319,7 +1319,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/others/detail/index.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
Expand Down Expand Up @@ -4285,7 +4286,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/others/detail/index.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
Expand Down Expand Up @@ -7251,7 +7253,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/others/detail/index.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1601,7 +1601,8 @@ require("./taro");

/** filePath: dist/comp.qml **/
<import src="./base.qml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
/*! For license information please see index.js.LICENSE.txt */
Expand Down Expand Up @@ -3838,7 +3839,8 @@ require("./taro");

/** filePath: dist/comp.qml **/
<import src="./base.qml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
/*! For license information please see index.js.LICENSE.txt */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1537,7 +1537,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
/*! For license information please see index.js.LICENSE.txt */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1305,7 +1305,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
Expand Down Expand Up @@ -2880,7 +2881,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
Expand Down Expand Up @@ -4455,7 +4457,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
Expand Down Expand Up @@ -6030,7 +6033,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1324,7 +1324,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/packageA/detail/index.js **/
require("../../sub-utils");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2636,7 +2636,8 @@ h�hځ��r������Nb2��х��K~��>;;ːL�1

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/about/index.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1305,7 +1305,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1271,7 +1271,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 6 ], {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1276,7 +1276,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 7 ], {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1449,7 +1449,8 @@ require("./taro");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/components/tab/tab.js **/
(wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 7 ], {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1369,7 +1369,8 @@ require("./runtime");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
"use strict";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1369,7 +1369,8 @@ require("./runtime");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
"use strict";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1529,7 +1529,8 @@ require("./runtime");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
"use strict";
Expand Down Expand Up @@ -3181,7 +3182,8 @@ require("./runtime");

/** filePath: output/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: output/pages/index/index.js **/
"use strict";
Expand Down Expand Up @@ -5104,7 +5106,8 @@ require("./runtime");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/irrelevant.txt **/
I m irrelevant.
Expand Down Expand Up @@ -6928,7 +6931,8 @@ require("./runtime");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
"use strict";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1370,7 +1370,8 @@ require("./runtime");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
"use strict";
Expand Down Expand Up @@ -3189,7 +3190,8 @@ require("./runtime");

/** filePath: dist/comp.wxml **/
<import src="./base.wxml" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
<wxs module="xs" src="./utils.wxs" />
<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />

/** filePath: dist/pages/index/index.js **/
"use strict";
Expand Down
Loading
Loading