chore: 解决合并冲突

Author: ZEJIA-LIU

packages/shared/src/template.ts

@@ -19,6 +19,7 @@ import {
   singleQuote,
   voidElements
 } from './components'
+import { COMPILE_MODE_IDENTIFIER_PREFIX } from './constants'
 import { isBooleanStringLiteral, isFunction, isNumber, isObjectStringLiteral, isString } from './is'
 import { Shortcuts } from './shortcuts'
 import { capitalize, getComponentsAlias, hasOwn, indent, toCamelCase, toDashed, toKebabCase } from './utils'
@@ -170,7 +171,7 @@ export class BaseTemplate {
                 ? `xs.b(i.${propAlias},${propValue})`
                 : `i.${propAlias}===undefined?${propValue}:i.${propAlias}`
             } else if (isObjectStringLiteral(propValue)) {
-              propValue = this.supportXS
+              propValue = this.isUseXS
                 ? `xs.d(i.${propAlias})`
                 : `i.${propAlias}===undefined?${propValue}:i.${propAlias}`
             } else {
@@ -289,7 +290,7 @@ export class BaseTemplate {
       if (isBooleanStringLiteral(patchValue) || isNumber(patchValue) || isString(patchValue)) {
         let propValue = ''
 
-        if (this.supportXS) {
+        if (this.isUseXS) {
           if (isObjectStringLiteral(patchValue)) {
             propValue = `xs.d(i.${toCamelCase(attr)})`
           }

packages/taro-components/types/common.d.ts

@@ -1,5 +1,6 @@
 import { CSSProperties, LegacyRef, ReactNode } from 'react'
 
+type COMPILE_MODE_SUB_RENDER_FN = 'subRenderFn'
 export interface StandardProps<T = any, TouchEvent extends BaseTouchEvent<any> = ITouchEvent> extends EventProps<TouchEvent> {
   /** 组件的唯一标示, 保持整个页面唯一 */
   id?: string
@@ -30,7 +31,7 @@ export interface StandardProps<T = any, TouchEvent extends BaseTouchEvent<any> =
    * 是否开启编译模式
    * @supported weapp, harmony
    */
-  compileMode?: boolean | string
+  compileMode?: boolean | string | COMPILE_MODE_SUB_RENDER_FN
   /**
    * 自定义容器组件的方向
    * @supported harmony