Skip to content

Commit

Permalink
Merge pull request #2738 from emqx/dev/1.9.1
Browse files Browse the repository at this point in the history
Sync code from refs/heads/dev/1.9.1 to enterprise
  • Loading branch information
Kinplemelon authored Jun 11, 2024
2 parents 717a2ee + 531cfd5 commit 59ddecf
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/components/ListenerDrawer/ListenerDrawer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
size="50%"
:z-index="1999"
class="listener-drawer"
destroy-on-close
>
<el-form
label-position="top"
Expand Down
1 change: 1 addition & 0 deletions src/hooks/Config/useListenerDialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ export default (props: Props, emit: Emit): UseListenerDialogReturns => {
} else {
// for prevent form throw error
listenerRecord.value = createRawListener()
listenerCustomConfigs.value = {}
isLoading.value = false
}
})
Expand Down
5 changes: 4 additions & 1 deletion src/hooks/Rule/useSQLAvailablePlaceholder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,10 @@ export default (): {
})
const { transFromStrToFromArr, getTestTargetEvent } = useRuleUtils()
const selectList = computed<Array<string>>(() => {
return splitOnComma(sqlKeyParts.value.fieldStr ?? '').map((item) => trimSpacesAndLFs(item))
if (isUndefined(sqlKeyParts.value.fieldStr)) {
return []
}
return splitOnComma(sqlKeyParts.value.fieldStr).map((item) => trimSpacesAndLFs(item))
})
const fromList = computed(() => transFromStrToFromArr(sqlKeyParts.value.fromStr || ''))

Expand Down

0 comments on commit 59ddecf

Please sign in to comment.