feat: picker slot support get params

ant-design · Sep 24, 2024 · a640cbe · a640cbe
1 parent e29a4b9
commit a640cbe
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 31 deletions.
diff --git a/compiled/alipay/demo/pages/Picker/index.axml b/compiled/alipay/demo/pages/Picker/index.axml
@@ -40,7 +40,12 @@
       placeholder="请选择"
       title="请选择"
       options="{{list}}"
-    ></ant-picker>
+    >
+      <view
+        slot="content"
+        slot-scope="prop"
+      >已选择：{{prop.value}}</view>
+    </ant-picker>
   </ant-list-item>
   <view class="btn-wrapper">
     <ant-button

diff --git a/compiled/alipay/src/Picker/index.axml b/compiled/alipay/src/Picker/index.axml
@@ -7,25 +7,35 @@
   style="{{style || ''}}"
   onTap="onOpen"
 >
-  <slot name="prefix"></slot>
+  <slot
+    name="prefix"
+    value="{{formatValue}}"
+  ></slot>
   <view class="ant-picker-value">
-    <slot name="content"></slot>
-    <view
-      a:if="{{formatValue}}"
-      class="ant-picker-value-text"
+    <slot
+      name="content"
+      value="{{formatValue}}"
     >
-      {{formatValue}}
-    </view>
-    <block a:else>
       <view
-        a:if="{{placeholder}}"
-        class="ant-picker-value-placeholder"
+        a:if="{{formatValue}}"
+        class="ant-picker-value-text"
       >
-        {{placeholder}}
+        {{formatValue}}
       </view>
-    </block>
+      <block a:else>
+        <view
+          a:if="{{placeholder}}"
+          class="ant-picker-value-placeholder"
+        >
+          {{placeholder}}
+        </view>
+      </block>
+    </slot>
   </view>
-  <slot name="suffix"></slot>
+  <slot
+    name="suffix"
+    value="{{formatValue}}"
+  ></slot>
 </view>
 <ant-popup
   className="ant-picker-popup {{popClassName || ''}}"

diff --git a/compiled/wechat/demo/pages/Picker/index.wxml b/compiled/wechat/demo/pages/Picker/index.wxml
@@ -34,7 +34,12 @@
       placeholder="请选择"
       title="请选择"
       options="{{list}}"
-    ></ant-picker>
+    >
+      <view
+        slot="content"
+        slot-scope="prop"
+      >已选择：{{prop.value}}</view>
+    </ant-picker>
   </ant-list-item>
   <view class="btn-wrapper">
     <ant-button

diff --git a/compiled/wechat/src/Picker/index.wxml b/compiled/wechat/src/Picker/index.wxml
@@ -7,7 +7,10 @@
   style="{{style || ''}}"
   bind:tap="onOpen"
 >
-  <slot name="prefix"></slot>
+  <slot
+    name="prefix"
+    value="{{formatValue}}"
+  ></slot>
   <view class="ant-picker-value">
     <view
       wx:if="{{formatValue}}"
@@ -20,7 +23,10 @@
       >{{placeholder}}</view>
     </block>
   </view>
-  <slot name="suffix"></slot>
+  <slot
+    name="suffix"
+    value="{{formatValue}}"
+  ></slot>
 </view>
 <ant-popup
   className="ant-picker-popup {{popClassName || ''}}"

diff --git a/demo/pages/Picker/index.axml b/demo/pages/Picker/index.axml
@@ -37,7 +37,10 @@
       value="{{ value }}"
       placeholder="请选择"
       title="请选择"
-      options="{{ list }}" />
+      options="{{ list }}"
+    >
+      <view slot="content" slot-scope="prop" >已选择：{{prop.value}}</view>
+    </ant-picker>
   </ant-list-item>
   <view class="btn-wrapper">
     <ant-button

diff --git a/src/Picker/index.axml b/src/Picker/index.axml
@@ -6,25 +6,28 @@
   class="ant-picker {{ disabled ? 'ant-picker-disabled' : '' }} {{ className || '' }}"
   style="{{ style || '' }}"
   onTap="onOpen">
-  <slot name="prefix" />
+  <slot name="prefix" value="{{formatValue}}" />
   <view class="ant-picker-value">
     <!-- #if ALIPAY -->
-    <slot name="content" />
+    <slot name="content" value="{{formatValue}}" >
     <!-- #endif -->
-    <view
-      a:if="{{ formatValue }}"
-      class="ant-picker-value-text">
-      {{ formatValue }}
-    </view>
-    <block a:else>
       <view
-        a:if="{{ placeholder }}"
-        class="ant-picker-value-placeholder">
-        {{ placeholder }}
+        a:if="{{ formatValue }}"
+        class="ant-picker-value-text">
+        {{ formatValue }}
       </view>
-    </block>
+      <block a:else>
+        <view
+          a:if="{{ placeholder }}"
+          class="ant-picker-value-placeholder">
+          {{ placeholder }}
+        </view>
+      </block>
+    <!-- #if ALIPAY -->
+    </slot>
+    <!-- #endif -->
   </view>
-  <slot name="suffix" />
+  <slot name="suffix" value="{{formatValue}}" />
 </view>
 <ant-popup
   className="ant-picker-popup {{ popClassName || '' }}"