diff --git a/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java b/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java index f58c552a29..2faf1fc800 100644 --- a/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java +++ b/core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java @@ -25,7 +25,7 @@ public class MybatisPlusGenerator { /** * 这是要生成代码的表名称 */ - private static final String TABLE_NAME = "visualization_outer_params_info"; + private static final String TABLE_NAME = "visualization_link_jump_info"; /** * 下面两个配置基本上不用动 diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJumpInfo.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJumpInfo.java index 73d2b1215f..f833aaa1b5 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJumpInfo.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/VisualizationLinkJumpInfo.java @@ -5,17 +5,20 @@ import java.io.Serializable; /** *

- * + * 跳转配置表 *

* * @author fit2cloud - * @since 2023-09-22 + * @since 2024-09-19 */ @TableName("visualization_link_jump_info") public class VisualizationLinkJumpInfo implements Serializable { private static final long serialVersionUID = 1L; + /** + * 主键 + */ private Long id; /** @@ -33,6 +36,11 @@ public class VisualizationLinkJumpInfo implements Serializable { */ private String jumpType; + /** + * 窗口大小large middle small + */ + private String windowSize; + /** * 关联仪表板ID */ @@ -58,8 +66,14 @@ public class VisualizationLinkJumpInfo implements Serializable { */ private Boolean attachParams; + /** + * 复制来源 + */ private Long copyFrom; + /** + * 复制来源ID + */ private Long copyId; public Long getId() { @@ -94,6 +108,14 @@ public class VisualizationLinkJumpInfo implements Serializable { this.jumpType = jumpType; } + public String getWindowSize() { + return windowSize; + } + + public void setWindowSize(String windowSize) { + this.windowSize = windowSize; + } + public Long getTargetDvId() { return targetDvId; } @@ -157,6 +179,7 @@ public class VisualizationLinkJumpInfo implements Serializable { ", linkJumpId = " + linkJumpId + ", linkType = " + linkType + ", jumpType = " + jumpType + + ", windowSize = " + windowSize + ", targetDvId = " + targetDvId + ", sourceFieldId = " + sourceFieldId + ", content = " + content + diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationLinkJumpInfoMapper.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationLinkJumpInfoMapper.java index 774dd88f74..8918e3ab2d 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationLinkJumpInfoMapper.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/VisualizationLinkJumpInfoMapper.java @@ -6,11 +6,11 @@ import org.apache.ibatis.annotations.Mapper; /** *

- * Mapper 接口 + * 跳转配置表 Mapper 接口 *

* * @author fit2cloud - * @since 2023-09-22 + * @since 2024-09-19 */ @Mapper public interface VisualizationLinkJumpInfoMapper extends BaseMapper { diff --git a/core/core-backend/src/main/resources/db/desktop/V2.10.1__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.10.1__ddl.sql index e25e136490..054cf673cd 100644 --- a/core/core-backend/src/main/resources/db/desktop/V2.10.1__ddl.sql +++ b/core/core-backend/src/main/resources/db/desktop/V2.10.1__ddl.sql @@ -3,3 +3,6 @@ ALTER TABLE `visualization_outer_params_info` ADD COLUMN `default_value` varchar(255) DEFAULT NULL COMMENT '默认值 JSON格式', ADD COLUMN `enabled_default` tinyint(1) NULL DEFAULT 0 COMMENT '是否启用默认值'; update visualization_outer_params_info set required =0; + +ALTER TABLE `visualization_link_jump_info` + ADD COLUMN `window_size` varchar(255) NULL DEFAULT 'middle' COMMENT '窗口大小large middle small'; diff --git a/core/core-backend/src/main/resources/db/migration/V2.10.1__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.10.1__ddl.sql index 0f10c972dc..3d30eb0d18 100644 --- a/core/core-backend/src/main/resources/db/migration/V2.10.1__ddl.sql +++ b/core/core-backend/src/main/resources/db/migration/V2.10.1__ddl.sql @@ -8,3 +8,6 @@ set required =0; ALTER TABLE `xpack_report_info` ADD COLUMN `show_watermark` tinyint(1) NOT NULL DEFAULT 0 COMMENT '显示水印' AFTER `rid`; +ALTER TABLE `visualization_link_jump_info` + ADD COLUMN `window_size` varchar(255) NULL DEFAULT 'middle' COMMENT '窗口大小large middle small'; + diff --git a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml index 2c313e85a5..acfa2d8f7a 100644 --- a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml +++ b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml @@ -16,6 +16,7 @@ + @@ -78,6 +79,7 @@ visualization_link_jump_info.link_jump_id, visualization_link_jump_info.link_type, visualization_link_jump_info.jump_type, + visualization_link_jump_info.window_size, visualization_link_jump_info.target_dv_id, visualization_link_jump_info.content, xpack_share.uuid AS publicJumpId, @@ -304,6 +306,7 @@ link_jump_id, link_type, jump_type, + window_size, target_dv_id, source_field_id, content, @@ -315,6 +318,7 @@ plj_copy.t_id, link_type, jump_type, + window_size, target_dv_id, source_field_id, content, diff --git a/core/core-frontend/src/components/visualization/LinkJumpSet.vue b/core/core-frontend/src/components/visualization/LinkJumpSet.vue index 51a3bfc587..ec65063709 100644 --- a/core/core-frontend/src/components/visualization/LinkJumpSet.vue +++ b/core/core-frontend/src/components/visualization/LinkJumpSet.vue @@ -120,6 +120,20 @@ {{ t('visualization.pop_window') }} + + + + + + + + + @@ -1022,7 +1036,7 @@ span { height: 100%; .settings-header { - height: 92px; + height: auto; border-bottom: 1px solid #e6e6e6; .radio-group-box { @@ -1047,6 +1061,7 @@ span { .settings-main { padding: 16px; + overflow: hidden; .empty { width: 100%; height: 100%; diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue index 3bac39d426..55424c5b46 100644 --- a/core/core-frontend/src/views/chart/components/views/index.vue +++ b/core/core-frontend/src/views/chart/components/views/index.vue @@ -379,14 +379,29 @@ const divEmbedded = type => { useEmitt().emitter.emit('changeCurrentComponent', type) } -const windowsJump = (url, jumpType) => { +const windowsJump = (url, jumpType, size = 'middle') => { try { let newWindow if ('newPop' === jumpType) { + let sizeX, sizeY + if (size === 'large') { + sizeX = 0.95 + sizeY = 0.9 + } else if (size === 'middle') { + sizeX = 0.8 + sizeY = 0.75 + } else { + sizeX = 0.6 + sizeY = 0.5 + } + const height = screen.height * sizeY + const width = screen.width * sizeX + const left = screen.width * ((1 - sizeX) / 2) + const top = screen.height * ((1 - sizeY) / 2) window.open( url, '_blank', - 'width=800,height=600,left=200,top=100,toolbar=no,scrollbars=yes,resizable=yes,location=no' + `width=${width},height=${height},left=${left},top=${top},toolbar=no,scrollbars=yes,resizable=yes,location=no` ) } else { newWindow = window.open(url, jumpType) @@ -441,7 +456,7 @@ const jumpClick = param => { }?jumpInfoParam=${encodeURIComponent(Base64.encode(JSON.stringify(param)))}` const currentUrl = window.location.href localStorage.setItem('beforeJumpUrl', currentUrl) - windowsJump(url, jumpInfo.jumpType) + windowsJump(url, jumpInfo.jumpType, jumpInfo.windowSize) } else { ElMessage.warning(t('visualization.public_link_tips')) } @@ -464,7 +479,7 @@ const jumpClick = param => { router.push(parseUrl(url)) return } - windowsJump(url, jumpInfo.jumpType) + windowsJump(url, jumpInfo.jumpType, jumpInfo.windowSize) } } else { ElMessage.warning('未指定跳转仪表板') @@ -483,7 +498,7 @@ const jumpClick = param => { return } - windowsJump(url, jumpInfo.jumpType) + windowsJump(url, jumpInfo.jumpType, jumpInfo.windowSize) } } else { } diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpInfoVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpInfoVO.java index 7dd8601d54..6525a97224 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationLinkJumpInfoVO.java @@ -29,6 +29,12 @@ public class VisualizationLinkJumpInfoVO { */ private String jumpType; + /** + * 窗口大小large middle small + */ + private String windowSize; + + /** * 关联仪表板ID */