升级最新依赖

yudao-dependencies/pom.xml

@@ -36,15 +36,15 @@
         <!-- Job 定时任务相关 -->
         <xxl-job.version>2.3.1</xxl-job.version>
         <!-- 服务保障相关 -->
-        <lock4j.version>2.2.2</lock4j.version>
+        <lock4j.version>2.2.3</lock4j.version>
         <resilience4j.version>1.7.1</resilience4j.version>
         <!-- 监控相关 -->
         <skywalking.version>8.12.0</skywalking.version>
         <spring-boot-admin.version>2.7.7</spring-boot-admin.version>
         <opentracing.version>0.33.0</opentracing.version>
         <!-- Test 测试相关 -->
-        <podam.version>7.2.9.RELEASE</podam.version>
+        <podam.version>7.2.11.RELEASE</podam.version>
-        <jedis-mock.version>1.0.4</jedis-mock.version>
+        <jedis-mock.version>1.0.5</jedis-mock.version>
         <mockito-inline.version>4.8.0</mockito-inline.version>
         <!-- Bpm 工作流相关 -->
         <flowable.version>6.7.2</flowable.version>
@@ -58,7 +58,7 @@
         <fastjson.version>1.2.83</fastjson.version>
         <guava.version>31.1-jre</guava.version>
         <guice.version>5.1.0</guice.version>
-        <transmittable-thread-local.version>2.14.0</transmittable-thread-local.version>
+        <transmittable-thread-local.version>2.14.2</transmittable-thread-local.version>
         <commons-net.version>3.8.0</commons-net.version>
         <jsch.version>0.1.55</jsch.version>
         <tika-core.version>2.5.0</tika-core.version>
@@ -68,9 +68,9 @@
         <okio.version>3.0.0</okio.version>
         <okhttp3.version>4.10.0</okhttp3.version>
         <minio.version>8.4.6</minio.version>
-        <aliyun-java-sdk-core.version>4.6.2</aliyun-java-sdk-core.version>
+        <aliyun-java-sdk-core.version>4.6.3</aliyun-java-sdk-core.version>
         <aliyun-java-sdk-dysmsapi.version>2.2.1</aliyun-java-sdk-dysmsapi.version>
-        <tencentcloud-sdk-java.version>3.1.635</tencentcloud-sdk-java.version>
+        <tencentcloud-sdk-java.version>3.1.637</tencentcloud-sdk-java.version>
         <justauth.version>1.4.0</justauth.version>
     </properties>
 

yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml

@@ -52,7 +52,7 @@
         <dependency>
             <groupId>com.alipay.sdk</groupId>
             <artifactId>alipay-sdk-java</artifactId>
-            <version>4.31.72.ALL</version>
+            <version>4.34.71.ALL</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bouncycastle</groupId>

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java

@@ -48,7 +48,7 @@ public interface BpmTaskConvert {
             return null;
         }
         try {
-            T newInstance = target.newInstance();
+            T newInstance = target.getDeclaredConstructor().newInstance();
             BeanUtils.copyProperties(source, newInstance);
             return newInstance;
         } catch (Exception e) {

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java

@@ -91,8 +91,6 @@ public class CodegenEngine {
                     vue3FilePath("views/${table.moduleName}/${classNameVar}/${classNameVar}.data.ts"))
             .put(vue3TemplatePath("api/api.ts"),
                     vue3FilePath("api/${table.moduleName}/${classNameVar}/index.ts"))
-            .put(vue3TemplatePath("api/types.ts"),
-                    vue3FilePath("api/${table.moduleName}/${classNameVar}/types.ts"))
             // SQL
             .put("codegen/sql/sql.vm", "sql/sql.sql")
             .put("codegen/sql/h2.vm", "sql/h2.sql")

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm

@@ -1,7 +1,48 @@
 import request from '@/config/axios'
-import { ${simpleClassName}VO, ${simpleClassName}PageReqVO, ${simpleClassName}ExcelReqVO } from './types'
 
+export interface ${simpleClassName}VO {
+  #foreach ($column in $columns)
+    #if ($column.createOperation || $column.updateOperation)
+      #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double")
+          ${column.javaField}: number
+      #elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime")
+          ${column.javaField}: Date
+      #else
+          ${column.javaField}: ${column.javaType.toLowerCase()}
+      #end
+    #end
+  #end
+}
+
+export interface ${simpleClassName}PageReqVO extends PageParam {
+  #foreach ($column in $columns)
+    #if (${column.listOperation})##查询操作
+      #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double")
+          ${column.javaField}?: number
+      #elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime")
+          ${column.javaField}?: Date[]
+      #else
+          ${column.javaField}?: ${column.javaType.toLowerCase()}
+      #end
+    #end
+  #end
+}
+
+export interface ${simpleClassName}ExcelReqVO {
+  #foreach ($column in $columns)
+    #if (${column.listOperation})##查询操作
+      #if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer" || ${column.javaType.toLowerCase()} == "double")
+          ${column.javaField}?: number
+      #elseif(${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime")
+          ${column.javaField}?: Date[]
+      #else
+          ${column.javaField}?: ${column.javaType.toLowerCase()}
+      #end
+    #end
+  #end
+}
 #set ($baseURL = "/${table.moduleName}/${simpleClassName_strikeCase}")
+
 // 查询${table.classComment}列表
 export const get${simpleClassName}PageApi = async (params: ${simpleClassName}PageReqVO) => {
   return await request.get({ url: '${baseURL}/page', params })

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/types.ts.vm

@@ -1,41 +0,0 @@
-export type ${simpleClassName}VO = {
-#foreach ($column in $columns)
-#if ($column.createOperation || $column.updateOperation)
-#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer")
-  ${column.javaField}: number
-#elseif(${column.javaType.toLowerCase()} == "date")
-  ${column.javaField}: string
-#else
-  ${column.javaField}: ${column.javaType.toLowerCase()}
-#end
-#end
-#end
-}
-
-export type ${simpleClassName}PageReqVO = {
-#foreach ($column in $columns)
-#if (${column.listOperation})##查询操作
-#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer")
-  ${column.javaField}: number
-#elseif(${column.javaType.toLowerCase()} == "date")
-  ${column.javaField}: string
-#else
-  ${column.javaField}: ${column.javaType.toLowerCase()}
-#end
-#end
-#end
-}
-
-export type ${simpleClassName}ExcelReqVO = {
-#foreach ($column in $columns)
-#if (${column.listOperation})##查询操作
-#if(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer")
-  ${column.javaField}: number
-#elseif(${column.javaType.toLowerCase()} == "date")
-  ${column.javaField}: string
-#else
-  ${column.javaField}: ${column.javaType.toLowerCase()}
-#end
-#end
-#end
-}

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm

@@ -1,51 +1,58 @@
 import { reactive } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
-import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
 import { DICT_TYPE } from '@/utils/dict'
+import { required } from '@/utils/formRules'
+import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
 const { t } = useI18n() // 国际化
 // 表单校验
 export const rules = reactive({
-#foreach ($column in $columns)
+  #foreach ($column in $columns)
-#if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键
+    #if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键
-#set($comment=$column.columnComment)
+      #set($comment=$column.columnComment)
-  $column.javaField: [{ required: true, message: '${comment}不能为空', trigger: #if($column.htmlType == "select")'change'#else'blur'#end }],
+        $column.javaField: [required],
-#end
+    #end
-#end
+  #end
 })
 // CrudSchema
-const crudSchemas = reactive<CrudSchema[]>([
+const crudSchemas = reactive<VxeCrudSchema>({
-#foreach($column in $columns)
+  primaryKey: 'id', // 默认的主键ID
+  primaryTitle: t('common.index'), // 默认显示的值
+  primaryType: 'seq', // 默认为seq，序号模式
+  action: true,
+  actionWidth: '200', // 3个按钮默认200，如有删减对应增减即可
+  columns: [
+    #foreach($column in $columns)
       #if ($column.listOperation || $column.listOperationResult || $column.createOperation || $column.updateOperation)
         #set ($dictType = $column.dictType)
+        #if(!$column.primaryKey)
         {
-    label: '${column.columnComment}',
+          title: '${column.columnComment}',
           field: '${column.javaField}',
+          #if (!$column.listOperationResult)
+            isTable: false,
+          #end
           #if ("" != $dictType)## 有数据字典
             dictType: DICT_TYPE.$dictType.toUpperCase(),
-    #end
+            #if (${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer")
-    #if($column.primaryKey)
+              dictData: 'number',
-    type: 'index',
-    form: {
-      show: false
-    },
-    detail: {
-      show: false
-    }
             #else
+              dictData: 'string',
+            #end
+          #end
           #if (!$column.createOperation && !$column.updateOperation)
-    form: {
+            isForm: false,
-      show: false
-    },
           #elseif(!("" != $column.dictType))
+            #if (${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime")
+              formatter: 'formatDate',
               form: {
-      show: true,
-      #if ($column.htmlType == "datetime")## 时间框
                 component: 'DatePicker',
                 componentProps: {
                   type: 'datetime',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss'
+                  valueFormat: 'x'
                 }
+              },
             #elseif($column.htmlType == "editor")## 文本编辑器
+              form: {
                 component: 'Editor',
                 colProps: {
                   span: 24
@@ -53,7 +60,9 @@ const crudSchemas = reactive<CrudSchema[]>([
                 componentProps: {
                   valueHtml: ''
                 }
+              },
             #elseif($column.htmlType == "textarea")## 文本框
+              form: {
                 component: 'Input',
                 componentProps: {
                   type: 'textarea',
@@ -62,50 +71,43 @@ const crudSchemas = reactive<CrudSchema[]>([
                 colProps: {
                   span: 24
                 }
-      #end
               },
-    #end
+            #elseif(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer")## 数字类型
-    #if ($column.listOperationResult)
-    search: {
-      #if($column.htmlType == "input")
-      show: true
-      #else
-      #if($column.htmlType == "datetime")
-      show: true,
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetimerange',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss'
-      }
-      #elseif($column.htmlType == "select" || $column.htmlType == "radio")
-      #if ("" == $dictType)## 没有数据字典
-      show: true,
-      component: 'Select',
-      componentProps: {
-        option: [{'','请选择字典生成'}]
-      }
-      #else
-      show: true
-      #end
-      #end
-      #end
-    }
-    #end
-    #end
-  },
-  #end
-#end
-  {
-    label: t('table.action'),
-    field: 'action',
-    width: '240px',
               form: {
-      show: false
+                component: 'InputNumber',
+                value: 0
               },
-    detail: {
+            #elseif($column.htmlType == "imageUpload")## 图片上传
-      show: false
+              form: {
+                component: 'UploadImg',
+                componentProps: {
+                  limit: 1
                 }
+              },
+            #elseif($column.htmlType == "fileUpload")## 图片上传
+              form: {
+                component: 'UploadFile'
+              },
+            #end
+          #end
+          #if ($column.listOperation)
+            #if($column.htmlType == "input")
+              isSearch: true,
+            #elseif("" != $dictType)
+              isSearch: true,
+            #elseif($column.htmlType == "datetime")
+              search: {
+                show: true,
+                itemRender: {
+                  name: 'XDataTimePicker'
                 }
-])
+              },
-
+            #end
-export const { allSchemas } = useCrudSchemas(crudSchemas)
+          #end
+        #end
+      },
+      #end
+    #end
+  ]
+})
+export const { allSchemas } = useVxeCrudSchemas(crudSchemas)

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm

@@ -1,102 +1,9 @@
-<script setup lang="ts">
-import { ref, unref } from 'vue'
-import dayjs from 'dayjs'
-import { ElMessage } from 'element-plus'
-import { DICT_TYPE } from '@/utils/dict'
-import { useTable } from '@/hooks/web/useTable'
-import { useI18n } from '@/hooks/web/useI18n'
-import { FormExpose } from '@/components/Form'
-import type { ${simpleClassName}VO } from '@/api/${table.moduleName}/${classNameVar}/types'
-import { rules, allSchemas } from './${classNameVar}.data'
-import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${classNameVar}'
-const { t } = useI18n() // 国际化
-
-// ========== 列表相关 ==========
-const { register, tableObject, methods } = useTable<${simpleClassName}VO>({
-  getListApi: ${simpleClassName}Api.get${simpleClassName}PageApi,
-  delListApi: ${simpleClassName}Api.delete${simpleClassName}Api,
-  exportListApi: ${simpleClassName}Api.export${simpleClassName}Api
-})
-const { getList, setSearchParams, delList, exportList } = methods
-
-// ========== CRUD 相关 ==========
-const actionLoading = ref(false) // 遮罩层
-const actionType = ref('') // 操作按钮的类型
-const dialogVisible = ref(false) // 是否显示弹出层
-const dialogTitle = ref('edit') // 弹出层标题
-const formRef = ref<FormExpose>() // 表单 Ref
-
-// 设置标题
-const setDialogTile = (type: string) => {
-  dialogTitle.value = t('action.' + type)
-  actionType.value = type
-  dialogVisible.value = true
-}
-
-// 新增操作
-const handleCreate = () => {
-  setDialogTile('create')
-  // 重置表单
-  unref(formRef)?.getElFormRef()?.resetFields()
-}
-
-// 修改操作
-const handleUpdate = async (row: ${simpleClassName}VO) => {
-  setDialogTile('update')
-  // 设置数据
-  const res = await ${simpleClassName}Api.get${simpleClassName}Api(row.id)
-  unref(formRef)?.setValues(res)
-}
-
-// 提交按钮
-const submitForm = async () => {
-  const elForm = unref(formRef)?.getElFormRef()
-  if (!elForm) return
-  elForm.validate(async (valid) => {
-    if (valid) {
-      actionLoading.value = true
-      // 提交请求
-      try {
-        const data = unref(formRef)?.formModel as ${simpleClassName}VO
-        if (actionType.value === 'create') {
-          await ${simpleClassName}Api.create${simpleClassName}Api(data)
-          ElMessage.success(t('common.createSuccess'))
-        } else {
-          await ${simpleClassName}Api.update${simpleClassName}Api(data)
-          ElMessage.success(t('common.updateSuccess'))
-        }
-        // 操作成功，重新加载列表
-        dialogVisible.value = false
-        await getList()
-      } finally {
-        actionLoading.value = false
-      }
-    }
-  })
-}
-
-// ========== 详情相关 ==========
-const detailRef = ref() // 详情 Ref
-
-// 详情操作
-const handleDetail = async (row: ${simpleClassName}VO) => {
-  // 设置数据
-  detailRef.value = row
-  setDialogTile('detail')
-}
-
-// ========== 初始化 ==========
-getList()
-</script>
-
 <template>
-  <!-- 搜索工作区 -->
   <ContentWrap>
-    <Search :schema="allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <!-- 列表 -->
-  </ContentWrap>
+    <vxe-grid ref="xGrid" v-bind="gridOptions" class="xtable-scrollbar">
-  <ContentWrap>
+      <template #toolbar_buttons>
-    <!-- 操作工具栏 -->
+        <!-- 操作：新增 -->
-    <div class="mb-10px">
         <XButton
                 type="primary"
                 preIcon="ep:zoom-in"
@@ -104,109 +11,167 @@ getList()
                 v-hasPermi="['${permissionPrefix}:create']"
                 @click="handleCreate()"
         />
+        <!-- 操作：导出 -->
         <XButton
                 type="warning"
                 preIcon="ep:download"
                 :title="t('action.export')"
                 v-hasPermi="['${permissionPrefix}:export']"
-        @click="exportList('数据.xls')"
+                @click="handleExport()"
         />
-    </div>
-    <!-- 列表 -->
-    <Table
-      :columns="allSchemas.tableColumns"
-      :selection="false"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
-      :pagination="{
-        total: tableObject.total
-      }"
-      v-model:pageSize="tableObject.pageSize"
-      v-model:currentPage="tableObject.currentPage"
-      @register="register"
-    >
-#foreach($column in $columns)
-#if ($column.listOperationResult)
-  #set ($dictType=$column.dictType)
-  #if ($column.javaType == "LocalDateTime")## 时间类型
-      <template #${column.javaField}="{ row }">
-        <span>{{ dayjs(row.${column.javaField}).format('YYYY-MM-DD HH:mm:ss') }}</span>
       </template>
-  #elseif("" != $column.dictType)## 数据字典
+      <template #actionbtns_default="{ row }">
-      <template #${column.javaField}="{ row }">
+        <!-- 操作：修改 -->
-        <DictTag :type="DICT_TYPE.$dictType.toUpperCase()" :value="row.${column.javaField}" />
+        <XTextButton
-      </template>
-  #end
-#end
-#end
-      <template #action="{ row }">
-        <XButton
-          link
-          type="primary"
                 preIcon="ep:edit"
                 :title="t('action.edit')"
                 v-hasPermi="['${permissionPrefix}:update']"
                 @click="handleUpdate(row.id)"
         />
-        <XButton
+        <!-- 操作：详情 -->
-          link
+        <XTextButton
-          type="primary"
                 preIcon="ep:view"
                 :title="t('action.detail')"
-          v-hasPermi="['${permissionPrefix}:update']"
+                v-hasPermi="['${permissionPrefix}:query']"
-          @click="handleDetail(row)"
+                @click="handleDetail(row.id)"
         />
-        <XButton
+        <!-- 操作：删除 -->
-          link
+        <XTextButton
-          type="primary"
                 preIcon="ep:delete"
                 :title="t('action.del')"
                 v-hasPermi="['${permissionPrefix}:delete']"
                 @click="handleDelete(row.id)"
         />
       </template>
-    </Table>
+    </vxe-grid>
   </ContentWrap>
-
+  <!-- 弹窗 -->
-  <Dialog v-model="dialogVisible" :title="dialogTitle">
+  <XModal id="${classNameVar}Model" :loading="modelLoading" v-model="modelVisible" :title="modelTitle">
-    <!-- 对话框(添加 / 修改) -->
+    <!-- 表单：添加/修改 -->
     <Form
+            ref="formRef"
             v-if="['create', 'update'].includes(actionType)"
             :schema="allSchemas.formSchema"
             :rules="rules"
-      ref="formRef"
     />
-    <!-- 对话框(详情) -->
+    <!-- 表单：详情 -->
     <Descriptions
             v-if="actionType === 'detail'"
             :schema="allSchemas.detailSchema"
-      :data="detailRef"
+            :data="detailData"
-    >
+    />
-#foreach($column in $columns)
-  #if ($column.listOperationResult)
-    #set ($dictType=$column.dictType)
-    #if ($column.javaType == "LocalDateTime")## 时间类型
-      <template #${column.javaField}="{ row }">
-        <span>{{ dayjs(row.${column.javaField}).format('YYYY-MM-DD HH:mm:ss') }}</span>
-      </template>
-    #elseif("" != $column.dictType)## 数据字典
-      <template #${column.javaField}="{ row }">
-        <DictTag :type="DICT_TYPE.$dictType.toUpperCase()" :value="row.${column.javaField}" />
-      </template>
-    #end
-  #end
-#end
-    </Descriptions>
-    <!-- 操作按钮 -->
     <template #footer>
+      <!-- 按钮：保存 -->
       <XButton
               v-if="['create', 'update'].includes(actionType)"
-        :loading="actionLoading"
-        :title="t('action.save')"
               type="primary"
-        @click="submitForm"
+              :title="t('action.save')"
+              :loading="actionLoading"
+              @click="submitForm()"
       />
-      <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" />
+      <!-- 按钮：关闭 -->
+      <XButton :loading="actionLoading" :title="t('dialog.close')" @click="modelVisible = false" />
     </template>
-  </Dialog>
+  </XModal>
 </template>
+<script setup lang="ts" name="${simpleClassName}">
+  // 全局相关的 import
+  import { ref, unref } from 'vue'
+  import { useI18n } from '@/hooks/web/useI18n'
+  import { useMessage } from '@/hooks/web/useMessage'
+  import { useVxeGrid } from '@/hooks/web/useVxeGrid'
+  import { VxeGridInstance } from 'vxe-table'
+  import { FormExpose } from '@/components/Form'
+  // 业务相关的 import
+  import { rules, allSchemas } from './${classNameVar}.data'
+  import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${classNameVar}'
+
+  const { t } = useI18n() // 国际化
+  const message = useMessage() // 消息弹窗
+
+  // 列表相关的变量
+  const xGrid = ref<VxeGridInstance>() // 列表 Grid Ref
+  const { gridOptions, getList, deleteData, exportList } = useVxeGrid<${simpleClassName}Api.${simpleClassName}VO>({
+    allSchemas: allSchemas,
+    getListApi: ${simpleClassName}Api.get${simpleClassName}PageApi,
+    deleteApi: ${simpleClassName}Api.delete${simpleClassName}Api,
+    exportListApi: ${simpleClassName}Api.export${simpleClassName}Api
+  })
+
+  // 弹窗相关的变量
+  const modelVisible = ref(false) // 是否显示弹出层
+  const modelTitle = ref('edit') // 弹出层标题
+  const modelLoading = ref(false) // 弹出层loading
+  const actionType = ref('') // 操作按钮的类型
+  const actionLoading = ref(false) // 按钮 Loading
+  const formRef = ref<FormExpose>() // 表单 Ref
+  const detailData = ref() // 详情 Ref
+
+  // 设置标题
+  const setDialogTile = (type: string) => {
+    modelLoading.value = true
+    modelTitle.value = t('action.' + type)
+    actionType.value = type
+    modelVisible.value = true
+  }
+
+  // 新增操作
+  const handleCreate = () => {
+    setDialogTile('create')
+    modelLoading.value = false
+  }
+
+  // 导出操作
+  const handleExport = async () => {
+    await exportList(xGrid, '${table.classComment}.xls')
+  }
+
+  // 修改操作
+  const handleUpdate = async (rowId: number) => {
+    setDialogTile('update')
+    // 设置数据
+    const res = await ${simpleClassName}Api.get${simpleClassName}Api(rowId)
+    unref(formRef)?.setValues(res)
+    modelLoading.value = false
+  }
+
+  // 详情操作
+  const handleDetail = async (rowId: number) => {
+    setDialogTile('detail')
+    const res = await ${simpleClassName}Api.get${simpleClassName}Api(rowId)
+    detailData.value = res
+    modelLoading.value = false
+  }
+
+  // 删除操作
+  const handleDelete = async (rowId: number) => {
+    await deleteData(xGrid, rowId)
+  }
+
+  // 提交按钮
+  const submitForm = async () => {
+    const elForm = unref(formRef)?.getElFormRef()
+    if (!elForm) return
+    elForm.validate(async (valid) => {
+      if (valid) {
+        actionLoading.value = true
+        // 提交请求
+        try {
+          const data = unref(formRef)?.formModel as ${simpleClassName}Api.${simpleClassName}VO
+          if (actionType.value === 'create') {
+            await ${simpleClassName}Api.create${simpleClassName}Api(data)
+            message.success(t('common.createSuccess'))
+          } else {
+            await ${simpleClassName}Api.update${simpleClassName}Api(data)
+            message.success(t('common.updateSuccess'))
+          }
+          modelVisible.value = false
+        } finally {
+          actionLoading.value = false
+          // 刷新列表
+          await getList(xGrid)
+        }
+      }
+    })
+  }
+</script>

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java

@@ -86,11 +86,30 @@ public class MenuServiceImpl implements MenuService {
     @Override
     @PostConstruct
     public synchronized void initLocalCache() {
-        // 获取菜单列表，如果有更新
+        initLocalCacheIfUpdate(null);
-        List<MenuDO> menuList = this.loadMenuIfUpdate(maxUpdateTime);
+    }
-        if (CollUtil.isEmpty(menuList)) {
+
+    @Scheduled(fixedDelay = SCHEDULER_PERIOD, initialDelay = SCHEDULER_PERIOD)
+    public void schedulePeriodicRefresh() {
+        initLocalCacheIfUpdate(this.maxUpdateTime);
+    }
+
+    /**
+     * 刷新本地缓存
+     *
+     * @param maxUpdateTime 最大更新时间
+     *                      1. 如果 maxUpdateTime 为 null，则“强制”刷新缓存
+     *                      2. 如果 maxUpdateTime 不为 null，判断自 maxUpdateTime 是否有数据发生变化，有的情况下才刷新缓存
+     */
+    private void initLocalCacheIfUpdate(LocalDateTime maxUpdateTime) {
+        // 如果没有增量的数据变化，则不进行本地缓存的刷新
+        if (maxUpdateTime != null
+                && menuMapper.selectCountByUpdateTimeGt(maxUpdateTime) == 0) {
+            log.info("[initLocalCacheIfUpdate][数据未发生变化({})，本地缓存不刷新]", maxUpdateTime);
             return;
         }
+        List<MenuDO> menuList = menuMapper.selectList();
+        log.info("[initLocalCacheIfUpdate][缓存菜单，数量为:{}]", menuList.size());
 
         // 构建缓存
         ImmutableMap.Builder<Long, MenuDO> menuCacheBuilder = ImmutableMap.builder();
@@ -103,34 +122,9 @@ public class MenuServiceImpl implements MenuService {
         });
         menuCache = menuCacheBuilder.build();
         permissionMenuCache = permMenuCacheBuilder.build();
-        maxUpdateTime = CollectionUtils.getMaxValue(menuList, MenuDO::getUpdateTime);
-        log.info("[initLocalCache][缓存菜单，数量为:{}]", menuList.size());
-    }
 
-    @Scheduled(fixedDelay = SCHEDULER_PERIOD, initialDelay = SCHEDULER_PERIOD)
+        // 设置最新的 maxUpdateTime，用于下次的增量判断
-    public void schedulePeriodicRefresh() {
+        this.maxUpdateTime = CollectionUtils.getMaxValue(menuList, MenuDO::getUpdateTime);
-        initLocalCache();
-    }
-
-    /**
-     * 如果菜单发生变化，从数据库中获取最新的全量菜单。
-     * 如果未发生变化，则返回空
-     *
-     * @param maxUpdateTime 当前菜单的最大更新时间
-     * @return 菜单列表
-     */
-    private List<MenuDO> loadMenuIfUpdate(LocalDateTime maxUpdateTime) {
-        // 第一步，判断是否要更新。
-        if (maxUpdateTime == null) { // 如果更新时间为空，说明 DB 一定有新数据
-            log.info("[loadMenuIfUpdate][首次加载全量菜单]");
-        } else { // 判断数据库中是否有更新的菜单
-            if (menuMapper.selectCountByUpdateTimeGt(maxUpdateTime) == 0) {
-                return null;
-            }
-            log.info("[loadMenuIfUpdate][增量加载全量菜单]");
-        }
-        // 第二步，如果有更新，则从数据库加载所有菜单
-        return menuMapper.selectList();
     }
 
     @Override