feat(dataset): 修复clickview无法注入dataset问题

NervJS · Dec 27, 2024 · 48597d2 · 48597d2
1 parent f4918ff
commit 48597d2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/packages/taro-plugin-html/src/runtime.ts b/packages/taro-plugin-html/src/runtime.ts
@@ -88,7 +88,7 @@ hooks.tap('modifySetAttrPayload', (element, key, payload, componentsAlias) => {
       element.enqueueUpdate({
         path: dataPath,
         value: payload.value ? catchViewAlias : (
-          element.isOnlyClickBinded() ? clickViewAlias : (element.isAnyEventBinded() ? viewAlias : staticViewAlias)
+          element.isOnlyClickBinded() && !isHasExtractProp(element) ? clickViewAlias : (element.isAnyEventBinded() ? viewAlias : staticViewAlias)
         )
       })
     } else if (isHasExtractProp(element) && !element.isAnyEventBinded()) {
@@ -140,7 +140,7 @@ hooks.tap('modifyRmAttrPayload', (element, key, payload, componentsAlias) => {
       // catch-view => view or click-view or static-view or pure-view
       element.enqueueUpdate({
         path: dataPath,
-        value: element.isOnlyClickBinded() ? clickViewAlias : (element.isAnyEventBinded() ? viewAlias : (isHasExtractProp(element) ? staticViewAlias : pureViewAlias))
+        value: element.isOnlyClickBinded() && !isHasExtractProp(element) ? clickViewAlias : (element.isAnyEventBinded() ? viewAlias : (isHasExtractProp(element) ? staticViewAlias : pureViewAlias))
       })
     } else if (!isHasExtractProp(element)) {
       // static-view => pure-view

diff --git a/packages/taro-plugin-html/src/utils.ts b/packages/taro-plugin-html/src/utils.ts
@@ -42,7 +42,7 @@ export function getMappedType (nodeName: string, rawProps: Record<string, any>,
     if (!node) {
       return 'view'
     }
-    if (node.isOnlyClickBinded()) {
+    if (node.isOnlyClickBinded() && !isHasExtractProp(node)) {
       return 'click-view'
     } else if (node.isAnyEventBinded()) {
       return 'view'

diff --git a/packages/taro-runtime/src/dom/element.ts b/packages/taro-runtime/src/dom/element.ts
@@ -211,7 +211,7 @@ export class TaroElement extends TaroNode {
         this.enqueueUpdate({
           path: `${_path}.${Shortcuts.NodeName}`,
           value: value ? catchViewAlias : (
-            this.isOnlyClickBinded() ? clickViewAlias : (this.isAnyEventBinded() ? viewAlias : staticViewAlias)
+            this.isOnlyClickBinded() && !isHasExtractProp(this) ? clickViewAlias : (this.isAnyEventBinded() ? viewAlias : staticViewAlias)
           )
         })
       } else if (isPureView && isHasExtractProp(this)) {
@@ -281,7 +281,7 @@ export class TaroElement extends TaroNode {
         // catch-view => view or click-view or static-view or pure-view
         this.enqueueUpdate({
           path: `${_path}.${Shortcuts.NodeName}`,
-          value: this.isOnlyClickBinded() ? clickViewAlias : (this.isAnyEventBinded() ? viewAlias : (isHasExtractProp(this) ? staticViewAlias : pureViewAlias))
+          value: this.isOnlyClickBinded() && !isHasExtractProp(this) ? clickViewAlias : (this.isAnyEventBinded() ? viewAlias : (isHasExtractProp(this) ? staticViewAlias : pureViewAlias))
         })
       } else if (isStaticView && !isHasExtractProp(this)) {
         // static-view => pure-view

diff --git a/packages/taro-runtime/src/hydrate.ts b/packages/taro-runtime/src/hydrate.ts
@@ -61,7 +61,7 @@ export function hydrate (node: TaroElement | TaroText): MiniData {
       }
     }
 
-    if (nodeName === VIEW && node.isOnlyClickBinded()) {
+    if (nodeName === VIEW && node.isOnlyClickBinded() && !isHasExtractProp(node)) {
       data[Shortcuts.NodeName] = CLICK_VIEW
     }
   }
-Original file line number
+Diff line change
@@ Expand Up @@
           }
         }
-        if (nodeName === VIEW && node.isOnlyClickBinded()) {
+        if (nodeName === VIEW && node.isOnlyClickBinded() && !isHasExtractProp(node)) {
           data[Shortcuts.NodeName] = CLICK_VIEW
         }
       }
@@ Expand Down @@