From 59b5b0a0cfa1e91ff6c35c22ec3567805fde9c3b Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 28 Mar 2022 09:19:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=A7=86=E5=9B=BE=E8=B7=B3=E8=BD=AC=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=98=AF=E5=8F=AF=E4=BB=A5=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/domain/PanelLinkJumpInfo.java        |  2 +
 .../base/domain/PanelLinkJumpInfoExample.java | 60 +++++++++++++++++++
 .../base/mapper/PanelLinkJumpInfoMapper.xml   | 25 ++++++--
 .../mapper/ext/ExtPanelLinkJumpMapper.xml     |  3 +
 .../main/resources/db/migration/V33__1.9.sql  |  5 +-
 .../src/main/resources/generatorConfig.xml    |  7 ++-
 .../canvas/custom-component/UserView.vue      | 18 +++++-
 .../src/views/panel/LinkJumpSet/index.vue     |  6 ++
 8 files changed, 115 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/domain/PanelLinkJumpInfo.java b/backend/src/main/java/io/dataease/base/domain/PanelLinkJumpInfo.java
index 4d4f24e479..7ba04b895f 100644
--- a/backend/src/main/java/io/dataease/base/domain/PanelLinkJumpInfo.java
+++ b/backend/src/main/java/io/dataease/base/domain/PanelLinkJumpInfo.java
@@ -21,6 +21,8 @@ public class PanelLinkJumpInfo implements Serializable {
 
     private Boolean checked;
 
+    private Boolean attachParams;
+
     private String copyFrom;
 
     private String copyId;
diff --git a/backend/src/main/java/io/dataease/base/domain/PanelLinkJumpInfoExample.java b/backend/src/main/java/io/dataease/base/domain/PanelLinkJumpInfoExample.java
index b4408603f1..c60289f908 100644
--- a/backend/src/main/java/io/dataease/base/domain/PanelLinkJumpInfoExample.java
+++ b/backend/src/main/java/io/dataease/base/domain/PanelLinkJumpInfoExample.java
@@ -654,6 +654,66 @@ public class PanelLinkJumpInfoExample {
             return (Criteria) this;
         }
 
+        public Criteria andAttachParamsIsNull() {
+            addCriterion("attach_params is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttachParamsIsNotNull() {
+            addCriterion("attach_params is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttachParamsEqualTo(Boolean value) {
+            addCriterion("attach_params =", value, "attachParams");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttachParamsNotEqualTo(Boolean value) {
+            addCriterion("attach_params <>", value, "attachParams");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttachParamsGreaterThan(Boolean value) {
+            addCriterion("attach_params >", value, "attachParams");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttachParamsGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("attach_params >=", value, "attachParams");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttachParamsLessThan(Boolean value) {
+            addCriterion("attach_params <", value, "attachParams");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttachParamsLessThanOrEqualTo(Boolean value) {
+            addCriterion("attach_params <=", value, "attachParams");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttachParamsIn(List<Boolean> values) {
+            addCriterion("attach_params in", values, "attachParams");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttachParamsNotIn(List<Boolean> values) {
+            addCriterion("attach_params not in", values, "attachParams");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttachParamsBetween(Boolean value1, Boolean value2) {
+            addCriterion("attach_params between", value1, value2, "attachParams");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttachParamsNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("attach_params not between", value1, value2, "attachParams");
+            return (Criteria) this;
+        }
+
         public Criteria andCopyFromIsNull() {
             addCriterion("copy_from is null");
             return (Criteria) this;
diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpInfoMapper.xml b/backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpInfoMapper.xml
index b889d702be..94008786f1 100644
--- a/backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpInfoMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpInfoMapper.xml
@@ -10,6 +10,7 @@
     <result column="source_field_id" jdbcType="VARCHAR" property="sourceFieldId" />
     <result column="content" jdbcType="VARCHAR" property="content" />
     <result column="checked" jdbcType="BIT" property="checked" />
+    <result column="attach_params" jdbcType="BIT" property="attachParams" />
     <result column="copy_from" jdbcType="VARCHAR" property="copyFrom" />
     <result column="copy_id" jdbcType="VARCHAR" property="copyId" />
   </resultMap>
@@ -73,7 +74,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, link_jump_id, link_type, jump_type, target_panel_id, source_field_id, content, 
-    `checked`, copy_from, copy_id
+    `checked`, attach_params, copy_from, copy_id
   </sql>
   <select id="selectByExample" parameterType="io.dataease.base.domain.PanelLinkJumpInfoExample" resultMap="BaseResultMap">
     select
@@ -108,12 +109,12 @@
   <insert id="insert" parameterType="io.dataease.base.domain.PanelLinkJumpInfo">
     insert into panel_link_jump_info (id, link_jump_id, link_type, 
       jump_type, target_panel_id, source_field_id, 
-      content, `checked`, copy_from, 
-      copy_id)
+      content, `checked`, attach_params, 
+      copy_from, copy_id)
     values (#{id,jdbcType=VARCHAR}, #{linkJumpId,jdbcType=VARCHAR}, #{linkType,jdbcType=VARCHAR}, 
       #{jumpType,jdbcType=VARCHAR}, #{targetPanelId,jdbcType=VARCHAR}, #{sourceFieldId,jdbcType=VARCHAR}, 
-      #{content,jdbcType=VARCHAR}, #{checked,jdbcType=BIT}, #{copyFrom,jdbcType=VARCHAR}, 
-      #{copyId,jdbcType=VARCHAR})
+      #{content,jdbcType=VARCHAR}, #{checked,jdbcType=BIT}, #{attachParams,jdbcType=BIT}, 
+      #{copyFrom,jdbcType=VARCHAR}, #{copyId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.dataease.base.domain.PanelLinkJumpInfo">
     insert into panel_link_jump_info
@@ -142,6 +143,9 @@
       <if test="checked != null">
         `checked`,
       </if>
+      <if test="attachParams != null">
+        attach_params,
+      </if>
       <if test="copyFrom != null">
         copy_from,
       </if>
@@ -174,6 +178,9 @@
       <if test="checked != null">
         #{checked,jdbcType=BIT},
       </if>
+      <if test="attachParams != null">
+        #{attachParams,jdbcType=BIT},
+      </if>
       <if test="copyFrom != null">
         #{copyFrom,jdbcType=VARCHAR},
       </if>
@@ -215,6 +222,9 @@
       <if test="record.checked != null">
         `checked` = #{record.checked,jdbcType=BIT},
       </if>
+      <if test="record.attachParams != null">
+        attach_params = #{record.attachParams,jdbcType=BIT},
+      </if>
       <if test="record.copyFrom != null">
         copy_from = #{record.copyFrom,jdbcType=VARCHAR},
       </if>
@@ -236,6 +246,7 @@
       source_field_id = #{record.sourceFieldId,jdbcType=VARCHAR},
       content = #{record.content,jdbcType=VARCHAR},
       `checked` = #{record.checked,jdbcType=BIT},
+      attach_params = #{record.attachParams,jdbcType=BIT},
       copy_from = #{record.copyFrom,jdbcType=VARCHAR},
       copy_id = #{record.copyId,jdbcType=VARCHAR}
     <if test="_parameter != null">
@@ -266,6 +277,9 @@
       <if test="checked != null">
         `checked` = #{checked,jdbcType=BIT},
       </if>
+      <if test="attachParams != null">
+        attach_params = #{attachParams,jdbcType=BIT},
+      </if>
       <if test="copyFrom != null">
         copy_from = #{copyFrom,jdbcType=VARCHAR},
       </if>
@@ -284,6 +298,7 @@
       source_field_id = #{sourceFieldId,jdbcType=VARCHAR},
       content = #{content,jdbcType=VARCHAR},
       `checked` = #{checked,jdbcType=BIT},
+      attach_params = #{attachParams,jdbcType=BIT},
       copy_from = #{copyFrom,jdbcType=VARCHAR},
       copy_id = #{copyId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml
index 096802cce0..e14d62685b 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml
@@ -38,6 +38,7 @@
             panel_link_jump_info.content,
             ifnull( panel_link_mapping.uuid, panel_link_mapping.id ) AS publicJumpId,
             ifnull( panel_link_jump_info.checked, 0 ) AS checked,
+            ifnull( panel_link_jump_info.attach_params, 0 ) AS attach_params,
             panel_link_jump_target_view_info.target_view_id,
             panel_link_jump_target_view_info.target_field_id
         FROM
@@ -198,6 +199,7 @@
             source_field_id,
             content,
             `checked`,
+            `attach_params`,
             copy_from,
             copy_id
         ) SELECT
@@ -209,6 +211,7 @@
         source_field_id,
         content,
         `checked`,
+        `attach_params`,
         id AS copy_from,
         #{copyId}
         FROM
diff --git a/backend/src/main/resources/db/migration/V33__1.9.sql b/backend/src/main/resources/db/migration/V33__1.9.sql
index 7d70f7e67d..921ab185c5 100644
--- a/backend/src/main/resources/db/migration/V33__1.9.sql
+++ b/backend/src/main/resources/db/migration/V33__1.9.sql
@@ -247,4 +247,7 @@ END
 ;;
 delimiter ;
 
-INSERT INTO `my_plugin`(`plugin_id`, `name`, `store`, `free`, `cost`, `category`, `descript`, `version`, `install_type`, `creator`, `load_mybatis`, `release_time`, `install_time`, `module_name`, `icon`) VALUES (3, 'tabs插件', 'default', 0, 20000, 'panel', 'tabs插件', '1.0-SNAPSHOT', NULL, 'fit2cloud-chenyw', 0, NULL, NULL, 'dataease-extensions-tabs-backend', NULL);
\ No newline at end of file
+INSERT INTO `my_plugin`(`plugin_id`, `name`, `store`, `free`, `cost`, `category`, `descript`, `version`, `install_type`, `creator`, `load_mybatis`, `release_time`, `install_time`, `module_name`, `icon`) VALUES (3, 'tabs插件', 'default', 0, 20000, 'panel', 'tabs插件', '1.0-SNAPSHOT', NULL, 'fit2cloud-chenyw', 0, NULL, NULL, 'dataease-extensions-tabs-backend', NULL);
+
+ALTER TABLE `panel_link_jump_info`
+ADD COLUMN `attach_params` tinyint(1) NULL COMMENT '是否附加点击参数' AFTER `checked`;
diff --git a/backend/src/main/resources/generatorConfig.xml b/backend/src/main/resources/generatorConfig.xml
index ca6e4672c7..09cfa9d012 100644
--- a/backend/src/main/resources/generatorConfig.xml
+++ b/backend/src/main/resources/generatorConfig.xml
@@ -63,8 +63,9 @@
 <!--        <table tableName="de_engine">-->
 <!--            <columnOverride column="configuration" property="configuration" javaType="java.lang.String"/>-->
 <!--        </table>-->
-        <table tableName="panel_outer_params"/>
-        <table tableName="panel_outer_params_info"/>
-        <table tableName="panel_outer_params_target_view_info"/>
+        <table tableName="panel_link_jump"/>
+        <table tableName="panel_link_jump_info"/>
+<!--        <table tableName="panel_outer_params_info"/>-->
+<!--        <table tableName="panel_outer_params_target_view_info"/>-->
     </context>
 </generatorConfiguration>
diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index afb04f90c8..e479a69c27 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -524,7 +524,7 @@ export default {
     },
 
     jumpClick(param) {
-      let dimension, jumpInfo, sourceInfo
+      let dimension, jumpInfo, sourceInfo, jumpFieldName
       // 倒序取最后一个能匹配的
       for (let i = param.dimensionList.length - 1; i >= 0; i--) {
         dimension = param.dimensionList[i]
@@ -566,7 +566,21 @@ export default {
             })
           }
         } else {
-          const url = jumpInfo.content
+          let url = jumpInfo.content
+          // 是否追加点击参数
+          if (jumpInfo.attachParams && this.chart.data && this.chart.data.sourceFields) {
+            this.chart.data.sourceFields.forEach(item => {
+              if (item.id === dimension.id) {
+                jumpFieldName = item.name
+              }
+            })
+            const urlAttachParams = jumpFieldName + '=' + dimension.value
+            if (url.indexOf('?') > -1) {
+              url = url + '&' + urlAttachParams
+            } else {
+              url = url + '?' + urlAttachParams
+            }
+          }
           window.open(url, jumpInfo.jumpType)
         }
       } else {
diff --git a/frontend/src/views/panel/LinkJumpSet/index.vue b/frontend/src/views/panel/LinkJumpSet/index.vue
index 45ceb23488..04b7d96e6c 100644
--- a/frontend/src/views/panel/LinkJumpSet/index.vue
+++ b/frontend/src/views/panel/LinkJumpSet/index.vue
@@ -71,6 +71,9 @@
                   <el-radio label="_blank">{{ $t('panel.new_window') }}</el-radio>
                 </el-radio-group>
               </el-col>
+              <el-col v-if="linkJumpInfo.linkType==='outer'" :span="9">
+                <el-checkbox v-model="linkJumpInfo.attachParams">附加点击参数</el-checkbox>
+              </el-col>
             </el-row>
             <el-row v-if="linkJumpInfo.linkType==='inner'" style="margin-top: 5px;" class="top_border">
               <el-row style="margin-top: 10px">
@@ -292,6 +295,9 @@ export default {
       if (!this.linkJumpInfo.content) {
         this.linkJumpInfo.content = 'http://'
       }
+      if (!this.linkJumpInfo.attachParams) {
+        this.linkJumpInfo.attachParams = false
+      }
       if (this.linkJumpInfo.targetPanelId) {
         this.getPanelViewList(this.linkJumpInfo.targetPanelId)
       }