forked from github/dataease
refactor(工作台): 工作台资源列表增加移动端标识
This commit is contained in:
parent
f198511797
commit
999fc9f5a2
@ -14,6 +14,7 @@ public interface XpackShareExtMapper {
|
|||||||
select
|
select
|
||||||
s.id as share_id,
|
s.id as share_id,
|
||||||
v.id as resource_id,
|
v.id as resource_id,
|
||||||
|
v.mobile_layout as ext_flag,
|
||||||
v.type,
|
v.type,
|
||||||
s.creator,
|
s.creator,
|
||||||
s.time,
|
s.time,
|
||||||
|
@ -28,4 +28,6 @@ public class XpackSharePO implements Serializable {
|
|||||||
|
|
||||||
private Long exp;
|
private Long exp;
|
||||||
|
|
||||||
|
private Integer extFlag;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -139,7 +139,7 @@ public class XpackShareManage {
|
|||||||
return pos.stream().map(po ->
|
return pos.stream().map(po ->
|
||||||
new XpackShareGridVO(
|
new XpackShareGridVO(
|
||||||
po.getShareId(), po.getResourceId(), po.getName(), po.getCreator().toString(),
|
po.getShareId(), po.getResourceId(), po.getName(), po.getCreator().toString(),
|
||||||
po.getTime(), po.getExp(), 9)).toList();
|
po.getTime(), po.getExp(), 9,po.getExtFlag())).toList();
|
||||||
}
|
}
|
||||||
|
|
||||||
private XpackShareManage proxy() {
|
private XpackShareManage proxy() {
|
||||||
|
@ -18,7 +18,8 @@ public interface CoreStoreExtMapper {
|
|||||||
v.create_by as creator,
|
v.create_by as creator,
|
||||||
v.update_by as editor,
|
v.update_by as editor,
|
||||||
v.update_time as edit_time,
|
v.update_time as edit_time,
|
||||||
v.name
|
v.name,
|
||||||
|
v.mobile_layout as ext_flag
|
||||||
from core_store s
|
from core_store s
|
||||||
left join data_visualization_info v on s.resource_id = v.id
|
left join data_visualization_info v on s.resource_id = v.id
|
||||||
${ew.customSqlSegment}
|
${ew.customSqlSegment}
|
||||||
|
@ -24,4 +24,6 @@ public class StorePO implements Serializable {
|
|||||||
|
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
|
private Integer extFlag;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -35,4 +35,6 @@ public class VisualizationResourcePO implements Serializable {
|
|||||||
private Boolean favorite;
|
private Boolean favorite;
|
||||||
|
|
||||||
private int weight;
|
private int weight;
|
||||||
|
|
||||||
|
private Integer extFlag;
|
||||||
}
|
}
|
||||||
|
@ -176,7 +176,7 @@ public class CoreVisualizationManage {
|
|||||||
new VisualizationResourceVO(
|
new VisualizationResourceVO(
|
||||||
po.getId(), po.getResourceId(), po.getName(),
|
po.getId(), po.getResourceId(), po.getName(),
|
||||||
po.getType(), String.valueOf(po.getCreator()), String.valueOf(po.getLastEditor()), po.getLastEditTime(),
|
po.getType(), String.valueOf(po.getCreator()), String.valueOf(po.getLastEditor()), po.getLastEditTime(),
|
||||||
po.getFavorite(), 9)).toList();
|
po.getFavorite(), 9,po.getExtFlag())).toList();
|
||||||
}
|
}
|
||||||
|
|
||||||
public IPage<VisualizationResourcePO> queryVisualizationPage(int goPage, int pageSize, VisualizationWorkbranchQueryRequest request) {
|
public IPage<VisualizationResourcePO> queryVisualizationPage(int goPage, int pageSize, VisualizationWorkbranchQueryRequest request) {
|
||||||
|
@ -89,7 +89,7 @@ public class VisualizationStoreManage {
|
|||||||
new VisualizationStoreVO(
|
new VisualizationStoreVO(
|
||||||
po.getStoreId(), po.getResourceId(), po.getName(),
|
po.getStoreId(), po.getResourceId(), po.getName(),
|
||||||
po.getType(), String.valueOf(po.getCreator()), ObjectUtils.isEmpty(po.getEditor()) ? null : String.valueOf(po.getEditor()),
|
po.getType(), String.valueOf(po.getCreator()), ObjectUtils.isEmpty(po.getEditor()) ? null : String.valueOf(po.getEditor()),
|
||||||
po.getEditTime(), 9)).toList();
|
po.getEditTime(), 9,po.getExtFlag())).toList();
|
||||||
}
|
}
|
||||||
|
|
||||||
public IPage<StorePO> queryStorePage(int goPage, int pageSize, VisualizationWorkbranchQueryRequest request) {
|
public IPage<StorePO> queryStorePage(int goPage, int pageSize, VisualizationWorkbranchQueryRequest request) {
|
||||||
|
@ -143,6 +143,7 @@
|
|||||||
`canvas_style_data`,
|
`canvas_style_data`,
|
||||||
`component_data`,
|
`component_data`,
|
||||||
`mobile_layout`,
|
`mobile_layout`,
|
||||||
|
`mobile_layout` as ext_flag,
|
||||||
`status`,
|
`status`,
|
||||||
`self_watermark_status`,
|
`self_watermark_status`,
|
||||||
`sort`,
|
`sort`,
|
||||||
@ -165,6 +166,7 @@
|
|||||||
SELECT dvResource.id,
|
SELECT dvResource.id,
|
||||||
dvResource.resource_id,
|
dvResource.resource_id,
|
||||||
dvResource.name,
|
dvResource.name,
|
||||||
|
dvResource.ext_flag,
|
||||||
dvResource.type,
|
dvResource.type,
|
||||||
dvResource.creator,
|
dvResource.creator,
|
||||||
core_opt_recent.uid AS last_editor,
|
core_opt_recent.uid AS last_editor,
|
||||||
@ -180,6 +182,7 @@
|
|||||||
FROM (SELECT core_dataset_group.id,
|
FROM (SELECT core_dataset_group.id,
|
||||||
core_dataset_group.id AS resource_id,
|
core_dataset_group.id AS resource_id,
|
||||||
core_dataset_group.NAME,
|
core_dataset_group.NAME,
|
||||||
|
0 as ext_flag,
|
||||||
'dataset' AS type,
|
'dataset' AS type,
|
||||||
core_dataset_group.create_by AS creator
|
core_dataset_group.create_by AS creator
|
||||||
FROM core_dataset_group
|
FROM core_dataset_group
|
||||||
@ -188,6 +191,7 @@
|
|||||||
SELECT core_datasource.id,
|
SELECT core_datasource.id,
|
||||||
core_datasource.id AS resource_id,
|
core_datasource.id AS resource_id,
|
||||||
core_datasource.NAME,
|
core_datasource.NAME,
|
||||||
|
0 as ext_flag,
|
||||||
'datasource' AS type,
|
'datasource' AS type,
|
||||||
core_datasource.create_by AS creator
|
core_datasource.create_by AS creator
|
||||||
FROM core_datasource
|
FROM core_datasource
|
||||||
@ -197,6 +201,7 @@
|
|||||||
data_visualization_info.id,
|
data_visualization_info.id,
|
||||||
data_visualization_info.id AS resource_id,
|
data_visualization_info.id AS resource_id,
|
||||||
data_visualization_info.NAME,
|
data_visualization_info.NAME,
|
||||||
|
data_visualization_info.`mobile_layout` as ext_flag,
|
||||||
(
|
(
|
||||||
CASE
|
CASE
|
||||||
data_visualization_info.type
|
data_visualization_info.type
|
||||||
|
@ -164,7 +164,12 @@ watch(
|
|||||||
<el-table-column key="name" width="280" prop="name" :label="t('common.name')">
|
<el-table-column key="name" width="280" prop="name" :label="t('common.name')">
|
||||||
<template v-slot:default="scope">
|
<template v-slot:default="scope">
|
||||||
<div class="name-content">
|
<div class="name-content">
|
||||||
<el-icon class="main-color"> <Icon name="icon_dashboard_outlined" /> </el-icon>
|
<el-icon style="margin-right: 12px; font-size: 18px" v-if="scope.row.extFlag">
|
||||||
|
<Icon name="dv-dashboard-spine-mobile"></Icon>
|
||||||
|
</el-icon>
|
||||||
|
<el-icon class="main-color" v-else>
|
||||||
|
<Icon name="icon_dashboard_outlined" />
|
||||||
|
</el-icon>
|
||||||
<el-tooltip placement="top">
|
<el-tooltip placement="top">
|
||||||
<template #content>{{ scope.row.name }}</template>
|
<template #content>{{ scope.row.name }}</template>
|
||||||
<span class="ellipsis" style="max-width: 250px">{{ scope.row.name }}</span>
|
<span class="ellipsis" style="max-width: 250px">{{ scope.row.name }}</span>
|
||||||
|
@ -36,7 +36,9 @@ const state = reactive({
|
|||||||
const busiDataMap = computed(() => interactiveStore.getData)
|
const busiDataMap = computed(() => interactiveStore.getData)
|
||||||
const iconMap = {
|
const iconMap = {
|
||||||
panel: 'icon_dashboard_outlined',
|
panel: 'icon_dashboard_outlined',
|
||||||
|
panelMobile: 'dv-dashboard-spine-mobile',
|
||||||
dashboard: 'icon_dashboard_outlined',
|
dashboard: 'icon_dashboard_outlined',
|
||||||
|
dashboardMobile: 'dv-dashboard-spine-mobile',
|
||||||
screen: 'icon_operation-analysis_outlined',
|
screen: 'icon_operation-analysis_outlined',
|
||||||
dataV: 'icon_operation-analysis_outlined',
|
dataV: 'icon_operation-analysis_outlined',
|
||||||
dataset: 'icon_app_outlined',
|
dataset: 'icon_app_outlined',
|
||||||
@ -281,7 +283,10 @@ const getEmptyDesc = (): string => {
|
|||||||
<el-table-column key="name" width="280" prop="name" :label="t('common.name')">
|
<el-table-column key="name" width="280" prop="name" :label="t('common.name')">
|
||||||
<template v-slot:default="scope">
|
<template v-slot:default="scope">
|
||||||
<div class="name-content" :class="{ 'jump-active': jumpActiveCheck(scope.row) }">
|
<div class="name-content" :class="{ 'jump-active': jumpActiveCheck(scope.row) }">
|
||||||
<el-icon :class="`main-color color-${scope.row.type}`">
|
<el-icon v-if="scope.row.extFlag" style="margin-right: 12px; font-size: 18px">
|
||||||
|
<Icon :name="iconMap[scope.row.type + 'Mobile']" />
|
||||||
|
</el-icon>
|
||||||
|
<el-icon v-else :class="`main-color color-${scope.row.type}`">
|
||||||
<Icon :name="iconMap[scope.row.type]" />
|
<Icon :name="iconMap[scope.row.type]" />
|
||||||
</el-icon>
|
</el-icon>
|
||||||
<el-tooltip placement="top">
|
<el-tooltip placement="top">
|
||||||
|
@ -65,6 +65,10 @@ public class DataVisualizationVO implements Serializable {
|
|||||||
* 移动端布局
|
* 移动端布局
|
||||||
*/
|
*/
|
||||||
private Boolean mobileLayout;
|
private Boolean mobileLayout;
|
||||||
|
/**
|
||||||
|
* 移动端布局
|
||||||
|
*/
|
||||||
|
private Integer extFlag;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 状态 0-未发布 1-已发布
|
* 状态 0-未发布 1-已发布
|
||||||
|
@ -35,4 +35,6 @@ public class VisualizationResourceVO implements Serializable {
|
|||||||
private Boolean favorite;
|
private Boolean favorite;
|
||||||
|
|
||||||
private int weight;
|
private int weight;
|
||||||
|
|
||||||
|
private Integer extFlag;
|
||||||
}
|
}
|
||||||
|
@ -33,4 +33,6 @@ public class VisualizationStoreVO implements Serializable {
|
|||||||
private Long lastEditTime;
|
private Long lastEditTime;
|
||||||
|
|
||||||
private int weight;
|
private int weight;
|
||||||
|
|
||||||
|
private Integer extFlag;
|
||||||
}
|
}
|
||||||
|
@ -36,4 +36,6 @@ public class XpackShareGridVO implements Serializable {
|
|||||||
@Schema(description = "权重")
|
@Schema(description = "权重")
|
||||||
private Integer weight;
|
private Integer weight;
|
||||||
|
|
||||||
|
private Integer extFlag;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user