优化测试模板添加

nr/node-red/packages/node_modules/@node-red/editor-client/public/red/red.min.js

@@ -437,6 +437,7 @@ var RED = (function() {
     let request_type = "GET";
     const flowId = getId();
     RED.nodes.currentNodeId = flowId;
+    console.log("#################flowId:",flowId);
     
     if(flowId!=null){
       //load_url = `http://192.168.0.113:1909/getflows?id=${getId()}`
@@ -75566,9 +75567,10 @@ const getId=()=>{
 }
 
 async function saveNode(){
-  console.log("save");
+  console.log("save:",RED.nodes.currentNodeId);
   const nns = RED.nodes.createCompleteNodeSet();
   const data = { id:RED.nodes.currentNodeId,label:nns[0].label,flows: nns };
+
   //先查询是否存在
   let token = await window.iotAPI.getToken();
   $.ajax({
@@ -75635,91 +75637,96 @@ async function saveNode(){
               tmpId = templateIdMatch[1]
               RED.nodes.templateId = tmpId
               console.log(`add id:${tmpId}`);
-              RED.nodes.dirty(false);
-              //RED.nodes.version(data.rev);
-              RED.nodes.originalFlow(nns);
-              RED.nodes.dirty(false);
-              const flowsToLock = new Set()
-                function ensureUnlocked(id) {
-                    const flow = id && (RED.nodes.workspace(id) || RED.nodes.subflow(id) || null);
-                    const isLocked = flow ? flow.locked : false;
-                    if (flow && isLocked) {
-                        flow.locked = false;
-                        flowsToLock.add(flow)
-                    }
-                }
-                RED.nodes.eachNode(function (node) {
-                    ensureUnlocked(node.z)
-                    if (node.changed) {
-                        node.dirty = true;
-                        node.changed = false;
-                    }
-                    if (node.moved) {
-                        node.dirty = true;
-                        node.moved = false;
-                    }
-                    if (node.credentials) {
-                        delete node.credentials;
-                    }
-                });
-                RED.nodes.eachGroup(function (node) {
-                    ensureUnlocked(node.z)
-                    if (node.changed) {
-                        node.dirty = true;
-                        node.changed = false;
-                    }
-                    if (node.moved) {
-                        node.dirty = true;
-                        node.moved = false;
-                    }
-                })
-                RED.nodes.eachJunction(function (node) {
-                    ensureUnlocked(node.z)
-                    if (node.changed) {
-                        node.dirty = true;
-                        node.changed = false;
-                    }
-                    if (node.moved) {
-                        node.dirty = true;
-                        node.moved = false;
-                    }
-                })
-                RED.nodes.eachConfig(function (confNode) {
-                    if (confNode.z) {
-                        ensureUnlocked(confNode.z)
-                    }
-                    confNode.changed = false;
-                    if (confNode.credentials) {
-                        delete confNode.credentials;
-                    }
-                });
-                RED.nodes.eachSubflow(function (subflow) {
-                    if (subflow.changed) {
-                        subflow.changed = false;
-                        RED.events.emit("subflows:change", subflow);
-                    }
-                });
-                RED.nodes.eachWorkspace(function (ws) {
-                    if (ws.changed || ws.added) {
-                        ensureUnlocked(ws.z)
-                        ws.changed = false;
-                        delete ws.added
-                        RED.events.emit("flows:change", ws)
-                    }
-                });
-                flowsToLock.forEach(flow => {
-                    flow.locked = true
-                })
-                // Once deployed, cannot undo back to a clean state
-                RED.history.markAllDirty();
-                RED.view.redraw();
-                RED.sidebar.config.refresh();
-                RED.events.emit("deploy");
+             
+            }
+
+            var json = JSON.parse(data);
+           
+
+            if(json.success){
+                RED.nodes.dirty(false);
+                //RED.nodes.version(data.rev);
+                RED.nodes.originalFlow(nns);
+                RED.nodes.dirty(false);
+                const flowsToLock = new Set()
+                  function ensureUnlocked(id) {
+                      const flow = id && (RED.nodes.workspace(id) || RED.nodes.subflow(id) || null);
+                      const isLocked = flow ? flow.locked : false;
+                      if (flow && isLocked) {
+                          flow.locked = false;
+                          flowsToLock.add(flow)
+                      }
+                  }
+                  RED.nodes.eachNode(function (node) {
+                      ensureUnlocked(node.z)
+                      if (node.changed) {
+                          node.dirty = true;
+                          node.changed = false;
+                      }
+                      if (node.moved) {
+                          node.dirty = true;
+                          node.moved = false;
+                      }
+                      if (node.credentials) {
+                          delete node.credentials;
+                      }
+                  });
+                  RED.nodes.eachGroup(function (node) {
+                      ensureUnlocked(node.z)
+                      if (node.changed) {
+                          node.dirty = true;
+                          node.changed = false;
+                      }
+                      if (node.moved) {
+                          node.dirty = true;
+                          node.moved = false;
+                      }
+                  })
+                  RED.nodes.eachJunction(function (node) {
+                      ensureUnlocked(node.z)
+                      if (node.changed) {
+                          node.dirty = true;
+                          node.changed = false;
+                      }
+                      if (node.moved) {
+                          node.dirty = true;
+                          node.moved = false;
+                      }
+                  })
+                  RED.nodes.eachConfig(function (confNode) {
+                      if (confNode.z) {
+                          ensureUnlocked(confNode.z)
+                      }
+                      confNode.changed = false;
+                      if (confNode.credentials) {
+                          delete confNode.credentials;
+                      }
+                  });
+                  RED.nodes.eachSubflow(function (subflow) {
+                      if (subflow.changed) {
+                          subflow.changed = false;
+                          RED.events.emit("subflows:change", subflow);
+                      }
+                  });
+                  RED.nodes.eachWorkspace(function (ws) {
+                      if (ws.changed || ws.added) {
+                          ensureUnlocked(ws.z)
+                          ws.changed = false;
+                          delete ws.added
+                          RED.events.emit("flows:change", ws)
+                      }
+                  });
+                  flowsToLock.forEach(flow => {
+                      flow.locked = true
+                  })
+                  // Once deployed, cannot undo back to a clean state
+                  RED.history.markAllDirty();
+                  RED.view.redraw();
+                  RED.sidebar.config.refresh();
+                  RED.events.emit("deploy");
             }else{
-                var json = JSON.parse(data);
                 window.alert(json.errorMessage);
             }
-           
         })
     }});