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

refactor(仪表板): 仪表板信息弹窗修改人显示别名

Browse Source
This commit is contained in:
wangjiahao 2022-09-29 15:08:57 +08:00
parent ad0c505a80
commit ead9940bf2
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/dto/panel/PanelGroupDTO.java
View File

@ -17,6 +17,8 @@ import java.util.Map;
public class PanelGroupDTO extends PanelGroupWithBLOBs implements ITreeBase<PanelGroupDTO> { public class PanelGroupDTO extends PanelGroupWithBLOBs implements ITreeBase<PanelGroupDTO> {
@ApiModelProperty("创建用户名") @ApiModelProperty("创建用户名")
private String creatorName; private String creatorName;
@ApiModelProperty("更新用户名")
private String updateName;
@ApiModelProperty("标签") @ApiModelProperty("标签")
private String label; private String label;
@ApiModelProperty("是否叶子节点") @ApiModelProperty("是否叶子节点")

2
backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
View File

@ -10,6 +10,7 @@
<result column="default_panel_name" jdbcType="VARCHAR" property="defaultPanelName"/> <result column="default_panel_name" jdbcType="VARCHAR" property="defaultPanelName"/>
<result column="source_panel_name" jdbcType="VARCHAR" property="sourcePanelName"/> <result column="source_panel_name" jdbcType="VARCHAR" property="sourcePanelName"/>
<result column="creator_name" jdbcType="VARCHAR" property="creatorName"/> <result column="creator_name" jdbcType="VARCHAR" property="creatorName"/>
<result column="update_name" jdbcType="VARCHAR" property="updateName"/>
<result column="is_default" property="isDefault"/> <result column="is_default" property="isDefault"/>
</resultMap> </resultMap>
@ -17,6 +18,7 @@
select panel_group.*, select panel_group.*,
panel_group.name as label, panel_group.name as label,
(select nick_name from sys_user where username = panel_group.create_by) as creator_name, (select nick_name from sys_user where username = panel_group.create_by) as creator_name,
(select nick_name from sys_user where username = panel_group.update_by) as update_name,
get_auths(panel_group.id, 'panel', #{userId}) as `privileges` get_auths(panel_group.id, 'panel', #{userId}) as `privileges`
from panel_group from panel_group
where id = #{panelId} where id = #{panelId}

1
frontend/src/api/panel/panel.js
View File

@ -170,6 +170,7 @@ export function initPanelData(panelId, useCache = false, callback) {
createTime: response.data.createTime, createTime: response.data.createTime,
creatorName: response.data.creatorName, creatorName: response.data.creatorName,
updateBy: response.data.updateBy, updateBy: response.data.updateBy,
updateName: response.data.updateName,
updateTime: response.data.updateTime updateTime: response.data.updateTime
}) })
// 刷新联动信息 // 刷新联动信息

2
frontend/src/views/panel/list/common/PanelDetailInfo.vue
View File

@ -10,7 +10,7 @@
</el-col> </el-col>
<el-col class="info-item"> <el-col class="info-item">
<p class="info-title">{{ $t('panel.update_by') }}</p> <p class="info-title">{{ $t('panel.update_by') }}</p>
<p class="info-content">{{ panelInfo.updateBy || 'N/A' }}</p> <p class="info-content">{{ panelInfo.updateName || 'N/A' }}</p>
</el-col> </el-col>
<el-col class="info-item"> <el-col class="info-item">
<p class="info-title">{{ $t('panel.update_time') }}</p> <p class="info-title">{{ $t('panel.update_time') }}</p>