feat: 日期范围改造完毕

ant-design · Oct 30, 2024 · f272516 · f272516
1 parent 7257b3f
commit f272516
Show file tree

Hide file tree

Showing 52 changed files with 141 additions and 293 deletions.
diff --git a/compiled/alipay/demo/pages/ConfigProvider/index.axml b/compiled/alipay/demo/pages/ConfigProvider/index.axml
@@ -15,6 +15,16 @@
           empty-text="暂无数据"
         ></ant-picker>
       </ant-list-item>
+      <ant-list-item>
+        日期范围
+        <ant-range-picker
+          slot="extra"
+          default-value="{{defaultDateRange}}"
+          onPickerChange="handlePickerRangeChange"
+          onVisibleChange="handleTriggerPicker"
+          onOk="handleRangeOk"
+        ></ant-range-picker>
+      </ant-list-item>
     </ant-list>
   </ant-config-provider>
 </ant-container>

diff --git a/compiled/alipay/demo/pages/ConfigProvider/index.js b/compiled/alipay/demo/pages/ConfigProvider/index.js
@@ -9,6 +9,11 @@ Page({
             'button-primary-color': 'yellow',
             'button-primary-background-color': 'green',
         },
+        defaultDate: new Date('2019/02/02').getTime(),
+        defaultDateRange: [
+            new Date('2022/03/21').getTime(),
+            new Date('2022/05/20').getTime(),
+        ],
     },
     handleTap() {
         my.alert({
@@ -24,4 +29,7 @@ Page({
     handleTriggerPicker(visible, e) {
         console.log('onVisibleChange', visible, e);
     },
+    handlePickerRangeChange(type, date, dateStr, e) {
+        console.log('onPickerRangeChange', type, date, dateStr, e);
+    },
 });
diff --git a/compiled/alipay/demo/pages/ConfigProvider/index.json b/compiled/alipay/demo/pages/ConfigProvider/index.json
@@ -8,6 +8,7 @@
     "ant-list-item": "../../../src/List/ListItem/index",
     "ant-config-provider": "../../../src/ConfigProvider/index",
     "ant-picker": "../../../src/Picker/index",
-    "ant-container": "../../../src/Container/index"
+    "ant-container": "../../../src/Container/index",
+    "ant-range-picker": "../../../src/DatePicker/RangePicker/index"
   }
 }
diff --git a/compiled/alipay/src/DatePicker/RangePicker/index.axml b/compiled/alipay/src/DatePicker/RangePicker/index.axml
@@ -53,12 +53,12 @@
   >
     <template
       is="selector"
-      data="{{ placeholder: startPlaceholder, active: pickerType === 'start', type: 'start', value: currentStartValueStr, precision: precision }}"
+      data="{{ placeholder: startPlaceholder === undefined ? locale.RangePicker.startPlaceholder : startPlaceholder, active: pickerType === 'start', type: 'start', value: currentStartValueStr, precision: precision }}"
     ></template>
     <view class="ant-range-picker-selector-split">{{splitCharacter}}</view>
     <template
       is="selector"
-      data="{{ placeholder: endPlaceholder, active: pickerType === 'end', type: 'end', value: currentEndValueStr, precision: precision }}"
+      data="{{ placeholder: endPlaceholder === undefined ? locale.RangePicker.endPlaceholder : endPlaceholder, active: pickerType === 'end', type: 'end', value: currentEndValueStr, precision: precision }}"
     ></template>
   </view>
   <slot

diff --git a/compiled/alipay/src/DatePicker/RangePicker/index.ts b/compiled/alipay/src/DatePicker/RangePicker/index.ts
@@ -1,24 +1,33 @@
+import { effect } from '@preact/signals-core';
+import dayjs from 'dayjs';
+import equal from 'fast-deep-equal';
+import computed from '../../mixins/computed';
+import mixinValue from '../../mixins/value';
+import { resolveEventValue, resolveEventValues } from '../../_util/platform';
 import {
-  Component,
+  ComponentWithSignalStoreImpl,
+  getValueFromProps,
   triggerEvent,
-  triggerEventValues,
   triggerEventOnly,
-  getValueFromProps,
+  triggerEventValues,
 } from '../../_util/simply';
-import { resolveEventValue, resolveEventValues } from '../../_util/platform';
-import { DateRangePickerDefaultProps } from './props';
-import dayjs from 'dayjs';
-import equal from 'fast-deep-equal';
+import i18nController from '../../_util/store';
 import {
-  getRangeData,
   getDateByValue,
-  getValueByDate,
+  getRangeData,
   getValidValue,
+  getValueByDate,
 } from '../util';
-import computed from '../../mixins/computed';
-import mixinValue from '../../mixins/value';
+import { DateRangePickerDefaultProps } from './props';
 
-Component(
+ComponentWithSignalStoreImpl(
+  {
+    store: () => i18nController,
+    updateHook: effect,
+    mapState: {
+      locale: ({ store }) => store.currentLocale.value,
+    },
+  },
   DateRangePickerDefaultProps,
   {
     // visible受控判断

diff --git a/compiled/alipay/src/DatePicker/RangePicker/props.ts b/compiled/alipay/src/DatePicker/RangePicker/props.ts
@@ -164,13 +164,13 @@ export const DateRangePickerDefaultProps: Partial<IDateRangePickerProps> = {
   value: null,
   defaultValue: null,
   title: '',
-  okText: '确定',
-  cancelText: '取消',
-  placeholder: '请选择',
+  okText: undefined,
+  cancelText: undefined,
+  placeholder: undefined,
   precision: 'day',
   splitCharacter: '-',
-  startPlaceholder: '未选择',
-  endPlaceholder: '未选择',
+  startPlaceholder: undefined,
+  endPlaceholder: undefined,
   maskClosable: true,
   popClassName: '',
   popStyle: '',

diff --git a/compiled/alipay/src/DatePicker/props.ts b/compiled/alipay/src/DatePicker/props.ts
@@ -147,9 +147,9 @@ export const DatePickerDefaultProps: IDatePickerProps = {
   value: null,
   defaultValue: null,
   title: '',
-  okText: '确定',
-  cancelText: '取消',
-  placeholder: '请选择',
+  okText: undefined,
+  cancelText: undefined,
+  placeholder: undefined,
   precision: 'day',
   maskClosable: true,
   popClassName: '',

diff --git a/compiled/alipay/src/_locale/ar-SA.ts b/compiled/alipay/src/_locale/ar-SA.ts
@@ -18,13 +18,7 @@ const arSA: Locale = {
     end: '结束',
     startAndEnd: '开始/结束',
   },
-  // TODO 部分可以优化成global数据
   RangePicker: {
-    // okText: '确定',
-    // cancelText: '取消',
-    // placeholder: '请选择',
-    precision: 'day',
-    splitCharacter: '-',
     startPlaceholder: '未选择',
     endPlaceholder: '未选择',
   },

diff --git a/compiled/alipay/src/_locale/de-DE.ts b/compiled/alipay/src/_locale/de-DE.ts
@@ -16,13 +16,7 @@ const deDE: Locale = {
     end: '结束',
     startAndEnd: '开始/结束',
   },
-  // TODO 部分可以优化成global数据
   RangePicker: {
-    // okText: '确定',
-    // cancelText: '取消',
-    // placeholder: '请选择',
-    precision: 'day',
-    splitCharacter: '-',
     startPlaceholder: '未选择',
     endPlaceholder: '未选择',
   },

diff --git a/compiled/alipay/src/_locale/en-US.ts b/compiled/alipay/src/_locale/en-US.ts
@@ -16,13 +16,7 @@ const enUS: Locale = {
     end: '结束',
     startAndEnd: '开始/结束',
   },
-  // TODO 部分可以优化成global数据
   RangePicker: {
-    // okText: '确定',
-    // cancelText: '取消',
-    // placeholder: '请选择',
-    precision: 'day',
-    splitCharacter: '-',
     startPlaceholder: '未选择',
     endPlaceholder: '未选择',
   },

diff --git a/compiled/alipay/src/_locale/es-ES.ts b/compiled/alipay/src/_locale/es-ES.ts
@@ -16,13 +16,7 @@ const esES: Locale = {
     end: '结束',
     startAndEnd: '开始/结束',
   },
-  // TODO 部分可以优化成global数据
   RangePicker: {
-    // okText: '确定',
-    // cancelText: '取消',
-    // placeholder: '请选择',
-    precision: 'day',
-    splitCharacter: '-',
     startPlaceholder: '未选择',
     endPlaceholder: '未选择',
   },

diff --git a/compiled/alipay/src/_locale/fr-FR.ts b/compiled/alipay/src/_locale/fr-FR.ts
@@ -16,13 +16,7 @@ const frFR: Locale = {
     end: '结束',
     startAndEnd: '开始/结束',
   },
-  // TODO 部分可以优化成global数据
   RangePicker: {
-    // okText: '确定',
-    // cancelText: '取消',
-    // placeholder: '请选择',
-    precision: 'day',
-    splitCharacter: '-',
     startPlaceholder: '未选择',
     endPlaceholder: '未选择',
   },

diff --git a/compiled/alipay/src/_locale/id-ID.ts b/compiled/alipay/src/_locale/id-ID.ts
@@ -16,13 +16,7 @@ const idID: Locale = {
     end: '结束',
     startAndEnd: '开始/结束',
   },
-  // TODO 部分可以优化成global数据
   RangePicker: {
-    // okText: '确定',
-    // cancelText: '取消',
-    // placeholder: '请选择',
-    precision: 'day',
-    splitCharacter: '-',
     startPlaceholder: '未选择',
     endPlaceholder: '未选择',
   },

diff --git a/compiled/alipay/src/_locale/it-IT.ts b/compiled/alipay/src/_locale/it-IT.ts
@@ -16,13 +16,7 @@ const itIT: Locale = {
     end: '结束',
     startAndEnd: '开始/结束',
   },
-  // TODO 部分可以优化成global数据
   RangePicker: {
-    // okText: '确定',
-    // cancelText: '取消',
-    // placeholder: '请选择',
-    precision: 'day',
-    splitCharacter: '-',
     startPlaceholder: '未选择',
     endPlaceholder: '未选择',
   },

diff --git a/compiled/alipay/src/_locale/ja-JP.ts b/compiled/alipay/src/_locale/ja-JP.ts
@@ -16,13 +16,7 @@ const jaJP: Locale = {
     end: '结束',
     startAndEnd: '开始/结束',
   },
-  // TODO 部分可以优化成global数据
   RangePicker: {
-    // okText: '确定',
-    // cancelText: '取消',
-    // placeholder: '请选择',
-    precision: 'day',
-    splitCharacter: '-',
     startPlaceholder: '未选择',
     endPlaceholder: '未选择',
   },

diff --git a/compiled/alipay/src/_locale/ko-KR.ts b/compiled/alipay/src/_locale/ko-KR.ts
@@ -16,13 +16,7 @@ const koKR: Locale = {
     end: '结束',
     startAndEnd: '开始/结束',
   },
-  // TODO 部分可以优化成global数据
   RangePicker: {
-    // okText: '确定',
-    // cancelText: '取消',
-    // placeholder: '请选择',
-    precision: 'day',
-    splitCharacter: '-',
     startPlaceholder: '未选择',
     endPlaceholder: '未选择',
   },

diff --git a/compiled/alipay/src/_locale/ms-MY.ts b/compiled/alipay/src/_locale/ms-MY.ts
@@ -16,13 +16,7 @@ const msMY: Locale = {
     end: '结束',
     startAndEnd: '开始/结束',
   },
-  // TODO 部分可以优化成global数据
   RangePicker: {
-    // okText: '确定',
-    // cancelText: '取消',
-    // placeholder: '请选择',
-    precision: 'day',
-    splitCharacter: '-',
     startPlaceholder: '未选择',
     endPlaceholder: '未选择',
   },

diff --git a/compiled/alipay/src/_locale/pt-BR.ts b/compiled/alipay/src/_locale/pt-BR.ts
@@ -16,13 +16,7 @@ const ptBR: Locale = {
     end: '结束',
     startAndEnd: '开始/结束',
   },
-  // TODO 部分可以优化成global数据
   RangePicker: {
-    // okText: '确定',
-    // cancelText: '取消',
-    // placeholder: '请选择',
-    precision: 'day',
-    splitCharacter: '-',
     startPlaceholder: '未选择',
     endPlaceholder: '未选择',
   },

diff --git a/compiled/alipay/src/_locale/ru-RU.ts b/compiled/alipay/src/_locale/ru-RU.ts
@@ -16,13 +16,7 @@ const ruRU: Locale = {
     end: '结束',
     startAndEnd: '开始/结束',
   },
-  // TODO 部分可以优化成global数据
   RangePicker: {
-    // okText: '确定',
-    // cancelText: '取消',
-    // placeholder: '请选择',
-    precision: 'day',
-    splitCharacter: '-',
     startPlaceholder: '未选择',
     endPlaceholder: '未选择',
   },

diff --git a/compiled/alipay/src/_locale/th-TH.ts b/compiled/alipay/src/_locale/th-TH.ts
@@ -16,13 +16,7 @@ const thTH: Locale = {
     end: '结束',
     startAndEnd: '开始/结束',
   },
-  // TODO 部分可以优化成global数据
   RangePicker: {
-    // okText: '确定',
-    // cancelText: '取消',
-    // placeholder: '请选择',
-    precision: 'day',
-    splitCharacter: '-',
     startPlaceholder: '未选择',
     endPlaceholder: '未选择',
   },

diff --git a/compiled/alipay/src/_locale/tr-TR.ts b/compiled/alipay/src/_locale/tr-TR.ts
@@ -16,13 +16,7 @@ const trTR: Locale = {
     end: '结束',
     startAndEnd: '开始/结束',
   },
-  // TODO 部分可以优化成global数据
   RangePicker: {
-    // okText: '确定',
-    // cancelText: '取消',
-    // placeholder: '请选择',
-    precision: 'day',
-    splitCharacter: '-',
     startPlaceholder: '未选择',
     endPlaceholder: '未选择',
   },

diff --git a/compiled/alipay/src/_locale/zh-HK.ts b/compiled/alipay/src/_locale/zh-HK.ts
@@ -17,13 +17,7 @@ const zhHK: Locale = {
     end: '结束',
     startAndEnd: '开始/结束',
   },
-  // TODO 部分可以优化成global数据
   RangePicker: {
-    // okText: '确定',
-    // cancelText: '取消',
-    // placeholder: '请选择',
-    precision: 'day',
-    splitCharacter: '-',
     startPlaceholder: '未选择',
     endPlaceholder: '未选择',
   },

diff --git a/compiled/alipay/src/_locale/zh_CN.ts b/compiled/alipay/src/_locale/zh_CN.ts
@@ -16,13 +16,7 @@ const zhCN: Locale = {
     end: '结束',
     startAndEnd: '开始/结束',
   },
-  // TODO 部分可以优化成global数据
   RangePicker: {
-    // okText: '确定',
-    // cancelText: '取消',
-    // placeholder: '请选择',
-    precision: 'day',
-    splitCharacter: '-',
     startPlaceholder: '未选择',
     endPlaceholder: '未选择',
   },

diff --git a/compiled/alipay/src/_locale/zh_TW.ts b/compiled/alipay/src/_locale/zh_TW.ts
@@ -17,13 +17,7 @@ const zhTW: Locale = {
     end: '结束',
     startAndEnd: '开始/结束',
   },
-  // TODO 部分可以优化成global数据
   RangePicker: {
-    // okText: '确定',
-    // cancelText: '取消',
-    // placeholder: '请选择',
-    precision: 'day',
-    splitCharacter: '-',
     startPlaceholder: '未选择',
     endPlaceholder: '未选择',
   },