From 28ed29125046912a18f3437c67d9a31ee52fed15 Mon Sep 17 00:00:00 2001 From: Jacky Date: Sun, 27 Apr 2025 09:22:14 +0800 Subject: [PATCH] fix(confilg-template): build template error #989 --- .../components/ConfigTemplate/TemplateForm.vue | 2 +- .../site_edit/components/ConfigTemplate/store.ts | 4 ++-- internal/template/template.go | 14 ++++++-------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/app/src/views/site/site_edit/components/ConfigTemplate/TemplateForm.vue b/app/src/views/site/site_edit/components/ConfigTemplate/TemplateForm.vue index 6e414a8b..d0344b7f 100644 --- a/app/src/views/site/site_edit/components/ConfigTemplate/TemplateForm.vue +++ b/app/src/views/site/site_edit/components/ConfigTemplate/TemplateForm.vue @@ -3,7 +3,7 @@ import type { Variable } from '@/api/template' import TemplateFormItem from './TemplateFormItem.vue' const data = defineModel>({ - default: () => {}, + default: reactive({}), }) diff --git a/app/src/views/site/site_edit/components/ConfigTemplate/store.ts b/app/src/views/site/site_edit/components/ConfigTemplate/store.ts index f2f02a20..1c56961c 100644 --- a/app/src/views/site/site_edit/components/ConfigTemplate/store.ts +++ b/app/src/views/site/site_edit/components/ConfigTemplate/store.ts @@ -8,8 +8,8 @@ export const useConfigTemplateStore = defineStore('configTemplate', () => { const variables = computed(() => data.value?.variables ?? {}) - function __buildTemplate(name: string) { - template.build_block(name, variables.value).then(r => { + function __buildTemplate() { + template.build_block(data.value.filename, variables.value).then(r => { data.value.directives = r.directives data.value.locations = r.locations data.value.custom = r.custom diff --git a/internal/template/template.go b/internal/template/template.go index 8bb6382a..1d75d82b 100644 --- a/internal/template/template.go +++ b/internal/template/template.go @@ -13,7 +13,6 @@ import ( "github.com/uozi-tech/cosy/logger" cSettings "github.com/uozi-tech/cosy/settings" "io" - "io/fs" "path/filepath" "strings" "text/template" @@ -40,14 +39,13 @@ func GetTemplateInfo(path, name string) (configListItem ConfigInfoItem) { Filename: name, } - file, _ := templ.DistFS.Open(filepath.Join(path, name)) + file, err := templ.DistFS.Open(filepath.Join(path, name)) + if err != nil { + logger.Error(err) + return + } - defer func(file fs.File) { - err := file.Close() - if err != nil { - logger.Error(err) - } - }(file) + defer file.Close() r := bufio.NewReader(file) lineBytes, _, err := r.ReadLine()