Ver Fonte

1)更新qscintilla2_qt.dll, 更新后可修正aucomplete列表在dpi非标准情况下过小/过大问题。

2)修正preview form关闭状态,autocomplete闪退问题
ZhangXK há 3 anos atrás
pai
commit
4977fe63bc

BIN
comx_sdk.node/deps/windows/bin/qscintilla2_qt5.dll


+ 5 - 0
comx_sdk.node/js/callTip.js

@@ -1534,6 +1534,11 @@ function diffuseArray(src, exclude)
 exports.postFilterNS = postFilterNS;
 function postFilterNS(ns_list, ret, sci, form_name)
 {
+    if(!ret)
+    {
+	return ret; 
+    }
+    
     var bIsGlCanvasType = false;
     var bIsScintillaType = false;
 

+ 12 - 4
comx_sdk.node/js/kul_editor_pane.js

@@ -4440,10 +4440,11 @@ function initCallbackEditor()
 
 	model.callTip.installCallTipOnce(ui.callback, ns_list);
 	if(model.callTip.installPane(ui.callback, ns_list))return [];
-		
+
 	if(!(ret = model.callTip.getPredefineNS(ns_list)))
 	{
 	    ns_list = model.callTip.preThisNS(ns_list);
+
 	    ret = model.getNamespaceList(ui.forms.value, ns_list);
 
 	    if(ns_list.length == 1)
@@ -4456,12 +4457,19 @@ function initCallbackEditor()
 		    varLocalList = varLocalList.filter(item=>{
 			return item.indexOf(ns) == 0;
 		    });
-		    
-		    ret = ret.concat(varLocalList);
+
+		    if(ret)
+		    {
+			ret = ret.concat(varLocalList);
+		    }
+		    else
+		    {
+			ret = varLocalList;
+		    }
 		}
 	    }
 
-	    if(model.callTip.installGlobalVarCallTipOnce(ui.callback, ret, ns_list))return [];
+	    if(ret && model.callTip.installGlobalVarCallTipOnce(ui.callback, ret, ns_list))return [];
 	}
 
 	/*

BIN
document/autocomplete.png


BIN
document/calltip.png