浏览代码

bug(4940)

zhangxc 5 年之前
父节点
当前提交
ac767ba677
共有 4 个文件被更改,包括 20 次插入8 次删除
  1. 6 3
      src/js/graphMap.js
  2. 5 2
      src/js/index.js
  3. 5 1
      src/js/knowledgeTree.js
  4. 4 2
      src/js/schemaMap.js

+ 6 - 3
src/js/graphMap.js

@@ -472,7 +472,8 @@ function renderTab(data){
 }
 ToggleTab()
 function ToggleTab(){
-    $(".toggleTab").click(function(){
+    $(".toggleTab").click(function(e){
+        e.stopPropagation()
         const hideTabDis = $(".hideTabList").css("display")
         if(hideTabDis == "none"){
             showHideTab()
@@ -487,7 +488,8 @@ function showHideTab(){
     $(".toggleTabTxt").html("收起")
     $(".toggleArrow").attr("src",iconUp)
 }
-function hideHideTab(){
+function hideHideTab(e){
+   
     $(".hideTabList").slideUp()
     $(".toggleTabTxt").html("展开")
     $(".toggleArrow").attr("src",iconDown)
@@ -592,5 +594,6 @@ module.exports ={
     getTab,
     renderTab,
     setTabBottomHei,
-    setSelectName
+    setSelectName,
+    hideHideTab
 }

+ 5 - 2
src/js/index.js

@@ -23,7 +23,7 @@ const iconUp = require('./../resources/images/iconUp.png');
 const iconDown = require('./../resources/images/iconDown.png');
 const { post, api } = require('./api.js');
 const { mapData, zTreeData,mapData3,zTreeData3 } = require('./data.js');
-const { drawGraph,updateTree,getGraph,getTree,getNode,getTab,renderTab,setTabBottomHei,setSelectName} = require('./graphMap.js');
+const { drawGraph,updateTree,getGraph,getTree,getNode,getTab,renderTab,setTabBottomHei,setSelectName,hideHideTab} = require('./graphMap.js');
 
 window.select_type="疾病";
 window.select_type_noSearch="疾病";
@@ -163,7 +163,7 @@ $('html').click(function(){
     const selectListShow = $('.selectList').css('display')
     const tabNameListShow = $('.tabNameList').css('display')
     const tabNameListNoSearchShow = $('.tabNameListNoSearch').css('display')
-
+    const hideTabListShow = $('.hideTabList').css('display')
     if(selectListShow == 'block'){
         $('.selectList').hide()
         $('.iconSlide').attr('src','./images/iconSlideDown.png')
@@ -174,6 +174,9 @@ $('html').click(function(){
     if(tabNameListNoSearchShow == 'block'){
         $('.tabNameListNoSearch').hide()
     }
+    if(hideTabListShow == 'block'){
+        hideHideTab()
+    }
 })
 
 module.exports ={

+ 5 - 1
src/js/knowledgeTree.js

@@ -21,7 +21,7 @@ require('./../resources/zTree/css/zTreeStyle/zTreeStyle.css');
 const iconUp = require('./../resources/images/iconUp.png');
 const iconDown = require('./../resources/images/iconDown.png');
 // document.write("aaaa");
-const {getSchema,updateTree,getTree,getNode,getTab,renderTab,setTabBottomHei,setSelectName} = require('./schemaMap.js');
+const {getSchema,updateTree,getTree,getNode,getTab,renderTab,setTabBottomHei,setSelectName,hideHideTab} = require('./schemaMap.js');
 
 window.select_type="疾病";
 window.select_type_noSearch="疾病";
@@ -160,6 +160,7 @@ $('html').click(function(){
     const selectListShow = $('.selectList').css('display')
     const tabNameListShow = $('.tabNameList').css('display')
     const tabNameListNoSearchShow = $('.tabNameListNoSearch').css('display')
+    const hideTabListShow = $('.hideTabList').css('display')
 
     if(selectListShow == 'block'){
         $('.selectList').hide()
@@ -171,6 +172,9 @@ $('html').click(function(){
     if(tabNameListNoSearchShow == 'block'){
         $('.tabNameListNoSearch').hide()
     }
+    if(hideTabListShow == 'block'){
+        hideHideTab()
+    }
 })
 		
 		

+ 4 - 2
src/js/schemaMap.js

@@ -363,7 +363,8 @@ function renderTab(data){
 }
 ToggleTab()
 function ToggleTab(){
-    $(".toggleTab").click(function(){
+    $(".toggleTab").click(function(e){
+        e.stopPropagation()
         const hideTabDis = $(".hideTabList").css("display")
         if(hideTabDis == "none"){
             showHideTab()
@@ -480,5 +481,6 @@ function setTabBottomHei(type){
     getTab,
     renderTab,
     setTabBottomHei,
-    setSelectName
+    setSelectName,
+    hideHideTab
  }