Browse Source

修改动态迁移的一个小bug

songzhibin97 4 năm trước cách đây
mục cha
commit
1cf61a6554
2 tập tin đã thay đổi với 6 bổ sung6 xóa
  1. 3 3
      server/config.yaml
  2. 3 3
      server/service/sys_auto_code.go

+ 3 - 3
server/config.yaml

@@ -75,9 +75,9 @@ autoCode:
 
   web: '/web/src'
   web-api: '/api'
-  web-form: '/view/file1'
-  web-table: '/view/file1'
-  web-flow: '/view/file1'
+  web-form: '/view'
+  web-table: '/view'
+  web-flow: '/view'
 
 # local configuration
 local:

+ 3 - 3
server/service/sys_auto_code.go

@@ -239,13 +239,13 @@ func addAutoMoveFile(data *tplData) {
 				global.GVA_CONFIG.AutoCode.Web, global.GVA_CONFIG.AutoCode.WApi, base)
 		} else if strings.Contains(fileSlice[n-2], "workflowForm") {
 			data.autoMoveFilePath = filepath.Join(global.GVA_CONFIG.AutoCode.Root,
-				global.GVA_CONFIG.AutoCode.Web, global.GVA_CONFIG.AutoCode.WFlow, strings.TrimSuffix(base, filepath.Ext(base))+"WorkflowForm.vue")
+				global.GVA_CONFIG.AutoCode.Web, global.GVA_CONFIG.AutoCode.WFlow, filepath.Base(filepath.Dir(filepath.Dir(data.autoCodePath))), strings.TrimSuffix(base, filepath.Ext(base))+"WorkflowForm.vue")
 		} else if strings.Contains(fileSlice[n-2], "form") {
 			data.autoMoveFilePath = filepath.Join(global.GVA_CONFIG.AutoCode.Root,
-				global.GVA_CONFIG.AutoCode.Web, global.GVA_CONFIG.AutoCode.WForm, strings.TrimSuffix(base, filepath.Ext(base))+"Form.vue")
+				global.GVA_CONFIG.AutoCode.Web, global.GVA_CONFIG.AutoCode.WForm, filepath.Base(filepath.Dir(filepath.Dir(data.autoCodePath))), strings.TrimSuffix(base, filepath.Ext(base))+"Form.vue")
 		} else if strings.Contains(fileSlice[n-2], "table") {
 			data.autoMoveFilePath = filepath.Join(global.GVA_CONFIG.AutoCode.Root,
-				global.GVA_CONFIG.AutoCode.Web, global.GVA_CONFIG.AutoCode.WTable, base)
+				global.GVA_CONFIG.AutoCode.Web, global.GVA_CONFIG.AutoCode.WTable, filepath.Base(filepath.Dir(filepath.Dir(data.autoCodePath))), base)
 		}
 	}
 }