#16: Fixed recursion and autocomplete

This commit is contained in:
frikky
2020-10-02 05:01:37 +02:00
parent cfb074d898
commit 6ebebe8795
3 changed files with 13 additions and 6 deletions
+10 -3
View File
@@ -393,12 +393,19 @@ class AppBase:
# FIXME: This is absolutely not perfect.
print("In recursion v2: ", actualitem)
is_loop = True
newvalue = []
firstitem = actualitem[0][0]
seconditem = actualitem[0][1]
# Means it's a single item -> continue
if seconditem == "":
print("In first")
newvalue = basejson[int(firstitem)]
print("In first - handling %s", seconditem)
tmpitem = basejson[int(firstitem)]
try:
newvalue, is_loop = recurse_json(tmpitem, parsersplit[outercnt+1:])
except IndexError:
newvalue, is_loop = (tmpitem, parsersplit[outercnt+1:])
else:
if seconditem == "max":
seconditem = len(basejson)
@@ -422,7 +429,7 @@ class AppBase:
#exit()
newvalue.append(ret)
return newvalue, True
return newvalue, is_loop
# FIXME: Add specific loop for other indexes
else:
+2 -2
View File
@@ -3069,7 +3069,7 @@ const AngularWorkflow = (props) => {
</div>
}
parentMenuOpen={!!menuPosition}
style={{backgroundColor: inputColor, color: "white"}}
style={{backgroundColor: inputColor, color: "white", minWidth: 250,}}
onClick={() => {
handleItemClick([innerdata])
}}
@@ -3078,7 +3078,7 @@ const AngularWorkflow = (props) => {
// FIXME: Should be recursive in here
const icon = pathdata.type === "value" ? <VpnKeyIcon style={iconStyle} /> : pathdata.type === "list" ? <FormatListNumberedIcon style={iconStyle} /> : <ExpandMoreIcon style={iconStyle} />
return (
<MenuItem key={pathdata.name} style={{backgroundColor: inputColor, color: "white"}} value={pathdata} onMouseOver={() => {}}
<MenuItem key={pathdata.name} style={{backgroundColor: inputColor, color: "white", minWidth: 250,}} value={pathdata} onMouseOver={() => {}}
onClick={() => {
handleItemClick([innerdata, pathdata])
}}
+1 -1
View File
@@ -67,7 +67,7 @@ export const GetParsedPaths = (inputdata, basekey) => {
return parsedValues
}
console.log("KEY: ", key, "VALUE: ", value, "BASEKEY: ", basekeyname)
//console.log("KEY: ", key, "VALUE: ", value, "BASEKEY: ", basekeyname)
if (typeof(value) === 'object') {
if (Array.isArray(value)) {
// Check if each item is object