Merge branch 'flipped-aurora:main' into main

Author: xue-ding-e

server/model/system/sys_auto_code.go

@@ -17,6 +17,7 @@ type AutoCodeStruct struct {
 	Description         string                 `json:"description"`         // Struct中文名称
 	AutoCreateApiToSql  bool                   `json:"autoCreateApiToSql"`  // 是否自动创建api
 	AutoCreateMenuToSql bool                   `json:"autoCreateMenuToSql"` // 是否自动创建menu
+	AutoMigrate         bool                   `json:"autoMigrate"`         // 是否自动迁移表结构
 	AutoCreateResource  bool                   `json:"autoCreateResource"`  // 是否自动创建资源标识
 	BusinessDB          string                 `json:"businessDB"`          // 业务数据库
 	GvaModel            bool                   `json:"gvaModel"`            // 是否使用gva默认Model

server/service/system/sys_auto_code.go

@@ -275,11 +275,13 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc
 	}
 
 	{
-		// 在gorm.go 注入 自动迁移
-		path := filepath.Join(global.GVA_CONFIG.AutoCode.Root,
-			global.GVA_CONFIG.AutoCode.Server, global.GVA_CONFIG.AutoCode.SInitialize, "gorm.go")
-		varDB := utils.MaheHump(autoCode.BusinessDB)
-		ast2.AddRegisterTablesAst(path, "RegisterTables", autoCode.Package, varDB, autoCode.BusinessDB, autoCode.StructName)
+		if autoCode.AutoMigrate {
+			// 在gorm.go 注入 自动迁移
+			path := filepath.Join(global.GVA_CONFIG.AutoCode.Root,
+				global.GVA_CONFIG.AutoCode.Server, global.GVA_CONFIG.AutoCode.SInitialize, "gorm.go")
+			varDB := utils.MaheHump(autoCode.BusinessDB)
+			ast2.AddRegisterTablesAst(path, "RegisterTables", autoCode.Package, varDB, autoCode.BusinessDB, autoCode.StructName)
+		}
 	}
 
 	{

web/src/view/layout/header/index.vue

@@ -4,9 +4,9 @@
 !-->
 
 <template>
-  <div class="fixed top-0 left-0 right-0 z-10 h-16 bg-white text-slate-700 dark:text-slate-300  dark:bg-slate-900 shadow dark:shadow-gray-700 flex items-center px-2">
+  <div class="flex justify-between fixed top-0 left-0 right-0 z-10 h-16 bg-white text-slate-700 dark:text-slate-300  dark:bg-slate-900 shadow dark:shadow-gray-700 flex items-center px-2">
     <div
-      class="flex items-center cursor-pointer"
+      class="flex items-center cursor-pointer flex-1"
       @click="router.push({ path: '/' })"
     >
       <img
@@ -22,7 +22,7 @@
         {{ $GIN_VUE_ADMIN.appName }}
       </div>
 
-      <gva-aside v-if="config.side_mode === 'head' && !isMobile" />
+      <gva-aside v-if="config.side_mode === 'head' && !isMobile" class="flex-1"/>
 
       <el-breadcrumb v-show="!isMobile" v-else class="ml-4">
         <el-breadcrumb-item
@@ -36,7 +36,7 @@
       </el-breadcrumb>
     </div>
 
-    <div class="ml-auto flex items-center">
+    <div class="ml-2 flex items-center">
       <tools />
       <el-dropdown>
         <div

web/src/view/systemTools/autoCode/index.vue

@@ -293,7 +293,18 @@
             </template>
             <el-checkbox v-model="form.autoCreateMenuToSql" />
           </el-form-item>
-
+          <el-form-item>
+            <template #label>
+              <el-tooltip
+                  content="注：自动同步数据库表结构，如果不需要可以选择关闭。"
+                  placement="bottom"
+                  effect="light"
+              >
+                <div> 同步表结构 <el-icon><QuestionFilled /></el-icon></div>
+              </el-tooltip>
+            </template>
+            <el-checkbox v-model="form.autoMigrate" />
+          </el-form-item>
         </div>
       </el-form>
     </div>
@@ -782,6 +793,7 @@ const form = ref({
   businessDB: '',
   autoCreateApiToSql: true,
   autoCreateMenuToSql: true,
+  autoMigrate: true,
   gvaModel: true,
   autoCreateResource: false,
   fields: []
@@ -1117,6 +1129,7 @@ const clearCatch = async () => {
     businessDB: '',
     autoCreateApiToSql: true,
     autoCreateMenuToSql: true,
+    autoMigrate: true,
     gvaModel: true,
     autoCreateResource: false,
     fields: []