Ver código fonte

fix(confilg-template): build template error #989

Jacky 6 dias atrás
pai
commit
28ed291250

+ 1 - 1
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<Record<string, Variable>>({
-  default: () => {},
+  default: reactive({}),
 })
 </script>
 

+ 2 - 2
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

+ 6 - 8
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()