소스 검색

Merge branch 'master' of http://47.100.18.120:3000/ChenYangFan/jvvm-front-end

 Conflicts:
	src/views/JVVM.vue
ChenYangfan 6 년 전
부모
커밋
bf8743c2bf
1개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 4 4
      src/views/JVVM.vue

+ 4 - 4
src/views/JVVM.vue

@@ -1,17 +1,17 @@
 <template>
   <div class="jvvm">
-    <j-heap class="heap" :objects="state.memory ? state.memory.objects : []"
+    <j-heap class="heap" :objects="state.memory?state.memory.objects:[]"
             @click-detail="handleCheckDetail($event, 'j-heap-detail')"></j-heap>
-    <j-method class="method" :objects="state.memory.classes"
+    <j-method class="method" :objects="state.memory?state.memory.classes:[]"
               @click-detail="handleCheckDetail($event, 'j-method-detail')"></j-method>
-    <j-thread class="thread" :objects="state.thread.threadStack"
+    <j-thread class="thread" :objects="state.thread?state.thread.threadStack:[]"
               @click-detail="handleCheckDetail($event, 'j-thread-detail')"></j-thread>
     <component class="detail" :is="detailComponent" :data="detail"></component>
     <div class="other-info">
       info
     </div>
     <div class="actions">
-      <v-btn class="mx-2" dark small color="#5a6a7a" @click="null">
+      <v-btn class="mx-2" dark small color="#5a6a7a" @click="()=>{}">
         查看源码
       </v-btn>
       <v-btn class="mx-2" fab dark small color="#5a6a7a" @click="goPreFrame">