Merge pull request #4266 from dataease/pr@dev@refactor_start

refactor: 取消发布的仪表板在收藏里隐藏菜单
2023-01-04 11:10:16 +08:00 · 2023-01-04 11:10:16 +08:00 · b5f8e2cd71
commit b5f8e2cd71
parent f51be3eac0 cf8c4eca46
2 changed files with 3 additions and 1 deletions
--- a/backend/src/main/resources/db/migration/V47__1.18-panel-subject-add.sql
+++ b/backend/src/main/resources/db/migration/V47__1.18-panel-subject-add.sql
@ -1,5 +1,6 @@
 delete
-from `panel_subject`;
+from `panel_subject`
+where id in ('system_1', 'system_2');
 BEGIN;
 INSERT INTO `panel_subject` (`id`, `name`, `type`, `details`, `create_num`, `create_time`, `create_by`, `update_time`,
                             `update_by`)
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@ -120,6 +120,7 @@
            </span>

            <span
+              v-if="activeTab!=='panels_star' || (activeTab ==='panels_star' && panelInfo.status === 'publish')"
              style="float: right;margin-right: 10px"
              class="de-tree"
            >