diff --git a/README.md b/README.md index d712eb8e5c..6e20dc3c78 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,6 @@ DataEase 是开源的数据可视化分析工具，帮助用户分析数据、 - 数据引擎: 支持直连模式、本地模式(基于 Apache Doris / Kettle 实现); - 数据连接: 支持关系型数据库、Excel 等文件、Hadoop 等大数据平台、NoSQL 等各种数据源。 -## 功能架构 - -![de-architecture](https://dataease.oss-cn-hangzhou.aliyuncs.com/img/de-architecture.png) - ## UI 展示 ![de-ui](https://dataease.oss-cn-hangzhou.aliyuncs.com/img/de-ui.png) @@ -39,6 +35,10 @@ curl -sSL https://github.com/dataease/dataease/releases/latest/download/quick_st ![wechat-group](https://dataease.oss-cn-hangzhou.aliyuncs.com/img/wechat-group.png) +## 功能架构 + +![de-architecture](https://dataease.oss-cn-hangzhou.aliyuncs.com/img/de-architecture.png) + ## 产品优势 - 开源开放：零门槛，线上快速获取和安装；快速获取用户反馈、按月发布新版本； diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml index a345bfc4b0..8285cd02a4 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml @@ -6,6 +6,10 @@ extends="io.dataease.base.mapper.PanelGroupMapper.BaseResultMap"> + + + + SELECT - id, - `name`, - pid, - `level`, - node_type, - create_by, - create_time, - panel_type, - `name` AS label - from panel_group - where panel_group.panel_type=#{panelType} + panel_group.id, + panel_group.`name`, + panel_group.pid, + panel_group.`level`, + panel_group.node_type, + panel_group.create_by, + panel_group.create_time, + panel_group.panel_type, + panel_group.`name` AS label, + panel_group.`source`, + panel_group.`panel_type`, + sourcePanelGroup.`name` as source_panel_name, + get_auths(panel_group.id,'panel',#{userId}) as `privileges` + from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'panel') cids) t,panel_group + LEFT JOIN (select id,`name` from panel_group) sourcePanelGroup + on sourcePanelGroup.id=panel_group.source + + FIND_IN_SET(panel_group.id,cids) + + and panel_group.name like CONCAT('%', #{name},'%') + + + and panel_group.node_type = #{nodeType} + + + and panel_group.panel_type = #{panelType} + + + and panel_group.id = #{id} + + + and panel_group.pid = #{pid} + + + and panel_group.level = #{level} + + + + order by ${sort} + + + order by panel_group.create_time desc + - delete from panel_group where FIND_IN_SET(panel_group.id,GET_PANEL_GROUP_WITH_CHILDREN(#{pid})) + delete from panel_group where FIND_IN_SET(panel_group.id,GET_PANEL_GROUP_WITH_CHILDREN(#{pid})) or FIND_IN_SET(panel_group.source,GET_PANEL_GROUP_WITH_CHILDREN(#{pid})) + diff --git a/backend/src/main/java/io/dataease/dto/panel/PanelGroupDTO.java b/backend/src/main/java/io/dataease/dto/panel/PanelGroupDTO.java index ea0037b069..de6e95210f 100644 --- a/backend/src/main/java/io/dataease/dto/panel/PanelGroupDTO.java +++ b/backend/src/main/java/io/dataease/dto/panel/PanelGroupDTO.java @@ -21,6 +21,14 @@ public class PanelGroupDTO extends PanelGroupWithBLOBs implements ITreeBase children = new ArrayList<>(); diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java index f7767b3f5c..845ec708b1 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java @@ -69,7 +69,7 @@ public class PanelGroupService { public List defaultTree(PanelGroupRequest panelGroupRequest) { String userId = String.valueOf(AuthUtils.getUser().getUserId()); panelGroupRequest.setUserId(userId); - List panelGroupDTOList = extPanelGroupMapper.panelGroupList(panelGroupRequest); + List panelGroupDTOList = extPanelGroupMapper.panelGroupListDefault(panelGroupRequest); List result = TreeUtils.mergeTree(panelGroupDTOList,"default_panel"); return result; } @@ -132,6 +132,7 @@ public class PanelGroupService { public void deleteCircle(String id) { Assert.notNull(id, "id cannot be null"); + // 同时会删除对应默认仪表盘 extPanelGroupMapper.deleteCircle(id); storeService.removeByPanelId(id); shareService.delete(id, null); diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue index 2428dca442..7234cf5eab 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/Editor/Preview.vue @@ -55,15 +55,17 @@ export default { scaleWidth: '100', scaleHeight: '100', timer: null, - componentDataShow: [] + componentDataShow: [], + mainWidth: '100%', + mainHeight: '100%' } }, computed: { customStyle() { let style = { margin: 'auto', - width: '100%', - height: '100%' + width: this.mainWidth, + height: this.mainHeight } if (this.canvasStyleData.openCommonStyle) { if (this.canvasStyleData.panel.backgroundType === 'image' && this.canvasStyleData.panel.imageUrl) { @@ -122,6 +124,7 @@ export default { this.scaleHeight = canvasHeight * 100 / parseInt(this.canvasStyleData.height)// 获取高度比 if (this.showType === 'width') { this.scaleHeight = this.scaleWidth + this.mainHeight = this.canvasStyleData.height * this.scaleHeight / 100 + 'px' } this.handleScaleChange() }, diff --git a/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue b/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue index de99c92323..7cd783afda 100644 --- a/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue +++ b/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue @@ -1,6 +1,6 @@