@douyinfe/semi-foundation 2.50.1 → 2.51.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -235,7 +235,7 @@ class AutoCompleteFoundation<P = Record<string, any>, S = Record<string, any>> e
235
235
 
236
236
  const options = this._generateList(data);
237
237
  // Get the option whose value match from options
238
- let selectedOption: StateOptionItem | Array<StateOptionItem> = options.filter(option => renderSelectedItem(option) === selectedValue);
238
+ let selectedOption: StateOptionItem | Array<StateOptionItem> = options.length ? options.filter(option => renderSelectedItem(option) === selectedValue) : [];
239
239
  const canMatchInData = selectedOption.length;
240
240
 
241
241
  const selectedOptionIndex = options.findIndex(option => renderSelectedItem(option) === selectedValue);
@@ -262,11 +262,13 @@ class AutoCompleteFoundation<P = Record<string, any>, S = Record<string, any>> e
262
262
 
263
263
  let { data, defaultActiveFirstOption } = this.getProps();
264
264
 
265
- let renderSelectedItem = this._getRenderSelectedItem();
266
-
267
- const options = this._generateList(data);
265
+ let selectedOptionIndex = -1;
268
266
 
269
- const selectedOptionIndex = options.findIndex(option => renderSelectedItem(option) === searchValue);
267
+ if (searchValue) {
268
+ let renderSelectedItem = this._getRenderSelectedItem();
269
+ const options = this._generateList(data);
270
+ selectedOptionIndex = options.findIndex(option => renderSelectedItem(option) === searchValue);
271
+ }
270
272
 
271
273
  if (selectedOptionIndex === -1 && defaultActiveFirstOption) {
272
274
  if (focusIndex !== 0) {
@@ -288,7 +290,9 @@ class AutoCompleteFoundation<P = Record<string, any>, S = Record<string, any>> e
288
290
  let { renderSelectedItem } = this.getProps();
289
291
 
290
292
  if (typeof renderSelectedItem === 'undefined') {
291
- renderSelectedItem = (option: any) => option.value;
293
+ renderSelectedItem = (option: any) => {
294
+ return option?.value;
295
+ };
292
296
  } else if (renderSelectedItem && typeof renderSelectedItem === 'function') {
293
297
  // do nothing
294
298
  }
@@ -24,4 +24,6 @@ export {
24
24
  cssClasses,
25
25
  strings,
26
26
  numbers
27
- };
27
+ };
28
+
29
+ export const VALUE_SPLIT = '_SEMI_CASCADER_SPLIT_';
@@ -1,4 +1,4 @@
1
- import { isEqual, get, difference, isUndefined, assign, cloneDeep, isEmpty, isNumber, includes, isFunction } from 'lodash';
1
+ import { isEqual, get, difference, isUndefined, assign, cloneDeep, isEmpty, isNumber, includes, isFunction, isObject } from 'lodash';
2
2
  import BaseFoundation, { DefaultAdapter } from '../base/foundation';
3
3
  import {
4
4
  filter,
@@ -12,10 +12,10 @@ import {
12
12
  import { Motion } from '../utils/type';
13
13
  import {
14
14
  convertDataToEntities,
15
- findKeysForValues,
16
15
  normalizedArr,
17
16
  isValid,
18
- calcMergeType
17
+ calcMergeType,
18
+ getKeysByValuePath
19
19
  } from './util';
20
20
  import { strings } from './constants';
21
21
  import isEnterPress from '../utils/isEnterPress';
@@ -439,14 +439,14 @@ export default class CascaderFoundation extends BaseFoundation<CascaderAdapter,
439
439
  const loadingKeys = this._adapter.getLoadingKeyRefValue();
440
440
  const filterable = this._isFilterable();
441
441
  const loadingActive = [...activeKeys].filter(i => loadingKeys.has(i));
442
-
443
- const valuePath = onChangeWithObject ? normalizedArr(value).map(i => i.value) : normalizedArr(value);
444
- const selectedKeys = findKeysForValues(valuePath, keyEntities);
442
+ const normalizedValue = normalizedArr(value);
443
+ const valuePath = onChangeWithObject && isObject(normalizedValue[0]) ? normalizedValue.map(i => i.value) : normalizedValue;
444
+ const selectedKeys = getKeysByValuePath(valuePath);
445
445
  let updateStates: Partial<BasicCascaderInnerData> = {};
446
446
 
447
- if (selectedKeys.length) {
448
- const selectedKey = selectedKeys[0];
449
- const selectedItem = keyEntities[selectedKey];
447
+ const selectedKey = selectedKeys.length > 0 ? selectedKeys[0] : undefined;
448
+ const selectedItem = selectedKey ? keyEntities[selectedKey] : undefined;
449
+ if (selectedItem) {
450
450
  /**
451
451
  * When changeOnSelect is turned on, or the target option is a leaf option,
452
452
  * the option is considered to be selected, even if the option is disabled
@@ -874,10 +874,8 @@ export default class CascaderFoundation extends BaseFoundation<CascaderAdapter,
874
874
  const { keyEntities } = this.getStates();
875
875
  const values: (string | number)[] = [];
876
876
  keys.forEach(key => {
877
- if (!isEmpty(keyEntities) && !isEmpty(keyEntities[key])) {
878
- const valueItem = keyEntities[key].data.value;
879
- values.push(valueItem);
880
- }
877
+ const valueItem = keyEntities[key]?.data?.value;
878
+ valueItem !== undefined && values.push(valueItem);
881
879
  });
882
880
  const formatValue: number | string | Array<string | number> = values.length === 1 ?
883
881
  values[0] :
package/cascader/util.ts CHANGED
@@ -3,7 +3,7 @@ import {
3
3
  isUndefined,
4
4
  isEqual
5
5
  } from 'lodash';
6
- import { strings } from './constants';
6
+ import { strings, VALUE_SPLIT } from './constants';
7
7
 
8
8
  function getPosition(level: any, index: any) {
9
9
  return `${level}-${index}`;
@@ -30,7 +30,7 @@ function traverseDataNodes(treeNodes: any, callback: any) {
30
30
  let item: any = null;
31
31
  // Process node if is not root
32
32
  if (node) {
33
- const key = parent ? getPosition(parent.key, ind) : `${ind}`;
33
+ const key = parent ? `${parent.key}${VALUE_SPLIT}${node.value}` : node.value;
34
34
  item = {
35
35
  data: { ...node },
36
36
  ind,
@@ -55,6 +55,25 @@ function traverseDataNodes(treeNodes: any, callback: any) {
55
55
  processNode(null);
56
56
  }
57
57
 
58
+ export function getKeysByValuePath(valuePath: (string | number)[][] | (string | number)[]) {
59
+ if (valuePath?.length) {
60
+ if (Array.isArray(valuePath[0])) {
61
+ return valuePath.map((item) => getKeyByValuePath(item));
62
+ } else {
63
+ return [getKeyByValuePath(valuePath as (string | number)[])];
64
+ }
65
+ }
66
+ return [];
67
+ }
68
+
69
+ export function getKeyByValuePath(valuePath: (string | number)[]) {
70
+ return valuePath.join(VALUE_SPLIT);
71
+ }
72
+
73
+ export function getValuePathByKey(key: string) {
74
+ return key.split(VALUE_SPLIT);
75
+ }
76
+
58
77
  export function convertDataToEntities(dataNodes: any) {
59
78
  const keyEntities: any = {};
60
79
 
@@ -74,14 +93,6 @@ export function convertDataToEntities(dataNodes: any) {
74
93
  return keyEntities;
75
94
  }
76
95
 
77
- export function findKeysForValues(value: any, keyEntities: any) {
78
- const valuePath = normalizedArr(value);
79
- const res = Object.values(keyEntities)
80
- .filter((item: any) => isEqual(item.valuePath, valuePath))
81
- .map((item: any) => item.key);
82
- return res;
83
- }
84
-
85
96
  export function calcMergeType(autoMergeValue: boolean, leafOnly: boolean): string {
86
97
  let mergeType: string;
87
98
  if (leafOnly) {
@@ -4,4 +4,8 @@ const cssClasses = {
4
4
  PREFIX: `${BASE_CLASS_PREFIX}-image`,
5
5
  } as const;
6
6
 
7
- export { cssClasses };
7
+ const numbers = {
8
+ DEFAULT_Z_INDEX: 1070,
9
+ };
10
+
11
+ export { cssClasses, numbers };
@@ -113,15 +113,21 @@ export default class TextAreaFoundation extends BaseFoundation<TextAreaAdapter>
113
113
  */
114
114
  handleVisibleMaxLength(value: string) {
115
115
  const { maxLength, getValueLength } = this._adapter.getProps();
116
- if (isNumber(maxLength) && maxLength >= 0 && isFunction(getValueLength) && isString(value)) {
117
- const valueLength = getValueLength(value);
118
- if (valueLength > maxLength) {
119
- console.warn('[Semi TextArea] The input character is truncated because the input length exceeds the maximum length limit');
120
- const truncatedValue = this.handleTruncateValue(value, maxLength);
121
- return truncatedValue;
116
+ if (isNumber(maxLength) && maxLength >= 0 && isString(value)) {
117
+ if (isFunction(getValueLength)) {
118
+ const valueLength = getValueLength(value);
119
+ if (valueLength > maxLength) {
120
+ console.warn('[Semi TextArea] The input character is truncated because the input length exceeds the maximum length limit');
121
+ const truncatedValue = this.handleTruncateValue(value, maxLength);
122
+ return truncatedValue;
123
+ }
122
124
  } else {
123
- return value;
125
+ if (value.length > maxLength) {
126
+ console.warn('[Semi TextArea] The input character is truncated because the input length exceeds the maximum length limit');
127
+ return value.slice(0, maxLength);
128
+ }
124
129
  }
130
+ return value;
125
131
  }
126
132
  return undefined;
127
133
  }
@@ -158,8 +164,26 @@ export default class TextAreaFoundation extends BaseFoundation<TextAreaAdapter>
158
164
 
159
165
  handleBlur(e: any) {
160
166
  const { value } = this.getStates();
167
+ const { maxLength } = this.getProps();
168
+ let realValue = value;
169
+ if (maxLength) {
170
+ // 如果设置了 maxLength,在中文输输入过程中,如果点击外部触发 blur,则拼音字符的所有内容会回显,
171
+ // 该表现不符合 maxLength 规定,因此需要在 blur 的时候二次确认
172
+ // 详情见 https://github.com/DouyinFE/semi-design/issues/2005
173
+ // If maxLength is set, during the Chinese input process, if you click outside to trigger blur,
174
+ // all the contents of the Pinyin characters will be echoed.
175
+ // This behavior does not meet the maxLength requirement, so we need to confirm twice when blurring。
176
+ // For details, see https://github.com/DouyinFE/semi-design/issues/2005
177
+ realValue = this.handleVisibleMaxLength(value);
178
+ if (realValue !== value) {
179
+ if (!this._isControlledComponent()) {
180
+ this._adapter.setValue(realValue);
181
+ }
182
+ this._adapter.notifyChange(realValue, e);
183
+ }
184
+ }
161
185
  this._adapter.toggleFocusing(false);
162
- this._adapter.notifyBlur(value, e);
186
+ this._adapter.notifyBlur(realValue, e);
163
187
  }
164
188
 
165
189
  handleKeyDown(e: any) {
@@ -205,7 +205,7 @@ class AutoCompleteFoundation extends _foundation.default {
205
205
  let renderSelectedItem = this._getRenderSelectedItem();
206
206
  const options = this._generateList(data);
207
207
  // Get the option whose value match from options
208
- let selectedOption = options.filter(option => renderSelectedItem(option) === selectedValue);
208
+ let selectedOption = options.length ? options.filter(option => renderSelectedItem(option) === selectedValue) : [];
209
209
  const canMatchInData = selectedOption.length;
210
210
  const selectedOptionIndex = options.findIndex(option => renderSelectedItem(option) === selectedValue);
211
211
  let inputValue = '';
@@ -235,9 +235,12 @@ class AutoCompleteFoundation extends _foundation.default {
235
235
  data,
236
236
  defaultActiveFirstOption
237
237
  } = this.getProps();
238
- let renderSelectedItem = this._getRenderSelectedItem();
239
- const options = this._generateList(data);
240
- const selectedOptionIndex = options.findIndex(option => renderSelectedItem(option) === searchValue);
238
+ let selectedOptionIndex = -1;
239
+ if (searchValue) {
240
+ let renderSelectedItem = this._getRenderSelectedItem();
241
+ const options = this._generateList(data);
242
+ selectedOptionIndex = options.findIndex(option => renderSelectedItem(option) === searchValue);
243
+ }
241
244
  if (selectedOptionIndex === -1 && defaultActiveFirstOption) {
242
245
  if (focusIndex !== 0) {
243
246
  this._adapter.updateFocusIndex(0);
@@ -259,7 +262,9 @@ class AutoCompleteFoundation extends _foundation.default {
259
262
  renderSelectedItem
260
263
  } = this.getProps();
261
264
  if (typeof renderSelectedItem === 'undefined') {
262
- renderSelectedItem = option => option.value;
265
+ renderSelectedItem = option => {
266
+ return option === null || option === void 0 ? void 0 : option.value;
267
+ };
263
268
  } else if (renderSelectedItem && typeof renderSelectedItem === 'function') {
264
269
  // do nothing
265
270
  }
@@ -15,3 +15,4 @@ declare const strings: {
15
15
  };
16
16
  declare const numbers: {};
17
17
  export { cssClasses, strings, numbers };
18
+ export declare const VALUE_SPLIT = "_SEMI_CASCADER_SPLIT_";
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.strings = exports.numbers = exports.cssClasses = void 0;
6
+ exports.strings = exports.numbers = exports.cssClasses = exports.VALUE_SPLIT = void 0;
7
7
  var _constants = require("../base/constants");
8
8
  const cssClasses = {
9
9
  PREFIX: `${_constants.BASE_CLASS_PREFIX}-cascader`,
@@ -24,4 +24,6 @@ const strings = {
24
24
  };
25
25
  exports.strings = strings;
26
26
  const numbers = {};
27
- exports.numbers = numbers;
27
+ exports.numbers = numbers;
28
+ const VALUE_SPLIT = '_SEMI_CASCADER_SPLIT_';
29
+ exports.VALUE_SPLIT = VALUE_SPLIT;
@@ -239,7 +239,16 @@ export default class CascaderFoundation extends BaseFoundation<CascaderAdapter,
239
239
  * @param {boolean} curCheckedStatus checked status of node
240
240
  */
241
241
  calcCheckedKeys(key: string, curCheckedStatus: boolean): {
242
- checkedKeys: Set<string>;
242
+ checkedKeys: Set<string>; /**
243
+ * If selectedKeys does not meet the update conditions,
244
+ * and state.selectedKeys is the same as selectedKeys
245
+ * at this time, state.selectedKeys should be cleared.
246
+ * A typical scenario is:
247
+ * The originally selected node is the leaf node, but
248
+ * after props.treeData is dynamically updated, the node
249
+ * is a non-leaf node. At this point, selectedKeys should
250
+ * be cleared.
251
+ */
243
252
  halfCheckedKeys: Set<string>;
244
253
  };
245
254
  handleInputChange(sugInput: string): void;
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.default = void 0;
7
+ var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
7
8
  var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
8
9
  var _includes2 = _interopRequireDefault(require("lodash/includes"));
9
10
  var _isNumber2 = _interopRequireDefault(require("lodash/isNumber"));
@@ -227,12 +228,13 @@ class CascaderFoundation extends _foundation.default {
227
228
  const loadingKeys = this._adapter.getLoadingKeyRefValue();
228
229
  const filterable = this._isFilterable();
229
230
  const loadingActive = [...activeKeys].filter(i => loadingKeys.has(i));
230
- const valuePath = onChangeWithObject ? (0, _util.normalizedArr)(value).map(i => i.value) : (0, _util.normalizedArr)(value);
231
- const selectedKeys = (0, _util.findKeysForValues)(valuePath, keyEntities);
231
+ const normalizedValue = (0, _util.normalizedArr)(value);
232
+ const valuePath = onChangeWithObject && (0, _isObject2.default)(normalizedValue[0]) ? normalizedValue.map(i => i.value) : normalizedValue;
233
+ const selectedKeys = (0, _util.getKeysByValuePath)(valuePath);
232
234
  let updateStates = {};
233
- if (selectedKeys.length) {
234
- const selectedKey = selectedKeys[0];
235
- const selectedItem = keyEntities[selectedKey];
235
+ const selectedKey = selectedKeys.length > 0 ? selectedKeys[0] : undefined;
236
+ const selectedItem = selectedKey ? keyEntities[selectedKey] : undefined;
237
+ if (selectedItem) {
236
238
  /**
237
239
  * When changeOnSelect is turned on, or the target option is a leaf option,
238
240
  * the option is considered to be selected, even if the option is disabled
@@ -692,10 +694,9 @@ class CascaderFoundation extends _foundation.default {
692
694
  } = this.getStates();
693
695
  const values = [];
694
696
  keys.forEach(key => {
695
- if (!(0, _isEmpty2.default)(keyEntities) && !(0, _isEmpty2.default)(keyEntities[key])) {
696
- const valueItem = keyEntities[key].data.value;
697
- values.push(valueItem);
698
- }
697
+ var _a, _b;
698
+ const valueItem = (_b = (_a = keyEntities[key]) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.value;
699
+ valueItem !== undefined && values.push(valueItem);
699
700
  });
700
701
  const formatValue = values.length === 1 ? values[0] : values;
701
702
  this._adapter.notifySelect(formatValue);
@@ -1,5 +1,7 @@
1
1
  export declare function isValid(val: any): boolean;
2
2
  export declare function normalizedArr(val: any): any[];
3
+ export declare function getKeysByValuePath(valuePath: (string | number)[][] | (string | number)[]): string[];
4
+ export declare function getKeyByValuePath(valuePath: (string | number)[]): string;
5
+ export declare function getValuePathByKey(key: string): string[];
3
6
  export declare function convertDataToEntities(dataNodes: any): any;
4
- export declare function findKeysForValues(value: any, keyEntities: any): any[];
5
7
  export declare function calcMergeType(autoMergeValue: boolean, leafOnly: boolean): string;
@@ -5,10 +5,11 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.calcMergeType = calcMergeType;
7
7
  exports.convertDataToEntities = convertDataToEntities;
8
- exports.findKeysForValues = findKeysForValues;
8
+ exports.getKeyByValuePath = getKeyByValuePath;
9
+ exports.getKeysByValuePath = getKeysByValuePath;
10
+ exports.getValuePathByKey = getValuePathByKey;
9
11
  exports.isValid = isValid;
10
12
  exports.normalizedArr = normalizedArr;
11
- var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
12
13
  var _isUndefined2 = _interopRequireDefault(require("lodash/isUndefined"));
13
14
  var _isNull2 = _interopRequireDefault(require("lodash/isNull"));
14
15
  var _constants = require("./constants");
@@ -35,7 +36,7 @@ function traverseDataNodes(treeNodes, callback) {
35
36
  let item = null;
36
37
  // Process node if is not root
37
38
  if (node) {
38
- const key = parent ? getPosition(parent.key, ind) : `${ind}`;
39
+ const key = parent ? `${parent.key}${_constants.VALUE_SPLIT}${node.value}` : node.value;
39
40
  item = {
40
41
  data: Object.assign({}, node),
41
42
  ind,
@@ -56,6 +57,22 @@ function traverseDataNodes(treeNodes, callback) {
56
57
  };
57
58
  processNode(null);
58
59
  }
60
+ function getKeysByValuePath(valuePath) {
61
+ if (valuePath === null || valuePath === void 0 ? void 0 : valuePath.length) {
62
+ if (Array.isArray(valuePath[0])) {
63
+ return valuePath.map(item => getKeyByValuePath(item));
64
+ } else {
65
+ return [getKeyByValuePath(valuePath)];
66
+ }
67
+ }
68
+ return [];
69
+ }
70
+ function getKeyByValuePath(valuePath) {
71
+ return valuePath.join(_constants.VALUE_SPLIT);
72
+ }
73
+ function getValuePathByKey(key) {
74
+ return key.split(_constants.VALUE_SPLIT);
75
+ }
59
76
  function convertDataToEntities(dataNodes) {
60
77
  const keyEntities = {};
61
78
  traverseDataNodes(dataNodes, data => {
@@ -74,11 +91,6 @@ function convertDataToEntities(dataNodes) {
74
91
  });
75
92
  return keyEntities;
76
93
  }
77
- function findKeysForValues(value, keyEntities) {
78
- const valuePath = normalizedArr(value);
79
- const res = Object.values(keyEntities).filter(item => (0, _isEqual2.default)(item.valuePath, valuePath)).map(item => item.key);
80
- return res;
81
- }
82
94
  function calcMergeType(autoMergeValue, leafOnly) {
83
95
  let mergeType;
84
96
  if (leafOnly) {
@@ -1,4 +1,7 @@
1
1
  declare const cssClasses: {
2
2
  readonly PREFIX: "semi-image";
3
3
  };
4
- export { cssClasses };
4
+ declare const numbers: {
5
+ DEFAULT_Z_INDEX: number;
6
+ };
7
+ export { cssClasses, numbers };
@@ -3,9 +3,13 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.cssClasses = void 0;
6
+ exports.numbers = exports.cssClasses = void 0;
7
7
  var _constants = require("../base/constants");
8
8
  const cssClasses = {
9
9
  PREFIX: `${_constants.BASE_CLASS_PREFIX}-image`
10
10
  };
11
- exports.cssClasses = cssClasses;
11
+ exports.cssClasses = cssClasses;
12
+ const numbers = {
13
+ DEFAULT_Z_INDEX: 1070
14
+ };
15
+ exports.numbers = numbers;
@@ -123,15 +123,21 @@ class TextAreaFoundation extends _foundation.default {
123
123
  maxLength,
124
124
  getValueLength
125
125
  } = this._adapter.getProps();
126
- if ((0, _isNumber2.default)(maxLength) && maxLength >= 0 && (0, _isFunction2.default)(getValueLength) && (0, _isString2.default)(value)) {
127
- const valueLength = getValueLength(value);
128
- if (valueLength > maxLength) {
129
- console.warn('[Semi TextArea] The input character is truncated because the input length exceeds the maximum length limit');
130
- const truncatedValue = this.handleTruncateValue(value, maxLength);
131
- return truncatedValue;
126
+ if ((0, _isNumber2.default)(maxLength) && maxLength >= 0 && (0, _isString2.default)(value)) {
127
+ if ((0, _isFunction2.default)(getValueLength)) {
128
+ const valueLength = getValueLength(value);
129
+ if (valueLength > maxLength) {
130
+ console.warn('[Semi TextArea] The input character is truncated because the input length exceeds the maximum length limit');
131
+ const truncatedValue = this.handleTruncateValue(value, maxLength);
132
+ return truncatedValue;
133
+ }
132
134
  } else {
133
- return value;
135
+ if (value.length > maxLength) {
136
+ console.warn('[Semi TextArea] The input character is truncated because the input length exceeds the maximum length limit');
137
+ return value.slice(0, maxLength);
138
+ }
134
139
  }
140
+ return value;
135
141
  }
136
142
  return undefined;
137
143
  }
@@ -171,8 +177,28 @@ class TextAreaFoundation extends _foundation.default {
171
177
  const {
172
178
  value
173
179
  } = this.getStates();
180
+ const {
181
+ maxLength
182
+ } = this.getProps();
183
+ let realValue = value;
184
+ if (maxLength) {
185
+ // 如果设置了 maxLength,在中文输输入过程中,如果点击外部触发 blur,则拼音字符的所有内容会回显,
186
+ // 该表现不符合 maxLength 规定,因此需要在 blur 的时候二次确认
187
+ // 详情见 https://github.com/DouyinFE/semi-design/issues/2005
188
+ // If maxLength is set, during the Chinese input process, if you click outside to trigger blur,
189
+ // all the contents of the Pinyin characters will be echoed.
190
+ // This behavior does not meet the maxLength requirement, so we need to confirm twice when blurring。
191
+ // For details, see https://github.com/DouyinFE/semi-design/issues/2005
192
+ realValue = this.handleVisibleMaxLength(value);
193
+ if (realValue !== value) {
194
+ if (!this._isControlledComponent()) {
195
+ this._adapter.setValue(realValue);
196
+ }
197
+ this._adapter.notifyChange(realValue, e);
198
+ }
199
+ }
174
200
  this._adapter.toggleFocusing(false);
175
- this._adapter.notifyBlur(value, e);
201
+ this._adapter.notifyBlur(realValue, e);
176
202
  }
177
203
  handleKeyDown(e) {
178
204
  this._adapter.notifyKeyDown(e);
@@ -792,7 +792,8 @@ class TableFoundation extends _foundation.default {
792
792
  }
793
793
  return true;
794
794
  } else {
795
- return false;
795
+ const isAllSelected = allKeys.every(rowKey => selectedRowKeysSet.has(rowKey));
796
+ return isAllSelected || false;
796
797
  }
797
798
  }
798
799
  /**
@@ -198,7 +198,7 @@ class AutoCompleteFoundation extends BaseFoundation {
198
198
  let renderSelectedItem = this._getRenderSelectedItem();
199
199
  const options = this._generateList(data);
200
200
  // Get the option whose value match from options
201
- let selectedOption = options.filter(option => renderSelectedItem(option) === selectedValue);
201
+ let selectedOption = options.length ? options.filter(option => renderSelectedItem(option) === selectedValue) : [];
202
202
  const canMatchInData = selectedOption.length;
203
203
  const selectedOptionIndex = options.findIndex(option => renderSelectedItem(option) === selectedValue);
204
204
  let inputValue = '';
@@ -228,9 +228,12 @@ class AutoCompleteFoundation extends BaseFoundation {
228
228
  data,
229
229
  defaultActiveFirstOption
230
230
  } = this.getProps();
231
- let renderSelectedItem = this._getRenderSelectedItem();
232
- const options = this._generateList(data);
233
- const selectedOptionIndex = options.findIndex(option => renderSelectedItem(option) === searchValue);
231
+ let selectedOptionIndex = -1;
232
+ if (searchValue) {
233
+ let renderSelectedItem = this._getRenderSelectedItem();
234
+ const options = this._generateList(data);
235
+ selectedOptionIndex = options.findIndex(option => renderSelectedItem(option) === searchValue);
236
+ }
234
237
  if (selectedOptionIndex === -1 && defaultActiveFirstOption) {
235
238
  if (focusIndex !== 0) {
236
239
  this._adapter.updateFocusIndex(0);
@@ -252,7 +255,9 @@ class AutoCompleteFoundation extends BaseFoundation {
252
255
  renderSelectedItem
253
256
  } = this.getProps();
254
257
  if (typeof renderSelectedItem === 'undefined') {
255
- renderSelectedItem = option => option.value;
258
+ renderSelectedItem = option => {
259
+ return option === null || option === void 0 ? void 0 : option.value;
260
+ };
256
261
  } else if (renderSelectedItem && typeof renderSelectedItem === 'function') {
257
262
  // do nothing
258
263
  }
@@ -15,3 +15,4 @@ declare const strings: {
15
15
  };
16
16
  declare const numbers: {};
17
17
  export { cssClasses, strings, numbers };
18
+ export declare const VALUE_SPLIT = "_SEMI_CASCADER_SPLIT_";
@@ -16,4 +16,5 @@ const strings = {
16
16
  NONE_MERGE_TYPE: 'none'
17
17
  };
18
18
  const numbers = {};
19
- export { cssClasses, strings, numbers };
19
+ export { cssClasses, strings, numbers };
20
+ export const VALUE_SPLIT = '_SEMI_CASCADER_SPLIT_';
@@ -239,7 +239,16 @@ export default class CascaderFoundation extends BaseFoundation<CascaderAdapter,
239
239
  * @param {boolean} curCheckedStatus checked status of node
240
240
  */
241
241
  calcCheckedKeys(key: string, curCheckedStatus: boolean): {
242
- checkedKeys: Set<string>;
242
+ checkedKeys: Set<string>; /**
243
+ * If selectedKeys does not meet the update conditions,
244
+ * and state.selectedKeys is the same as selectedKeys
245
+ * at this time, state.selectedKeys should be cleared.
246
+ * A typical scenario is:
247
+ * The originally selected node is the leaf node, but
248
+ * after props.treeData is dynamically updated, the node
249
+ * is a non-leaf node. At this point, selectedKeys should
250
+ * be cleared.
251
+ */
243
252
  halfCheckedKeys: Set<string>;
244
253
  };
245
254
  handleInputChange(sugInput: string): void;
@@ -1,3 +1,4 @@
1
+ import _isObject from "lodash/isObject";
1
2
  import _isFunction from "lodash/isFunction";
2
3
  import _includes from "lodash/includes";
3
4
  import _isNumber from "lodash/isNumber";
@@ -10,7 +11,7 @@ import _get from "lodash/get";
10
11
  import _isEqual from "lodash/isEqual";
11
12
  import BaseFoundation from '../base/foundation';
12
13
  import { filter, findAncestorKeys, calcCheckedKeysForUnchecked, calcCheckedKeysForChecked, calcCheckedKeys, findDescendantKeys, normalizeKeyList } from '../tree/treeUtil';
13
- import { convertDataToEntities, findKeysForValues, normalizedArr, isValid, calcMergeType } from './util';
14
+ import { convertDataToEntities, normalizedArr, isValid, calcMergeType, getKeysByValuePath } from './util';
14
15
  import { strings } from './constants';
15
16
  import isEnterPress from '../utils/isEnterPress';
16
17
  export default class CascaderFoundation extends BaseFoundation {
@@ -220,12 +221,13 @@ export default class CascaderFoundation extends BaseFoundation {
220
221
  const loadingKeys = this._adapter.getLoadingKeyRefValue();
221
222
  const filterable = this._isFilterable();
222
223
  const loadingActive = [...activeKeys].filter(i => loadingKeys.has(i));
223
- const valuePath = onChangeWithObject ? normalizedArr(value).map(i => i.value) : normalizedArr(value);
224
- const selectedKeys = findKeysForValues(valuePath, keyEntities);
224
+ const normalizedValue = normalizedArr(value);
225
+ const valuePath = onChangeWithObject && _isObject(normalizedValue[0]) ? normalizedValue.map(i => i.value) : normalizedValue;
226
+ const selectedKeys = getKeysByValuePath(valuePath);
225
227
  let updateStates = {};
226
- if (selectedKeys.length) {
227
- const selectedKey = selectedKeys[0];
228
- const selectedItem = keyEntities[selectedKey];
228
+ const selectedKey = selectedKeys.length > 0 ? selectedKeys[0] : undefined;
229
+ const selectedItem = selectedKey ? keyEntities[selectedKey] : undefined;
230
+ if (selectedItem) {
229
231
  /**
230
232
  * When changeOnSelect is turned on, or the target option is a leaf option,
231
233
  * the option is considered to be selected, even if the option is disabled
@@ -685,10 +687,9 @@ export default class CascaderFoundation extends BaseFoundation {
685
687
  } = this.getStates();
686
688
  const values = [];
687
689
  keys.forEach(key => {
688
- if (!_isEmpty(keyEntities) && !_isEmpty(keyEntities[key])) {
689
- const valueItem = keyEntities[key].data.value;
690
- values.push(valueItem);
691
- }
690
+ var _a, _b;
691
+ const valueItem = (_b = (_a = keyEntities[key]) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.value;
692
+ valueItem !== undefined && values.push(valueItem);
692
693
  });
693
694
  const formatValue = values.length === 1 ? values[0] : values;
694
695
  this._adapter.notifySelect(formatValue);
@@ -1,5 +1,7 @@
1
1
  export declare function isValid(val: any): boolean;
2
2
  export declare function normalizedArr(val: any): any[];
3
+ export declare function getKeysByValuePath(valuePath: (string | number)[][] | (string | number)[]): string[];
4
+ export declare function getKeyByValuePath(valuePath: (string | number)[]): string;
5
+ export declare function getValuePathByKey(key: string): string[];
3
6
  export declare function convertDataToEntities(dataNodes: any): any;
4
- export declare function findKeysForValues(value: any, keyEntities: any): any[];
5
7
  export declare function calcMergeType(autoMergeValue: boolean, leafOnly: boolean): string;
@@ -1,7 +1,6 @@
1
- import _isEqual from "lodash/isEqual";
2
1
  import _isUndefined from "lodash/isUndefined";
3
2
  import _isNull from "lodash/isNull";
4
- import { strings } from './constants';
3
+ import { strings, VALUE_SPLIT } from './constants';
5
4
  function getPosition(level, index) {
6
5
  return `${level}-${index}`;
7
6
  }
@@ -24,7 +23,7 @@ function traverseDataNodes(treeNodes, callback) {
24
23
  let item = null;
25
24
  // Process node if is not root
26
25
  if (node) {
27
- const key = parent ? getPosition(parent.key, ind) : `${ind}`;
26
+ const key = parent ? `${parent.key}${VALUE_SPLIT}${node.value}` : node.value;
28
27
  item = {
29
28
  data: Object.assign({}, node),
30
29
  ind,
@@ -45,6 +44,22 @@ function traverseDataNodes(treeNodes, callback) {
45
44
  };
46
45
  processNode(null);
47
46
  }
47
+ export function getKeysByValuePath(valuePath) {
48
+ if (valuePath === null || valuePath === void 0 ? void 0 : valuePath.length) {
49
+ if (Array.isArray(valuePath[0])) {
50
+ return valuePath.map(item => getKeyByValuePath(item));
51
+ } else {
52
+ return [getKeyByValuePath(valuePath)];
53
+ }
54
+ }
55
+ return [];
56
+ }
57
+ export function getKeyByValuePath(valuePath) {
58
+ return valuePath.join(VALUE_SPLIT);
59
+ }
60
+ export function getValuePathByKey(key) {
61
+ return key.split(VALUE_SPLIT);
62
+ }
48
63
  export function convertDataToEntities(dataNodes) {
49
64
  const keyEntities = {};
50
65
  traverseDataNodes(dataNodes, data => {
@@ -63,11 +78,6 @@ export function convertDataToEntities(dataNodes) {
63
78
  });
64
79
  return keyEntities;
65
80
  }
66
- export function findKeysForValues(value, keyEntities) {
67
- const valuePath = normalizedArr(value);
68
- const res = Object.values(keyEntities).filter(item => _isEqual(item.valuePath, valuePath)).map(item => item.key);
69
- return res;
70
- }
71
81
  export function calcMergeType(autoMergeValue, leafOnly) {
72
82
  let mergeType;
73
83
  if (leafOnly) {
@@ -1,4 +1,7 @@
1
1
  declare const cssClasses: {
2
2
  readonly PREFIX: "semi-image";
3
3
  };
4
- export { cssClasses };
4
+ declare const numbers: {
5
+ DEFAULT_Z_INDEX: number;
6
+ };
7
+ export { cssClasses, numbers };
@@ -2,4 +2,7 @@ import { BASE_CLASS_PREFIX } from "../base/constants";
2
2
  const cssClasses = {
3
3
  PREFIX: `${BASE_CLASS_PREFIX}-image`
4
4
  };
5
- export { cssClasses };
5
+ const numbers = {
6
+ DEFAULT_Z_INDEX: 1070
7
+ };
8
+ export { cssClasses, numbers };
@@ -116,15 +116,21 @@ export default class TextAreaFoundation extends BaseFoundation {
116
116
  maxLength,
117
117
  getValueLength
118
118
  } = this._adapter.getProps();
119
- if (_isNumber(maxLength) && maxLength >= 0 && _isFunction(getValueLength) && _isString(value)) {
120
- const valueLength = getValueLength(value);
121
- if (valueLength > maxLength) {
122
- console.warn('[Semi TextArea] The input character is truncated because the input length exceeds the maximum length limit');
123
- const truncatedValue = this.handleTruncateValue(value, maxLength);
124
- return truncatedValue;
119
+ if (_isNumber(maxLength) && maxLength >= 0 && _isString(value)) {
120
+ if (_isFunction(getValueLength)) {
121
+ const valueLength = getValueLength(value);
122
+ if (valueLength > maxLength) {
123
+ console.warn('[Semi TextArea] The input character is truncated because the input length exceeds the maximum length limit');
124
+ const truncatedValue = this.handleTruncateValue(value, maxLength);
125
+ return truncatedValue;
126
+ }
125
127
  } else {
126
- return value;
128
+ if (value.length > maxLength) {
129
+ console.warn('[Semi TextArea] The input character is truncated because the input length exceeds the maximum length limit');
130
+ return value.slice(0, maxLength);
131
+ }
127
132
  }
133
+ return value;
128
134
  }
129
135
  return undefined;
130
136
  }
@@ -164,8 +170,28 @@ export default class TextAreaFoundation extends BaseFoundation {
164
170
  const {
165
171
  value
166
172
  } = this.getStates();
173
+ const {
174
+ maxLength
175
+ } = this.getProps();
176
+ let realValue = value;
177
+ if (maxLength) {
178
+ // 如果设置了 maxLength,在中文输输入过程中,如果点击外部触发 blur,则拼音字符的所有内容会回显,
179
+ // 该表现不符合 maxLength 规定,因此需要在 blur 的时候二次确认
180
+ // 详情见 https://github.com/DouyinFE/semi-design/issues/2005
181
+ // If maxLength is set, during the Chinese input process, if you click outside to trigger blur,
182
+ // all the contents of the Pinyin characters will be echoed.
183
+ // This behavior does not meet the maxLength requirement, so we need to confirm twice when blurring。
184
+ // For details, see https://github.com/DouyinFE/semi-design/issues/2005
185
+ realValue = this.handleVisibleMaxLength(value);
186
+ if (realValue !== value) {
187
+ if (!this._isControlledComponent()) {
188
+ this._adapter.setValue(realValue);
189
+ }
190
+ this._adapter.notifyChange(realValue, e);
191
+ }
192
+ }
167
193
  this._adapter.toggleFocusing(false);
168
- this._adapter.notifyBlur(value, e);
194
+ this._adapter.notifyBlur(realValue, e);
169
195
  }
170
196
  handleKeyDown(e) {
171
197
  this._adapter.notifyKeyDown(e);
@@ -785,7 +785,8 @@ class TableFoundation extends BaseFoundation {
785
785
  }
786
786
  return true;
787
787
  } else {
788
- return false;
788
+ const isAllSelected = allKeys.every(rowKey => selectedRowKeysSet.has(rowKey));
789
+ return isAllSelected || false;
789
790
  }
790
791
  }
791
792
  /**
package/package.json CHANGED
@@ -1,13 +1,13 @@
1
1
  {
2
2
  "name": "@douyinfe/semi-foundation",
3
- "version": "2.50.1",
3
+ "version": "2.51.0",
4
4
  "description": "",
5
5
  "scripts": {
6
6
  "build:lib": "node ./scripts/compileLib.js",
7
7
  "prepublishOnly": "npm run build:lib"
8
8
  },
9
9
  "dependencies": {
10
- "@douyinfe/semi-animation": "2.50.1",
10
+ "@douyinfe/semi-animation": "2.51.0",
11
11
  "async-validator": "^3.5.0",
12
12
  "classnames": "^2.2.6",
13
13
  "date-fns": "^2.29.3",
@@ -23,7 +23,7 @@
23
23
  "*.scss",
24
24
  "*.css"
25
25
  ],
26
- "gitHead": "aa51082cdb589792e9224e02c29288991c442344",
26
+ "gitHead": "5a554bf517411b933e891ad51b874bd9eb6c87c6",
27
27
  "devDependencies": {
28
28
  "@babel/plugin-transform-runtime": "^7.15.8",
29
29
  "@babel/preset-env": "^7.15.8",
@@ -989,7 +989,8 @@ class TableFoundation<RecordType> extends BaseFoundation<TableAdapter<RecordType
989
989
  }
990
990
  return true;
991
991
  } else {
992
- return false;
992
+ const isAllSelected = allKeys.every(rowKey => selectedRowKeysSet.has(rowKey));
993
+ return isAllSelected || false;
993
994
  }
994
995
  }
995
996