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-02-15 17:07:40 +08:00
parent 806c4b8694
commit 57c0f2d745
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml
View File

@ -119,8 +119,8 @@
'leaf' AS node_type, 'leaf' AS node_type,
'view' AS model_type 'view' AS model_type
FROM FROM
panel_view chart_view
LEFT JOIN chart_view ON panel_view.chart_view_id = chart_view.id LEFT JOIN panel_view ON panel_view.chart_view_id = chart_view.id
<where> <where>
<if test="record.pids != null and record.pids.size() > 0"> <if test="record.pids != null and record.pids.size() > 0">
@ -151,7 +151,8 @@
UNION ALL UNION ALL
SELECT SELECT
panel_view.id, distinct
chart_view.id,
chart_view.id AS 'inner_id', chart_view.id AS 'inner_id',
chart_view.NAME, chart_view.NAME,
chart_view.NAME AS 'label', chart_view.NAME AS 'label',
@ -160,8 +161,8 @@
'leaf' AS node_type, 'leaf' AS node_type,
'view' AS model_type 'view' AS model_type
FROM FROM
panel_view chart_view
LEFT JOIN chart_view ON panel_view.chart_view_id = chart_view.id LEFT JOIN panel_view ON panel_view.chart_view_id = chart_view.id
<where> <where>
chart_view.chart_type ='public' chart_view.chart_type ='public'
<if test="record.pids != null and record.pids.size() > 0"> <if test="record.pids != null and record.pids.size() > 0">

2
backend/src/main/resources/db/migration/V32__1.8.sql
View File

@ -2,7 +2,7 @@ ALTER TABLE `chart_view` ADD COLUMN `x_axis_ext` LONGTEXT COMMENT 'table-row' AF
UPDATE `chart_view` SET `x_axis_ext` = '[]'; UPDATE `chart_view` SET `x_axis_ext` = '[]';
INSERT INTO `chart_group` (`id`, `name`, `pid`, `level`, `type`, `create_by`, `create_time`) VALUES ('0', 'i18n_public_chart', 'public_chart', -1, 'group', 'admin', NULL); INSERT INTO `chart_group` (`id`, `name`, `pid`, `level`, `type`, `create_by`, `create_time`) VALUES ('0', 'i18n_public_chart', 'public_chart', -1, 'history', 'admin', NULL);
ALTER TABLE `chart_view` ALTER TABLE `chart_view`
MODIFY COLUMN `scene_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '场景ID chart_type为privat的时候 是仪表板id' AFTER `title`, MODIFY COLUMN `scene_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '场景ID chart_type为privat的时候 是仪表板id' AFTER `title`,

13
frontend/src/views/panel/ViewSelect/index.vue
View File

@ -36,11 +36,14 @@
> >
<span slot-scope="{ node, data }" class="custom-tree-node"> <span slot-scope="{ node, data }" class="custom-tree-node">
<span> <span>
<span v-if="data.modelType==='panel'|| data.nodeType === 'spine'"> <span v-if="data.modelInnerType==='history'">
<el-button <i class="el-icon-collection" />
icon="el-icon-folder" </span>
type="text" <span v-else-if="data.nodeType === 'spine'">
/> <i class="el-icon-folder" />
</span>
<span v-else-if="data.modelType==='panel'&& data.nodeType === 'leaf'">
<svg-icon icon-class="panel" class="ds-icon-scene" />
</span> </span>
<span v-else> <span v-else>
<svg-icon :icon-class="data.modelInnerType" style="width: 14px;height: 14px" /> <svg-icon :icon-class="data.modelInnerType" style="width: 14px;height: 14px" />