change ref

hamster-shared · Nov 8, 2023 · d5d3b61 · d5d3b61
2 parents 6d609f0 + a5f1491
commit d5d3b61
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/views/projects/projectsDeploymentOrchestration/components/utils/engine.ts b/src/views/projects/projectsDeploymentOrchestration/components/utils/engine.ts
@@ -272,10 +272,14 @@ export default class NewEngine {
                 if (params[i].startsWith("$")){
                     let contractName = params[i].substring(1).split(".")[0]
                     let attr = params[i].substring(1).split(".")[1]
-                    let deploy = deployInfo.find((t: DeployStep) => JSON.stringify(t) != "{}" && (t.contract.name === contractName || contractName.includes(t.contract.name)))
+                    let deploy = deployInfo.find((t: DeployStep) => JSON.stringify(t) != "{}" && (t.contract.name === contractName))
                     if(deploy === undefined){
-                        continue
+                        deploy = deployInfo.find((t: DeployStep) => JSON.stringify(t) != "{}" && contractName.includes(t.contract.name))
+                        if(deploy === undefined){
+                            continue
+                        }
                     }
+
                     params[i] = deploy.contract[attr]
                 }
             }

diff --git a/src/views/projects/projectsDeploymentOrchestration/index.vue b/src/views/projects/projectsDeploymentOrchestration/index.vue
@@ -489,9 +489,8 @@ const setContractInfo = () => {
 }
 //验证Invoke Contract Method表单
 const checkContractForm = async () => {
-  
-  //Contract Parameters 字段非空验证
-  if (paramsRef.value.formContractRef != undefined) {
+  if (paramsRef.value.formContractRef != undefined){
+    //Contract Parameters 字段非空验证
     await paramsRef.value.formContractRef.validate();
   }
   //Invoke Contract Method 字段非空验证