bugfix:PostgreSQL initdb (#1953)

* bugfix:postgresql增加显示指定template

---------

Co-authored-by: PiexlMax(奇淼 <[email protected]>

Author: xue-ding-e

server/model/system/request/sys_init.go

@@ -15,6 +15,7 @@ type InitDB struct {
 	Password      string `json:"password"`                  // 数据库密码
 	DBName        string `json:"dbName" binding:"required"` // 数据库名
 	DBPath        string `json:"dbPath"`                    // sqlite数据库文件路径
+	Template      string `json:"template"`                  // postgresql指定template
 }
 
 // MysqlEmptyDsn msyql 空数据库 建库链接

server/service/system/sys_initdb_pgsql.go

@@ -54,7 +54,12 @@ func (h PgsqlInitHandler) EnsureDB(ctx context.Context, conf *request.InitDB) (n
 	} // 如果没有数据库名, 则跳出初始化数据
 
 	dsn := conf.PgsqlEmptyDsn()
-	createSql := fmt.Sprintf("CREATE DATABASE %s;", c.Dbname)
+	var createSql string
+	if conf.Template != "" {
+		createSql = fmt.Sprintf("CREATE DATABASE %s WITH TEMPLATE %s;", c.Dbname, conf.Template)
+	} else {
+		createSql = fmt.Sprintf("CREATE DATABASE %s;", c.Dbname)
+	}
 	if err = createDatabase(dsn, "pgx", createSql); err != nil {
 		return nil, err
 	} // 创建数据库

web/src/view/init/index.vue

@@ -111,6 +111,12 @@
               placeholder="请输入sqlite数据库文件存放路径"
             />
           </el-form-item>
+          <el-form-item v-if="form.dbType === 'pgsql'" label="template">
+            <el-input
+              v-model="form.template"
+              placeholder="请输入postgresql指定template"
+            />
+          </el-form-item>
           <el-form-item>
             <div style="text-align: right">
               <el-button type="primary" @click="onSubmit">立即初始化</el-button>
@@ -192,7 +198,8 @@
           userName: 'postgres',
           password: '',
           dbName: 'gva',
-          dbPath: ''
+          dbPath: '',
+          template: 'template0'
         })
         break
       case 'oracle':

web/src/view/superAdmin/menu/icon.vue

@@ -9,7 +9,7 @@
     >
       <template #prefix>
         <el-icon>
-          <component :is="value" />
+          <component v-if="value" :is="value" />
         </el-icon>
       </template>
       <el-option
@@ -21,7 +21,7 @@
       >
         <span class="gva-icon" style="padding: 3px 0 0" :class="item.label">
           <el-icon>
-            <component :is="item.label" />
+            <component v-if="item.label" :is="item.label" />
           </el-icon>
         </span>
         <span style="text-align: left">{{ item.key }}</span>

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

@@ -704,7 +704,7 @@
         <el-upload
           class="flex items-center"
           :before-upload="importJson"
-          show-file-list="false"
+          :show-file-list="false"
           accept=".json"
         >
           <el-button type="primary" class="mx-2" :disabled="isAdd"

web/src/view/systemTools/system/system.vue

@@ -310,8 +310,8 @@
           <el-form-item label="字符长度">
             <el-input-number
               v-model="config.captcha['key-long']"
-              min="4"
-              max="6"
+              :min="4"
+              :max="6"
             />
           </el-form-item>
           <el-form-item label="图片宽度">