test/amis
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-12-04 12:58:38 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

修复select 选择顺序没办法控制的问题

Browse Source
This commit is contained in:
liaoxuezhi 2019-12-19 12:17:14 +08:00
parent a86aeb7e35
commit c4b6d5afb7
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/store/formItem.ts
View File

@ -16,7 +16,8 @@ import {
isArrayChildrenModified,
isObject,
createObject,
isObjectShallowModified
isObjectShallowModified,
findTree
} from '../utils/helper';
import {flattenTree} from '../utils/helper';
import {IRendererStore} from '.';
@ -151,33 +152,21 @@ export const FormItemStore = types
const selectedOptions: Array<any> = [];
flattenTree(self.filteredOptions).forEach((item: any) => {
let idx = findIndex(selected, seleced => {
return isObject(seleced)
? seleced === item[self.valueField || 'value']
: String(item[self.valueField || 'value']) === String(seleced);
selected.forEach(item => {
const matched = findTree(self.filteredOptions, option => {
return isObject(item)
? item === option[self.valueField || 'value']
: String(option[self.valueField || 'value']) === String(item);
});
if (~idx) {
selected.splice(idx, 1);
selectedOptions.push(item);
}
});
selected.forEach((item, index) => {
let unMatched = (value && value[index]) || item;
if (
unMatched &&
(typeof unMatched === 'string' || typeof unMatched === 'number')
) {
unMatched = {
if (matched) {
selectedOptions.push(matched);
} else if (item) {
selectedOptions.push({
[self.valueField || 'value']: item,
[self.labelField || 'label']: item
};
});
}
unMatched && selectedOptions.push(unMatched);
});
return selectedOptions;