public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-21 12:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 【数据集】带系统变量的SQL节点，对in操作的支持有误

Browse Source
This commit is contained in:
taojinlong
2024-12-30 19:36:23 +08:00
committed by dataeaseShu
parent 4fe660f0bd
commit 846a1e108e
4 changed files with 213 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue
View File

@@ -227,10 +227,8 @@ const handleSearchVariableApi = async () => {
onMounted(async () => {
dsChange(sqlNode.value.datasourceId)
await handleSearchVariableApi()
codeCom.value = myCm.value.codeComInit(
setNameIdTrans('id', 'name', Base64.decode(sqlNode.value.sql)),
true
)
sql = Base64.decode(sqlNode.value.sql)
codeCom.value = myCm.value.codeComInit(setNameIdTrans('id', 'name', sql), true)
})
onBeforeUnmount(() => {
@@ -382,6 +380,7 @@ const close = () => {
const handleClose = () => {
let sqlNew = codeCom.value.state.doc.toString()
sqlNew = setNameIdTrans('name', 'id', sqlNew)
if (changeFlag || sql !== sqlNew || !sqlNew.trim()) {
ElMessageBox.confirm(t('chart.tips'), {
confirmButtonType: 'primary',
@@ -405,7 +404,7 @@ const getSQLPreview = () => {
parseVariable()
dataPreviewLoading.value = true
getPreviewSql({
sql: Base64.encode(codeCom.value.state.doc.toString()),
sql: Base64.encode((sql = setNameIdTrans('name', 'id', codeCom.value.state.doc.toString()))),
datasourceId: sqlNode.value.datasourceId,
sqlVariableDetails: JSON.stringify(state.variables)
})