From e1fc55512cc061c20a7d048210a0cdee45140d55 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, 27 Apr 2022 11:36:36 +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=E6=A0=91=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/tool/gen.js                |  4 ++--
 src/views/tool/gen/genInfoForm.vue | 12 ++++++------
 src/views/tool/gen/index.vue       | 21 ++++-----------------
 3 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/api/tool/gen.js b/src/api/tool/gen.js
index b28fe8e..04cd085 100644
--- a/src/api/tool/gen.js
+++ b/src/api/tool/gen.js
@@ -85,11 +85,11 @@ export function updateGenTable(data) {
 }
 
 // 预览生成代码
-export function previewTable(tableId) {
+export function previewTable(tableId, data) {
   return request({
     url: '/tool/gen/preview/' + tableId,
     method: 'post',
-    // data: data
+    params: data
   })
 }
 
diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue
index dce003b..cb74306 100644
--- a/src/views/tool/gen/genInfoForm.vue
+++ b/src/views/tool/gen/genInfoForm.vue
@@ -6,8 +6,8 @@
           <template #label>生成模板</template>
           <el-select v-model="info.tplCategory" @change="tplSelectChange">
             <el-option label="单表（增删改查）" value="crud" />
-            <!-- <el-option label="单表查询" value="select" />
-            <el-option label="树表（增删改查）" value="tree" /> -->
+            <!-- <el-option label="单表查询" value="select" /> -->
+            <el-option label="树表（增删改查）" value="tree" />
             <!-- <el-option label="导航查询" value="subNav"></el-option> -->
             <!-- <el-option label="主子表（增删改查）" value="sub" /> -->
           </el-select>
@@ -195,7 +195,7 @@
               </el-icon>
             </el-tooltip>
           </template>
-          <el-select v-model="info.treeCode" placeholder="请选择">
+          <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-select>
         </el-form-item>
@@ -210,14 +210,14 @@
               </el-icon>
             </el-tooltip>
           </template>
-          <el-select v-model="info.treeParentCode" placeholder="请选择">
+          <el-select v-model="info.treeParentCode" placeholder="请选择树父编码字段">
             <el-option v-for="(column, index) in columns" :key="index" :label="column.csharpField + '：' + column.columnComment" :value="column.csharpField"></el-option>
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :lg="12">
         <el-form-item>
-          <template label>
+          <template #label>
             树名称字段
             <el-tooltip content="树节点的显示名称字段名， 如：dept_name" placement="top">
               <el-icon>
@@ -225,7 +225,7 @@
               </el-icon>
             </el-tooltip>
           </template>
-          <el-select v-model="info.treeName" placeholder="请选择">
+          <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-select>
         </el-form-item>
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 6bd2928..f1cf6f1 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -6,7 +6,6 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="search" @click="getList()">查询</el-button>
-        <!-- <el-button type="default" icon="refresh" @click="loadTableData()">刷新</el-button> -->
       </el-form-item>
     </el-form>
 
@@ -84,7 +83,6 @@ const data = reactive({
     pageNum: 1,
     pageSize: 10,
     tableName: undefined,
-    // tableComment: undefined,
   },
   preview: {
     open: false,
@@ -121,12 +119,11 @@ function handleGenTable(row) {
     if (valid) {
       proxy.$modal.loading('正在生成代码...')
 
-      var seachdata = {
+      codeGenerator({
         tableId: currentSelected.value.tableId,
         tableName: currentSelected.value.name,
-      }
-
-      codeGenerator(seachdata)
+        VueVersion: 3,
+      })
         .then((res) => {
           const { data } = res
           showGenerate.value = false
@@ -163,12 +160,6 @@ function handleSynchDb(row) {
 function openImportTable() {
   proxy.$refs['importRef'].show()
 }
-/** 重置按钮操作 */
-function resetQuery() {
-  dateRange.value = []
-  proxy.resetForm('queryParams')
-  handleQuery()
-}
 /** 预览按钮 */
 function handlePreview(row) {
   proxy.$refs['codeform'].validate((valid) => {
@@ -177,7 +168,7 @@ function handlePreview(row) {
       return
     }
     proxy.$modal.loading('请稍后...')
-    previewTable(row.tableId).then((res) => {
+    previewTable(row.tableId, { VueVersion: 3 }).then((res) => {
       if (res.code === 200) {
         showGenerate.value = false
         preview.value.open = true
@@ -239,9 +230,5 @@ function highlightedCode(code, key) {
 function clipboardSuccess() {
   proxy.$modal.msgSuccess('复制成功')
 }
-function cancel() {
-  showGenerate.value = false
-  currentSelected.value = {}
-}
 getList()
 </script>