fix: 修复 form-picker 等组件在微信平台下获取数值失败的问题 (#1093)

Co-authored-by: DiamondYuan <[email protected]>
ant-design · Feb 5, 2024 · 0d66ceb · 0d66ceb
1 parent 3ada919
commit 0d66ceb
Show file tree

Hide file tree

Showing 38 changed files with 122 additions and 94 deletions.
diff --git a/compiled/alipay/src/Form/FormCascaderPicker/index.axml b/compiled/alipay/src/Form/FormCascaderPicker/index.axml
@@ -15,7 +15,7 @@
   validateStatus="{{ validateStatus }}"
   help="{{ help }}">
   <view>
-    <cascader-picker
+    <ant-cascader-picker
       options="{{ options }}"
       cancelText="{{ cancelText }}"
       okText="{{ okText }}"
@@ -44,12 +44,12 @@
         name="title"
         slot="title" />
 
-      <icon
+      <ant-icon
         a:if="{{ arrowUtil.getArrow(arrow) }}"
         className="ant-form-cascader-picker-arrow"
         type="{{ arrowUtil.getArrow(arrow) }}"
         slot="suffix" />
-    </cascader-picker>
+    </ant-cascader-picker>
   </view>
 
   <view

diff --git a/compiled/alipay/src/Form/FormCascaderPicker/index.json b/compiled/alipay/src/Form/FormCascaderPicker/index.json
@@ -2,7 +2,7 @@
   "component": true,
   "usingComponents": {
     "form-item": "../FormItem/index",
-    "cascader-picker": "../../Picker/CascaderPicker/index",
-    "icon": "../../Icon/index"
+    "ant-cascader-picker": "../../Picker/CascaderPicker/index",
+    "ant-icon": "../../Icon/index"
   }
 }
diff --git a/compiled/alipay/src/Form/FormDatePicker/index.axml b/compiled/alipay/src/Form/FormDatePicker/index.axml
@@ -15,7 +15,7 @@
   validateStatus="{{ validateStatus }}"
   help="{{ help }}">
   <view>
-    <date-picker
+    <ant-date-picker
       min="{{ min }}"
       max="{{ max }}"
       format="{{ format }}"
@@ -47,12 +47,12 @@
       <slot
         name="title"
         slot="title" />
-      <icon
+      <ant-icon
         a:if="{{ arrowUtil.getArrow(arrow) }}"
         className="ant-form-date-picker-arrow"
         type="{{ arrowUtil.getArrow(arrow) }}"
         slot="suffix" />
-    </date-picker>
+    </ant-date-picker>
   </view>
   <view
     a:if="{{ !tooltip }}"

diff --git a/compiled/alipay/src/Form/FormDatePicker/index.json b/compiled/alipay/src/Form/FormDatePicker/index.json
@@ -2,7 +2,7 @@
   "component": true,
   "usingComponents": {
     "form-item": "../FormItem/index",
-    "date-picker": "../../DatePicker/index",
-    "icon": "../../Icon/index"
+    "ant-date-picker": "../../DatePicker/index",
+    "ant-icon": "../../Icon/index"
   }
 }
diff --git a/compiled/alipay/src/Form/FormDatePicker/index.ts b/compiled/alipay/src/Form/FormDatePicker/index.ts
@@ -8,14 +8,15 @@ import {
 } from '../../_util/hooks/useHandleCustomEvent';
 import { useFormItem } from '../use-form-item';
 import { FormDatePickerDefaultProps, FormDatePickerProps } from './props';
+import { platform } from '../../_util/platform';
 
 const FormDatePicker = (props: FormDatePickerProps) => {
   const { formData, emit } = useFormItem(props);
   const { triggerEventValues, triggerEventOnly, triggerEvent } =
     useComponentEvent(props);
 
   useMultipleValueHandleCustomEvent('onOk', (date, dateStr, e) => {
-    emit('onChange', date);
+    emit('onChange', platform() === 'wechat' ? date.getTime() : date);
     triggerEventValues('ok', [date, dateStr], e);
   });
 

diff --git a/compiled/alipay/src/Form/FormPicker/index.axml b/compiled/alipay/src/Form/FormPicker/index.axml
@@ -15,7 +15,7 @@
   validateStatus="{{ validateStatus }}"
   help="{{ help }}">
   <view>
-    <picker
+    <ant-picker
       cancelText="{{ cancelText }}"
       okText="{{ okText }}"
       placeholder="{{ placeholder }}"
@@ -43,12 +43,12 @@
       <slot
         name="content"
         slot="content" />
-      <icon
+      <ant-icon
         a:if="{{ arrowUtil.getArrow(arrow) }}"
         className="ant-form-picker-arrow"
         type="{{ arrowUtil.getArrow(arrow) }}"
         slot="suffix" />
-    </picker>
+    </ant-picker>
   </view>
   <view
     a:if="{{ !tooltip }}"

diff --git a/compiled/alipay/src/Form/FormPicker/index.json b/compiled/alipay/src/Form/FormPicker/index.json
@@ -2,7 +2,7 @@
   "component": true,
   "usingComponents": {
     "form-item": "../FormItem/index",
-    "picker": "../../Picker/index",
-    "icon": "../../Icon/index"
+    "ant-picker": "../../Picker/index",
+    "ant-icon": "../../Icon/index"
   }
 }
diff --git a/compiled/alipay/src/Form/FormRadioGroup/index.axml b/compiled/alipay/src/Form/FormRadioGroup/index.axml
@@ -11,7 +11,7 @@
   validateStatus="{{ validateStatus }}"
   help="{{ help }}">
   <view>
-    <radio-group
+    <ant-radio-group
       options="{{ options }}"
       value="{{ formData.value }}"
       onChange="onChange"
@@ -24,7 +24,7 @@
         slot-scope="props"
         value="{{props.value}}"
         index="{{props.index}}" />
-    </radio-group>
+    </ant-radio-group>
   </view>
 
   <view

diff --git a/compiled/alipay/src/Form/FormRadioGroup/index.json b/compiled/alipay/src/Form/FormRadioGroup/index.json
@@ -2,6 +2,6 @@
   "component": true,
   "usingComponents": {
     "form-item": "../FormItem/index",
-    "radio-group": "../../Radio/RadioGroup/index"
+    "ant-radio-group": "../../Radio/RadioGroup/index"
   }
 }
diff --git a/compiled/alipay/src/Form/FormRangePicker/index.axml b/compiled/alipay/src/Form/FormRangePicker/index.axml
@@ -15,7 +15,7 @@
   validateStatus="{{ validateStatus }}"
   help="{{ help }}">
   <view>
-    <range-picker
+    <ant-range-picker
       endPlaceholder="{{ endPlaceholder }}"
       startPlaceholder="{{ startPlaceholder }}"
       splitCharacter="{{ splitCharacter }}"
@@ -50,12 +50,12 @@
       <slot
         name="title"
         slot="title" />
-      <icon
+      <ant-icon
         a:if="{{ arrowUtil.getArrow(arrow) }}"
         className="ant-form-range-picker-arrow"
         type="{{ arrowUtil.getArrow(arrow) }}"
         slot="suffix" />
-    </range-picker>
+    </ant-range-picker>
   </view>
   <view
     a:if="{{ !tooltip }}"

diff --git a/compiled/alipay/src/Form/FormRangePicker/index.json b/compiled/alipay/src/Form/FormRangePicker/index.json
@@ -2,7 +2,7 @@
   "component": true,
   "usingComponents": {
     "form-item": "../FormItem/index",
-    "range-picker": "../../DatePicker/RangePicker/index",
-    "icon": "../../Icon/index"
+    "ant-range-picker": "../../DatePicker/RangePicker/index",
+    "ant-icon": "../../Icon/index"
   }
 }
diff --git a/compiled/alipay/src/Form/FormRangePicker/index.ts b/compiled/alipay/src/Form/FormRangePicker/index.ts
@@ -6,6 +6,7 @@ import {
   useHandleCustomEventOnly,
   useMultipleValueHandleCustomEvent,
 } from '../../_util/hooks/useHandleCustomEvent';
+import { platform } from '../../_util/platform';
 import { useFormItem } from '../use-form-item';
 import { FormRangePickerDefaultProps, FormRangePickerProps } from './props';
 
@@ -15,7 +16,15 @@ const FormDatePicker = (props: FormRangePickerProps) => {
     useComponentEvent(props);
 
   useMultipleValueHandleCustomEvent('onOk', (date, dateStr, e) => {
-    emit('onChange', date);
+    emit(
+      'onChange',
+      date.map((o: Date) => {
+        if (platform() === 'wechat') {
+          return o.getTime();
+        }
+        return o;
+      })
+    );
     triggerEventValues('ok', [date, dateStr], e);
   });
 

diff --git a/compiled/wechat/demo/pages/DatePicker/index.wxml b/compiled/wechat/demo/pages/DatePicker/index.wxml
@@ -9,7 +9,7 @@
       placeholder="请选择"
       bind:pickerchange="handlePickerChange"
       bind:visiblechange="handleTriggerPicker"
-      onCancel="handleDismiss"
+      bind:cancel="handleDismiss"
       bind:ok="handleOk" />
   </ant-list-item>
   <ant-list-item>
@@ -77,7 +77,7 @@
       placeholder="请选择"
       bind:pickerchange="handlePickerChange"
       bind:visiblechange="handleTriggerPicker"
-      onCancel="handleDismiss"
+      bind:cancel="handleDismiss"
       bind:ok="handleOk"
       onFormatLabel="{{ handleFormatLabel ? handleFormatLabel : 'handleFormatLabel' }}" />
   </ant-list-item>

diff --git a/compiled/wechat/src/Form/FormCascaderPicker/index.json b/compiled/wechat/src/Form/FormCascaderPicker/index.json
@@ -2,7 +2,7 @@
   "component": true,
   "usingComponents": {
     "form-item": "../FormItem/index",
-    "cascader-picker": "../../Picker/CascaderPicker/index",
-    "icon": "../../Icon/index"
+    "ant-cascader-picker": "../../Picker/CascaderPicker/index",
+    "ant-icon": "../../Icon/index"
   }
 }
diff --git a/compiled/wechat/src/Form/FormCascaderPicker/index.wxml b/compiled/wechat/src/Form/FormCascaderPicker/index.wxml
@@ -15,7 +15,7 @@
   validateStatus="{{ validateStatus }}"
   help="{{ help }}">
   <view>
-    <cascader-picker
+    <ant-cascader-picker
       options="{{ options }}"
       cancelText="{{ cancelText }}"
       okText="{{ okText }}"
@@ -32,9 +32,9 @@
       indicatorStyle="{{ indicatorStyle }}"
       indicatorClassName="{{ indicatorClassName }}"
       value="{{ formData.value }}"
-      onOk="onOk"
+      bind:ok="onOk"
       bind:change="onChange"
-      onCancel="onDismissPicker"
+      bind:cancel="onDismissPicker"
       bind:visiblechange="onVisibleChange"
       onFormat="{{ handleFormat ? handleFormat : 'handleFormat' }}">
       <slot
@@ -44,12 +44,12 @@
         name="title"
         slot="title" />
 
-      <icon
+      <ant-icon
         wx:if="{{ arrowUtil.getArrow(arrow) }}"
         className="ant-form-cascader-picker-arrow"
         type="{{ arrowUtil.getArrow(arrow) }}"
         slot="suffix" />
-    </cascader-picker>
+    </ant-cascader-picker>
   </view>
 
   <view

diff --git a/compiled/wechat/src/Form/FormDatePicker/index.js b/compiled/wechat/src/Form/FormDatePicker/index.js
@@ -4,11 +4,12 @@ import { useComponentEvent } from '../../_util/hooks/useComponentEvent';
 import { useHandleCustomEvent, useHandleCustomEventOnly, useMultipleValueHandleCustomEvent, } from '../../_util/hooks/useHandleCustomEvent';
 import { useFormItem } from '../use-form-item';
 import { FormDatePickerDefaultProps } from './props';
+import { platform } from '../../_util/platform';
 var FormDatePicker = function (props) {
     var _a = useFormItem(props), formData = _a.formData, emit = _a.emit;
     var _b = useComponentEvent(props), triggerEventValues = _b.triggerEventValues, triggerEventOnly = _b.triggerEventOnly, triggerEvent = _b.triggerEvent;
     useMultipleValueHandleCustomEvent('onOk', function (date, dateStr, e) {
-        emit('onChange', date);
+        emit('onChange', platform() === 'wechat' ? date.getTime() : date);
         triggerEventValues('ok', [date, dateStr], e);
     });
     useMultipleValueHandleCustomEvent('onPickerChange', function (date, dateStr, e) {

diff --git a/compiled/wechat/src/Form/FormDatePicker/index.json b/compiled/wechat/src/Form/FormDatePicker/index.json
@@ -2,7 +2,7 @@
   "component": true,
   "usingComponents": {
     "form-item": "../FormItem/index",
-    "date-picker": "../../DatePicker/index",
-    "icon": "../../Icon/index"
+    "ant-date-picker": "../../DatePicker/index",
+    "ant-icon": "../../Icon/index"
   }
 }
diff --git a/compiled/wechat/src/Form/FormDatePicker/index.wxml b/compiled/wechat/src/Form/FormDatePicker/index.wxml
@@ -15,7 +15,7 @@
   validateStatus="{{ validateStatus }}"
   help="{{ help }}">
   <view>
-    <date-picker
+    <ant-date-picker
       min="{{ min }}"
       max="{{ max }}"
       format="{{ format }}"
@@ -35,9 +35,9 @@
       indicatorStyle="{{ indicatorStyle }}"
       indicatorClassName="{{ indicatorClassName }}"
       value="{{ formData.value }}"
-      onOk="onOk"
-      onPickerChange="onPickerChange"
-      onCancel="onDismissPicker"
+      bind:ok="onOk"
+      bind:pickerchange="onPickerChange"
+      bind:cancel="onDismissPicker"
       bind:visiblechange="onVisibleChange"
       onFormatLabel="{{ handleFormatLabel ? handleFormatLabel : 'handleFormatLabel' }}"
       onFormat="{{ handleFormat ? handleFormat : 'handleFormat' }}">
@@ -47,12 +47,12 @@
       <slot
         name="title"
         slot="title" />
-      <icon
+      <ant-icon
         wx:if="{{ arrowUtil.getArrow(arrow) }}"
         className="ant-form-date-picker-arrow"
         type="{{ arrowUtil.getArrow(arrow) }}"
         slot="suffix" />
-    </date-picker>
+    </ant-date-picker>
   </view>
   <view
     wx:if="{{ !tooltip }}"

diff --git a/compiled/wechat/src/Form/FormPicker/index.json b/compiled/wechat/src/Form/FormPicker/index.json
@@ -2,7 +2,7 @@
   "component": true,
   "usingComponents": {
     "form-item": "../FormItem/index",
-    "picker": "../../Picker/index",
-    "icon": "../../Icon/index"
+    "ant-picker": "../../Picker/index",
+    "ant-icon": "../../Icon/index"
   }
 }
diff --git a/compiled/wechat/src/Form/FormPicker/index.wxml b/compiled/wechat/src/Form/FormPicker/index.wxml
@@ -15,7 +15,7 @@
   validateStatus="{{ validateStatus }}"
   help="{{ help }}">
   <view>
-    <picker
+    <ant-picker
       cancelText="{{ cancelText }}"
       okText="{{ okText }}"
       placeholder="{{ placeholder }}"
@@ -32,9 +32,9 @@
       indicatorClassName="{{ indicatorClassName }}"
       options="{{ options }}"
       value="{{ formData.value }}"
-      onOk="onOk"
+      bind:ok="onOk"
       bind:change="onChange"
-      onCancel="onDismissPicker"
+      bind:cancel="onDismissPicker"
       bind:visiblechange="onVisibleChange"
       onFormat="{{ handleFormat ? handleFormat : 'handleFormat' }}">
       <slot
@@ -43,12 +43,12 @@
       <slot
         name="content"
         slot="content" />
-      <icon
+      <ant-icon
         wx:if="{{ arrowUtil.getArrow(arrow) }}"
         className="ant-form-picker-arrow"
         type="{{ arrowUtil.getArrow(arrow) }}"
         slot="suffix" />
-    </picker>
+    </ant-picker>
   </view>
   <view
     wx:if="{{ !tooltip }}"

diff --git a/compiled/wechat/src/Form/FormRadioGroup/index.json b/compiled/wechat/src/Form/FormRadioGroup/index.json
@@ -2,6 +2,6 @@
   "component": true,
   "usingComponents": {
     "form-item": "../FormItem/index",
-    "radio-group": "../../Radio/RadioGroup/index"
+    "ant-radio-group": "../../Radio/RadioGroup/index"
   }
 }