center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #9056 from dataease/pr@dev-v2@refactor_matrix

Browse Source 
refactor(仪表板): 调整仪表板矩阵密度，组件可以更精细化调整位置大小
This commit is contained in:
王嘉豪 2024-04-11 14:18:52 +08:00 committed by GitHub
commit ef7c2d9a5b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 79 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/MybatisPlusGenerator.java
View File

@ -25,7 +25,7 @@ public class MybatisPlusGenerator {
/**
* 这是要生成代码的表名称
*/
private static final String TABLE_NAME = "visualization_outer_params_target_view_info";
private static final String TABLE_NAME = "data_visualization_info";
/**
* 下面两个配置基本上不用动

16
core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/DataVisualizationInfo.java
View File

@ -9,7 +9,7 @@ import java.io.Serializable;
* </p>
*
* @author fit2cloud
* @since 2023-05-11
* @since 2024-04-11
*/
@TableName("data_visualization_info")
public class DataVisualizationInfo implements Serializable {
@ -123,6 +123,11 @@ public class DataVisualizationInfo implements Serializable {
*/
private String deleteBy;
/**
* 可视化资源版本
*/
private Integer version;
public Long getId() {
return id;
}
@ -299,6 +304,14 @@ public class DataVisualizationInfo implements Serializable {
this.deleteBy = deleteBy;
}
public Integer getVersion() {
return version;
}
public void setVersion(Integer version) {
this.version = version;
}
@Override
public String toString() {
return "DataVisualizationInfo{" +
@ -324,6 +337,7 @@ public class DataVisualizationInfo implements Serializable {
", deleteFlag = " + deleteFlag +
", deleteTime = " + deleteTime +
", deleteBy = " + deleteBy +
", version = " + version +
"}";
}
}

2
core/core-backend/src/main/java/io/dataease/visualization/dao/auto/mapper/DataVisualizationInfoMapper.java
View File

@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
* </p>
*
* @author fit2cloud
* @since 2023-05-11
* @since 2024-04-11
*/
@Mapper
public interface DataVisualizationInfoMapper extends BaseMapper<DataVisualizationInfo> {

2
core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java
View File

@ -123,6 +123,7 @@ public class CoreVisualizationManage {
visualizationInfo.setCreateTime(System.currentTimeMillis());
visualizationInfo.setUpdateTime(System.currentTimeMillis());
visualizationInfo.setOrgId(AuthUtils.getUser().getDefaultOid());
visualizationInfo.setVersion(3);
mapper.insert(visualizationInfo);
coreOptRecentManage.saveOpt(visualizationInfo.getId(), OptConstants.OPT_RESOURCE_TYPE.VISUALIZATION, OptConstants.OPT_TYPE.NEW);
return visualizationInfo.getId();
@ -132,6 +133,7 @@ public class CoreVisualizationManage {
public void innerEdit(DataVisualizationInfo visualizationInfo) {
visualizationInfo.setUpdateTime(System.currentTimeMillis());
visualizationInfo.setUpdateBy(AuthUtils.getUser().getUserId().toString());
visualizationInfo.setVersion(3);
mapper.updateById(visualizationInfo);
coreOptRecentManage.saveOpt(visualizationInfo.getId(), OptConstants.OPT_RESOURCE_TYPE.VISUALIZATION, OptConstants.OPT_TYPE.UPDATE);
}

6
core/core-backend/src/main/resources/db/desktop/V2.6__ddl.sql Normal file
View File

@ -0,0 +1,6 @@
ALTER TABLE `xpack_share`
ADD COLUMN `auto_pwd` tinyint(1) NOT NULL DEFAULT 1 COMMENT '自动生成密码';
ALTER TABLE `data_visualization_info`
ADD COLUMN `version` int NULL DEFAULT 3 COMMENT '可视化资源版本';
update data_visualization_info set version = 2;

6
core/core-backend/src/main/resources/db/migration/V2.6__ddl.sql
View File

@ -1,2 +1,6 @@
ALTER TABLE `xpack_share`
ADD COLUMN `auto_pwd` tinyint(1) NOT NULL DEFAULT 1 COMMENT '自动生成密码' AFTER `type`;
ADD COLUMN `auto_pwd` tinyint(1) NOT NULL DEFAULT 1 COMMENT '自动生成密码' AFTER `type`;
ALTER TABLE `data_visualization_info`
ADD COLUMN `version` int NULL DEFAULT 3 COMMENT '可视化资源版本';
update data_visualization_info set version = 2;

3
core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml
View File

@ -155,7 +155,8 @@
`source`,
`delete_flag`,
`delete_time`,
`delete_by`
`delete_by`,
`version`
FROM data_visualization_info
where data_visualization_info.delete_flag = 0
and data_visualization_info.id = #{dvId}

32
core/core-frontend/src/custom-component/component-list.ts
View File

@ -116,8 +116,8 @@ const list = [
innerType: 'VQuery',
x: 1,
y: 1,
sizeX: 36,
sizeY: 2,
sizeX: 72,
sizeY: 4,
request: {
method: 'GET',
data: [],
@ -141,8 +141,8 @@ const list = [
actionSelection: ACTION_SELECTION,
x: 1,
y: 1,
sizeX: 18,
sizeY: 7,
sizeX: 36,
sizeY: 14,
style: {
width: 600,
height: 300
@ -161,8 +161,8 @@ const list = [
frameLinks: FRAMELINKS,
x: 1,
y: 1,
sizeX: 18,
sizeY: 7,
sizeX: 36,
sizeY: 14,
style: {
width: 600,
height: 300
@ -179,8 +179,8 @@ const list = [
canvasActive: false,
x: 1,
y: 1,
sizeX: 18,
sizeY: 6,
sizeX: 36,
sizeY: 12,
propValue: {},
style: {
width: 300,
@ -210,8 +210,8 @@ const list = [
canvasActive: false,
x: 1,
y: 1,
sizeX: 18,
sizeY: 7,
sizeX: 36,
sizeY: 14,
propValue: {
url: '',
flip: {
@ -236,8 +236,8 @@ const list = [
canvasActive: false,
x: 1,
y: 1,
sizeX: 5,
sizeY: 5,
sizeX: 10,
sizeY: 10,
style: {
width: 40,
height: 40,
@ -255,8 +255,8 @@ const list = [
canvasActive: false,
x: 1,
y: 1,
sizeX: 15,
sizeY: 15,
sizeX: 30,
sizeY: 30,
style: {
width: 600,
height: 300,
@ -326,8 +326,8 @@ const list = [
canvasActive: false,
x: 1,
y: 1,
sizeX: 18,
sizeY: 7,
sizeX: 36,
sizeY: 14,
style: {
width: 600,
height: 300,

2
core/core-frontend/src/store/modules/data-visualization/copy.ts
View File

@ -52,7 +52,7 @@ export const copyStore = defineStore('copy', {
const xPositionOffset = index % 2
const yPositionOffset = index % 2
newComponent.sizeX = pcMatrixCount.value.x / 2
newComponent.sizeY = 7
newComponent.sizeY = 14
newComponent.x = newComponent.sizeX * xPositionOffset + 1
newComponent.y = 200
// dataV 数据大屏

4
core/core-frontend/src/store/modules/data-visualization/dvMain.ts
View File

@ -108,8 +108,8 @@ export const dvMainStore = defineStore('dataVisualization', {
height: 1080
},
pcMatrixCount: {
x: 36,
y: 18
x: 72,
y: 36
},
mobileMatrixCount: {
x: 6,

8
core/core-frontend/src/utils/canvasUtils.ts
View File

@ -109,6 +109,7 @@ export function initCanvasDataPrepare(dvId, busiFlag, callBack) {
watermarkInfo: watermarkInfo,
mobileLayout: canvasInfo.mobileLayout || false
}
const canvasVersion = canvasInfo.version
const canvasDataResult = JSON.parse(canvasInfo.componentData)
const canvasStyleResult = JSON.parse(canvasInfo.canvasStyleData)
@ -123,6 +124,13 @@ export function initCanvasDataPrepare(dvId, busiFlag, callBack) {
if (componentItem.component === 'UserView') {
componentItem.actionSelection = componentItem.actionSelection || deepCopy(ACTION_SELECTION)
}
// 2 为基础版本 此处需要增加仪表板矩阵密度
if ((!canvasVersion || canvasVersion === 2) && canvasInfo.type === 'dashboard') {
componentItem.x = 1 + (componentItem.x - 1) * 2
componentItem.y = 1 + (componentItem.y - 1) * 2
componentItem.sizeX = componentItem.sizeX * 2
componentItem.sizeY = componentItem.sizeY * 2
}
})
const curPreviewGap =
dvInfo.type === 'dashboard' && canvasStyleResult['dashboard'].gap === 'yes'

20
sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java
View File

@ -123,6 +123,26 @@ public class DataVisualizationVO implements Serializable {
*/
private String source;
/**
* 删除标志
*/
private Boolean deleteFlag;
/**
* 删除时间
*/
private Long deleteTime;
/**
* 删除人
*/
private String deleteBy;
/**
* 可视化资源版本
*/
private Integer version;
/**
* 图表基本信息
*/