From f9a62bfe09f3279185b8319c5e21ff4898df81c1 Mon Sep 17 00:00:00 2001
From: Kirigaya <1193466151@qq.com>
Date: Tue, 22 Oct 2024 21:28:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=BF=9D=E5=AD=98=E5=8F=A6?=
 =?UTF-8?q?=E5=AD=98=E4=B8=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                             |   2 +-
 public/test.vcd.view                          | Bin 6318 -> 0 bytes
 public/test.view                              | Bin 0 -> 7099 bytes
 scripts/vscode-package.py                     |   2 +-
 src/App.vue                                   |   8 ++-
 src/api/index.js                              |  21 ++++++-
 src/api/message.js                            |  48 ++++++++++++++++
 .../toolbar/file-menu/load-view.vue           |  28 +++++++++-
 src/hook/recover.js                           |  13 ++++-
 src/hook/wave-container-view.js               |  52 ++++++++++++++++--
 10 files changed, 161 insertions(+), 13 deletions(-)
 delete mode 100644 public/test.vcd.view
 create mode 100644 public/test.view
 create mode 100644 src/api/message.js

diff --git a/public/index.html b/public/index.html
index d4125e2..e0a4685 100644
--- a/public/index.html
+++ b/public/index.html
@@ -18,7 +18,7 @@
     <script>
         window.readVcdFile = async () => {
             let inputVcdFile = 'test.vcd';
-            let inputViewFile = 'test.vcd.view';
+            let inputViewFile = 'test.view';
 
             const response = await fetch(inputVcdFile);
             const blob = await response.blob();
diff --git a/public/test.vcd.view b/public/test.vcd.view
deleted file mode 100644
index 9dc2f3acc64da3e1bb45ff2b38e65f8be702a211..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6318
zcmcIpO>Epm6n?uKApBK6R8RqeErk|@vb)~hW)lu1YLh@9X#y!t%YoIbJ)1RnZEHN<
zpNa!FxWbJSKL;cvR3QXNP|k>R4;-P#igMuu2c+=E<Jj(!jco~AigsrF{LMFS-kbN{
z<k|^<nIRca7gp{DDAnKs02D3Kr*H~eU1qr2pv?x2y3yv;<sE8iy^3MEyv-OT`WQ;K
z!wuVl<0!85jJ=+Te;hmFDXFlDKN9dsY$X7?P6A#XUJ3Ea)A2mQcw6Ic0$KxJ4$+=S
zKx3l>ux17@o&<I_!#Y{wI_KflaGj^8uT%GU#bLJAPP4Nu@IuUIQeX<3>3GqO%;Pr`
z_M$Lq>6C5SIx+Drz8?_NqiZ(n6Am-}P-!9KT4>+lNmjZD8wf6~^dz>XSZSa3+e4jj
zl3)pH4K9axbJOvBHzFgWX|@^ZSICg)I!nS<;ZlhGTn21IPeQK4l@Pg-0U0+b8N89s
zpoNOlXrY<qph`tBrN_ymFL}N5Sq{E5Hr0ZyaCe?c+8vf^$qN~jNEn_B{Ad$`nSnuv
zF8qDW4<+9q%aUvCS;Snox;DHP@_ztZ@fcDx4eRZ+0Y`C-s}u?d0i``=dyWr&CIt82
z6gAtlnUtEvwn-e9qDXMWTpT;1hrv(l8K#cs4&3GUF<|{%ypy(YV0kp$i>)xSNY4Ib
zhcjw~-(h40pD6^iW^v#YZ7eifI!t3HkRx_=L8=B{<6vB++t`=f?#I@FN->H`cIhIn
zq>mHiq|h$~aLf*(m@D+)D-?sPWSk-jAFl2HYya!;(*#`|`&0M7j4!7|i_lUc!bOLm
zsqqbA?Y<4nNwdhokWuAzNTGSmMAB&<1*3)JK)BR^Uz0sg<T{C-*9v#+K5SWZSpKi~
zwKP)G7gKuQiuAtk5G`)V7sGjk_r)?N$uNDUm9Jt|_+f&0l$|_yKwO+1B0ZDTvm|tq
z{4N6JVHK(TF|vv>vN*~gg=D1dNq;<@t3Ng&g#pQQHN62z`DjUb?7><1N^EZI2#=~n
z;bBo;EP0=tz6p`2q+CYPJSfk@_X0RZSs181#_z#akZVi6nNxJhT|t~YxVPY20UYDL
zgMG<eWGQ5b>8E6#u>g>~MdZnY_X1oOz%kxYJt5{KLz$II>e(xde2sh&u1&CyYC@6t
zg_Vh<U&f&+2TdrMubE(#nI^-I>pbyFM+)bwXjM(nbXZ~~YC4q6*Ra)ks>Iu`;w0z9
z#M_sZtlvdT%EKMi#u4#G#C>0TBq$Xn@3e(w&KA;4W7$DPDv2jqb|5Tym-5j#9(|l}
z3LchjO4qjdOVqy#J&w~UcxLk+yos@=(38W0#3#2uTvkRq8Zqf68Nn@NRtUO=1^;~U
z=Z($I_L9PF=Nw@H+~WeSWAllT(N?$XQVu;a`#9+QvA@5sjCVM7pp2gt#w#9PhJEBe
zzb`4asb7wNhW#t?FGWB4SoH4v-ZgaEA#B%Q+dDXMNyB9m!=g;q(+c0ybiWE$xY4Js
zSSb93q=Hq#(?4#gtMAP(7X%ew58;qvdHoGy;nlQw6kZE{5eGgMBct;kbFs*OM7)@B
zjDd~G-TT<aLiq(DAg1*1v<f4*@y3gf9lQG3asgu}EdTb<?Ptg5iYDn$6GVBwuvoTS
zn00&h5b5GAz)}dnu!R60?B4o#eDiY&P}@2Y0}u&?sy5>YFvA(8;yPq?<Pb}D;TIGt
z*5G0MIXrGaQH4jRzOCTpEEMZ-L{TCA`QSPciVYAdJA5*Eg&(_nWLmG?HSm_E*gR^E
zgDYa{x`wrfI%dMeFOb1H-rSCGI$WfUV}^A})7K2#?KK=a|9tgzmom4is*8<gb(`65
mQH@tuP>vIGZhd97st4_Xrq9W1;Hu+wOhc=Re>+rg7~o%e+n9F%

diff --git a/public/test.view b/public/test.view
new file mode 100644
index 0000000000000000000000000000000000000000..bb1dc9806877e50721deda10e0dce753bd1b28e7
GIT binary patch
literal 7099
zcmcIpO^n+_6n;q-D1XI=3XnjsZGnQ&Cb5(K<3LyagTiiip{0KaqKQ4(7#uqqPyQ+n
z+~5i~PW&8@5C|azNT@{|IB@R)af1VgigMw^1*yF8cx|uM?AS{kDay=b=9}-mdGlu8
zo68RY%#6s8`tZjdfJz-s0YKR$Jqic0)M2)74qI&4FzgnmK5tXk>{e~p=Pkx4u_jRQ
z`rP(h*oWP<uD#iH@XN6xJ{29-@J9k3z>)&c?<?>Ocrn78osKskjJHhgE6^J7LWK6H
z0*#FoV9gw0Tm?3tLr$iYa{*q8<a}bfoYsI>`^+<2Sypxt1`+0y88C&-v<LBuEZ~@w
zy=aWO7G-OmMI8JW{~r=(Ku>tAM>xy`O_imbvd~_itE_YxRuNoU>3%FtvC<yxwMG`<
zL}3Yf9nMF1bJOvHZA8X)(`hl%tCA71ET+QN;cSHcbPjCWQXv~~AwsU^K*mK<gEz7n
zv`}#tEj05us!Rkk?l|fC)bcLmaeP^9Y7y3>)p<;{IxLgOOF5KC7<vY-GNI*cCbZ>f
zsPEhEW|c7NQ|>CjjXJy<X`nt`11WG}Q7nUk4So0U84g0jfY&1SMjrN^Nh^yFGa7I)
znxK|<0;Tes(2CHTInkM~x6mL}>pTCyrZCh~z|7F5BOmB}!ByuQ6r<wXn=Wxqx*ZQ*
zjs(01OUXM<*|FU>vtEca-@Zhlgb+~KWZs}3fFFv$gMZ4V=Xgx^+Jj|>^nHq5!Xxm^
zq%UfCIWxPqW8t|7w*_^)P@Tt8lD2Tw^60t?OR>32(!p$!(yTy8P+G#O9C$aD#KAB3
zBZTDeLI?*fVwtoK(>MzFnBx^Zqwx;;D>fz>4zWI+;cm8aEKs?R-oxdqVu9|&c@7+!
z3zWW1(p#teA5)^mdpc5n;0&blbBY#>EY^Gs_$eg;i55p#J(^GCZ=?*n^Hs%4(SRRP
zQp6{NFoIAD7o-Tg@P@_mZ^F+h{$jVwEwVS_zvVWi5W97{@m5Lh{advo<}*qnz4LA*
zk)sQh1pS2pU!+zgjt+${41!9G+@ut$co91mYeWtBE=BhY*0($K@a7;HXNmmeO`}-i
zP53HBJWe`nc~Kc=N#6Uhw=yCt)Ho{h@O_H%xk%S{U?~jUB;VW-pX9C~P7zyl0lpQ$
ziHpu@tV=r)mkKh%Xht&68Ba>yVrvw^dl4=R-~{hDJQZ`2kqmMq_51;Au|~cGU#8f{
zDTeTfl7X(IKZ~7ru<;-yF4jzzA<KO@sd8n4P<Ad>&zNi3S<z9zu2gi?vsk;<b@)1E
z8XH)T9k=8WgshUYGI1L8m8{=Js3LZwZtQT}+>3JttVx)7ki4^|DGIibMi$Es^Ba=5
z%Cf`Gl6R#jjW<;eFie|B&O123R7PYg-BPI9(Q$LaDGV?|)H<HapQpjQz&_NLh9?g1
z!s~c)mb$W8=<uWK@2_a%(<X7~8X3biRBS1%+AjS2+22>!+8c*8?)8rl7Q#Iu;MyKf
zwT#z09ZV@fSIj;MD}UX%aYLJ&=Clv9IIJ`|Ho(mA2f^ph!<y$<=aa**ejzzh)Z@XT
zwtc*BTeMBsxj?qJaN>%IViVh?Oa|{7-!!ct<kz^}qrMOn{y|cql<@eKRsHxo3o9i-
zCD23Eq`8CMDsl0hMtn3bB1`d$IPkG3jgJnPj~Ru}MVfr3Zx20u6?hlR7>_?2brmOQ
zX$)5{KKJn6OP{Qi@Z^V;-|oNu)Z|FnA#Liw?bu^!dDit|kKgr1NEcHMha&(c0p2@z
z?Ze6MpGtuG`hy7oaUIh2W)cBrIHOeLUXG9Z#I=0*1v{1N@BseY{M3W84)``T<=-k=
zG?We4;YKUn(N=C9$_)@IyZL1DJu8ujXJ)t6u`wl7ZtgV4_I-tmz=VmPBEysTj4{UP
zP)HBkZ1=2bov?AWPhiv0XKJtbl=(GXUv4yO8_auyn!I)l`*GsToji8DW`*UUY0b$u
Sky?Myc5JgI-r%a(4DcVgyo;Ft

literal 0
HcmV?d00001

diff --git a/scripts/vscode-package.py b/scripts/vscode-package.py
index afcc478..58f3666 100644
--- a/scripts/vscode-package.py
+++ b/scripts/vscode-package.py
@@ -8,7 +8,7 @@ for file in os.listdir('dist'):
 with open('./dist/index.html', 'r', encoding='utf-8') as fp:
     html = fp.read()
 
-html = html.replace("''", "'<workerRoot>'")
+html = html.replace("''", "'<root>'")
 
 with open('./dist/index.html', 'w', encoding='utf-8') as fp:
     fp.write(html)
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index e01887a..853e380 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -30,6 +30,7 @@ import RightNav from '@/components/right-nav.vue';
 import Pivot from '@/components/pivot';
 import { recoverFromInputFile, recoverSession } from './hook/recover';
 import { setDefaultCss } from './hook/css';
+import { handleVscodeMessage } from './api/message';
 
 const { t } = useI18n();
 
@@ -114,14 +115,19 @@ onMounted(async () => {
                 globalLookup.topModules.push(mod);
             }
         }
-        loading.close();
         worker.terminate();
 
         // 根据 recoverConfig 完成现场回复
         recoverSession(VcdInfo.topModules);
+        loading.close();
     });
 });
 
+// vscode 传递事件
+window.addEventListener('message', event => {
+    handleVscodeMessage(event);
+});
+
 </script>
 
 <style>
diff --git a/src/api/index.js b/src/api/index.js
index c066c90..19b7f4e 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -26,7 +26,7 @@ export async function saveView(originVcdFile, originVcdViewFile, payload) {
     } else {
         vscode.postMessage({
             command: 'save-view',
-            data: { originVcdFile, originVcdViewFile, payload }
+            data: { originVcdFile, originVcdViewFile, payload: structuredClone(payload) }
         });
     }
 }
@@ -47,11 +47,28 @@ export async function saveViewAs(originVcdFile, originVcdViewFile, payload) {
     } else {
         vscode.postMessage({
             command: 'save-view-as',
-            data: { originVcdFile, originVcdViewFile, payload }
+            data: { originVcdFile, originVcdViewFile, payload: structuredClone(payload) }
         });
     }
 }
 
+export async function loadView(originVcdFile) {
+    if (mode === 'debug') {
+        const res = await axios.post('http://localhost:3000/load-view', { originVcdFile });
+        if (res.data && res.data.recoverJson && res.data.viewPath) {
+            globalLookup.originVcdViewFile = res.data.viewPath;
+            return res.data.recoverJson;
+        }
+    } else {
+        vscode.postMessage({
+            command: 'load-view',
+            data: { originVcdFile }
+        });
+    }
+
+    return undefined;
+}
+
 /**
  * 
  * @param {number} delay 
diff --git a/src/api/message.js b/src/api/message.js
new file mode 100644
index 0000000..80f5678
--- /dev/null
+++ b/src/api/message.js
@@ -0,0 +1,48 @@
+import { globalLookup } from "@/hook/global";
+import { recoverFromJson, recoverSession } from "@/hook/recover";
+import { ElLoading } from "element-plus";
+import i18n from "@/i18n/index";
+
+const { t } = i18n.global;
+
+/**
+ * 
+ * @param {MessageEvent} event 
+ */
+export function handleVscodeMessage(event) {
+    const command = event.data.command;
+    switch (command) {
+        case 'save-view-as':
+            saveViewAs(event.data);
+            break;
+        case 'load-view':
+            loadView(event.data);
+            break;
+        default:
+            break;
+    }
+}
+
+function loadView(data) {
+    const { recoverJson, viewPath } = data;
+    if (recoverJson === undefined || viewPath === undefined) {
+        return;
+    }
+    const loading = new ElLoading.service({
+        lock: true,
+        text: t('loading'),
+        background: 'rgba(0, 0, 0, 0.7)'
+    });
+    globalLookup.originVcdViewFile = viewPath;
+    recoverFromJson(recoverJson);
+    recoverSession(globalLookup.topModules);
+    loading.close();
+}
+
+function saveViewAs(data) {
+    const { viewPath } = data;
+    if (viewPath === undefined) {
+        return;
+    }
+    globalLookup.originVcdViewFile = viewPath;
+}
\ No newline at end of file
diff --git a/src/components/toolbar/file-menu/load-view.vue b/src/components/toolbar/file-menu/load-view.vue
index 9f0ed27..ea85df6 100644
--- a/src/components/toolbar/file-menu/load-view.vue
+++ b/src/components/toolbar/file-menu/load-view.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <div class="status"></div>
-        <div class="item">
+        <div class="item" @click="manualLoadView()">
             <span>{{ t('filemenu.load-view') }}</span>
             <span><code>Ctrl K</code></span>
         </div>
@@ -9,6 +9,10 @@
 </template>
 
 <script setup>
+import { loadView } from '@/api';
+import { globalLookup } from '@/hook/global';
+import { recoverFromJson, recoverSession } from '@/hook/recover';
+import { ElLoading } from 'element-plus';
 import { defineComponent } from 'vue';
 import { useI18n } from 'vue-i18n';
 
@@ -16,4 +20,26 @@ const { t } = useI18n();
 
 defineComponent({ name: 'load-view' });
 
+async function manualLoadView() {
+    const loading = new ElLoading.service({
+        lock: true,
+        text: t('loading'),
+        background: 'rgba(0, 0, 0, 0.7)'
+    });
+
+    const recoverJson = await loadView(globalLookup.originVcdFile);
+    if (recoverJson) {
+        recoverFromJson(recoverJson);
+        recoverSession(globalLookup.topModules);
+    }
+    loading.close();
+}
+
+document.addEventListener('keydown', async event => {
+    if (event.ctrlKey && event.key === 'k') {
+        event.preventDefault();
+        manualLoadView();
+    }
+});
+
 </script>
\ No newline at end of file
diff --git a/src/hook/recover.js b/src/hook/recover.js
index 52cc887..d945c69 100644
--- a/src/hook/recover.js
+++ b/src/hook/recover.js
@@ -66,6 +66,11 @@ async function attemptRecover(inputFile, inputViewFile) {
         globalLookup.originVcdViewFile = inputViewFile;
         return recoverResult;
     }
+
+    // 不存在则创建一个和 inputFile 同名的 view 文件
+    if (inputFile.endsWith('.vcd')) {
+        inputFile = inputFile.slice(0, -4);
+    }
     globalLookup.originVcdViewFile = inputFile + '.view';
     return await findRecoverFile(globalLookup.originVcdViewFile);
 }
@@ -82,13 +87,16 @@ export async function recoverFromInputFile(inputFile, inputViewFile) {
     recoverFromJson(recoverJson);
 }
 
-function recoverFromJson(recoverJson) {
+export function recoverFromJson(recoverJson) {
     if (recoverJson === undefined) {
         return;
     }
 
     // 加载 waves
     const waves = recoverJson.waves;
+    if (!recoverConfig.waves) {
+        recoverConfig.waves = new Map();
+    }
     if (waves instanceof Array && waves.length > 0) {
         for (const wave of waves) {
             const name = wave.name;
@@ -401,7 +409,8 @@ export function makeSaveViewPayload(config) {
 
     // 窗口状态
     if (all || defaultFalseWrapper(config, 'state')) {
-        const state = globalLookup.pstate;
+        // proxy 对象在一定情况下无法序列化
+        const state = JSON.parse(JSON.stringify(globalLookup.pstate));
         Object.assign(payload, { state });
     }
 
diff --git a/src/hook/wave-container-view.js b/src/hook/wave-container-view.js
index 976f07c..16cf417 100644
--- a/src/hook/wave-container-view.js
+++ b/src/hook/wave-container-view.js
@@ -3,6 +3,7 @@
  * 设计参考文档：https://nc-ai-lab.feishu.cn/wiki/Fy3ZwtbYbiatmxkhOp2cyHSFnlw
  */
 
+import { groupColorDispatcher } from "@/components/sidebar/manage-group";
 import { globalLookup } from "./global";
 import { getSmartCurrentSignalValue } from "./utils";
 
@@ -65,11 +66,28 @@ export const WaveContainerView = {
         delete globalLookup.currentSignalValues[signal.link];
         
         // 从 currentWiresRenderView 中删除
-        const i = findViewIndexByLink(signal.link);
-        const tailElements = renderView.slice(i + 1);
-        renderView.length = i;
-        tailElements.forEach(view => renderView.push(view));
+        // 此处需要考虑到处于 group 中的 link 的情况
+        const { index, childIndex } = findViewIndexTuple(signal.link);
 
+        function deleteElement(container, index) {
+            const tailElements = container.slice(index + 1);
+            container.length = index;
+            tailElements.forEach(el => container.push(el));
+        }
+
+        if (childIndex >= 0) {
+            // 删除 group 内元素
+            const view = renderView[index];
+            deleteElement(view.children, childIndex);
+            // 如果 group 空了，则也删除
+            if (view.children.length === 0) {
+                deleteElement(renderView, index);
+                groupColorDispatcher.put(view.groupInfo.color);
+            }
+        } else if (index >= 0) {
+            // 删除总体的元素
+            deleteElement(renderView, index);
+        }
     },
 
     /**
@@ -82,12 +100,36 @@ export const WaveContainerView = {
     }
 };
 
+/**
+ * @description 找到位于嵌套结构中的索引
+ * @param {string} link 
+ * @returns {{ index: number, childIndex: number }} index: 位于 renderView 的索引，位于 group 的 children 中的索引  
+ */
+function findViewIndexTuple(link) {
+    const renderView = globalLookup.currentWiresRenderView;
+
+    for (let i = 0; i < renderView.length; ++ i) {
+        const view = renderView[i];
+        if (view.signalInfo.link === link) {
+            return { index: i, childIndex: -1 };
+        }
+        for (let j = 0; j < view.children.length; ++ j) {
+            const child = view.children[j];
+            if (child.signalInfo.link === link) {
+                return { index: i, childIndex: j };
+            }
+        }
+    }
+
+    return { index: -1, childIndex: -1 };
+}
+
 
 export function findViewIndexByLink(link) {
     const renderView = globalLookup.currentWiresRenderView;
 
     let i = 0;
-    while (renderView[i].signalInfo.link !== link && i < renderView.length) {
+    while (i < renderView.length && renderView[i].signalInfo.link !== link) {
         ++ i;
     }