From 2a54a42ac3b5fef729c8979c993b50470fa8ebdf Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 29 Apr 2024 20:17:34 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=85=8D=E7=BD=AE=E6=97=B6=E9=97=B4=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=AD=9B=E9=80=89=EF=BC=8C=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E8=AF=AF=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/dto/panel/linkJump/PanelLinkJumpInfoDTO.java  | 2 ++
 .../main/java/io/dataease/ext/ExtPanelLinkJumpMapper.xml   | 3 ++-
 core/frontend/src/views/panel/linkJumpSet/index.vue        | 7 +++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/core/backend/src/main/java/io/dataease/dto/panel/linkJump/PanelLinkJumpInfoDTO.java b/core/backend/src/main/java/io/dataease/dto/panel/linkJump/PanelLinkJumpInfoDTO.java
index 12affaaff1..439185caa5 100644
--- a/core/backend/src/main/java/io/dataease/dto/panel/linkJump/PanelLinkJumpInfoDTO.java
+++ b/core/backend/src/main/java/io/dataease/dto/panel/linkJump/PanelLinkJumpInfoDTO.java
@@ -17,6 +17,8 @@ public class PanelLinkJumpInfoDTO extends PanelLinkJumpInfo {
 
     private String sourceFieldName;
 
+    private Integer sourceFieldType;
+
     private String sourceJumpInfo;
 
     //存在公共链接的目标仪表板
diff --git a/core/backend/src/main/java/io/dataease/ext/ExtPanelLinkJumpMapper.xml b/core/backend/src/main/java/io/dataease/ext/ExtPanelLinkJumpMapper.xml
index 7b961b659b..ec30ff790e 100644
--- a/core/backend/src/main/java/io/dataease/ext/ExtPanelLinkJumpMapper.xml
+++ b/core/backend/src/main/java/io/dataease/ext/ExtPanelLinkJumpMapper.xml
@@ -12,6 +12,7 @@
     <resultMap id="LinkJumpInfoMap" type="io.dataease.dto.panel.linkJump.PanelLinkJumpInfoDTO"
                extends="io.dataease.plugins.common.base.mapper.PanelLinkJumpInfoMapper.BaseResultMap">
         <result column="source_field_id" jdbcType="VARCHAR" property="sourceFieldId"/>
+        <result column="source_field_type" jdbcType="VARCHAR" property="sourceFieldType"/>
         <result column="source_field_name" jdbcType="VARCHAR" property="sourceFieldName"/>
         <result column="publicJumpId" jdbcType="VARCHAR" property="publicJumpId"/>
         <collection property="targetViewInfoList"
@@ -29,7 +30,7 @@
     </resultMap>
 
     <select id="getLinkJumpInfo" resultMap="LinkJumpInfoMap">
-        SELECT dataset_table_field.id AS 'source_field_id', dataset_table_field.NAME AS 'source_field_name', panel_link_jump_info.id,
+        SELECT dataset_table_field.id AS 'source_field_id',dataset_table_field.de_type AS 'source_field_type',  dataset_table_field.NAME AS 'source_field_name', panel_link_jump_info.id,
                panel_link_jump_info.link_jump_id,
                panel_link_jump_info.link_type,
                panel_link_jump_info.jump_type,
diff --git a/core/frontend/src/views/panel/linkJumpSet/index.vue b/core/frontend/src/views/panel/linkJumpSet/index.vue
index 38fa1c1270..98100a4652 100644
--- a/core/frontend/src/views/panel/linkJumpSet/index.vue
+++ b/core/frontend/src/views/panel/linkJumpSet/index.vue
@@ -142,6 +142,7 @@
                       >
                         <el-option
                           v-for="item in currentLinkPanelViewArray"
+                          v-show="checkShow(item)"
                           :key="item.id"
                           :label="item.name"
                           :value="item.id"
@@ -579,6 +580,10 @@ export default {
         })
       })
     },
+    checkShow(item) {
+      const result = !(this.linkJumpInfo && this.linkJumpInfo.sourceFieldType !== 1 && item.componentType && item.componentType.indexOf('time') > -1)
+      return result
+    },
     handleExceed(file) {
     },
     cancel() {
@@ -610,6 +615,7 @@ export default {
     },
     nodeClick(data, node) {
       this.linkJumpInfo = this.mapJumpInfoArray[data.sourceFieldId]
+      console.log('nodeClick=' + JSON.stringify(this.linkJumpInfo))
       if (!this.linkJumpInfo.linkType) {
         this.linkJumpInfo.linkType = 'inner'
       }
@@ -644,6 +650,7 @@ export default {
           if (componentItem.type === 'custom' && this.widgetSubjectsFilter.includes(componentItem.serviceName)) {
             this.currentLinkPanelViewArray.push({
               id: componentItem.id,
+              componentType: componentItem.serviceName,
               type: 'filter',
               name: componentItem.options.attrs.title ? componentItem.options.attrs.title : this.widgetSubjectsTrans[componentItem.serviceName]
             })