From 7a17696ef8d87ff1ec782cc336d3ba92da021fac 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: Wed, 10 May 2023 13:43:01 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=96=B0=E5=A2=9E=E6=9C=88=E4=BB=BD=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6&=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=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   |  1 +
 src/views/tool/gen/genInfoForm.vue | 17 +++++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue
index 3a64a72..c313837 100644
--- a/src/views/tool/gen/editTable.vue
+++ b/src/views/tool/gen/editTable.vue
@@ -121,6 +121,7 @@
                 <el-option label="自定义输入框" value="customInput" />
                 <el-option label="下拉单选组合" title="查询下拉,表单单选" value="selectRadio" />
                 <el-option label="颜色选择器" value="colorPicker" />
+                <el-option label="月份选择器" value="month" />
               </el-select>
             </template>
           </el-table-column>
diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue
index 4998222..c56386e 100644
--- a/src/views/tool/gen/genInfoForm.vue
+++ b/src/views/tool/gen/genInfoForm.vue
@@ -189,6 +189,9 @@
             <el-checkbox :label="6">
               <el-tag type="danger">清空</el-tag>
             </el-checkbox>
+            <el-checkbox :label="7">
+              <el-tag type="danger">批量删除</el-tag>
+            </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
       </el-col>
@@ -252,7 +255,10 @@
               v-for="(column, index) in columns"
               :key="index"
               :label="column.csharpField + '：' + column.columnComment"
-              :value="column.csharpField"></el-option>
+              :value="column.csharpField">
+              <span style="float: left">{{ column.csharpField }}</span>
+              <span style="float: right">{{ column.columnComment }}</span>
+            </el-option>
           </el-select>
         </el-form-item>
       </el-col>
@@ -269,11 +275,10 @@
             </span>
           </template>
           <el-select v-model="info.treeName" placeholder="请选择树名称字段">
-            <el-option
-              v-for="(column, index) in columns"
-              :key="index"
-              :label="column.csharpField + '：' + column.columnComment"
-              :value="column.csharpField"></el-option>
+            <el-option v-for="(column, index) in columns" :key="index" :label="column.csharpField" :value="column.csharpField">
+              <span style="float: left">{{ column.csharpField }}</span>
+              <span style="float: right">{{ column.columnComment }}</span>
+            </el-option>
           </el-select>
         </el-form-item>
       </el-col>