Skip to content
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
2 changes: 1 addition & 1 deletion packages/uni-mp-alipay/__tests__/externalClass.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ describe('mp-alipay: externalClass 2.0', () => {
test('动态 externalClass 自动引入 uniView SJS', () => {
assert(
'<external-class :box-class="klass" empty-class=""/>',
'<external-class box-class="{{uV.c(a,3,0)}}" empty-class="" u-i="10a73a5e-0"/><import-sjs name="uV" from="/common/uniView.sjs"/>\n',
'<import-sjs name="uV" from="/common/uniView.sjs"/>\n<external-class box-class="{{uV.c(a,3,0)}}" empty-class="" u-i="10a73a5e-0"/>',
`(_ctx, _cache) => { "raw js"
const __returned__ = { a: _ctx.klass }
return __returned__
Expand Down
2 changes: 1 addition & 1 deletion packages/uni-mp-alipay/__tests__/styleIsolation.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ describe('mp-alipay: styleIsolation 2.0', () => {
test('动态 class 自动引入 uniView SJS', () => {
assert(
'<view :class="klass"/>',
'<view class="{{uV.c(a,3)}}" style="{{\'--status-bar-height:\' + b + \';\' + (\'--uni-safe-area-inset-bottom:\' + c)}}"/><import-sjs name="uV" from="/common/uniView.sjs"/>\n',
'<import-sjs name="uV" from="/common/uniView.sjs"/>\n<view class="{{uV.c(a,3)}}" style="{{\'--status-bar-height:\' + b + \';\' + (\'--uni-safe-area-inset-bottom:\' + c)}}"/>',
`(_ctx, _cache) => { "raw js"
const __returned__ = { a: _n(_ctx.klass), b: \`\${_ctx.u_s_b_h}px\`, c: \`\${_ctx.u_s_a_i_b}px\` }
return __returned__
Expand Down
9 changes: 9 additions & 0 deletions packages/uni-mp-compiler/src/template/codegen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,12 @@ export function generate(
genNode(node, context)
})
if (filter && filter.generate && autoImportFilters.length) {
const isAlipayX = isX && process.env.UNI_PLATFORM === 'mp-alipay'
const templateCode = context.code
// 支付宝 x 兼容钉钉:先输出 SJS 声明,再接回模板,否则动态 class 不生效。
if (isAlipayX) {
context.code = ''
}
autoImportFilters.forEach((autoImportFilter) => {
const filterPath =
(process.env.UNI_SUBPACKAGE
Expand All @@ -127,6 +133,9 @@ export function generate(
) => string | void
context.code += generate(autoImportFilter, filterPath, filename) + '\n'
})
if (isAlipayX) {
context.code += templateCode
}
}
emitFile!({ type: 'asset', fileName: filename, source: context.code })
}
Expand Down
Loading