Merge pull request #3114 from dataease/refactor@dev@refactor_panel-details

refactor(仪表板): 仪表板详情弹框显示用户别名
This commit is contained in:
xuwei-fit2cloud 2022-09-20 13:42:44 +08:00 committed by GitHub
commit f38b0023ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 2 deletions

View File

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

View File

@ -9,11 +9,17 @@
<result column="default_panel_id" jdbcType="VARCHAR" property="defaultPanelId"/>
<result column="default_panel_name" jdbcType="VARCHAR" property="defaultPanelName"/>
<result column="source_panel_name" jdbcType="VARCHAR" property="sourcePanelName"/>
<result column="creator_name" jdbcType="VARCHAR" property="creatorName"/>
<result column="is_default" property="isDefault"/>
</resultMap>
<select id="findOneWithPrivileges" resultMap="BaseResultMapDTO">
select panel_group.*,panel_group.name as label , get_auths(panel_group.id,'panel',#{userId}) as `privileges` from panel_group where id =#{panelId}
select panel_group.*,
panel_group.name as label,
(select nick_name from sys_user where username = panel_group.create_by) as creator_name,
get_auths(panel_group.id, 'panel', #{userId}) as `privileges`
from panel_group
where id = #{panelId}
</select>
<select id="panelGroupInit" resultMap="BaseResultMapDTO">

View File

@ -168,6 +168,7 @@ export function initPanelData(panelId, useCache = false, callback) {
status: response.data.status,
createBy: response.data.createBy,
createTime: response.data.createTime,
creatorName: response.data.creatorName,
updateBy: response.data.updateBy,
updateTime: response.data.updateTime
})

View File

@ -2,7 +2,7 @@
<el-row>
<el-col class="info-item">
<p class="info-title">{{ $t('panel.create_by') }}</p>
<p class="info-content">{{ panelInfo.createBy }}</p>
<p class="info-content">{{ panelInfo.creatorName }}</p>
</el-col>
<el-col class="info-item">
<p class="info-title">{{ $t('panel.create_time') }}</p>