diff --git a/admin/src/views/monitor_project/edit.vue b/admin/src/views/monitor_project/edit.vue index bf8123b..d7b8d0a 100644 --- a/admin/src/views/monitor_project/edit.vue +++ b/admin/src/views/monitor_project/edit.vue @@ -82,13 +82,13 @@ const formRules = { // trigger: ['blur'] // } // ], - // projectName: [ - // { - // required: true, - // message: '请输入项目名称', - // trigger: ['blur'] - // } - // ], + projectName: [ + { + required: true, + message: '请输入项目名称', + trigger: ['blur'] + } + ], projectType: [ { required: true, diff --git a/server/admin/generator/tpl_utils/templates/uniapp/pages.json.tpl b/server/admin/generator/tpl_utils/templates/uniapp/pages.json.tpl index 973db8a..c0449db 100644 --- a/server/admin/generator/tpl_utils/templates/uniapp/pages.json.tpl +++ b/server/admin/generator/tpl_utils/templates/uniapp/pages.json.tpl @@ -2,7 +2,7 @@ { "pages": [ { - "path": "pages/{{{ .ModuleName }}}/index", + "path": "pages/{{{nameToPath .ModuleName }}}/index", "style": { "navigationBarTitleText": "{{{.FunctionName}}}", "enablePullDownRefresh": true, @@ -10,20 +10,20 @@ } }, { - "path": "pages/{{{ .ModuleName }}}/details", + "path": "pages/{{{nameToPath .ModuleName }}}/details", "style": { "navigationBarTitleText": "{{{.FunctionName}}}详情", "enablePullDownRefresh": true } }, { - "path": "pages/{{{ .ModuleName }}}/edit", + "path": "pages/{{{nameToPath .ModuleName }}}/edit", "style": { "navigationBarTitleText": "编辑{{{.FunctionName}}}" } }, { - "path": "pages/{{{ .ModuleName }}}/search", + "path": "pages/{{{nameToPath .ModuleName }}}/search", "style": { "navigationBarTitleText": "搜索{{{.FunctionName}}}" } diff --git a/server/admin/generator/tpl_utils/tpl.go b/server/admin/generator/tpl_utils/tpl.go index add4421..9fd195c 100644 --- a/server/admin/generator/tpl_utils/tpl.go +++ b/server/admin/generator/tpl_utils/tpl.go @@ -25,6 +25,7 @@ var TemplateUtil = templateUtil{ "contains": util.ToolsUtil.Contains, "goToTsType": util.ToolsUtil.GoToTsType, "getPageResp": util.ToolsUtil.GetPageResp, + "nameToPath": util.ToolsUtil.NameToPath, }), } @@ -221,17 +222,17 @@ func (tu templateUtil) GetFilePaths(tplCodeMap map[string]string, ModuleName str // "server/admin/%s_route.go", "gocode/controller.go.tpl": strings.Join([]string{"server/admin/", ModuleName, "/", ModuleName, "_ctl.go"}, ""), //"server/admin/%s/%s_ctl.go", - "vue/api.ts.tpl": strings.Join([]string{"admin/src/api/", ModuleName, ".ts"}, ""), // "admin/src/api/%s.ts", - "vue/edit.vue.tpl": strings.Join([]string{"admin/src/views/", ModuleName, "/edit.vue"}, ""), // "admin/src/views/%s/edit.vue", - "vue/index.vue.tpl": strings.Join([]string{"admin/src/views/", ModuleName, "/index.vue"}, ""), // "admin/src/views/%s/index.vue", - "vue/index-tree.vue.tpl": strings.Join([]string{"admin/src/views/", ModuleName, "/index-tree.vue"}, ""), // "admin/src/views/%s/index-tree.vue", + "vue/api.ts.tpl": strings.Join([]string{"admin/src/api/", ModuleName, ".ts"}, ""), // "admin/src/api/%s.ts", + "vue/edit.vue.tpl": strings.Join([]string{"admin/src/views/", util.ToolsUtil.NameToPath(ModuleName), "/edit.vue"}, ""), // "admin/src/views/%s/edit.vue", + "vue/index.vue.tpl": strings.Join([]string{"admin/src/views/", util.ToolsUtil.NameToPath(ModuleName), "/index.vue"}, ""), // "admin/src/views/%s/index.vue", + "vue/index-tree.vue.tpl": strings.Join([]string{"admin/src/views/", util.ToolsUtil.NameToPath(ModuleName), "/index-tree.vue"}, ""), // "admin/src/views/%s/index-tree.vue", "uniapp/api.ts.tpl": strings.Join([]string{"x_admin_app/api/", ModuleName, ".ts"}, ""), - "uniapp/edit.vue.tpl": strings.Join([]string{"x_admin_app/pages/", ModuleName, "/edit.vue"}, ""), - "uniapp/index.vue.tpl": strings.Join([]string{"x_admin_app/pages/", ModuleName, "/index.vue"}, ""), - "uniapp/search.vue.tpl": strings.Join([]string{"x_admin_app/pages/", ModuleName, "/search.vue"}, ""), - "uniapp/details.vue.tpl": strings.Join([]string{"x_admin_app/pages/", ModuleName, "/details.vue"}, ""), - "uniapp/pages.json.tpl": strings.Join([]string{"x_admin_app/pages/", ModuleName, "/pages.json"}, ""), + "uniapp/edit.vue.tpl": strings.Join([]string{"x_admin_app/pages/", util.ToolsUtil.NameToPath(ModuleName), "/edit.vue"}, ""), + "uniapp/index.vue.tpl": strings.Join([]string{"x_admin_app/pages/", util.ToolsUtil.NameToPath(ModuleName), "/index.vue"}, ""), + "uniapp/search.vue.tpl": strings.Join([]string{"x_admin_app/pages/", util.ToolsUtil.NameToPath(ModuleName), "/search.vue"}, ""), + "uniapp/details.vue.tpl": strings.Join([]string{"x_admin_app/pages/", util.ToolsUtil.NameToPath(ModuleName), "/details.vue"}, ""), + "uniapp/pages.json.tpl": strings.Join([]string{"x_admin_app/pages/", util.ToolsUtil.NameToPath(ModuleName), "/pages.json"}, ""), } filePath := make(map[string]string) for tplPath, tplCode := range tplCodeMap { diff --git a/server/util/tools.go b/server/util/tools.go index 3ac2dda..02d6d48 100644 --- a/server/util/tools.go +++ b/server/util/tools.go @@ -102,6 +102,11 @@ func (tu toolsUtil) GetPageResp(s string) string { return `response.Response{ data=response.PageResp{ lists= []` + s + `Resp}}` } +// NameToPath 下划线文件路径 +func (tu toolsUtil) NameToPath(s string) string { + return strings.ReplaceAll(s, "_", "/") +} + // Round float四舍五入 func (tu toolsUtil) Round(val float64, n int) float64 { base := math.Pow(10, float64(n))