Skip to content

Commit 7a5d893

Browse files
committed
refactor: improve option handling and select props in MemberFormContent
1 parent 74909d4 commit 7a5d893

1 file changed

Lines changed: 11 additions & 2 deletions

File tree

ui/src/views/system/role/component/MemberFormContent.vue

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
style="width: 100%"
3131
collapse-tags
3232
collapse-tags-tooltip
33-
v-bind="model.selectProps"
33+
v-bind="getSelectProps(model)"
3434
>
3535
<el-option
3636
v-for="opt in getOptions(element, model)"
@@ -97,7 +97,16 @@ const selectedRoles = computed(() => {
9797
9898
function getOptions(element: any, model: FormItemModel) {
9999
const dynamicOptions = element[`_${model.path}_options`]
100-
return dynamicOptions || model.selectProps?.options || []
100+
// 检查是否已经设置过动态选项(包括空数组)
101+
if (element.hasOwnProperty(`_${model.path}_options`)) {
102+
return dynamicOptions
103+
}
104+
return model.selectProps?.options || []
105+
}
106+
107+
function getSelectProps(model: FormItemModel) {
108+
const {options, ...restProps} = model.selectProps || {}
109+
return restProps
101110
}
102111
103112
async function handleRemoteSearch(query: string, element: any, model: FormItemModel) {

0 commit comments

Comments
 (0)