Merge pull request #1995 from hqwcxy/master

[FIX] <pro>Lov: Fixed an issue where the data displayed by Lov was in…

Author: Huihuawk

components-pro/lov/Lov.tsx

@@ -738,7 +738,13 @@ export default class Lov extends Select<LovProps> {
   handleLovViewSelect(records: Record | Record[]) {
     const { viewMode, textField = '' } = this;
     if (isArrayLike(records)) {
-      this.setValue(getRecords(records, textField).map(record => this.processRecordToObject(record)));
+      // 全选的情况下，所有记录 selectedTimestamp 都相同
+      const isSameSelectedTimestamp = new Set(records.map(record => (record.selectedTimestamp || -1))).size === 1;
+      if (isSameSelectedTimestamp) {
+        this.setValue(records.map(record => this.processRecordToObject(record)));
+      } else {
+        this.setValue(getRecords(records, textField).map(record => this.processRecordToObject(record)));
+      }
     } else {
       this.setValue(records && this.processRecordToObject(records) || this.emptyValue);
     }

components/configure/index.en-US.md

@@ -44,6 +44,7 @@ const prefixCls = getConfig('prefixCls');
 | lovQueryCachedSelected | lov 查询缓存已勾选记录 | (code: string, cachedSelected: Map<string, Record>) => Promise<object[]> | |
 | lookupBatchAxiosConfig | hook for batch lookup query, more info:[AxiosRequestConfig](#AxiosRequestConfig)。 | (codes: string[]) => AxiosRequestConfig | - |
 | useLookupBatch | 是否使用批量查询快码 | (code: string, field: Field) => boolean | noop |
+| batchParaKey | lookup 批量查询参数的键，如果查询参数的键全部在 batchParaKey 数组中，那么依然执行批量查询 | string\[\] | - |
 | selectReverse | Whether to enable the pull-down multi-select reverse function. | boolean | true |
 | selectOptionsFilter | 选项过滤。 | (record: Record) => boolean | |
 | selectSearchable | 是否开启下拉搜索功能。 | boolean | false |

components/configure/index.zh-CN.md

@@ -47,6 +47,7 @@ const prefixCls = getConfig('prefixCls');
 | lovQueryCachedSelected | lov 查询缓存已勾选记录 | (code: string, cachedSelected: Map<string, Record>) => Promise<object[]> | |
 | lookupBatchAxiosConfig | 返回 lookup 批量查询配置的钩子，详见[AxiosRequestConfig](#AxiosRequestConfig)。 | (codes: string[]) => AxiosRequestConfig | - |
 | useLookupBatch | 是否使用批量查询快码 | (code: string, field: Field) => boolean | noop |
+| batchParaKey | lookup 批量查询参数的键，如果查询参数的键全部在 batchParaKey 数组中，那么依然执行批量查询 | string\[\] | - |
 | selectReverse | 是否开启下拉多选反向功能。 | boolean | true |
 | selectOptionsFilter | 选项过滤。 | (record: Record) => boolean | |
 | selectSearchable | 是否开启下拉搜索功能。 | boolean | false |