修改动态迁移的一个小bug

songzhibin97 · songzhibin97 · commit 1cf61a655414 · 2021-03-10T12:00:32.000+08:00
diff --git a/server/config.yaml b/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:
diff --git a/server/service/sys_auto_code.go b/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)
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -239,13 +239,13 @@ func addAutoMoveFile(data *tplData) {`
`239`	`239`	`global.GVA_CONFIG.AutoCode.Web, global.GVA_CONFIG.AutoCode.WApi, base)`
`240`	`240`	`} else if strings.Contains(fileSlice[n-2], "workflowForm") {`
`241`	`241`	`data.autoMoveFilePath = filepath.Join(global.GVA_CONFIG.AutoCode.Root,`
`242`		`- global.GVA_CONFIG.AutoCode.Web, global.GVA_CONFIG.AutoCode.WFlow, strings.TrimSuffix(base, filepath.Ext(base))+"WorkflowForm.vue")`
	`242`	`+ 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")`
`243`	`243`	`} else if strings.Contains(fileSlice[n-2], "form") {`
`244`	`244`	`data.autoMoveFilePath = filepath.Join(global.GVA_CONFIG.AutoCode.Root,`
`245`		`- global.GVA_CONFIG.AutoCode.Web, global.GVA_CONFIG.AutoCode.WForm, strings.TrimSuffix(base, filepath.Ext(base))+"Form.vue")`
	`245`	`+ 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")`
`246`	`246`	`} else if strings.Contains(fileSlice[n-2], "table") {`
`247`	`247`	`data.autoMoveFilePath = filepath.Join(global.GVA_CONFIG.AutoCode.Root,`
`248`		`- global.GVA_CONFIG.AutoCode.Web, global.GVA_CONFIG.AutoCode.WTable, base)`
	`248`	`+ global.GVA_CONFIG.AutoCode.Web, global.GVA_CONFIG.AutoCode.WTable, filepath.Base(filepath.Dir(filepath.Dir(data.autoCodePath))), base)`
`249`	`249`	`}`
`250`	`250`	`}`
`251`	`251`	`}`