Merge branch 'CDSS6.0' into CDSS6.0.0

src/js/cdss.js

@@ -445,6 +445,7 @@ function renderDiagItem(list,name,number){
   if(list.length === 0){
     return
   }
+  moduleNum++
   let titleStr = titleStr2(name)
   let {shortStr, longStr} = renderItemWrapper(list,number,1,true)
   let boxStr = `<div class="moduleBox">

src/js/staticSearch.js

@@ -124,7 +124,7 @@ function getKnowledgeData(value) {
                 for(var i = 0;i<knowledgeLis.length;i++){
                     var tmpPart = knowledgeLis[i]
                     var tmpLi = `<li data-name='${tmpPart.name}' data-uname='${tmpPart.uniqueName}' data-type='${tmpPart.libTypeId}' data-sign='${tmpPart.type}'>
-                        <p>${tmpPart.name}<i>${tmpPart.libTypeName?('( '+tmpPart.libTypeName+' )'):''}</i></p>
+                        <p>${tmpPart.name}<i>${tmpPart.typeName?('( '+tmpPart.typeName+' )'):''}</i></p>
                         ${tmpPart.retrievalName?('<span>• '+tmpPart.retrievalName+'</span>'):''}
                     </li>`
                     lisStr += tmpLi