From 3359396800b4a53626c75beb5fcf7ba77ac564c2 Mon Sep 17 00:00:00 2001 From: Kirigaya <1193466151@qq.com> Date: Wed, 28 Feb 2024 20:09:10 +0800 Subject: [PATCH] optimise search | list --- public/iconfont.css | 10 +++++++--- public/iconfont.woff2 | Bin 1332 -> 1504 bytes src/components/setting/index.vue | 10 ++++++++++ src/components/sidebar.vue | 22 ++++++++++++++++++++-- src/hook/global.js | 3 ++- src/i18n/en.json | 1 + src/i18n/zh.json | 1 + 7 files changed, 41 insertions(+), 6 deletions(-) diff --git a/public/iconfont.css b/public/iconfont.css index a4f4972..dbf27c4 100644 --- a/public/iconfont.css +++ b/public/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 4440655 */ - src: url('iconfont.woff2?t=1708609094813') format('woff2'), - url('iconfont.woff?t=1708609094813') format('woff'), - url('iconfont.ttf?t=1708609094813') format('truetype'); + src: url('iconfont.woff2?t=1709106897565') format('woff2'), + url('iconfont.woff?t=1709106897565') format('woff'), + url('iconfont.ttf?t=1709106897565') format('truetype'); } .iconfont { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-register:before { + content: "\e611"; +} + .icon-about:before { content: "\e601"; } diff --git a/public/iconfont.woff2 b/public/iconfont.woff2 index 32d903a3f5ffeecc44a0121a9b149c9eb16a6a71..fc913937ff6cc43257d21f5888a54d8d84383170 100644 GIT binary patch delta 1494 zcmV;{1u6Qp3g8PEcTYw#00961000Hx01E&B000bl000G%kr*C-Rtk$SiCzIV0we<* z3lIPVAO(bH2W}hE3L_DwV~{8Ni^ABA(Am2jRZw4+tg=MTMmBG+szjqvwlNg*dE{HV zkB<3#5Ij$I@1Hx^w^=3mGCEm7^~o0M$O?8T%wQgwp0+h-pcvp6lx%LM*GYcC#r6Xb z0APBx&RFJUajtrQ4`@t;8OpOy9(~tKyN=Sp(O>(udaCWmvv+2cLX7+OOczs6cx9-B zbdepMn4ZwP=BAm)xNT$%F$lCQ$?fUn-FFlnEzB z55*s5Vj7f!ANQz7n)31t3u=j40^6Y%!N zU~2_fKm*l|EL#>e7tV1ygsQnnQ1v~A4h|xG6y}}p|NGwW9)4MK4)BglfHw;fiTDQ( zEDAwm@IX8eiMrfAO&+{M5$r4~ASgsL5vCaJ4T45=3Gy-AWiO&!Rd#Co1SkRWRgGfY zdXe~P!<|}x3FAn%HEoy~X=$07;)iRbYh|sb7O3XEOOUZo7xC&qVmz@Z!{()eX)!V@ zVJS$_)Q|@R5VrX@T-rw8E0i8MAaJtWr7*836k#QaLX0TpUlABX5St@}uO^slv(Ij! zl?rYnEkI>8?@X~}aG$Ge2l8avMS29;o9o0re3t@$ACZ{WmAvbcE7OeJ*p}rFvg*ON zVfXz+QLrovqKG7k7e+gA*BBY;K<&e)Oti@IjMWY_y%e}#SedoniRV@iXbR(|+tGy6 z0WxK=3r{k83_`6!&GZ0#6hRs)+y)=@X1k17nk!v!++W{qX0)SZ#0d<_);lYexsXFc z(lTa$cBJB7w1ly+LD~B+(X<4pG)pgZ0|LS{S^F+RNGO%dF85K_?8rXaHhr$<($k_I zsH~HL=Gku-LY;jk)LM256FiqA95kQz;BTLx%x8n^2G$R(ZjdSJ-P$>!5tTh}&T(s7 z&5+2tdhYjc`hTb!LX39<3TKWD82k3mm3vpd$$kGI?{AlSmT4?Bfm;yQ7jr6@uk3s;6}8W`7>`x z-U1b=VAjd=B5!Hl1cN>0TG$#}sdMXOtt(RJ*-mXVwKpi_f5>!G**&cDeBLja>#H#nEfPF9pmu zKNT5k)no~htgg%?flgnWvB?-Md#zKa^o-{AO`U9vtoaL!g0la)Tz^g=Vimxl6N|mOfb+ieMfQf%DkyP8u9f& z)2vp$B}z&RpA9u3(?bfys_@Iy6w3BskppnY^;#SqUmqEuv%o#gd>p3j?xs!qa(^-C zCc$*YTK_4x;%x)kEmwme>& w7EDxwJMwF+Y{uV;V4O8MvoodW;>0L9OV delta 1321 zcmV+^1=jlD3$zLtcTYw#00961000Fv01E&B000WC000E%kr*C-KnjQqhYJBV0we<% z3l0DTAO(bH2V)yr2@w^f$&md>uwxRxhX)#=87*=XJn(I1?_*6rVT=*Y)LbGp5!jvv z)~;3Y$cp(%V&SH^E@NI8ro?vn=|i}{{`B)e8vrM3Y6~P=_p)>)G^SDlk^{h@8rx-d zLRC%ylW-Gunea1z((f^xfZHRrSH(M?g8(E==!DXv*MKk?b0#jCM==_5xq!S`%$YfT zB7w07t%o8A*bVNnT7B^@Iw%#&6X2cj^WsOEi2x|*D)L4{ruCe{jc@qzh3cdoP(Q-m z-#FY}0dznG8l0I=Ea{KTLrqN$f0`=;W@7wI&7LvFaXh$N`~ z<$;DkK}82)AT2?{56J8A4MqSBz7b}EHHIz}v{qmUmFKC&G3Wpod)y`)!~_u6kZPgb zr&g7VqCCqgEHwM%WtD|At%cTTq8CjjHR8rnDa4N?5{MIy$3v^UuyZ+)ip!6+yWHrI z1IBoVgz6rD_79>s2SydJ0>wjCM~*rT!bjp#ddWu7V{YTv@sw%$iSVIkRp}>n!UvqX zk%Lda$@BWL!*0C^ek$cAlU_XTBoZ<2(lPh=W&h$)=g5WG1(yHxX4y#R#*-Ekyl1yU zqukriCkDMMg(IA+H7EMlOGdlb!bdckmg*dk67^Ys7$s8O!=@?TZFF8lMmIgGF=5Y% zqP&qCFV^H-GBj#i>UQhN=Mztt2Nf$Sg=q=saZf#xQb>%P_uvFbOgZP|L({|*75?MX zLYUlRM`Y-kD}&xOp-aWNB7;}IlWD5%b<^^%qNSSKVV3>-q}R9OYLBk<)?2kk*B?C$o#8V6yWO*DITWmV$XyknN*`nZ;@|7ktb_3}QUp^d++`A^L+8?Q=)`h{@9 zqHWGEjRrMrIB1MkddHZww_%UcAC9#-_Cp(gcQ&cI3%b;JHQJ_kjfQ8N_GY>D><(SZ z_LtJLY}L)4P<#31Yn`oX*6i7K)?)vzHOuqM=5;R|yLM2j#jta~jnRj-h&G(qWoNhM z?}gjHk=5g`dhNq?dSrFxP`#)mFI>3Dcwc81md6K{=W0~W6$i$rZVfIBw~-ss-s#eR zB(yPf;YJ&0Dm*1q7i0dcFpZ`%)&OaFF-JpnApNm=N39O&gnC$QvNo?DsrpDabX(US z_;y_U>ukaJ%npAC%>R7y^MC)p7gRj-`iKKRP%CWB&v}hwbkb?i#~om3fYzf8TBBjQ z1R}}=4w6v-sg}SmIFZ9A`|{iDw;%|AVCSGvi4sr=Pz|l&>w%6*GcX9y5hV5Ld9sPk z0#t-n8K}hu06`W9K_P>SppwOXw1!WCPCnm)K^FgkBr2@)nbZ;%dlnc)P1T<|%d^vV z4WmBLETfU8^am0;Oj6#cNws*#4B5p2VQmUkM^1R6TYNK&Ba;{IVKr%0eVI0Yp4Rpy ziRCFe3yh+s>Q9~J*}0ju{QDkgmeB|k{Rv4BY8svLBx9iOmYFr_nRJG=DU?of zEkhVpj>)%g)x&DiZjte2N;5gGB{{xrdWly768UgLC_)vQ(1jr?p--%M(OrOQH#es< fkK?UXJ(I_T(}aoTAKSL`r_HPgh{Ja=f+zw2ljMc^ diff --git a/src/components/setting/index.vue b/src/components/setting/index.vue index c2d75a9..71f094d 100644 --- a/src/components/setting/index.vue +++ b/src/components/setting/index.vue @@ -51,6 +51,16 @@ {{ t('display-wave-height') }} + +
+ +
+ {{ t('display-signal-info-scope') }} + + width + parent + +
diff --git a/src/components/sidebar.vue b/src/components/sidebar.vue index 0b85e8c..1ff4bcc 100644 --- a/src/components/sidebar.vue +++ b/src/components/sidebar.vue @@ -4,7 +4,7 @@
- +
{{ signal.name }} @@ -24,7 +24,7 @@ /* eslint-disable */ import { reactive } from 'vue'; import { useI18n } from 'vue-i18n'; -import { emitter, globalLookup } from '@/hook/global'; +import { emitter, globalLookup, globalSetting } from '@/hook/global'; export default { name: 'sidebar', @@ -35,9 +35,27 @@ export default { emitter.emit('right-nav', 0); } + function makeSignalIconClass(signal) { + if (signal.type === 'wire') { + return 'iconfont icon-wave-square'; + } else if (signal.type === 'reg') { + return 'iconfont icon-register'; + } else { + return 'iconfont icon-wave-square'; + } + } + + function makeSignalInfo(signal) { + let htmlString = ''; + + } + + + return { t, globalLookup, + makeSignalIconClass, addSignal } } diff --git a/src/hook/global.js b/src/hook/global.js index b6fa2a6..b649113 100644 --- a/src/hook/global.js +++ b/src/hook/global.js @@ -30,7 +30,8 @@ const globalSetting = reactive({ displayParentOnly: false, displaySignalHeight: 50, searchMode: 'so', // so, mo, sm - searchScope: ['wire', 'reg'] + searchScope: ['wire', 'reg'], + displaySignalInfoScope: ['width', 'parent'], }) export { diff --git a/src/i18n/en.json b/src/i18n/en.json index 9425db8..bfc432c 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -18,6 +18,7 @@ "appearance-setting": "Appearance", "display-wave-height": "Height of Wave Track", + "display-signal-info-scope": "Info displayed in sidebar", "current-version": "current version", "copyright": "The copyright of this software belongs to Digital-IDE project team. Welcome to Star." diff --git a/src/i18n/zh.json b/src/i18n/zh.json index 8a94fdb..12aa635 100644 --- a/src/i18n/zh.json +++ b/src/i18n/zh.json @@ -18,6 +18,7 @@ "appearance-setting": "外观", "display-wave-height": "波形轨道的高度", + "display-signal-info-scope": "侧边栏展示信息", "current-version": "当前版本", "copyright": "本软件版权归 Digital-IDE 项目组所有,欢迎 Star。"