From ae0b2e13b2816f2ea78209a06ee753473ba072fd Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 18 Jul 2025 12:22:42 +0800 Subject: [PATCH] refactor: dashboard canvas update --- frontend/src/assets/svg/dv-tab.svg | 6 ++-- frontend/src/assets/svg/dv-text.svg | 5 +-- frontend/src/assets/svg/dv-view.svg | 6 ++-- .../assets/svg/icon_arrow-left_outlined.svg | 3 ++ frontend/src/i18n/en.json | 1 + frontend/src/i18n/zh-CN.json | 1 + .../dashboard/common/ResourceGroupOpt.vue | 8 +++-- .../button-label/ComponentButtonLabel.vue | 28 +++++++-------- .../src/views/dashboard/editor/Toolbar.vue | 29 +++++++++------- frontend/src/views/dashboard/editor/index.vue | 34 +++++++++++++------ 10 files changed, 74 insertions(+), 47 deletions(-) create mode 100644 frontend/src/assets/svg/icon_arrow-left_outlined.svg diff --git a/frontend/src/assets/svg/dv-tab.svg b/frontend/src/assets/svg/dv-tab.svg index 5625982e..4ee70e7d 100644 --- a/frontend/src/assets/svg/dv-tab.svg +++ b/frontend/src/assets/svg/dv-tab.svg @@ -1,3 +1,5 @@ - - + + + + diff --git a/frontend/src/assets/svg/dv-text.svg b/frontend/src/assets/svg/dv-text.svg index ff6d406b..e8331348 100644 --- a/frontend/src/assets/svg/dv-text.svg +++ b/frontend/src/assets/svg/dv-text.svg @@ -1,3 +1,4 @@ - - + + + diff --git a/frontend/src/assets/svg/dv-view.svg b/frontend/src/assets/svg/dv-view.svg index 19093125..7a3c1575 100644 --- a/frontend/src/assets/svg/dv-view.svg +++ b/frontend/src/assets/svg/dv-view.svg @@ -1,4 +1,4 @@ - - - + + + diff --git a/frontend/src/assets/svg/icon_arrow-left_outlined.svg b/frontend/src/assets/svg/icon_arrow-left_outlined.svg new file mode 100644 index 00000000..3c27e442 --- /dev/null +++ b/frontend/src/assets/svg/icon_arrow-left_outlined.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json index 74ecff47..d4d44684 100644 --- a/frontend/src/i18n/en.json +++ b/frontend/src/i18n/en.json @@ -32,6 +32,7 @@ "password_reset_successful": "Password reset successful" }, "dashboard": { + "add_view": "Add Chart", "delete_dashboard_warn": "Delete This Dashboard: {0}", "rename_dashboard": "Rename Dashboard", "dashboard_name": "Dashboard Name", diff --git a/frontend/src/i18n/zh-CN.json b/frontend/src/i18n/zh-CN.json index 0104d3bf..fcb110d5 100644 --- a/frontend/src/i18n/zh-CN.json +++ b/frontend/src/i18n/zh-CN.json @@ -34,6 +34,7 @@ "password_reset_successful": "重置密码成功" }, "dashboard": { + "add_view": "添加图表", "delete_dashboard_warn": "是否删除仪表板：{0}", "rename_dashboard": "重命名仪表板", "dashboard_name": "仪表板名称", diff --git a/frontend/src/views/dashboard/common/ResourceGroupOpt.vue b/frontend/src/views/dashboard/common/ResourceGroupOpt.vue index 5bd1bb0f..76e44b45 100644 --- a/frontend/src/views/dashboard/common/ResourceGroupOpt.vue +++ b/frontend/src/views/dashboard/common/ResourceGroupOpt.vue @@ -124,9 +124,11 @@ const propsTree = { isLeaf: (node) => !node.children?.length, } -const showPid = computed(() => { - return state.opt && ['newLeaf'].includes(state.opt) && state.parentSelect -}) +// const showPid = computed(() => { +// return state.opt && ['newLeaf'].includes(state.opt) && state.parentSelect +// }) + +const showPid = false const saveResource = () => { const params = { diff --git a/frontend/src/views/dashboard/components/button-label/ComponentButtonLabel.vue b/frontend/src/views/dashboard/components/button-label/ComponentButtonLabel.vue index a808b3a5..91ea18b9 100644 --- a/frontend/src/views/dashboard/components/button-label/ComponentButtonLabel.vue +++ b/frontend/src/views/dashboard/components/button-label/ComponentButtonLabel.vue @@ -26,42 +26,42 @@ const emits = defineEmits(['customClick'])
- +
@@ -181,9 +181,10 @@ const addChatChart = (views: any) => {
{ height: 56px; display: flex; align-items: center; - background: #d1ddf6; - padding-left: 8px; + background: #fff; + padding-left: 24px; + border-bottom: 1px solid rgba(31, 35, 41, 0.15); .left-area { - margin-top: 8px; - margin-left: 14px; + margin-left: 12px; width: 300px; display: flex; flex-direction: column; @@ -252,18 +253,18 @@ const addChatChart = (views: any) => { width: 300px; overflow: hidden; cursor: pointer; - color: #fff; + color: #1f2329; input { position: absolute; left: 0; width: 100%; - color: #fff; - background-color: #d1ddf6; + background-color: #f5f6f7; outline: none; - border: 1px solid #295acc; + font-size: 16px; + border: 1px solid #1cba90; border-radius: 4px; - padding: 0 4px; + padding-left: 4px; height: 100%; } } @@ -300,6 +301,10 @@ const addChatChart = (views: any) => { color: #fff; } +.back-icon { + margin-top: 8px; +} + .toolbar-hover-icon { cursor: pointer; font-size: 18px !important; diff --git a/frontend/src/views/dashboard/editor/index.vue b/frontend/src/views/dashboard/editor/index.vue index 2434747e..808ba642 100644 --- a/frontend/src/views/dashboard/editor/index.vue +++ b/frontend/src/views/dashboard/editor/index.vue @@ -75,23 +75,35 @@ const baseParams = computed(() => {