From d24546faf70e7320e020697935987f7c7d0bc4a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sun, 22 May 2022 18:08:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=A1=8C=E5=88=97=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/gen/editTable.vue   | 7 ++++---
 src/views/tool/gen/genInfoForm.vue | 6 ++++++
 src/views/tool/gen/index.vue       | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue
index e449ecf..ba3d1a1 100644
--- a/src/views/tool/gen/editTable.vue
+++ b/src/views/tool/gen/editTable.vue
@@ -17,7 +17,7 @@
             </template>
           </el-table-column>
           <el-table-column label="物理类型" prop="columnType" :show-overflow-tooltip="true" width="90" />
-          <el-table-column label="C#类型" width="110">
+          <el-table-column label="C#类型" width="140">
             <template #default="scope">
               <el-select v-model="scope.row.csharpType">
                 <el-option label="int" value="int" />
@@ -63,7 +63,7 @@
               </el-checkbox>
             </template>
           </el-table-column>
-          <el-table-column label="查询方式">
+          <el-table-column label="查询方式" width="90" align="center">
             <template #default="scope">
               <el-select v-model="scope.row.queryType" :disabled="scope.row.htmlType == 'datetime'" v-if="scope.row.isQuery">
                 <el-option label="=" value="EQ" />
@@ -140,7 +140,7 @@ import Sortable from 'sortablejs'
 // 选中选项卡的 name
 const activeName = ref('cloum')
 // 表格的高度
-const tableHeight = ref(document.documentElement.scrollHeight - 245 + 'px')
+const tableHeight = ref(document.documentElement.scrollHeight - 275 + 'px')
 // 表信息
 const tables = ref([])
 // 表列信息
@@ -189,6 +189,7 @@ function submitForm() {
         sortType: info.value.sortType,
         checkedBtn: info.value.checkedBtn,
         permissionPrefix: info.value.permissionPrefix,
+        colNum: info.value.colNum,
       }
       console.log('genForm', genTable)
 
diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue
index 63f7347..c928a13 100644
--- a/src/views/tool/gen/genInfoForm.vue
+++ b/src/views/tool/gen/genInfoForm.vue
@@ -168,6 +168,12 @@
           <el-input v-model="info.vuePath" placeholder="Vue项目所在绝对路径到项目根目录，eg：D:/ZRAdmin-vue"></el-input>
         </el-form-item>
       </el-col> -->
+      <el-col :lg="12">
+        <el-form-item prop="colNum" label="一行显示列">
+          <el-radio v-model="info.colNum" :label="12">2列</el-radio>
+          <el-radio v-model="info.colNum" :label="24">1列</el-radio>
+        </el-form-item>
+      </el-col>
       <el-col :lg="24" v-show="info.tplCategory != 'select'">
         <el-form-item label="显示按钮">
           <el-checkbox-group v-model="info.checkedBtn" @change="checkedBtnSelect">
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index c0cf964..a02b399 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -173,7 +173,7 @@ function openImportTable() {
 function handlePreview(row) {
   proxy.$refs['codeform'].validate((valid) => {
     if (!valid) {
-      proxy.$modal.msgError('请先完成表格')
+      proxy.$modal.msgError('请先完成表格内容')
       return
     }
     proxy.$modal.loading('请稍后...')