From c9e2ba645c732a01b6d821e61298201b75dcb64e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 21 Nov 2024 17:47:52 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E3=80=81=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=90=8D=E7=A7=B0=E7=A6=81=E6=AD=A2=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=88=96=E6=9C=AA=E9=85=8D=E7=BD=AE=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=B7=B3=E8=BD=AC=E6=9D=A1=E4=BB=B6=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E5=A4=96=E9=83=A8=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/ExtVisualizationLinkJumpMapper.xml     |  4 ++--
 .../components/visualization/OuterParamsSet.vue    | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml
index b2751b098e..0413c7dde2 100644
--- a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml
+++ b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml
@@ -104,7 +104,7 @@
                 LEFT JOIN visualization_link_jump_target_view_info ON visualization_link_jump_info.id = visualization_link_jump_target_view_info.link_jump_info_id
                 LEFT JOIN xpack_share ON xpack_share.creator = #{uid}
                 AND visualization_link_jump_info.target_dv_id = xpack_share.resource_id
-                left join visualization_outer_params_info on visualization_outer_params_info.params_id = visualization_link_jump_target_view_info.target_view_id
+                left join visualization_outer_params_info on visualization_outer_params_info.params_info_id = visualization_link_jump_target_view_info.target_view_id
         WHERE
             core_chart_view.id = #{source_view_id}
           AND core_chart_view.type != 'VQuery'
@@ -164,7 +164,7 @@
 
         <select id="queryOutParamsTargetWithDvId" resultType="io.dataease.api.visualization.vo.VisualizationOutParamsJumpVO">
             SELECT
-            	vopi.params_id as id,
+            	vopi.params_info_id as id,
             	vopi.param_name as name,
             	vopi.param_name as title,
             	'outerParams' as type
diff --git a/core/core-frontend/src/components/visualization/OuterParamsSet.vue b/core/core-frontend/src/components/visualization/OuterParamsSet.vue
index f818841b9e..c9af78a35d 100644
--- a/core/core-frontend/src/components/visualization/OuterParamsSet.vue
+++ b/core/core-frontend/src/components/visualization/OuterParamsSet.vue
@@ -596,8 +596,14 @@ const jsonArrayCheck = params => {
 const save = () => {
   const outerParamsCopy = deepCopy(state.outerParams)
   let checkErrorNum = 0
+  let checkNullErrorNum = 0
   let checkMessage = ''
+  const paramNameArray = []
   outerParamsCopy.outerParamsInfoArray?.forEach(outerParamsInfo => {
+    if (!outerParamsInfo.paramName || paramNameArray.includes(outerParamsInfo.paramName)) {
+      checkNullErrorNum++
+    }
+    paramNameArray.push(outerParamsInfo.paramName)
     if (outerParamsInfo.defaultValue && !jsonArrayCheck(outerParamsInfo.defaultValue)) {
       checkErrorNum++
       checkMessage = checkMessage + `【${outerParamsInfo.paramName}】`
@@ -636,6 +642,14 @@ const save = () => {
     })
     return
   }
+  if (checkNullErrorNum > 0) {
+    ElMessage({
+      message: `存在未配置的参数名或者参数名称重复！`,
+      type: 'warning',
+      showClose: true
+    })
+    return
+  }
   updateOuterParamsSet(outerParamsCopy).then(() => {
     ElMessage({
       message: t('commons.save_success'),