Merge branch '1.4.0' of https://github.com/shuffle/shuffle into 1.4.0

This commit is contained in:
Frikky
2024-03-07 11:16:52 +01:00
+35 -21
View File
@@ -8993,7 +8993,7 @@ const AngularWorkflow = (defaultprops) => {
const AppConditionHandler = (props) => {
const { tmpdata, type } = props;
const [data] = useState(tmpdata);
const [data] = useState({...tmpdata});
const [multiline, setMultiline] = useState(false);
const [showAutocomplete, setShowAutocomplete] = React.useState(false);
const [actionlist, setActionlist] = React.useState([]);
@@ -9595,8 +9595,9 @@ const AngularWorkflow = (defaultprops) => {
<MenuItem
style={menuItemStyle}
onClick={(e) => {
conditionValue.value = "equals";
setConditionValue(conditionValue);
const newConditionValue = { ...conditionValue };
newConditionValue.value = "equals";
setConditionValue(newConditionValue);
setVariableAnchorEl(null);
}}
key={"equals"}
@@ -9606,8 +9607,9 @@ const AngularWorkflow = (defaultprops) => {
<MenuItem
style={menuItemStyle}
onClick={(e) => {
conditionValue.value = "does not equal";
setConditionValue(conditionValue);
const newConditionValue = { ...conditionValue };
newConditionValue.value = "does not equal";
setConditionValue(newConditionValue);
setVariableAnchorEl(null);
}}
key={"does not equal"}
@@ -9617,8 +9619,9 @@ const AngularWorkflow = (defaultprops) => {
<MenuItem
style={menuItemStyle}
onClick={(e) => {
conditionValue.value = "startswith";
setConditionValue(conditionValue);
const newConditionValue = { ...conditionValue };
newConditionValue.value = "startswith";
setConditionValue(newConditionValue);
setVariableAnchorEl(null);
}}
key={"starts with"}
@@ -9628,8 +9631,9 @@ const AngularWorkflow = (defaultprops) => {
<MenuItem
style={menuItemStyle}
onClick={(e) => {
conditionValue.value = "endswith";
setConditionValue(conditionValue);
const newConditionValue = { ...conditionValue };
newConditionValue.value = "endswith";
setConditionValue(newConditionValue);
setVariableAnchorEl(null);
}}
key={"ends with"}
@@ -9639,8 +9643,9 @@ const AngularWorkflow = (defaultprops) => {
<MenuItem
style={menuItemStyle}
onClick={(e) => {
conditionValue.value = "contains";
setConditionValue(conditionValue);
const newConditionValue = { ...conditionValue };
newConditionValue.value = "contains";
setConditionValue(newConditionValue);
setVariableAnchorEl(null);
}}
key={"contains"}
@@ -9650,8 +9655,9 @@ const AngularWorkflow = (defaultprops) => {
<MenuItem
style={menuItemStyle}
onClick={(e) => {
conditionValue.value = "contains_any_of";
setConditionValue(conditionValue);
const newConditionValue = { ...conditionValue };
newConditionValue.value = "contains_any_of";
setConditionValue(newConditionValue);
setVariableAnchorEl(null);
}}
key={"contains_any_of"}
@@ -9661,8 +9667,9 @@ const AngularWorkflow = (defaultprops) => {
<MenuItem
style={menuItemStyle}
onClick={(e) => {
conditionValue.value = "matches regex";
setConditionValue(conditionValue);
const newConditionValue = { ...conditionValue };
newConditionValue.value = "matches regex";
setConditionValue(newConditionValue);
setVariableAnchorEl(null);
}}
key={"matches regex"}
@@ -9672,8 +9679,9 @@ const AngularWorkflow = (defaultprops) => {
<MenuItem
style={menuItemStyle}
onClick={(e) => {
conditionValue.value = "larger than";
setConditionValue(conditionValue);
const newConditionValue = { ...conditionValue };
newConditionValue.value = "larger than";
setConditionValue(newConditionValue);
setVariableAnchorEl(null);
}}
key={"larger than"}
@@ -9683,8 +9691,9 @@ const AngularWorkflow = (defaultprops) => {
<MenuItem
style={menuItemStyle}
onClick={(e) => {
conditionValue.value = "less than";
setConditionValue(conditionValue);
const newConditionValue = { ...conditionValue };
newConditionValue.value = "less than";
setConditionValue(newConditionValue);
setVariableAnchorEl(null);
}}
key={"less than"}
@@ -9694,8 +9703,9 @@ const AngularWorkflow = (defaultprops) => {
<MenuItem
style={menuItemStyle}
onClick={(e) => {
conditionValue.value = "is empty";
setConditionValue(conditionValue);
const newConditionValue = { ...conditionValue };
newConditionValue.value = "is empty";
setConditionValue(newConditionValue);
setVariableAnchorEl(null);
}}
key={"is empty"}
@@ -9863,6 +9873,8 @@ const AngularWorkflow = (defaultprops) => {
marginTop: "15px",
marginLeft: "10px",
overflow: "hidden",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
maxWidth: 72,
}}
>
@@ -9906,6 +9918,8 @@ const AngularWorkflow = (defaultprops) => {
marginBottom: "auto",
marginLeft: "10px",
overflow: "hidden",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
maxWidth: 72,
}}
>