From 816de01beecfd5ce46c6fb9b98171e4006867b71 Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Mon, 15 Aug 2022 14:58:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8-?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=A8=A1=E6=9D=BF=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hxkj/generator/util/VelocityUtil.java |  18 +-
 .../src/main/resources/vue/api.ts.vm          |  21 ++
 .../src/main/resources/vue/edit.vue.vm        | 198 +++++++++++++++++
 .../src/main/resources/vue/index-tree.vue.vm  | 199 +++++++++++++++++-
 4 files changed, 427 insertions(+), 9 deletions(-)
 create mode 100644 server/like-generator/src/main/resources/vue/api.ts.vm
 create mode 100644 server/like-generator/src/main/resources/vue/edit.vue.vm

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 91f95bfe..64f000cf 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
@@ -111,14 +111,16 @@ 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");
+        templates.add("vue/api.ts.vm");
+        templates.add("vue/edit.vue.vm");
         if (GenConstants.TPL_CRUD.equals(genTpl)) {
             templates.add("vue/index.vue.vm");
         }
diff --git a/server/like-generator/src/main/resources/vue/api.ts.vm b/server/like-generator/src/main/resources/vue/api.ts.vm
new file mode 100644
index 00000000..01a1ed4e
--- /dev/null
+++ b/server/like-generator/src/main/resources/vue/api.ts.vm
@@ -0,0 +1,21 @@
+import request from '@/utils/request'
+
+// ${functionName}列表
+export function ${moduleName}Lists(params?: Record<string, any>) {
+    return request.get({ url: '/${moduleName}/list', params })
+}
+
+// ${functionName}新增
+export function ${moduleName}Add(params: Record<string, any>) {
+    return request.post({ url: '/${moduleName}/add', params })
+}
+
+// ${functionName}编辑
+export function ${moduleName}Edit(params: Record<string, any>) {
+    return request.post({ url: '/${moduleName}/edit', params })
+}
+
+// ${functionName}删除
+export function ${moduleName}Delete(params: Record<string, any>) {
+    return request.post({ url: '/${moduleName}/del', params })
+}
diff --git a/server/like-generator/src/main/resources/vue/edit.vue.vm b/server/like-generator/src/main/resources/vue/edit.vue.vm
new file mode 100644
index 00000000..773acb80
--- /dev/null
+++ b/server/like-generator/src/main/resources/vue/edit.vue.vm
@@ -0,0 +1,198 @@
+<template>
+    <div class="edit-popup">
+        <popup
+                ref="popupRef"
+                :title="popupTitle"
+                :async="true"
+                width="550px"
+                :clickModalClose="true"
+                @confirm="handleSubmit"
+                @close="handleClose"
+        >
+            <el-form ref="formRef" :model="formData" label-width="84px" :rules="formRules">
+            #foreach ($column in $columns)
+            #if($column.isEdit)
+            #if($column.htmlType=="input")
+                <el-form-item label="${column.columnComment}" prop="${column.javaField}">
+                    <el-input v-model="formData.name" placeholder="请输入${column.columnComment}" />
+                </el-form-item>
+            #elseif($column.htmlType=="number")
+                <el-form-item label="${column.columnComment}" prop="${column.javaField}">
+                    <div>
+                        <el-input-number v-model="formData.sort" />
+                    </div>
+                </el-form-item>
+            #elseif($column.htmlType=="treeSelect")
+                <el-form-item label="${column.columnComment}" prop="${column.javaField}">
+                    <el-tree-select
+                        class="flex-1"
+                        v-model="formData.${字段名}"
+                        :data="treeList"
+                        clearable
+                        node-key="${树主键}"
+                        :props="{label: ${显示的字段名如name}}"
+                        :default-expand-all="true"
+                        placeholder="请选择${字段描述}"
+                        check-strictly
+                    />
+                </el-form-item>
+            #elseif($column.htmlType=="textarea")
+                <el-form-item label="备注" prop="remark">
+                    <el-input
+                        v-model="formData.${column.javaField}"
+                        placeholder="请输入${column.columnComment}"
+                        type="textarea"
+                        :autosize="{ minRows: 4, maxRows: 6 }"
+                    />
+                </el-form-item>
+            #elseif($column.htmlType=="checkbox")
+                <el-form-item label="${column.columnComment}" prop="${column.javaField}">
+                    <el-checkbox-group v-model="formData.${column.javaField}" placeholder="请选择${column.columnComment}">
+                        #if($column.dictType!="")
+                        <el-checkbox
+                                v-for="(item, index) in dictData.${column.dictType}"
+                                :key="index"
+                                :label="item.value"
+                                :disabled="!item.status"
+                        >
+                            {{ item.name }}
+                        </el-checkbox>
+                        #else
+                        <el-checkbox>请选择字典生成</el-checkbox>
+                        #end
+                    </el-checkbox-group>
+                </el-form-item>
+            #elseif($column.htmlType=="radio")
+                <el-form-item label="${column.columnComment}" prop="${column.javaField}">
+                    <el-radio-group v-model="formData.${column.javaField}" placeholder="请选择${column.columnComment}">
+                        #if($column.dictType!="")
+                        <el-radio
+                            v-for="(item, index) in dictData.${column.dictType}"
+                            :key="index"
+                            :label="item.value"
+                            :disabled="!item.status"
+                        >
+                            {{ item.name }}
+                        </el-radio>
+                        #else
+                        <el-radio label="0">请选择字典生成</el-radio>
+                        #end
+                    </el-radio-group>
+                </el-form-item>
+            #elseif($column.htmlType=="datetime")
+                <el-form-item label="${column.columnComment}" prop="${column.javaField}">
+                    <el-date-picker
+                        v-model="form.${column.javaField}"
+                        type="date"
+                        clearable
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择${column.columnComment}"
+                    />
+                </el-form-item>
+            #end
+            #elseif($column.htmlType=="editor")
+                <el-form-item label="${column.columnComment}" prop="${column.javaField}">
+                    <editor v-model="formData.${column.javaField}" :height="500" />
+                </el-form-item>
+            #elseif($column.htmlType=="imageUpload")
+                <el-form-item label="${column.columnComment}" prop="${column.javaField}">
+                    <material-picker v-model="formData.${column.javaField}" />
+                </el-form-item>
+            #end
+            #end
+            </el-form>
+        </popup>
+    </div>
+</template>
+<script lang="ts" setup>
+    import type { FormInstance } from 'element-plus'
+    import { ${moduleName}Edit, ${moduleName}Add, ${moduleName}All } from '@/api/${moduleName}'
+    import Popup from '@/components/popup/index.vue'
+    import feedback from '@/utils/feedback'
+    import type { PropType } from 'vue'
+    defineProps({
+        dictData: {
+            type: Object as PropType<Record<string, any[]>>,
+            default: () => ({})
+        }
+    })
+    const emit = defineEmits(['success', 'close'])
+    const formRef = shallowRef<FormInstance>()
+    const popupRef = shallowRef<InstanceType<typeof Popup>>()
+    #if($table.treePrimary && $table.treeParent)
+    const treeList = ref<any[]>([])
+    #end
+    const mode = ref('add')
+    const popupTitle = computed(() => {
+        return mode.value == 'edit' ? '编辑${functionName}' : '新增${functionName}'
+    })
+
+    const formData = reactive({
+        #foreach ($column in $columns)
+        #if($column.isEdit)
+        ${column.javaField}: '',
+        #end
+        #end
+    })
+
+    const formRules = {
+        #foreach ($column in $columns)
+        #if($column.isEdit && $column.isRequired)
+        ${column.javaField}: [
+            {
+                required: true,
+                #if($column.htmlType=="checkbox" || $column.htmlType=="datetime" || $column.htmlType=="radio" || $column.htmlType=="select")
+                message: '请选择${column.columnComment}',
+                #else
+                message: '请输入${column.columnComment}',
+                #end
+                trigger: ['blur']
+            }
+        ],
+        #end
+        #end
+    }
+
+    const handleSubmit = async () => {
+        await formRef.value?.validate()
+        mode.value == 'edit' ? await ${moduleName}Edit(formData) : await${moduleName}Add(formData)
+        popupRef.value?.close()
+        feedback.msgSuccess('操作成功')
+        emit('success')
+    }
+
+    const open = (type = 'add') => {
+        mode.value = type
+        popupRef.value?.open()
+    }
+
+    const setFormData = (data: Record<string, any>) => {
+        for (const key in formData) {
+            if (data[key] != null && data[key] != undefined) {
+                //@ts-ignore
+                formData[key] = data[key]
+            }
+        }
+    }
+
+    const handleClose = () => {
+        emit('close')
+    }
+    #if($table.treePrimary && $table.treeParent)
+
+    // 树表
+    const getLists = () => {
+        const data: any = await ${moduleName}List()
+        const item = { id: 0, menuName: '顶级', children: [] }
+        item.children = data
+        treeList.value.push(item)
+    }
+
+    getLists()
+    #end
+
+    defineExpose({
+        open,
+        setFormData
+    })
+</script>
diff --git a/server/like-generator/src/main/resources/vue/index-tree.vue.vm b/server/like-generator/src/main/resources/vue/index-tree.vue.vm
index a8b23e47..5387e5da 100644
--- a/server/like-generator/src/main/resources/vue/index-tree.vue.vm
+++ b/server/like-generator/src/main/resources/vue/index-tree.vue.vm
@@ -1 +1,198 @@
-未定的内容
\ No newline at end of file
+<template>
+    <div class="index-tree">
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
+                #foreach ($column in $columns)
+                #if($column.isQuery==1)
+                    #if($column.htmlType=="datetime")
+                    <el-form-item label="${column.columnComment}" prop="${column.javaField}">
+                        <data-picker
+                            v-model:startTime="queryParams.startTime"
+                            v-model:endTime="queryParams.endTime"
+                        />
+                    </el-form-item>
+                    #elseif($column.htmlType=="select")
+                        <el-form-item label="${column.columnComment}" prop="${column.javaField}">
+                            <el-select
+                                    v-model="queryParams.${column.javaField}"
+                                    class="w-56"
+                                    clearable
+                            >
+                                #if($column.dictType=="")
+                                    <el-option label="请选择字典生成" value="" />
+                                #else
+                                    <el-option label="全部" value="" />
+                                    <el-option
+                                            v-for="(item, index) in dictData.${column.dictType}"
+                                            :key="index"
+                                            :label="item.name"
+                                            :value="item.value"
+                                    />
+                                #end
+                            </el-select>
+                        </el-form-item>
+                    #elseif($column.htmlType=="input")
+                        <el-form-item label="${column.columnComment}" prop="${column.javaField}">
+                            <el-input class="w-56" v-model="queryParams.${column.javaField}" />
+                        </el-form-item>
+                   #end
+                #end
+                #end
+                <el-form-item>
+                    <el-button type="primary" @click="getLists">查询</el-button>
+                    <el-button @click="getLists">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" shadow="never">
+            <div>
+                <el-button v-perms="['${moduleName}:add']" type="primary" @click="handleAdd()">
+                    <template #icon>
+                        <icon name="el-icon-Plus" />
+                    </template>
+                    新增
+                </el-button>
+                <el-button @click="handleExpand"> 展开/折叠 </el-button>
+            </div>
+            <el-table
+                    v-loading="loading"
+                    ref="tableRef"
+                    class="mt-4"
+                    size="large"
+                    :data="lists"
+                    row-key="id"
+                    :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+            >
+            #foreach ($column in $columns)
+            #if($column.isList)
+                #if($column.htmlType=="imageUpload")
+                <el-table-column label="${column.columnComment}" prop="${column.javaField}" min-width="80">
+                    <template #default="{ row }">
+                        <div class="flex">
+                            <icon :name="row.${column.javaField}" :size="20" />
+                        </div>
+                    </template>
+                </el-table-column>
+                #elseif($column.htmlType=="number")
+                <el-table-column label="${column.columnComment}" prop="${column.javaField}" min-width="100" />
+                #elseif($column.htmlType=="datetime")
+                <el-table-column
+                    label="${column.columnComment}"
+                    prop="${column.javaField}"
+                    min-width="180"
+                ></el-table-column>
+                #else
+                <el-table-column
+                    label="菜单名称"
+                    prop="menuName"
+                    min-width="150"
+                    show-overflow-tooltip
+                />
+                #end
+            #end
+            #end
+                <el-table-column label="操作" width="160" fixed="right">
+                    <template #default="{ row }">
+                        <el-button
+                                v-perms="['${moduleName}:add']"
+                                type="primary"
+                                link
+                                @click="handleAdd(row.id)"
+                        >
+                            新增
+                        </el-button>
+                        <el-button
+                                v-perms="['${moduleName}:edit']"
+                                type="primary"
+                                link
+                                @click="handleEdit(row)"
+                        >
+                            编辑
+                        </el-button>
+                        <el-button
+                                v-perms="['${moduleName}:del']"
+                                type="danger"
+                                link
+                                @click="handleDelete(row.id)"
+                        >
+                            删除
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+<script lang="ts" setup>
+    import { ${moduleName}Delete, ${moduleName}Lists } from '@/api/${moduleName}'
+    import type { ElTable } from 'element-plus'
+    import { MenuEnum } from '@/enums/appEnums'
+    import EditPopup from './edit.vue'
+    import feedback from '@/utils/feedback'
+    const tableRef = shallowRef<InstanceType<typeof ElTable>>()
+    const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+    let isExpand = false
+    const showEdit = ref(false)
+    const loading = ref(false)
+    const lists = ref<any[]>([])
+
+    const queryParams = reactive({
+        #foreach ($column in $columns)
+        #if($column.isQuery)
+        ${column.javaField}: '',
+        #end
+        #end
+    })
+
+    const getLists = async () => {
+        loading.value = true
+        try {
+            const data = await ${moduleName}Lists(queryParams)
+            lists.value = data
+            loading.value = false
+        } catch (error) {
+            loading.value = false
+        }
+    }
+
+    const handleAdd = async (id?: number) => {
+        showEdit.value = true
+        await nextTick()
+        if (id) {
+            editRef.value?.setFormData({
+                pid: id
+            })
+        }
+        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 (${primaryKey}: number) => {
+        await feedback.confirm('确定要删除？')
+        await menuDelete({ ${primaryKey} })
+        getLists()
+    }
+
+    const handleExpand = () => {
+        isExpand = !isExpand
+        toggleExpand(lists.value, isExpand)
+    }
+
+    const toggleExpand = (children: any[], unfold = true) => {
+        for (const key in children) {
+            tableRef.value?.toggleRowExpansion(children[key], unfold)
+            if (children[key].children) {
+                toggleExpand(children[key].children!, unfold)
+            }
+        }
+    }
+
+    getLists()
+</script>