Showing
1 changed file
with
12 additions
and
8 deletions
| @@ -50,6 +50,7 @@ | @@ -50,6 +50,7 @@ | ||
| 50 | value: item.tbDeviceId, | 50 | value: item.tbDeviceId, |
| 51 | })); | 51 | })); |
| 52 | } | 52 | } |
| 53 | + console.log(); | ||
| 53 | dynamicInput.params.push({ | 54 | dynamicInput.params.push({ |
| 54 | name: props.value.label, | 55 | name: props.value.label, |
| 55 | profileId: props.value.value, | 56 | profileId: props.value.value, |
| @@ -69,17 +70,20 @@ | @@ -69,17 +70,20 @@ | ||
| 69 | 70 | ||
| 70 | //chang改变 | 71 | //chang改变 |
| 71 | const emitChange = () => { | 72 | const emitChange = () => { |
| 72 | - const findDeviceDict = selectOptions.value.map((item) => { | ||
| 73 | - if (dynamicInput.params[0].deviceList?.includes(item.value)) { | ||
| 74 | - return { | ||
| 75 | - name: item.label, | ||
| 76 | - deviceId: item.value, | ||
| 77 | - }; | ||
| 78 | - } | 73 | + const tempDeviceList: Recordable[] = []; // fix: 修改选择设备顺序问题 |
| 74 | + dynamicInput.params[0].deviceList?.forEach((item) => { | ||
| 75 | + selectOptions.value?.forEach((newItem) => { | ||
| 76 | + if (item === newItem.value) { | ||
| 77 | + tempDeviceList.push({ | ||
| 78 | + name: newItem.label, | ||
| 79 | + deviceId: newItem.value, | ||
| 80 | + }); | ||
| 81 | + } | ||
| 82 | + }); | ||
| 79 | }); | 83 | }); |
| 80 | return { | 84 | return { |
| 81 | ...dynamicInput.params[0], | 85 | ...dynamicInput.params[0], |
| 82 | - deviceList: findDeviceDict.filter(Boolean), | 86 | + deviceList: tempDeviceList.filter(Boolean), // 过滤假值 |
| 83 | }; | 87 | }; |
| 84 | }; | 88 | }; |
| 85 | defineExpose({ | 89 | defineExpose({ |