2.7.4 workflow fix

xiaobaidadada · Feb 5, 2025 · ba37a10 · ba37a10
1 parent 3c75f67
commit ba37a10
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "filecat",
-  "version": "2.7.3",
+  "version": "2.7.4",
   "description": "filecat 文件管理器",
   "author": "xiaobaidadada",
   "scripts": {

diff --git a/src/main/domain/file/workflow/test.yml b/src/main/domain/file/workflow/test.yml
@@ -28,7 +28,7 @@ jobs:
     sys-env: # 这里的token 会在执行的添加到shell的环境变量中
       token: {{{token}}}
     env:
-      temp: {{token}}123 # 用于设置一些临时变量
+      temp: '{{token}}123' # 用于设置一些临时变量
     steps: # 这些脚本会按顺序执行
       - use-yml: test2 # 使用其它 yml 文件中的 name
         with-env:

diff --git a/src/main/domain/file/workflow/workflow.service.ts b/src/main/domain/file/workflow/workflow.service.ts
@@ -482,6 +482,11 @@ class work_children {
                                 // 执行另一个文件
                                 const yaml = this.import_files_map.get(step["use-yml"]);
                                 if(yaml) {
+                                    if(step['with-env']) {
+                                        for (const key of Object.keys(step['with-env'])) {
+                                            step['with-env'][key] = Mustache.render(`${step['with-env'][key]??""}`, {...this.env,...job.env});
+                                        }
+                                    }
                                     const worker = new work_children(undefined, this.workflow_dir_path);
                                     await worker.init({
                                         env:step['with-env'],
@@ -538,12 +543,13 @@ class work_children {
                             step.duration = `${((Date.now() - step_satrt_time) / 1000).toFixed(2)} s`;
                             step.code = code as number;
                             step.running_type = running_type.success;
-                            this.send_all_wss();
                             if(code !==0 ) {
                                 step.running_type = running_type.fail;
                                 // 终止后面的行为
+                                this.send_all_wss();
                                 break;
                             }
+                            this.send_all_wss();
                         }
 
                     }

diff --git a/src/web/project/component/file/component/workflow/WorkFlow.tsx b/src/web/project/component/file/component/workflow/WorkFlow.tsx
@@ -164,8 +164,9 @@ export function WorkFlow(props) {
             }
         } else if(job_list) {
             for (const item of job_list??[]){
+                const name =  <div><StatusCircle success={item.code === undefined?undefined:item.code === 0} />${item.name}</div>
                 r_list.push({
-                    name:item.name,
+                    name:name,
                     extra_data: {code:item.code,is_job:true,job_data:item}
                 })
             }

diff --git a/src/web/project/component/prompts/FileNew.tsx b/src/web/project/component/prompts/FileNew.tsx
@@ -40,7 +40,7 @@ jobs:
     sys-env: # 这里的token 会在执行的添加到shell的环境变量中
       token: {{{token}}}
     env:
-      temp: {{token}}123 # 用于设置一些临时变量
+      temp: '{{token}}123' # 用于设置一些临时变量
     steps: # 这些脚本会按顺序执行
       - use-yml: test2 # 使用其它 yml 文件中的 name
         with-env: