diff --git a/frontend/src/components/canvas/components/Editor/PreviewEject.vue b/frontend/src/components/canvas/components/Editor/PreviewEject.vue index 068c6e77e1..9a35802c9c 100644 --- a/frontend/src/components/canvas/components/Editor/PreviewEject.vue +++ b/frontend/src/components/canvas/components/Editor/PreviewEject.vue @@ -100,7 +100,11 @@ export default { if (--loadingCount === 0) { this.dataLoading = false } - console.log('outerParams Deocode error:', e) + this.$message({ + message: this.$t('panel.outer_param_decode_error'), + type: 'error' + }) + console.log('outerParams Decode error:', e) } } if (tempParam) { diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 416309e7ee..c276c1045b 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1434,6 +1434,7 @@ export default { enable_param: 'Enable Param', param_name: 'Param Name', outer_param_set: 'Outer Param Set', + outer_param_decode_error: 'External Parameter Parsing Error And Does Not Take Effect, Please Check', input_param_name: "Please Input Param's Name", params_setting: 'Outer Params Setting', template_view_tips: "Template's Views. Please Change", diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 3c9a5de455..82a981401f 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1435,6 +1435,7 @@ export default { enable_param: '启用参数', param_name: '参数名称', outer_param_set: '外部参数设置', + outer_param_decode_error: '外部参数解析错误未生效,请按规定编码方式传参', input_param_name: '请输入参数名称', params_setting: '外部参数设置', template_view_tips: '当前是模板视图,请点击更换数据集', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 4ccfeaf5af..ec3c00af78 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1443,6 +1443,7 @@ export default { enable_param: '启用参数', param_name: '参数名称', outer_param_set: '外部参数设置', + outer_param_decode_error: '外部参数解析错误未生效,请按规定编码方式传参', input_param_name: '请输入参数名称', params_setting: '外部参数设置', template_view_tips: '当前是模板视图,请点击更换数据集', diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js index dc7ff1a1ce..b6d73cdbc9 100644 --- a/frontend/src/store/index.js +++ b/frontend/src/store/index.js @@ -345,8 +345,13 @@ const data = { // 外部参数 可能会包含多个参数 Object.keys(params).forEach(function(sourceInfo) { - // 获取外部参数的值 sourceInfo 是外部参数名称 - const paramValue = params[sourceInfo] + // 获取外部参数的值 sourceInfo 是外部参数名称 支持数组传入 + let paramValue = params[sourceInfo] + const operator = 'eq' + if (paramValue && !Array.isArray(paramValue)) { + paramValue = [paramValue] + operator = 'in' + } // 获取所有目标联动信息 const targetInfoList = trackInfo[sourceInfo] || [] @@ -355,7 +360,7 @@ const data = { const targetViewId = targetInfoArray[0] // 目标视图 if (element.propValue.viewId === targetViewId) { // 如果目标视图 和 当前循环组件id相等 则进行条件增减 const targetFieldId = targetInfoArray[1] // 目标视图列ID - const condition = new Condition('', targetFieldId, 'eq', [paramValue], [targetViewId]) + const condition = new Condition('', targetFieldId, operator, paramValue, [targetViewId]) let j = currentFilters.length while (j--) { const filter = currentFilters[j] diff --git a/frontend/src/views/link/view/index.vue b/frontend/src/views/link/view/index.vue index a0ea7a06d1..9b61de7d4c 100644 --- a/frontend/src/views/link/view/index.vue +++ b/frontend/src/views/link/view/index.vue @@ -83,9 +83,8 @@ export default { } this.$message({ - message: this.$t('panel.json_params_error'), - type: 'error', - showClose: true + message: this.$t('panel.outer_param_decode_error'), + type: 'error' }) console.log('outerParams Decode error:', e) }