fix user select

Author: xlorne

admin-ui/src/components/Flow/panel/NodePanel.tsx

@@ -279,12 +279,11 @@ const NodePanel: React.FC<NodePanelProps> = (props) => {
                     visible={userSelectVisible}
                     setVisible={setUserSelectVisible}
                     userSelectType={"users"}
-                    specifyUserIds={[]}
+                    specifyUserIds={GroovyScript.getOperatorUsers(props.form.getFieldValue("operatorMatcher"))}
                     mode={"multiple"}
-                    onFinish={(values)=>{
-                        const operatorMatcher = props.form.getFieldValue("operatorMatcher");
-                        const script = operatorMatcher.replaceAll("%s", values.map((item:any)=>item.id).join(","));
-                        console.log(script);
+                    onFinish={(values) => {
+                        setUserSelectVisible(false);
+                        const script = GroovyScript.specifyOperatorMatcher.replaceAll("%s", values.map((item: any) => item.id).join(","));
                         props.form.setFieldsValue({
                             operatorMatcher: script
                         });

admin-ui/src/components/Flow/utils/script.ts

@@ -20,6 +20,19 @@ class GroovyScript {
         }
     }
 
+
+    static getOperatorUsers(script:string) {
+        if(script) {
+            const match = script.match(/\[([\d,\s]+)\]/);
+            if (match && match[1]) {
+                return match[1]
+                    .split(',')
+                    .map(num => parseInt(num.trim(), 10));
+            }
+        }
+        return [];
+    }
+
     static errTriggerType(errTrigger: string) {
         if (errTrigger === GroovyScript.defaultOutTrigger) {
             return "default";