chore: 调整AntdDateRangePicker参数pickerValue格式及底层逻辑

CNFeffery · Sep 13, 2024 · 2d4a099 · 2d4a099
1 parent e16cb65
commit 2d4a099
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/feffery_antd_components/AntdDateRangePicker.py b/feffery_antd_components/AntdDateRangePicker.py
@@ -79,7 +79,7 @@ class AntdDateRangePicker(Component):
 - defaultValue (list of strings; optional):
     初始化已选值，与`format`格式对应.
 
-- pickerValue (list of strings; optional):
+- pickerValue (string; optional):
     监听或设置面板展开对应日期，与`format`格式对应.
 
 - disabledDatesStrategy (list of dicts; optional):

diff --git a/src/lib/components/dataEntry/AntdDateRangePicker.react.js b/src/lib/components/dataEntry/AntdDateRangePicker.react.js
@@ -139,7 +139,7 @@ AntdDateRangePicker.propTypes = {
     /**
      * 监听或设置面板展开对应日期，与`format`格式对应
      */
-    pickerValue: PropTypes.arrayOf(PropTypes.string),
+    pickerValue: PropTypes.string,
 
     /**
      * 配置日期禁用项策略数组，满足策略中至少一项规则的日期将会被禁止选中

diff --git a/src/lib/fragments/dataEntry/AntdDateRangePicker.react.js b/src/lib/fragments/dataEntry/AntdDateRangePicker.react.js
@@ -149,10 +149,7 @@ const AntdDateRangePicker = (props) => {
         // 处理pickerValue缺省赋值
         if (!pickerValue) {
             setProps({
-                pickerValue: [
-                    dayjs(new Date()).format(format || (showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD')),
-                    dayjs(new Date()).format(format || (showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'))
-                ]
+                pickerValue: dayjs(new Date()).format(format || (showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'))
             })
         }
     }, [])
@@ -498,7 +495,7 @@ const AntdDateRangePicker = (props) => {
                     onChange={onChange}
                     onPanelChange={(v, m) => {
                         setProps({
-                            pickerValue: [(v[0] || v[1]).format(format), (v[0] || v[1]).format(format)]
+                            pickerValue: (v[0] || v[1]).format(format)
                         })
                     }}
                     variant={(
@@ -507,7 +504,7 @@ const AntdDateRangePicker = (props) => {
                             variant
                     )}
                     disabledDate={disabledDatesStrategy ? checkDisabledDate : undefined}
-                    pickerValue={pickerValue && [dayjs(pickerValue[0], format), dayjs(pickerValue[0], format)]}
+                    pickerValue={pickerValue && [dayjs(pickerValue, format), dayjs(pickerValue, format)]}
                     value={
                         formId && (name || id) ?
                             (