From 343235bc404d87b67b983cf37eb6f69e3e384f6d 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: Mon, 7 Aug 2023 18:18:43 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=BC=96=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/gen/editTable.vue   |  9 ++--
 src/views/tool/gen/genInfoForm.vue | 75 +++++++++++++++++-------------
 2 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue
index bc6ed06..4154ef8 100644
--- a/src/views/tool/gen/editTable.vue
+++ b/src/views/tool/gen/editTable.vue
@@ -296,15 +296,13 @@ const tableSort = () => {
   const tbody = document.querySelector('.el-table__body > tbody')
 
   Sortable.create(tbody, {
+    dragClass: 'sortable-ghost',
     onEnd: (evt) => {
       const targetRow = columns.value.splice(evt.oldIndex, 1)[0]
       columns.value.splice(evt.newIndex, 0, targetRow)
       for (const index in columns.value) {
         columns.value[index].sort = parseInt(index) + 1
       }
-      nextTick(() => {
-        console.log(columns.value)
-      })
     }
   })
 }
@@ -315,3 +313,8 @@ onMounted(() => {
 
 handleQuery()
 </script>
+<style>
+.sortable-ghost {
+  background: burlywood;
+}
+</style>
diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue
index afa6b95..671e434 100644
--- a/src/views/tool/gen/genInfoForm.vue
+++ b/src/views/tool/gen/genInfoForm.vue
@@ -242,10 +242,13 @@
       </el-col>
     </el-row>
 
-    <el-row v-show="info.tplCategory == 'tree'">
-      <h4 class="form-header">其他信息</h4>
+    <!-- 树表配置 -->
+    <el-row v-if="info.tplCategory == 'tree'">
+      <el-col :lg="24">
+        <h4 class="form-header">树表信息</h4>
+      </el-col>
       <el-col :lg="12">
-        <el-form-item>
+        <el-form-item prop="treeCode">
           <template #label>
             树编码字段
             <span>
@@ -257,16 +260,36 @@
             </span>
           </template>
           <el-select v-model="info.treeCode" 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.columnComment" :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>
+
       <el-col :lg="12">
-        <el-form-item>
+        <el-form-item prop="treeName">
+          <template #label>
+            树名称字段
+            <span>
+              <el-tooltip content="树节点的显示名称字段名， 如：dept_name" placement="top">
+                <el-icon>
+                  <question-filled />
+                </el-icon>
+              </el-tooltip>
+            </span>
+          </template>
+          <el-select v-model="info.treeName" placeholder="请选择树名称字段">
+            <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>
+      <el-col :lg="24">
+        <el-form-item prop="treeParentCode">
           <template #label>
             树父编码字段
             <span>
@@ -289,34 +312,16 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :lg="12">
-        <el-form-item>
-          <template #label>
-            树名称字段
-            <span>
-              <el-tooltip content="树节点的显示名称字段名， 如：dept_name" placement="top">
-                <el-icon>
-                  <question-filled />
-                </el-icon>
-              </el-tooltip>
-            </span>
-          </template>
-          <el-select v-model="info.treeName" placeholder="请选择树名称字段">
-            <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>
     </el-row>
-    <el-row v-show="info.tplCategory == 'sub' || info.tplCategory == 'subNav' || info.tplCategory == 'subNavMore'">
+
+    <!-- 主子表配置 -->
+    <el-row v-if="info.tplCategory == 'sub' || info.tplCategory == 'subNav' || info.tplCategory == 'subNavMore'">
       <el-col :lg="24">
         <h4 class="form-header">关联信息</h4>
       </el-col>
 
       <el-col :lg="12">
-        <el-form-item>
+        <el-form-item prop="subTableName">
           <template #label>
             关联子表的表名
             <span>
@@ -339,7 +344,7 @@
         </el-form-item>
       </el-col>
       <el-col :lg="12">
-        <el-form-item>
+        <el-form-item prop="subTableFkName">
           <template #label>
             子表关联的外键名
             <span>
@@ -410,7 +415,11 @@ const rules = ref({
     message: '请输入权限前缀',
     trigger: 'blur'
   },
-  genType: [{ required: true, message: '请选择方式', trigger: 'blur' }]
+  genType: [{ required: true, message: '请选择代码生成方式', trigger: 'blur' }],
+  treeCode: [{ required: true, message: '请选择树编码字段', trigger: 'blur' }],
+  treeParentCode: [{ required: true, message: '请选择树父编码字段', trigger: 'blur' }],
+  subTableName: [{ required: true, message: '请选择关联的子表表名', trigger: 'blur' }],
+  subTableFkName: [{ required: true, message: '请选择子表关联的外键名', trigger: 'blur' }]
 })
 function subSelectChange(value) {
   props.info.subTableFkName = ''