From 2b16a2d1524a907472a0e68fb377230eb275fd51 Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Fri, 12 Aug 2022 18:36:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8-=E5=89=8D=E7=AB=AF=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hxkj/generator/util/VelocityUtil.java |  17 +-
 .../src/main/resources/vue/index.vue.vm       | 518 +++++-------------
 2 files changed, 143 insertions(+), 392 deletions(-)

diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java
index 9acf94a8..032eeab8 100644
--- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java
+++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java
@@ -100,15 +100,14 @@ public class VelocityUtil {
      */
     public static List<String> getTemplateList(String genTpl, List<GenTableColumn> columns) {
         List<String> templates = new LinkedList<>();
-        templates.add("java/controller.java.vm");
-        templates.add("java/entity.java.vm");
-        templates.add("java/mapper.java.vm");
-        templates.add("java/service.java.vm");
-        templates.add("java/serviceImpl.java.vm");
-        templates.add("java/validate.java.vm");
-        templates.add("java/voList.java.vm");
-        templates.add("java/voDetail.java.vm");
-
+//        templates.add("java/controller.java.vm");
+//        templates.add("java/entity.java.vm");
+//        templates.add("java/mapper.java.vm");
+//        templates.add("java/service.java.vm");
+//        templates.add("java/serviceImpl.java.vm");
+//        templates.add("java/validate.java.vm");
+//        templates.add("java/voList.java.vm");
+//        templates.add("java/voDetail.java.vm");
         if (GenConstants.TPL_CRUD.equals(genTpl)) {
             templates.add("vue/index.vue.vm");
         }
diff --git a/server/like-generator/src/main/resources/vue/index.vue.vm b/server/like-generator/src/main/resources/vue/index.vue.vm
index 72fde9cb..e31c647e 100644
--- a/server/like-generator/src/main/resources/vue/index.vue.vm
+++ b/server/like-generator/src/main/resources/vue/index.vue.vm
@@ -1,393 +1,145 @@
 <template>
-    <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="模块标题" prop="title">
-                <el-input
-                        v-model="queryParams.title"
-                        placeholder="请输入模块标题"
-                        clearable
-                        @keyup.enter.native="handleQuery"
-                />
-            </el-form-item>
-            <el-form-item label="方法名称" prop="method">
-                <el-input
-                        v-model="queryParams.method"
-                        placeholder="请输入方法名称"
-                        clearable
-                        @keyup.enter.native="handleQuery"
-                />
-            </el-form-item>
-            <el-form-item label="请求方式" prop="requestMethod">
-                <el-input
-                        v-model="queryParams.requestMethod"
-                        placeholder="请输入请求方式"
-                        clearable
-                        @keyup.enter.native="handleQuery"
-                />
-            </el-form-item>
-            <el-form-item label="操作人员" prop="operName">
-                <el-input
-                        v-model="queryParams.operName"
-                        placeholder="请输入操作人员"
-                        clearable
-                        @keyup.enter.native="handleQuery"
-                />
-            </el-form-item>
-            <el-form-item label="部门名称" prop="deptName">
-                <el-input
-                        v-model="queryParams.deptName"
-                        placeholder="请输入部门名称"
-                        clearable
-                        @keyup.enter.native="handleQuery"
-                />
-            </el-form-item>
-            <el-form-item label="请求URL" prop="operUrl">
-                <el-input
-                        v-model="queryParams.operUrl"
-                        placeholder="请输入请求URL"
-                        clearable
-                        @keyup.enter.native="handleQuery"
-                />
-            </el-form-item>
-            <el-form-item label="主机地址" prop="operIp">
-                <el-input
-                        v-model="queryParams.operIp"
-                        placeholder="请输入主机地址"
-                        clearable
-                        @keyup.enter.native="handleQuery"
-                />
-            </el-form-item>
-            <el-form-item label="操作地点" prop="operLocation">
-                <el-input
-                        v-model="queryParams.operLocation"
-                        placeholder="请输入操作地点"
-                        clearable
-                        @keyup.enter.native="handleQuery"
-                />
-            </el-form-item>
-            <el-form-item label="操作时间" prop="operTime">
-                <el-date-picker clearable
-                                v-model="queryParams.operTime"
-                                type="date"
-                                value-format="yyyy-MM-dd"
-                                placeholder="请选择操作时间">
-                </el-date-picker>
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            </el-form-item>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-                <el-button
-                        type="primary"
-                        plain
-                        icon="el-icon-plus"
-                        size="mini"
-                        @click="handleAdd"
-                        v-hasPermi="['system:log:add']"
-                >新增</el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button
-                        type="success"
-                        plain
-                        icon="el-icon-edit"
-                        size="mini"
-                        :disabled="single"
-                        @click="handleUpdate"
-                        v-hasPermi="['system:log:edit']"
-                >修改</el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button
-                        type="danger"
-                        plain
-                        icon="el-icon-delete"
-                        size="mini"
-                        :disabled="multiple"
-                        @click="handleDelete"
-                        v-hasPermi="['system:log:remove']"
-                >删除</el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button
-                        type="warning"
-                        plain
-                        icon="el-icon-download"
-                        size="mini"
-                        @click="handleExport"
-                        v-hasPermi="['system:log:export']"
-                >导出</el-button>
-            </el-col>
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :data="logList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column label="日志主键" align="center" prop="operId" />
-            <el-table-column label="模块标题" align="center" prop="title" />
-            <el-table-column label="业务类型" align="center" prop="businessType" />
-            <el-table-column label="方法名称" align="center" prop="method" />
-            <el-table-column label="请求方式" align="center" prop="requestMethod" />
-            <el-table-column label="操作类别" align="center" prop="operatorType" />
-            <el-table-column label="操作人员" align="center" prop="operName" />
-            <el-table-column label="部门名称" align="center" prop="deptName" />
-            <el-table-column label="请求URL" align="center" prop="operUrl" />
-            <el-table-column label="主机地址" align="center" prop="operIp" />
-            <el-table-column label="操作地点" align="center" prop="operLocation" />
-            <el-table-column label="请求参数" align="center" prop="operParam" />
-            <el-table-column label="返回参数" align="center" prop="jsonResult" />
-            <el-table-column label="操作状态" align="center" prop="status" />
-            <el-table-column label="错误消息" align="center" prop="errorMsg" />
-            <el-table-column label="操作时间" align="center" prop="operTime" width="180">
-                <template slot-scope="scope">
-                    <span>{{ parseTime(scope.row.operTime, '{y}-{m}-{d}') }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                <template slot-scope="scope">
-                    <el-button
-                            size="mini"
-                            type="text"
-                            icon="el-icon-edit"
-                            @click="handleUpdate(scope.row)"
-                            v-hasPermi="['system:log:edit']"
-                    >修改</el-button>
-                    <el-button
-                            size="mini"
-                            type="text"
-                            icon="el-icon-delete"
-                            @click="handleDelete(scope.row)"
-                            v-hasPermi="['system:log:remove']"
-                    >删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-
-        <pagination
-                v-show="total>0"
-                :total="total"
-                :page.sync="queryParams.pageNum"
-                :limit.sync="queryParams.pageSize"
-                @pagination="getList"
-        />
-
-        <!-- 添加或修改操作日志记录对话框 -->
-        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-                <el-form-item label="模块标题" prop="title">
-                    <el-input v-model="form.title" placeholder="请输入模块标题" />
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form
+                    class="mb-[-16px]"
+                    :model="queryParams"
+                    inline
+            >
+            #foreach ($column in $columns)
+            #if($column.isQuery==1)
+                <el-form-item label="${column.columnComment}" prop="type">
+                    <el-input class="w-56" v-model="queryParams.${column.javaField}" clearable placeholder="请输入${column.columnComment}" />
                 </el-form-item>
-                <el-form-item label="方法名称" prop="method">
-                    <el-input v-model="form.method" placeholder="请输入方法名称" />
-                </el-form-item>
-                <el-form-item label="请求方式" prop="requestMethod">
-                    <el-input v-model="form.requestMethod" placeholder="请输入请求方式" />
-                </el-form-item>
-                <el-form-item label="操作人员" prop="operName">
-                    <el-input v-model="form.operName" placeholder="请输入操作人员" />
-                </el-form-item>
-                <el-form-item label="部门名称" prop="deptName">
-                    <el-input v-model="form.deptName" placeholder="请输入部门名称" />
-                </el-form-item>
-                <el-form-item label="请求URL" prop="operUrl">
-                    <el-input v-model="form.operUrl" placeholder="请输入请求URL" />
-                </el-form-item>
-                <el-form-item label="主机地址" prop="operIp">
-                    <el-input v-model="form.operIp" placeholder="请输入主机地址" />
-                </el-form-item>
-                <el-form-item label="操作地点" prop="operLocation">
-                    <el-input v-model="form.operLocation" placeholder="请输入操作地点" />
-                </el-form-item>
-                <el-form-item label="请求参数" prop="operParam">
-                    <el-input v-model="form.operParam" type="textarea" placeholder="请输入内容" />
-                </el-form-item>
-                <el-form-item label="返回参数" prop="jsonResult">
-                    <el-input v-model="form.jsonResult" type="textarea" placeholder="请输入内容" />
-                </el-form-item>
-                <el-form-item label="错误消息" prop="errorMsg">
-                    <el-input v-model="form.errorMsg" type="textarea" placeholder="请输入内容" />
-                </el-form-item>
-                <el-form-item label="操作时间" prop="operTime">
-                    <el-date-picker clearable
-                                    v-model="form.operTime"
-                                    type="date"
-                                    value-format="yyyy-MM-dd"
-                                    placeholder="请选择操作时间">
-                    </el-date-picker>
+            #end
+            #end
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
                 </el-form-item>
             </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="submitForm">确 定</el-button>
-                <el-button @click="cancel">取 消</el-button>
+        </el-card>
+
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['config/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button
+                    v-perms="['config/delete']"
+                    :disabled="!selectData.length"
+                    @click="handleDelete(selectData)"
+            >
+                删除
+            </el-button>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                #foreach ($column in $columns)
+                #if($column.isList==1)
+                    <el-table-column label="${column.columnComment}" prop="${column.javaField}" />
+                #end
+                #end
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button
+                                    v-perms="['config/edit']"
+                                    type="primary"
+                                    link
+                                    @click="handleEdit(row)"
+                            >
+                                编辑
+                            </el-button>
+                            <el-button
+                                    v-perms="['config/delete']"
+                                    type="danger"
+                                    link
+                                    @click="handleDelete(row.id)"
+                            >
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
             </div>
-        </el-dialog>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+
+        <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
     </div>
 </template>
 
-<script>
-    import { listLog, getLog, delLog, addLog, updateLog } from "@/api/system/log";
+<script lang="ts" setup>
+    import { usePaging } from '@/hooks/usePaging'
+    import { dictDataLists } from '@/api/setting/dict'
+    import { apiConfigLists, apiConfigDelete } from '@/api/config'
+    import { timeFormat } from '@/utils/util'
+    import feedback from '@/utils/feedback'
+    import EditPopup from './edit.vue'
 
-    export default {
-        name: "Log",
-        data() {
-            return {
-                // 遮罩层
-                loading: true,
-                // 选中数组
-                ids: [],
-                // 非单个禁用
-                single: true,
-                // 非多个禁用
-                multiple: true,
-                // 显示搜索条件
-                showSearch: true,
-                // 总条数
-                total: 0,
-                // 操作日志记录表格数据
-                logList: [],
-                // 弹出层标题
-                title: "",
-                // 是否显示弹出层
-                open: false,
-                // 查询参数
-                queryParams: {
-                    pageNum: 1,
-                    pageSize: 10,
-                    title: null,
-                    businessType: null,
-                    method: null,
-                    requestMethod: null,
-                    operatorType: null,
-                    operName: null,
-                    deptName: null,
-                    operUrl: null,
-                    operIp: null,
-                    operLocation: null,
-                    operParam: null,
-                    jsonResult: null,
-                    status: null,
-                    errorMsg: null,
-                    operTime: null
-                },
-                // 表单参数
-                form: {},
-                // 表单校验
-                rules: {
-                }
-            };
-        },
-        created() {
-            this.getList();
-        },
-        methods: {
-            /** 查询操作日志记录列表 */
-            getList() {
-                this.loading = true;
-                listLog(this.queryParams).then(response => {
-                    this.logList = response.rows;
-                    this.total = response.total;
-                    this.loading = false;
-                });
-            },
-            // 取消按钮
-            cancel() {
-                this.open = false;
-                this.reset();
-            },
-            // 表单重置
-            reset() {
-                this.form = {
-                    operId: null,
-                    title: null,
-                    businessType: null,
-                    method: null,
-                    requestMethod: null,
-                    operatorType: null,
-                    operName: null,
-                    deptName: null,
-                    operUrl: null,
-                    operIp: null,
-                    operLocation: null,
-                    operParam: null,
-                    jsonResult: null,
-                    status: 0,
-                    errorMsg: null,
-                    operTime: null
-                };
-                this.resetForm("form");
-            },
-            /** 搜索按钮操作 */
-            handleQuery() {
-                this.queryParams.pageNum = 1;
-                this.getList();
-            },
-            /** 重置按钮操作 */
-            resetQuery() {
-                this.resetForm("queryForm");
-                this.handleQuery();
-            },
-            // 多选框选中数据
-            handleSelectionChange(selection) {
-                this.ids = selection.map(item => item.operId)
-                this.single = selection.length!==1
-                this.multiple = !selection.length
-            },
-            /** 新增按钮操作 */
-            handleAdd() {
-                this.reset();
-                this.open = true;
-                this.title = "添加操作日志记录";
-            },
-            /** 修改按钮操作 */
-            handleUpdate(row) {
-                this.reset();
-                const operId = row.operId || this.ids
-                getLog(operId).then(response => {
-                    this.form = response.data;
-                    this.open = true;
-                    this.title = "修改操作日志记录";
-                });
-            },
-            /** 提交按钮 */
-            submitForm() {
-                this.$refs["form"].validate(valid => {
-                if (valid) {
-                if (this.form.operId != null) {
-                updateLog(this.form).then(response => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-                });
-                } else {
-                addLog(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-                });
-                }
-                }
-                });
-            },
-            /** 删除按钮操作 */
-            handleDelete(row) {
-                const operIds = row.operId || this.ids;
-                this.$modal.confirm('是否确认删除操作日志记录编号为"' + operIds + '"的数据项？').then(function() {
-                return delLog(operIds);
-                }).then(() => {
-                this.getList();
-                this.$modal.msgSuccess("删除成功");
-                }).catch(() => {});
-            },
-            /** 导出按钮操作 */
-            handleExport() {
-                this.download('system/log/export', {
-                    ...this.queryParams
-                }, `log_${new Date().getTime()}.xlsx`)
-            }
-        }
-    };
+    const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+    // 是否显示编辑框
+    const showEdit = ref(false)
+
+
+    // 查询条件
+    const queryParams = reactive({
+        type: '',
+        name: '',
+        value: ''
+    })
+
+    // 选中数据
+    const selectData = ref<any[]>([])
+
+    // 表格选择后回调事件
+    const handleSelectionChange = (val: any[]) => {
+        selectData.value = val.map(({ id }) => id)
+    }
+
+    // 字典数据
+    const dictData = reactive<Record<string, any[]>>({
+
+    })
+
+    // 获取字典数据
+    const getDictData = () => {
+
+    }
+
+    // 分页相关
+    const { pager, getLists, resetParams, resetPage } = usePaging({
+        fetchFun: apiConfigLists,
+        params: queryParams
+    })
+
+    // 添加
+    const handleAdd = async () => {
+        showEdit.value = true
+        await nextTick()
+        editRef.value?.open('add')
+    }
+
+    // 编辑
+    const handleEdit = async (data: any) => {
+        showEdit.value = true
+        await nextTick()
+        editRef.value?.open('edit')
+        editRef.value?.setFormData(data)
+    }
+
+    // 删除
+    const handleDelete = async (id: number | any[]) => {
+        await feedback.confirm('确定要删除？')
+        await apiConfigDelete({ id })
+        getLists()
+    }
+
+    getLists()
+    getDictData()
 </script>
+