From aa50dc17620d7e4e004b1480d9490876b885c7b7 Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Thu, 30 Nov 2023 14:35:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lzbi/common/constant/GenConstants.java    |  18 ++-
 .../com/lzbi/generator/util/GenUtils.java     |   4 +-
 .../src/main/resources/vm/vue/index.vue.vm    | 140 +++++++++++++++---
 3 files changed, 134 insertions(+), 28 deletions(-)

diff --git a/lzbi-common/src/main/java/com/lzbi/common/constant/GenConstants.java b/lzbi-common/src/main/java/com/lzbi/common/constant/GenConstants.java
index cbc00d7..2bb8fa1 100644
--- a/lzbi-common/src/main/java/com/lzbi/common/constant/GenConstants.java
+++ b/lzbi-common/src/main/java/com/lzbi/common/constant/GenConstants.java
@@ -44,19 +44,29 @@ public class GenConstants
     public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
             "bit", "bigint", "float", "double", "decimal" };
 
+    /** 页面不需要新增字段 */
+    public static final String[] COLUMNNAME_NOT_ADD = { "id", "create_by", "create_time", "del_flag", "update_by",
+            "update_time", "remark", "delete_by", "delete_time","tenant_id", "revision","created_by", "created_time","updated_by",
+            "updated_time"};
+
+
     /** 页面不需要编辑字段 */
-    public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" };
+    public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag", "update_by",
+            "update_time", "remark", "delete_by", "delete_time","tenant_id", "revision","created_by", "created_time","updated_by",
+            "updated_time"};
 
     /** 页面不需要显示的列表字段 */
     public static final String[] COLUMNNAME_NOT_LIST = { "id", "create_by", "create_time", "del_flag", "update_by",
-            "update_time" };
+            "update_time", "remark", "delete_by", "delete_time","tenant_id", "revision","created_by", "created_time","updated_by",
+            "updated_time"};
 
     /** 页面不需要查询字段 */
     public static final String[] COLUMNNAME_NOT_QUERY = { "id", "create_by", "create_time", "del_flag", "update_by",
-            "update_time", "remark" };
+            "update_time", "remark", "delete_by", "delete_time","tenant_id", "revision","created_by", "created_time","updated_by",
+            "updated_time"};
 
     /** Entity基类字段 */
-    public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark" };
+    public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark", "tenantId", "revision","deleteBy" ,"deleteTime" };
 
     /** Tree基类字段 */
     public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors", "children" };
diff --git a/lzbi-generator/src/main/java/com/lzbi/generator/util/GenUtils.java b/lzbi-generator/src/main/java/com/lzbi/generator/util/GenUtils.java
index 8a538cb..19ee20a 100644
--- a/lzbi-generator/src/main/java/com/lzbi/generator/util/GenUtils.java
+++ b/lzbi-generator/src/main/java/com/lzbi/generator/util/GenUtils.java
@@ -79,7 +79,9 @@ public class GenUtils
         }
 
         // 插入字段（默认所有字段都需要插入）
-        column.setIsInsert(GenConstants.REQUIRE);
+        if(!arraysContains(GenConstants.COLUMNNAME_NOT_ADD, columnName) && !column.isPk()) {
+            column.setIsInsert(GenConstants.REQUIRE);
+        }
 
         // 编辑字段
         if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk())
diff --git a/lzbi-generator/src/main/resources/vm/vue/index.vue.vm b/lzbi-generator/src/main/resources/vm/vue/index.vue.vm
index 26db658..466424b 100644
--- a/lzbi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/lzbi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -1,6 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" class="my-custom-form">
+      <el-row>
 #foreach($column in $columns)
 #if($column.query)
 #set($dictType=$column.dictType)
@@ -12,7 +13,8 @@
 #set($comment=$column.columnComment)
 #end
 #if($column.htmlType == "input")
-      <el-form-item label="${comment}" prop="${column.javaField}">
+    <el-col :span="4">
+      <el-form-item label="${comment}" prop="${column.javaField}" label-width="auto">
         <el-input
           v-model="queryParams.${column.javaField}"
           placeholder="请输入${comment}"
@@ -20,8 +22,10 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
-      <el-form-item label="${comment}" prop="${column.javaField}">
+    </el-col>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+    <el-col :span="4">
+      <el-form-item label="${comment}" prop="${column.javaField}" label-width="auto">
         <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
           <el-option
             v-for="dict in ${dictType}"
@@ -31,14 +35,18 @@
           />
         </el-select>
       </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
-      <el-form-item label="${comment}" prop="${column.javaField}">
+    </el-col>
+#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && !$dictType)
+    <el-col :span="4">
+      <el-form-item label="${comment}" prop="${column.javaField}" label-width="auto">
         <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
+    </el-col>
 #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
-      <el-form-item label="${comment}" prop="${column.javaField}">
+    <el-col :span="4">
+      <el-form-item label="${comment}" prop="${column.javaField}" label-width="auto">
         <el-date-picker clearable
           v-model="queryParams.${column.javaField}"
           type="date"
@@ -46,8 +54,10 @@
           placeholder="请选择${comment}">
         </el-date-picker>
       </el-form-item>
+    </el-col>
 #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-      <el-form-item label="${comment}" style="width: 308px">
+    <el-col :span="4">
+      <el-form-item label="${comment}" style="width: 308px" label-width="auto">
         <el-date-picker
           v-model="daterange${AttrName}"
           value-format="YYYY-MM-DD"
@@ -57,13 +67,15 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
+    </el-col>
 #end
 #end
 #end
-      <el-form-item>
+      <el-form-item class="childTextAlignLeft">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
+      </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -108,8 +120,8 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange" :max-height="tableHeight" :border="true" :column-width-draggable="true">
+      <el-table-column type="selection" width="55" align="center" fixed="left"/>
 #foreach($column in $columns)
 #set($javaField=$column.javaField)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
@@ -119,21 +131,21 @@
 #set($comment=$column.columnComment)
 #end
 #if($column.pk)
-      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+      <el-table-column label="${comment}" align="center" :width="120" prop="${javaField}" />
 #elseif($column.list && $column.htmlType == "datetime")
-      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+      <el-table-column label="${comment}" align="center" :width="120" prop="${javaField}" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
 #elseif($column.list && $column.htmlType == "imageUpload")
-      <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
+      <el-table-column label="${comment}" align="center" :width="120" prop="${javaField}" width="100">
         <template #default="scope">
           <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
         </template>
       </el-table-column>
 #elseif($column.list && "" != $column.dictType)
-      <el-table-column label="${comment}" align="center" prop="${javaField}">
+      <el-table-column label="${comment}" align="center" :width="120" prop="${javaField}">
         <template #default="scope">
 #if($column.htmlType == "checkbox")
           <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
@@ -143,17 +155,22 @@
         </template>
       </el-table-column>
 #elseif($column.list && "" != $javaField)
-      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+      <el-table-column label="${comment}" align="center" :width="120" prop="${javaField}" />
 #end
 #end
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" :width="200" :fixed="fixedColumns?'right':false">
+        <template #header>
+          <div class="fixed-column-header"  style="text-align: center;display: block;" @dblclick="toggleFixedColumns">
+            <span style="text-align: center;display: block;">操作<img style="width:10px;margin-left:5px" v-show="fixedColumns" :src="lock" alt="Image"/></span>
+          </div>
+        </template>
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']">修改</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -164,7 +181,8 @@
 
     <!-- 添加或修改${functionName}对话框 -->
     <el-dialog :title="title" v-model="open" width="60%" append-to-body :close-on-click-modal="true">
-      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="120px" class="my-custom-form">
+        <el-row>
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -177,22 +195,31 @@
 #end
 #set($dictType=$column.dictType)
 #if($column.htmlType == "input")
+    <el-col :span="12">
         <el-form-item label="${comment}" prop="${field}">
           <el-input v-model="form.${field}" placeholder="请输入${comment}" />
         </el-form-item>
+    </el-col>
 #elseif($column.htmlType == "imageUpload")
+    <el-col :span="12">
         <el-form-item label="${comment}" prop="${field}">
           <image-upload v-model="form.${field}"/>
         </el-form-item>
+    </el-col>
 #elseif($column.htmlType == "fileUpload")
+    <el-col :span="12">
         <el-form-item label="${comment}" prop="${field}">
           <file-upload v-model="form.${field}"/>
         </el-form-item>
+    </el-col>
 #elseif($column.htmlType == "editor")
+    <el-col :span="12">
         <el-form-item label="${comment}">
           <editor v-model="form.${field}" :min-height="192"/>
         </el-form-item>
-#elseif($column.htmlType == "select" && "" != $dictType)
+    </el-col>
+#elseif($column.htmlType == "select" && $dictType)
+    <el-col :span="12">
         <el-form-item label="${comment}" prop="${field}">
           <el-select v-model="form.${field}" placeholder="请选择${comment}">
             <el-option
@@ -207,13 +234,17 @@
             ></el-option>
           </el-select>
         </el-form-item>
-#elseif($column.htmlType == "select" && $dictType)
+    </el-col>
+#elseif($column.htmlType == "select" && !$dictType)
+    <el-col :span="12">
         <el-form-item label="${comment}" prop="${field}">
           <el-select v-model="form.${field}" placeholder="请选择${comment}">
             <el-option label="请选择字典生成" value="" />
           </el-select>
         </el-form-item>
+    </el-col>
 #elseif($column.htmlType == "checkbox" && "" != $dictType)
+    <el-col :span="12">
         <el-form-item label="${comment}" prop="${field}">
           <el-checkbox-group v-model="form.${field}">
             <el-checkbox
@@ -224,13 +255,17 @@
             </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
+    </el-col>
 #elseif($column.htmlType == "checkbox" && $dictType)
+    <el-col :span="12">
         <el-form-item label="${comment}" prop="${field}">
           <el-checkbox-group v-model="form.${field}">
             <el-checkbox>请选择字典生成</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
+    </el-col>
 #elseif($column.htmlType == "radio" && "" != $dictType)
+    <el-col :span="12">
         <el-form-item label="${comment}" prop="${field}">
           <el-radio-group v-model="form.${field}">
             <el-radio
@@ -244,13 +279,17 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
+    </el-col>
 #elseif($column.htmlType == "radio" && $dictType)
+    <el-col :span="12">
         <el-form-item label="${comment}" prop="${field}">
           <el-radio-group v-model="form.${field}">
             <el-radio label="1">请选择字典生成</el-radio>
           </el-radio-group>
         </el-form-item>
+    </el-col>
 #elseif($column.htmlType == "datetime")
+    <el-col :span="12">
         <el-form-item label="${comment}" prop="${field}">
           <el-date-picker clearable
             v-model="form.${field}"
@@ -259,10 +298,13 @@
             placeholder="请选择${comment}">
           </el-date-picker>
         </el-form-item>
+    </el-col>
 #elseif($column.htmlType == "textarea")
+    <el-col :span="12">
         <el-form-item label="${comment}" prop="${field}">
           <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
         </el-form-item>
+    </el-col>
 #end
 #end
 #end
@@ -331,6 +373,7 @@
 #end
         </el-table>
 #end
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -341,10 +384,12 @@
     </el-dialog>
   </div>
 </template>
-
+<style lang="scss" >
+  @import "@/assets/styles/self-defined.scss";
+</style>
 <script setup name="${BusinessName}">
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
-
+import lock from "@/assets/icons/svg/lock.svg";
 const { proxy } = getCurrentInstance();
 #if(${dicts} != '')
 #set($dictsNoSymbol=$dicts.replace("'", ""))
@@ -366,6 +411,9 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
+const tableHeight = ref("0px");
+const collapseVisible = ref(false);
+const fixedColumns = ref(false);
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
@@ -586,5 +634,51 @@ function handleExport() {
   }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
 }
 
+
+function toggleFixedColumns() {
+  fixedColumns.value = !fixedColumns.value;
+}
+
+onMounted(()=>{
+  calculateTableHeight();
+  window.addEventListener('resize', calculateTableHeight);
+  window.onresize = () => {
+    return (() => {
+      calculateTableHeight();
+    })()
+  }
+})
+
+onUnmounted(() => {
+  window.removeEventListener('resize', calculateTableHeight);
+});
+watch(
+    [collapseVisible,showSearch],
+    () => {
+      calculateTableHeight();
+    }
+);
+const calculateTableHeight = () => {
+  nextTick(() => {
+    const heightForm = proxy.$refs.queryRef?.$el.clientHeight || 0;
+    const windowHeight = window.innerHeight;
+    const paginationHeight = 60;
+    const tableHeaderHeight = 40;
+    const tableMargin = 20;
+    const remainingHeight = windowHeight - paginationHeight - tableHeaderHeight - tableMargin - heightForm - 100;
+    tableHeight.value = remainingHeight + 'px';
+  });
+};
+
+function toggleCollapse() {
+  collapseVisible.value = !collapseVisible.value;
+  if(collapseVisible.value){
+    editName.value = "折叠筛选项";
+  }else{
+    editName.value = "更多筛选项"
+  }
+}
+
+
 getList();
 </script>