Merge branch 'develop' into feat/#1991

XiaoMi · Nov 10, 2021 · d51aab2 · d51aab2
2 parents b3ef7e6 + 6608fe4
commit d51aab2
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,10 +2,12 @@
 
 # 3.8.0-rc
 
+- 新增 `Input` 组件的支持 placeholder 受控动态更新  [#1982](https://github.com/XiaoMi/hiui/issues/1982)
 - 修复 `Select` 组件高亮词搜索存在正则注入  [#1972](https://github.com/XiaoMi/hiui/issues/1972)
 - 修复 `Table` 组件 resizable 调节列宽功能失效  [#1970](https://github.com/XiaoMi/hiui/issues/1970)
 - 修复 `Input` 组件的 placeholder 没法动态更新  [#1970](https://github.com/XiaoMi/hiui/issues/1982)
 - 优化 `Dropdown` 组件 props 中的 data 消除副作用 [#1991](https://github.com/XiaoMi/hiui/issues/1991)
+- 修复 `TimePicker` 组件使用 minusStep 当点击 clear 后会再次自动回显值  [#1986](https://github.com/XiaoMi/hiui/issues/1986)
 
 # 3.8.0
 

diff --git a/components/date-picker/components/Time.jsx b/components/date-picker/components/Time.jsx
@@ -129,6 +129,10 @@ const Time = ({ date, onChange, timeRangePanelType, startDate, currentDate }) =>
   }
   const selectedEvent = useCallback(
     (type, value, arrow, target) => {
+      // 避免空值时 点开 select 自动更新 input
+      // 这里的 `scroll` 是 TimeList 内部暴露的自定义事件，需要规避处理
+      if (target === 'scroll' && !currentDate) return
+
       const cDate = moment(date)
       const disabledList = _getDsiabledList()[type]
       if (disabledList.includes(value) && arrow) {

diff --git a/components/table/HeaderTable.jsx b/components/table/HeaderTable.jsx
@@ -165,12 +165,14 @@ const HeaderTable = ({ rightFixedIndex }) => {
                   indeterminate={!isAllChecked && rowSelection.selectedRowKeys.length > 0}
                   onChange={(e) => {
                     if (rowSelection.onChange) {
+                      const selectedItems = isAllChecked
+                        ? []
+                        : flatTreeData(_.cloneDeep(data)).filter((data) => !disabledData.current.includes(data.key))
+
                       rowSelection.onChange(
-                        isAllChecked
-                          ? []
-                          : flatTreeData(_.cloneDeep(data))
-                              .filter((data) => !disabledData.current.includes(data.key))
-                              .map((d) => d.key)
+                        selectedItems.map((item) => item.key),
+                        selectedItems,
+                        !isAllChecked
                       )
                     }
                   }}

diff --git a/components/table/Row.jsx b/components/table/Row.jsx
@@ -153,11 +153,16 @@ const Row = ({
             onChange={(e) => {
               const { selectedRowKeys = [], onChange } = rowSelection
               const _selectedRowKeys = [...selectedRowKeys]
+
               if (_selectedRowKeys.includes(rowData.key)) {
-                onChange(_selectedRowKeys.filter((key) => key !== rowData.key))
+                onChange(
+                  _selectedRowKeys.filter((key) => key !== rowData.key),
+                  rowData,
+                  false
+                )
               } else {
                 _selectedRowKeys.push(rowData.key)
-                onChange(_selectedRowKeys)
+                onChange(_selectedRowKeys, rowData, true)
               }
             }}
           />

diff --git a/components/table/index.d.ts b/components/table/index.d.ts
@@ -40,7 +40,8 @@ export type TableFixedOption = {
 }
 export type TableRowSelection = {
   selectedRowKeys?: string[] | number[]
-  onChange?: (selectedRowKeys: string | number) => void
+  getCheckboxConfig?: (rowData: object) => object
+  onChange?: (selectedRowKeys: string | number, targetRow?: object | object[], shouldChecked?: boolean) => void
 }
 
 export type TableHeaderRowReturn = {

diff --git a/docs/demo/time-picker/section-range.jsx b/docs/demo/time-picker/section-range.jsx
@@ -11,10 +11,13 @@ class Demo extends React.Component {
       <TimePicker
         defaultValue={{start: new Date(), end: new Date()}}
         type="timerange"
-        onChange={(date, dateString) => console.log(date, dateString)}
+        onChange={(date, dateString) => {
+          console.log('onChange: ', date, dateString)
+        }}
       />
     )
   }
 }`
+
 const DemoBase = () => <DocViewer code={code} scope={{ TimePicker }} prefix={prefix} desc={desc} />
 export default DemoBase
diff --git a/docs/zh-CN/components/table.mdx b/docs/zh-CN/components/table.mdx
@@ -186,4 +186,4 @@ import DemoAsync from '../../demo/table/section-async.jsx'
 | ----------------- | ---------------------- | ----------------------------------- | ---------------- | ------ |
 | selectedRowKeys   | 选中的行（受控）       | string[]                            | row 中对应的 key | -      |
 | getCheckboxConfig | 行选择的配置项         | rowData => object                   | -                | -      |
-| onChange          | 选中项发生变化时的回调 | (selectedRowKeys: string[]) => void | -                | -      |
+| onChange          | 选中项发生变化时的回调，如果是全选操作，`targetRow` 将是数组结构 | (selectedRowKeys: string[], targetRow?: object \| object[], shouldChecked?: boolean) => void | -                | -      |