فهرست منبع

Revert "阻止事件冒泡"

This reverts commit 9ade5f4c089c35aed0475c4566442570b9a17e4f.
zhangxc 4 سال پیش
والد
کامیت
183b2076cc
2فایلهای تغییر یافته به همراه5 افزوده شده و 12 حذف شده
  1. 4 9
      src/js/graphMap.js
  2. 1 3
      src/js/medicalTermMap.js

+ 4 - 9
src/js/graphMap.js

@@ -81,6 +81,7 @@ function drawGraph(data,resultShowId) {
             data: legends.slice(0,showLegendNum).map(function (a) {
                 return a.name;
             }),
+            
         }],
         series: [
             {
@@ -92,7 +93,6 @@ function drawGraph(data,resultShowId) {
                 roam: 'move',
                 edgeSymbol: ['circle', 'arrow'],
                 edgeSymbolSize: [1, 5],
-                padding:[50,50,50,50],
                 edgeLabel: {
                     // cursor:'pointer',
                     normal: {
@@ -163,11 +163,7 @@ function drawGraph(data,resultShowId) {
         myChart.resize(); 
      })
     myChart.on('click',dataClick);
-    myChart.on('legendselectedchanged',function(obj){
-        console.log('aaaaaaa')
-    })
-    myChart.setOption(option,true);
-    const legendsSlice =  legends.slice(0,showLegendNum)
+    myChart.setOption(option);
     if(legends.length > showLegendNum){
         $('.legendSlideUp').toggleClass('legendSlideUp')
         $('.legendIcon').css('display',"block")
@@ -175,15 +171,14 @@ function drawGraph(data,resultShowId) {
         $('.legendSlideUp').toggleClass('legendSlideUp')
         $('.legendIcon').css('display',"none")
     }
-    $('.legendIconImg').on('click',function(e){
-        e.stopPropagation()
+    $('.legendIconImg').on('click',function(){
         $('.legendIconImg').toggleClass('legendSlideUp')
         if(option.legend[0].type=='scroll'){
             option.legend[0].type='plain'
             option.legend[0].data = legends
         }else{
             option.legend[0].type='scroll'
-            option.legend[0].data = legendsSlice
+            option.legend[0].data = legends.slice(0,showLegendNum)
         }
        
         myChart.setOption(option);

+ 1 - 3
src/js/medicalTermMap.js

@@ -5,7 +5,6 @@ require("./../css/medicalTermMap.less");
 require('./../resources/images/empty2.png');
 const { post, api } = require('./api.js');
 const { medicalTermDefaultMap } = require('./utils.js');
-const e = require("express");
 
 window.select_type="disease";
 window.select_name="疾病";
@@ -246,8 +245,7 @@ function drawGraph(data,resultShowId) {
         $('.legendSlideUp').toggleClass('legendSlideUp')
         $('.legendIcon').css('display',"none")
     }
-    $('.legendIconImg').on('click',function(e){
-        e.stopPropagation()
+    $('.legendIconImg').on('click',function(){
         $('.legendIconImg').toggleClass('legendSlideUp')
         if(option.legend[0].type=='scroll'){
             option.legend[0].type='plain'