Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion frontend/src/views/system/permission/auth-tree/RowAuth.vue
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,16 @@ const dfsInit = (arr: any[]) => {
const child = dfsInit(items)
elementList.push({ logic, child })
} else {
const { enum_value, field_id, filter_type, term, value, field, value_type, variable_id } = ele
const {
enum_value,
field_id,
filter_type,
term,
value,
field,
value_type = 'normal',
variable_id = '',
} = ele
const { name } = field || {}
elementList.push({
enum_value: enum_value.join(','),
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/views/system/variables/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ const keywords = ref('')
const oldKeywords = ref('')
const searchLoading = ref(false)

const selectable = () => {
return true
const selectable = (row: any) => {
return ![1, 2, 3].includes(row.id)
}
onMounted(() => {
search()
Expand Down