fix(Link): resolve disabled problem

Tencent · Apr 25, 2023 · 5f7fb27 · 5f7fb27
1 parent 1737ab5
commit 5f7fb27
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 3 deletions.
diff --git a/src/link/__test__/__snapshots__/demo.test.js.snap b/src/link/__test__/__snapshots__/demo.test.js.snap
@@ -29,6 +29,11 @@ exports[`Link Link disabled demo works fine 1`] = `
       content="跳转链接"
       disabled="{{true}}"
       hover="{{true}}"
+      navigatorProps="{{
+        Object {
+          "url": "/pages/home/home",
+        }
+      }}"
       size="small"
       suffixIcon="jump"
       theme="primary"

diff --git a/src/link/__test__/__virtualHostSnapshot__/demo.test.js.snap b/src/link/__test__/__virtualHostSnapshot__/demo.test.js.snap
@@ -29,6 +29,11 @@ exports[`Link Link disabled demo works fine 1`] = `
       content="跳转链接"
       disabled="{{true}}"
       hover="{{true}}"
+      navigatorProps="{{
+        Object {
+          "url": "/pages/home/home",
+        }
+      }}"
       size="small"
       suffixIcon="jump"
       theme="primary"

diff --git a/src/link/_example/disabled/index.js b/src/link/_example/disabled/index.js
@@ -1 +1,7 @@
-Component({});
+Component({
+  data: {
+    navigatorProps: {
+      url: '/pages/home/home',
+    },
+  },
+});
diff --git a/src/link/_example/disabled/index.wxml b/src/link/_example/disabled/index.wxml
@@ -1,5 +1,13 @@
 <view class="link-example">
-  <t-link size="small" theme="primary" content="跳转链接" suffixIcon="jump" disabled hover />
+  <t-link
+    navigatorProps="{{navigatorProps}}"
+    size="small"
+    theme="primary"
+    content="跳转链接"
+    suffixIcon="jump"
+    disabled
+    hover
+  />
   <t-link size="small" content="跳转链接" suffixIcon="jump" disabled />
   <t-link size="small" theme="danger" content="跳转链接" suffixIcon="jump" disabled />
 </view>

diff --git a/src/link/link.wxml b/src/link/link.wxml
@@ -5,7 +5,7 @@
   class="{{className}} class {{prefix}}-class"
   style="{{_._style([style, customStyle])}}"
   target="{{navigatorProps.target}}"
-  url="{{navigatorProps.url}}"
+  url="{{ !disabled && navigatorProps.url}}"
   open-type="{{navigatorProps.openType || 'navigate'}}"
   delta="{{navigatorProps.delta}}"
   app-id="{{navigatorProps.appId}}"