增加代码模板 --预览新和代码生成新

src/api/infra/codegen/index.ts

@@ -100,10 +100,17 @@ export const syncCodegenFromDB = (id: number) => {
 export const previewCodegen = (id: number) => {
   return request.get({ url: '/infra/codegen/preview?tableId=' + id })
 }
+// 预览生成代码
+export const previewCodegenNew = (id: number) => {
+  return request.get({ url: '/infra/codegen/previewNew?tableId=' + id })
+}
 
 // 下载生成代码
 export const downloadCodegen = (id: number) => {
   return request.download({ url: '/infra/codegen/download?tableId=' + id })
+} // 下载生成代码
+export const downloadCodegenNew = (id: number) => {
+  return request.download({ url: '/infra/codegen/downloadNew?tableId=' + id })
 }
 
 // 获得表定义

src/api/infra/codegentemple/index.ts

@@ -0,0 +1,45 @@
+import request from '@/config/axios'
+
+// 代码生成表定义 VO
+export interface CodegenTempleVO {
+  id: number // 编号
+  scene: number // 生成场景
+  templeName: string // 表名称
+  templeComment: string // 表描述
+  remark: string // 备注
+  fileName: string // 文件名称
+  targetPackage: string // 目标包路径
+}
+
+// 代码生成表定义 API
+export const CodegenTempleApi = {
+  // 查询代码生成表定义分页
+  getCodegenTemplePage: async (params: any) => {
+    return await request.get({ url: `/infra/codegen-temple/page`, params })
+  },
+
+  // 查询代码生成表定义详情
+  getCodegenTemple: async (id: number) => {
+    return await request.get({ url: `/infra/codegen-temple/get?id=` + id })
+  },
+
+  // 新增代码生成表定义
+  createCodegenTemple: async (data: CodegenTempleVO) => {
+    return await request.post({ url: `/infra/codegen-temple/create`, data })
+  },
+
+  // 修改代码生成表定义
+  updateCodegenTemple: async (data: CodegenTempleVO) => {
+    return await request.put({ url: `/infra/codegen-temple/update`, data })
+  },
+
+  // 删除代码生成表定义
+  deleteCodegenTemple: async (id: number) => {
+    return await request.delete({ url: `/infra/codegen-temple/delete?id=` + id })
+  },
+
+  // 导出代码生成表定义 Excel
+  exportCodegenTemple: async (params) => {
+    return await request.download({ url: `/infra/codegen-temple/export-excel`, params })
+  }
+}

src/views/infra/codegen/PreviewCode.vue

@@ -112,7 +112,25 @@ const open = async (id: number) => {
     loading.value = false
   }
 }
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 打开弹窗 */
+const openNew = async (id: number) => {
+  dialogVisible.value = true
+  try {
+    loading.value = true
+    // 生成代码
+    const data = await CodegenApi.previewCodegenNew(id)
+    previewCodegen.value = data
+    // 处理文件
+    let file = handleFiles(data)
+    preview.fileTree = handleTree2(file, 'id', 'parentId', 'children', '/')
+    // 点击首个文件
+    preview.activeName = data[0].filePath
+  } finally {
+    loading.value = false
+  }
+}
+defineExpose({ open, openNew }) // 提供 open 方法，用于打开弹窗
 
 /** 处理文件 */
 const handleFiles = (datas: CodegenApi.CodegenPreviewVO[]) => {

src/views/infra/codegen/index.vue

@@ -73,13 +73,7 @@
         width="200"
       />
       <el-table-column align="center" label="实体" prop="className" width="200" />
-      <el-table-column
-        :formatter="dateFormatter"
-        align="center"
-        label="创建时间"
-        prop="createTime"
-        width="180"
-      />
+
       <el-table-column
         :formatter="dateFormatter"
         align="center"
@@ -87,7 +81,7 @@
         prop="createTime"
         width="180"
       />
-      <el-table-column align="center" fixed="right" label="操作" width="300px">
+      <el-table-column align="center" fixed="right" label="操作" width="500px">
         <template #default="scope">
           <el-button
             v-hasPermi="['infra:codegen:preview']"
@@ -97,6 +91,14 @@
           >
             预览
           </el-button>
+          <el-button
+            v-hasPermi="['infra:codegen:preview']"
+            link
+            type="primary"
+            @click="handlePreviewNew(scope.row)"
+          >
+            预览新
+          </el-button>
           <el-button
             v-hasPermi="['infra:codegen:update']"
             link
@@ -129,6 +131,14 @@
           >
             生成代码
           </el-button>
+          <el-button
+            v-hasPermi="['infra:codegen:download']"
+            link
+            type="primary"
+            @click="handleGenTableNew(scope.row)"
+          >
+            生成代码新
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -213,6 +223,9 @@ const previewRef = ref()
 const handlePreview = (row: CodegenApi.CodegenTableVO) => {
   previewRef.value.open(row.id)
 }
+const handlePreviewNew = (row: CodegenApi.CodegenTableVO) => {
+  previewRef.value.openNew(row.id)
+}
 
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
@@ -243,6 +256,11 @@ const handleGenTable = async (row: CodegenApi.CodegenTableVO) => {
   const res = await CodegenApi.downloadCodegen(row.id)
   download.zip(res, 'codegen-' + row.className + '.zip')
 }
+/** 生成代码操作 */
+const handleGenTableNew = async (row: CodegenApi.CodegenTableVO) => {
+  const res = await CodegenApi.downloadCodegenNew(row.id)
+  download.zip(res, 'codegen-' + row.className + '.zip')
+}
 
 /** 初始化 **/
 onMounted(async () => {

src/views/infra/codegentemple/CodegenTempleForm.vue

@@ -0,0 +1,132 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+    >
+      <el-form-item label="生成场景" prop="scene">
+        <el-select v-model="formData.scene" placeholder="请选择生成场景">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.INFRA_CODEGEN_SCENE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="模板名称" prop="templeName">
+        <el-input v-model="formData.templeName" placeholder="请输入模板名称" />
+      </el-form-item>
+      <el-form-item label="模板描述" prop="templeComment">
+        <el-input
+          v-model="formData.templeComment"
+          :rows="20"
+          placeholder="请输入模板描述"
+          type="textarea"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+      <el-form-item label="文件名称" prop="fileName">
+        <el-input v-model="formData.fileName" placeholder="请输入文件名称" />
+      </el-form-item>
+      <el-form-item label="目标包路径" prop="targetPackage">
+        <el-input v-model="formData.targetPackage" placeholder="请输入目标包路径" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { CodegenTempleApi, CodegenTempleVO } from '@/api/infra/codegentemple'
+
+/** 代码生成表定义 表单 */
+defineOptions({ name: 'CodegenTempleForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  scene: undefined,
+  templeName: undefined,
+  templeComment: undefined,
+  remark: undefined,
+  fileName: undefined,
+  targetPackage: undefined
+})
+const formRules = reactive({
+  scene: [{ required: true, message: '生成场景不能为空', trigger: 'change' }],
+  templeName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
+  templeComment: [{ required: true, message: '模板描述不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await CodegenTempleApi.getCodegenTemple(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as CodegenTempleVO
+    if (formType.value === 'create') {
+      await CodegenTempleApi.createCodegenTemple(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await CodegenTempleApi.updateCodegenTemple(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    scene: undefined,
+    templeName: undefined,
+    templeComment: undefined,
+    remark: undefined,
+    fileName: undefined,
+    targetPackage: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/infra/codegentemple/index.vue

@@ -0,0 +1,261 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      ref="queryFormRef"
+      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
+      label-width="68px"
+    >
+      <el-form-item label="生成场景" prop="scene">
+        <el-select
+          v-model="queryParams.scene"
+          class="!w-240px"
+          clearable
+          placeholder="请选择生成场景"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.INFRA_CODEGEN_SCENE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="模板名称" prop="templeName">
+        <el-input
+          v-model="queryParams.templeName"
+          class="!w-240px"
+          clearable
+          placeholder="请输入模板名称"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="模板描述" prop="templeComment">
+        <el-input
+          v-model="queryParams.templeComment"
+          class="!w-240px"
+          clearable
+          placeholder="请输入模板描述"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input
+          v-model="queryParams.remark"
+          class="!w-240px"
+          clearable
+          placeholder="请输入备注"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-220px"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item label="文件名称" prop="fileName">
+        <el-input
+          v-model="queryParams.fileName"
+          class="!w-240px"
+          clearable
+          placeholder="请输入文件名称"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="目标包路径" prop="targetPackage">
+        <el-input
+          v-model="queryParams.targetPackage"
+          class="!w-240px"
+          clearable
+          placeholder="请输入目标包路径"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-button
+          v-hasPermi="['infra:codegen-temple:create']"
+          plain
+          type="primary"
+          @click="openForm('create')"
+        >
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
+        </el-button>
+        <el-button
+          v-hasPermi="['infra:codegen-temple:export']"
+          :loading="exportLoading"
+          plain
+          type="success"
+          @click="handleExport"
+        >
+          <Icon class="mr-5px" icon="ep:download" />
+          导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+      <el-table-column align="center" label="编号" prop="id" />
+      <el-table-column align="center" label="生成场景" prop="scene">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_CODEGEN_SCENE" :value="scope.row.scene" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="模板名称" prop="templeName" />
+      <el-table-column align="center" label="模板描述" prop="templeComment" />
+      <el-table-column align="center" label="备注" prop="remark" />
+      <el-table-column
+        :formatter="dateFormatter"
+        align="center"
+        label="创建时间"
+        prop="createTime"
+        width="180px"
+      />
+      <el-table-column align="center" label="文件名称" prop="fileName" />
+      <el-table-column align="center" label="目标包路径" prop="targetPackage" />
+      <el-table-column align="center" label="操作" min-width="120px">
+        <template #default="scope">
+          <el-button
+            v-hasPermi="['infra:codegen-temple:update']"
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-hasPermi="['infra:codegen-temple:delete']"
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <CodegenTempleForm ref="formRef" @success="getList" />
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { CodegenTempleApi, CodegenTempleVO } from '@/api/infra/codegentemple'
+import CodegenTempleForm from './CodegenTempleForm.vue'
+
+/** 代码生成表定义 列表 */
+defineOptions({ name: 'CodegenTemple' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<CodegenTempleVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  scene: undefined,
+  templeName: undefined,
+  templeComment: undefined,
+  remark: undefined,
+  createTime: [],
+  fileName: undefined,
+  targetPackage: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await CodegenTempleApi.getCodegenTemplePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await CodegenTempleApi.deleteCodegenTemple(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CodegenTempleApi.exportCodegenTemple(queryParams)
+    download.excel(data, '代码生成表定义.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>