From 948370b644a75c0f574e3105a1082b20e7ca4a38 Mon Sep 17 00:00:00 2001 From: Kirigaya <1193466151@qq.com> Date: Tue, 27 Aug 2024 22:31:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BA=BFsidebar=20|=20?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=E8=BD=AC?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- design/webgl.drawio | 578 +++++++++++++++++- public/vcd.css | 11 +- src/App.vue | 2 +- src/components/sidebar/group-context-menu.vue | 6 +- src/components/sidebar/group-item.vue | 16 +- src/components/sidebar/index.vue | 33 +- src/components/sidebar/signal-item.vue | 17 +- src/components/toolbar/signal-modal.vue | 32 +- .../toolbar/signal-value-format.vue | 50 +- src/hook/global.js | 2 + src/hook/render.js | 2 + src/hook/sidebar-select-wire.js | 48 ++ src/hook/wave-view/dom-container.js | 2 +- src/hook/wave-view/format.js | 145 ----- src/hook/wave-view/get-label.js | 24 +- src/hook/wave-view/page-format.js | 120 ---- src/hook/wave-view/render-shader.js | 2 +- src/hook/wave-view/render-utils.js | 21 +- src/hook/wave-view/render-values.js | 22 +- src/hook/wave-view/render-wave.js | 4 +- src/hook/wave-view/toolbar/corner-case.js | 172 ++++++ src/hook/wave-view/toolbar/renderFormat.js | 210 +++++++ src/hook/wave-view/toolbar/renderModal.js | 153 ++++- src/hook/wave-view/x-offset-update.js | 2 +- 24 files changed, 1284 insertions(+), 390 deletions(-) create mode 100644 src/hook/sidebar-select-wire.js delete mode 100644 src/hook/wave-view/format.js delete mode 100644 src/hook/wave-view/page-format.js create mode 100644 src/hook/wave-view/toolbar/corner-case.js diff --git a/design/webgl.drawio b/design/webgl.drawio index ea30e30..ff59dae 100644 --- a/design/webgl.drawio +++ b/design/webgl.drawio @@ -1,6 +1,6 @@ - + @@ -566,11 +566,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -838,161 +865,650 @@ - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/vcd.css b/public/vcd.css index be950be..42e4510 100644 --- a/public/vcd.css +++ b/public/vcd.css @@ -4,7 +4,7 @@ --main-color: #CB81DA; --main-dark-color: #2D323B; --main-light-color: var(--main-color); - --sidebar-width: 230px; + --sidebar-width: 330px; --right-nav-width: 60px; --time-scale-height: 50px; --sidebar-padding: 10px; @@ -118,4 +118,13 @@ a { background-size: 100%; height: 200px; width: 200px; +} + +.el-radio-button__original-radio:disabled:checked+.el-radio-button__inner { + opacity: 0.6; +} + +.el-select__wrapper.is-disabled { + opacity: 0.6; + box-shadow: unset !important; } \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 41e35c3..fb4b45e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -73,7 +73,7 @@ onMounted(async () => { // 设置全局宏 document.body.style.setProperty('--time-scale-height', '50px'); document.body.style.setProperty('--vcd-render-padding', '30px'); - document.body.style.setProperty('--sidebar-width', '230px'); + document.body.style.setProperty('--sidebar-width', '330px'); document.body.style.setProperty('--toolbar-height', '60px'); // signal height diff --git a/src/components/sidebar/group-context-menu.vue b/src/components/sidebar/group-context-menu.vue index 01ffed5..9934bd9 100644 --- a/src/components/sidebar/group-context-menu.vue +++ b/src/components/sidebar/group-context-menu.vue @@ -6,6 +6,7 @@ :ref="el => groupcontextmenu.groupNameInput = el" v-model="value" size="default" + @keydown.enter="onKeydownEnter()" >
@@ -71,11 +72,14 @@ const value = computed({ } }); - function onClick(item) { groupcontextmenu.currentGroupView.groupInfo.color = item.color; } +function onKeydownEnter() { + groupcontextmenu.show = false; +} +