优化 vue3 配置,修复部分 bug
This commit is contained in:
parent
3a9a0215b0
commit
3e686bb2db
@ -36,15 +36,15 @@
|
|||||||
<!-- Job 定时任务相关 -->
|
<!-- Job 定时任务相关 -->
|
||||||
<xxl-job.version>2.3.1</xxl-job.version>
|
<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>
|
<resilience4j.version>1.7.1</resilience4j.version>
|
||||||
<!-- 监控相关 -->
|
<!-- 监控相关 -->
|
||||||
<skywalking.version>8.12.0</skywalking.version>
|
<skywalking.version>8.12.0</skywalking.version>
|
||||||
<spring-boot-admin.version>2.7.7</spring-boot-admin.version>
|
<spring-boot-admin.version>2.7.7</spring-boot-admin.version>
|
||||||
<opentracing.version>0.33.0</opentracing.version>
|
<opentracing.version>0.33.0</opentracing.version>
|
||||||
<!-- Test 测试相关 -->
|
<!-- 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>
|
<mockito-inline.version>4.8.0</mockito-inline.version>
|
||||||
<!-- Bpm 工作流相关 -->
|
<!-- Bpm 工作流相关 -->
|
||||||
<flowable.version>6.7.2</flowable.version>
|
<flowable.version>6.7.2</flowable.version>
|
||||||
@ -58,19 +58,19 @@
|
|||||||
<fastjson.version>1.2.83</fastjson.version>
|
<fastjson.version>1.2.83</fastjson.version>
|
||||||
<guava.version>31.1-jre</guava.version>
|
<guava.version>31.1-jre</guava.version>
|
||||||
<guice.version>5.1.0</guice.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>
|
<commons-net.version>3.8.0</commons-net.version>
|
||||||
<jsch.version>0.1.55</jsch.version>
|
<jsch.version>0.1.55</jsch.version>
|
||||||
<tika-core.version>2.5.0</tika-core.version>
|
<tika-core.version>2.5.0</tika-core.version>
|
||||||
<aj-captcha.version>1.3.0</aj-captcha.version>
|
<aj-captcha.version>1.3.0</aj-captcha.version>
|
||||||
<netty-all.version>4.1.82.Final</netty-all.version>
|
<netty-all.version>4.1.85.Final</netty-all.version>
|
||||||
<!-- 三方云服务相关 -->
|
<!-- 三方云服务相关 -->
|
||||||
<okio.version>3.0.0</okio.version>
|
<okio.version>3.0.0</okio.version>
|
||||||
<okhttp3.version>4.10.0</okhttp3.version>
|
<okhttp3.version>4.10.0</okhttp3.version>
|
||||||
<minio.version>8.4.6</minio.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>
|
<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>
|
<justauth.version>1.4.0</justauth.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -1,12 +1,10 @@
|
|||||||
package cn.iocoder.yudao.framework.common.util.object;
|
package cn.iocoder.yudao.framework.common.util.object;
|
||||||
|
|
||||||
import cn.hutool.core.util.ArrayUtil;
|
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
import cn.hutool.core.util.ReflectUtil;
|
import cn.hutool.core.util.ReflectUtil;
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -47,6 +45,7 @@ public class ObjectUtils {
|
|||||||
return obj1.compareTo(obj2) > 0 ? obj1 : obj2;
|
return obj1.compareTo(obj2) > 0 ? obj1 : obj2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SafeVarargs
|
||||||
public static <T> T defaultIfNull(T... array) {
|
public static <T> T defaultIfNull(T... array) {
|
||||||
for (T item : array) {
|
for (T item : array) {
|
||||||
if (item != null) {
|
if (item != null) {
|
||||||
@ -56,6 +55,7 @@ public class ObjectUtils {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SafeVarargs
|
||||||
public static <T> boolean equalsAny(T obj, T... array) {
|
public static <T> boolean equalsAny(T obj, T... array) {
|
||||||
return Arrays.asList(array).contains(obj);
|
return Arrays.asList(array).contains(obj);
|
||||||
}
|
}
|
||||||
|
@ -9,7 +9,7 @@ import javax.validation.constraints.*;
|
|||||||
#if (${column.createOperation} && (!${column.updateOperation} || !${column.listOperationResult})
|
#if (${column.createOperation} && (!${column.updateOperation} || !${column.listOperationResult})
|
||||||
&& ${column.javaType} == "LocalDateTime")## 时间类型
|
&& ${column.javaType} == "LocalDateTime")## 时间类型
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
import static ${DateUtilsClassName}.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||||
#break
|
#break
|
||||||
#end
|
#end
|
||||||
|
@ -1,7 +1,12 @@
|
|||||||
package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo;
|
package ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePackage}.${table.businessName}.vo;
|
||||||
|
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import java.util.*;
|
#foreach ($column in $columns)
|
||||||
|
#if (${column.javaType} == "LocalDateTime")
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
#break
|
||||||
|
#end
|
||||||
|
#end
|
||||||
import io.swagger.annotations.*;
|
import io.swagger.annotations.*;
|
||||||
|
|
||||||
@ApiModel("${sceneEnum.name} - ${table.classComment} Response VO")
|
@ApiModel("${sceneEnum.name} - ${table.classComment} Response VO")
|
||||||
|
@ -1,7 +1,48 @@
|
|||||||
import request from '@/config/axios'
|
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.javaType.toLowerCase()} == "bigdecimal")
|
||||||
|
${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.javaType.toLowerCase()} == "bigdecimal")
|
||||||
|
${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.javaType.toLowerCase()} == "bigdecimal")
|
||||||
|
${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}")
|
#set ($baseURL = "/${table.moduleName}/${simpleClassName_strikeCase}")
|
||||||
|
|
||||||
// 查询${table.classComment}列表
|
// 查询${table.classComment}列表
|
||||||
export const get${simpleClassName}PageApi = async (params: ${simpleClassName}PageReqVO) => {
|
export const get${simpleClassName}PageApi = async (params: ${simpleClassName}PageReqVO) => {
|
||||||
return await request.get({ url: '${baseURL}/page', params })
|
return await request.get({ url: '${baseURL}/page', params })
|
||||||
|
@ -1,111 +1,110 @@
|
|||||||
import { reactive } from 'vue'
|
import { reactive } from 'vue'
|
||||||
import { useI18n } from '@/hooks/web/useI18n'
|
import { useI18n } from '@/hooks/web/useI18n'
|
||||||
import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas'
|
|
||||||
import { DICT_TYPE } from '@/utils/dict'
|
import { DICT_TYPE } from '@/utils/dict'
|
||||||
|
import { required } from '@/utils/formRules'
|
||||||
|
import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
|
||||||
const { t } = useI18n() // 国际化
|
const { t } = useI18n() // 国际化
|
||||||
// 表单校验
|
// 表单校验
|
||||||
export const rules = reactive({
|
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
|
// CrudSchema
|
||||||
const crudSchemas = reactive<CrudSchema[]>([
|
const crudSchemas = reactive<VxeCrudSchema>({
|
||||||
#foreach($column in $columns)
|
primaryKey: 'id', // 默认的主键ID
|
||||||
#if ($column.listOperation || $column.listOperationResult || $column.createOperation || $column.updateOperation)
|
primaryTitle: t('common.index'), // 默认显示的值
|
||||||
#set ($dictType = $column.dictType)
|
primaryType: 'seq', // 默认为seq,序号模式
|
||||||
{
|
action: true,
|
||||||
label: '${column.columnComment}',
|
actionWidth: '200', // 3个按钮默认200,如有删减对应增减即可
|
||||||
field: '${column.javaField}',
|
columns: [
|
||||||
#if ("" != $dictType)## 有数据字典
|
#foreach($column in $columns)
|
||||||
dictType: DICT_TYPE.$dictType.toUpperCase(),
|
#if ($column.listOperation || $column.listOperationResult || $column.createOperation || $column.updateOperation)
|
||||||
#end
|
#set ($dictType = $column.dictType)
|
||||||
#if($column.primaryKey)
|
#if(!$column.primaryKey)
|
||||||
type: 'index',
|
{
|
||||||
form: {
|
title: '${column.columnComment}',
|
||||||
show: false
|
field: '${column.javaField}',
|
||||||
},
|
#if (!$column.listOperationResult)
|
||||||
detail: {
|
isTable: false,
|
||||||
show: false
|
#end
|
||||||
}
|
#if ("" != $dictType)## 有数据字典
|
||||||
#else
|
dictType: DICT_TYPE.$dictType.toUpperCase(),
|
||||||
#if (!$column.createOperation && !$column.updateOperation)
|
#if (${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer")
|
||||||
form: {
|
dictClass: 'number',
|
||||||
show: false
|
#else
|
||||||
},
|
dictClass: 'string',
|
||||||
#elseif(!("" != $column.dictType))
|
#end
|
||||||
form: {
|
#end
|
||||||
show: true,
|
#if (!$column.createOperation && !$column.updateOperation)
|
||||||
#if ($column.htmlType == "datetime")## 时间框
|
isForm: false,
|
||||||
component: 'DatePicker',
|
#elseif(!("" != $column.dictType))
|
||||||
componentProps: {
|
#if (${column.javaType.toLowerCase()} == "date" || ${column.javaType.toLowerCase()} == "localdatetime")
|
||||||
type: 'datetime',
|
form: {
|
||||||
valueFormat: 'YYYY-MM-DD HH:mm:ss'
|
component: 'DatePicker',
|
||||||
}
|
componentProps: {
|
||||||
|
type: 'datetime',
|
||||||
|
valueFormat: 'x'
|
||||||
|
}
|
||||||
|
},
|
||||||
#elseif($column.htmlType == "editor")## 文本编辑器
|
#elseif($column.htmlType == "editor")## 文本编辑器
|
||||||
component: 'Editor',
|
form: {
|
||||||
colProps: {
|
component: 'Editor',
|
||||||
span: 24
|
colProps: {
|
||||||
|
span: 24
|
||||||
|
},
|
||||||
|
componentProps: {
|
||||||
|
valueHtml: ''
|
||||||
|
}
|
||||||
},
|
},
|
||||||
componentProps: {
|
|
||||||
valueHtml: ''
|
|
||||||
}
|
|
||||||
#elseif($column.htmlType == "textarea")## 文本框
|
#elseif($column.htmlType == "textarea")## 文本框
|
||||||
component: 'Input',
|
form: {
|
||||||
componentProps: {
|
component: 'Input',
|
||||||
type: 'textarea',
|
componentProps: {
|
||||||
rows: 4
|
type: 'textarea',
|
||||||
|
rows: 4
|
||||||
|
},
|
||||||
|
colProps: {
|
||||||
|
span: 24
|
||||||
|
}
|
||||||
|
},
|
||||||
|
#elseif(${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer")## 数字类型
|
||||||
|
form: {
|
||||||
|
component: 'InputNumber',
|
||||||
|
value: 0
|
||||||
|
},
|
||||||
|
#elseif($column.htmlType == "imageUpload")## 图片上传
|
||||||
|
form: {
|
||||||
|
component: 'UploadImg' // 单图上传,多图为UploadImgs
|
||||||
|
},
|
||||||
|
#elseif($column.htmlType == "fileUpload")## 图片上传
|
||||||
|
form: {
|
||||||
|
component: 'UploadFile'
|
||||||
},
|
},
|
||||||
colProps: {
|
|
||||||
span: 24
|
|
||||||
}
|
|
||||||
#end
|
#end
|
||||||
},
|
#end
|
||||||
#end
|
#if ($column.listOperation)
|
||||||
#if ($column.listOperationResult)
|
|
||||||
search: {
|
|
||||||
#if($column.htmlType == "input")
|
#if($column.htmlType == "input")
|
||||||
show: true
|
isSearch: true,
|
||||||
#else
|
#elseif("" != $dictType)
|
||||||
#if($column.htmlType == "datetime")
|
isSearch: true,
|
||||||
show: true,
|
#elseif($column.htmlType == "datetime")
|
||||||
component: 'DatePicker',
|
formatter: 'formatDate',
|
||||||
componentProps: {
|
search: {
|
||||||
type: 'datetimerange',
|
show: true,
|
||||||
valueFormat: 'YYYY-MM-DD HH:mm:ss'
|
itemRender: {
|
||||||
}
|
name: 'XDataTimePicker'
|
||||||
#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
|
|
||||||
},
|
|
||||||
#end
|
|
||||||
#end
|
|
||||||
{
|
|
||||||
label: t('table.action'),
|
|
||||||
field: 'action',
|
|
||||||
width: '240px',
|
|
||||||
form: {
|
|
||||||
show: false
|
|
||||||
},
|
},
|
||||||
detail: {
|
#end
|
||||||
show: false
|
#end
|
||||||
}
|
#end
|
||||||
}
|
]
|
||||||
])
|
})
|
||||||
|
export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
|
||||||
export const { allSchemas } = useCrudSchemas(crudSchemas)
|
|
@ -1,51 +1,151 @@
|
|||||||
<script setup lang="ts">
|
<template>
|
||||||
|
<ContentWrap>
|
||||||
|
<!-- 列表 -->
|
||||||
|
<vxe-grid ref="xGrid" v-bind="gridOptions" class="xtable-scrollbar">
|
||||||
|
<template #toolbar_buttons>
|
||||||
|
<!-- 操作:新增 -->
|
||||||
|
<XButton
|
||||||
|
type="primary"
|
||||||
|
preIcon="ep:zoom-in"
|
||||||
|
:title="t('action.add')"
|
||||||
|
v-hasPermi="['${permissionPrefix}:create']"
|
||||||
|
@click="handleCreate()"
|
||||||
|
/>
|
||||||
|
<!-- 操作:导出 -->
|
||||||
|
<XButton
|
||||||
|
type="warning"
|
||||||
|
preIcon="ep:download"
|
||||||
|
:title="t('action.export')"
|
||||||
|
v-hasPermi="['${permissionPrefix}:export']"
|
||||||
|
@click="handleExport()"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
<template #actionbtns_default="{ row }">
|
||||||
|
<!-- 操作:修改 -->
|
||||||
|
<XTextButton
|
||||||
|
preIcon="ep:edit"
|
||||||
|
:title="t('action.edit')"
|
||||||
|
v-hasPermi="['${permissionPrefix}:update']"
|
||||||
|
@click="handleUpdate(row.id)"
|
||||||
|
/>
|
||||||
|
<!-- 操作:详情 -->
|
||||||
|
<XTextButton
|
||||||
|
preIcon="ep:view"
|
||||||
|
:title="t('action.detail')"
|
||||||
|
v-hasPermi="['${permissionPrefix}:query']"
|
||||||
|
@click="handleDetail(row.id)"
|
||||||
|
/>
|
||||||
|
<!-- 操作:删除 -->
|
||||||
|
<XTextButton
|
||||||
|
preIcon="ep:delete"
|
||||||
|
:title="t('action.del')"
|
||||||
|
v-hasPermi="['${permissionPrefix}:delete']"
|
||||||
|
@click="handleDelete(row.id)"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</vxe-grid>
|
||||||
|
</ContentWrap>
|
||||||
|
<!-- 弹窗 -->
|
||||||
|
<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"
|
||||||
|
/>
|
||||||
|
<!-- 表单:详情 -->
|
||||||
|
<Descriptions
|
||||||
|
v-if="actionType === 'detail'"
|
||||||
|
:schema="allSchemas.detailSchema"
|
||||||
|
:data="detailData"
|
||||||
|
/>
|
||||||
|
<template #footer>
|
||||||
|
<!-- 按钮:保存 -->
|
||||||
|
<XButton
|
||||||
|
v-if="['create', 'update'].includes(actionType)"
|
||||||
|
type="primary"
|
||||||
|
:title="t('action.save')"
|
||||||
|
:loading="actionLoading"
|
||||||
|
@click="submitForm()"
|
||||||
|
/>
|
||||||
|
<!-- 按钮:关闭 -->
|
||||||
|
<XButton :loading="actionLoading" :title="t('dialog.close')" @click="modelVisible = false" />
|
||||||
|
</template>
|
||||||
|
</XModal>
|
||||||
|
</template>
|
||||||
|
<script setup lang="ts" name="${simpleClassName}">
|
||||||
|
// 全局相关的 import
|
||||||
import { ref, unref } from 'vue'
|
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 { 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 { FormExpose } from '@/components/Form'
|
||||||
import type { ${simpleClassName}VO } from '@/api/${table.moduleName}/${classNameVar}/types'
|
// 业务相关的 import
|
||||||
import { rules, allSchemas } from './${classNameVar}.data'
|
import { rules, allSchemas } from './${classNameVar}.data'
|
||||||
import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${classNameVar}'
|
import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${classNameVar}'
|
||||||
const { t } = useI18n() // 国际化
|
|
||||||
|
|
||||||
// ========== 列表相关 ==========
|
const { t } = useI18n() // 国际化
|
||||||
const { register, tableObject, methods } = useTable<${simpleClassName}VO>({
|
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,
|
getListApi: ${simpleClassName}Api.get${simpleClassName}PageApi,
|
||||||
delListApi: ${simpleClassName}Api.delete${simpleClassName}Api,
|
deleteApi: ${simpleClassName}Api.delete${simpleClassName}Api,
|
||||||
exportListApi: ${simpleClassName}Api.export${simpleClassName}Api
|
exportListApi: ${simpleClassName}Api.export${simpleClassName}Api
|
||||||
})
|
})
|
||||||
const { getList, setSearchParams, delList, exportList } = methods
|
|
||||||
|
|
||||||
// ========== CRUD 相关 ==========
|
// 弹窗相关的变量
|
||||||
const actionLoading = ref(false) // 遮罩层
|
const modelVisible = ref(false) // 是否显示弹出层
|
||||||
|
const modelTitle = ref('edit') // 弹出层标题
|
||||||
|
const modelLoading = ref(false) // 弹出层loading
|
||||||
const actionType = ref('') // 操作按钮的类型
|
const actionType = ref('') // 操作按钮的类型
|
||||||
const dialogVisible = ref(false) // 是否显示弹出层
|
const actionLoading = ref(false) // 按钮 Loading
|
||||||
const dialogTitle = ref('edit') // 弹出层标题
|
|
||||||
const formRef = ref<FormExpose>() // 表单 Ref
|
const formRef = ref<FormExpose>() // 表单 Ref
|
||||||
|
const detailData = ref() // 详情 Ref
|
||||||
|
|
||||||
// 设置标题
|
// 设置标题
|
||||||
const setDialogTile = (type: string) => {
|
const setDialogTile = (type: string) => {
|
||||||
dialogTitle.value = t('action.' + type)
|
modelLoading.value = true
|
||||||
|
modelTitle.value = t('action.' + type)
|
||||||
actionType.value = type
|
actionType.value = type
|
||||||
dialogVisible.value = true
|
modelVisible.value = true
|
||||||
}
|
}
|
||||||
|
|
||||||
// 新增操作
|
// 新增操作
|
||||||
const handleCreate = () => {
|
const handleCreate = () => {
|
||||||
setDialogTile('create')
|
setDialogTile('create')
|
||||||
// 重置表单
|
modelLoading.value = false
|
||||||
unref(formRef)?.getElFormRef()?.resetFields()
|
}
|
||||||
|
|
||||||
|
// 导出操作
|
||||||
|
const handleExport = async () => {
|
||||||
|
await exportList(xGrid, '${table.classComment}.xls')
|
||||||
}
|
}
|
||||||
|
|
||||||
// 修改操作
|
// 修改操作
|
||||||
const handleUpdate = async (row: ${simpleClassName}VO) => {
|
const handleUpdate = async (rowId: number) => {
|
||||||
setDialogTile('update')
|
setDialogTile('update')
|
||||||
// 设置数据
|
// 设置数据
|
||||||
const res = await ${simpleClassName}Api.get${simpleClassName}Api(row.id)
|
const res = await ${simpleClassName}Api.get${simpleClassName}Api(rowId)
|
||||||
unref(formRef)?.setValues(res)
|
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)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 提交按钮
|
// 提交按钮
|
||||||
@ -57,156 +157,21 @@ const submitForm = async () => {
|
|||||||
actionLoading.value = true
|
actionLoading.value = true
|
||||||
// 提交请求
|
// 提交请求
|
||||||
try {
|
try {
|
||||||
const data = unref(formRef)?.formModel as ${simpleClassName}VO
|
const data = unref(formRef)?.formModel as ${simpleClassName}Api.${simpleClassName}VO
|
||||||
if (actionType.value === 'create') {
|
if (actionType.value === 'create') {
|
||||||
await ${simpleClassName}Api.create${simpleClassName}Api(data)
|
await ${simpleClassName}Api.create${simpleClassName}Api(data)
|
||||||
ElMessage.success(t('common.createSuccess'))
|
message.success(t('common.createSuccess'))
|
||||||
} else {
|
} else {
|
||||||
await ${simpleClassName}Api.update${simpleClassName}Api(data)
|
await ${simpleClassName}Api.update${simpleClassName}Api(data)
|
||||||
ElMessage.success(t('common.updateSuccess'))
|
message.success(t('common.updateSuccess'))
|
||||||
}
|
}
|
||||||
// 操作成功,重新加载列表
|
modelVisible.value = false
|
||||||
dialogVisible.value = false
|
|
||||||
await getList()
|
|
||||||
} finally {
|
} finally {
|
||||||
actionLoading.value = false
|
actionLoading.value = false
|
||||||
|
// 刷新列表
|
||||||
|
await getList(xGrid)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// ========== 详情相关 ==========
|
|
||||||
const detailRef = ref() // 详情 Ref
|
|
||||||
|
|
||||||
// 详情操作
|
|
||||||
const handleDetail = async (row: ${simpleClassName}VO) => {
|
|
||||||
// 设置数据
|
|
||||||
detailRef.value = row
|
|
||||||
setDialogTile('detail')
|
|
||||||
}
|
|
||||||
|
|
||||||
// ========== 初始化 ==========
|
|
||||||
getList()
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
|
||||||
<!-- 搜索工作区 -->
|
|
||||||
<ContentWrap>
|
|
||||||
<Search :schema="allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
|
|
||||||
</ContentWrap>
|
|
||||||
<ContentWrap>
|
|
||||||
<!-- 操作工具栏 -->
|
|
||||||
<div class="mb-10px">
|
|
||||||
<XButton
|
|
||||||
type="primary"
|
|
||||||
preIcon="ep:zoom-in"
|
|
||||||
:title="t('action.add')"
|
|
||||||
v-hasPermi="['${permissionPrefix}:create']"
|
|
||||||
@click="handleCreate()"
|
|
||||||
/>
|
|
||||||
<XButton
|
|
||||||
type="warning"
|
|
||||||
preIcon="ep:download"
|
|
||||||
:title="t('action.export')"
|
|
||||||
v-hasPermi="['${permissionPrefix}:export']"
|
|
||||||
@click="exportList('数据.xls')"
|
|
||||||
/>
|
|
||||||
</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 #${column.javaField}="{ row }">
|
|
||||||
<DictTag :type="DICT_TYPE.$dictType.toUpperCase()" :value="row.${column.javaField}" />
|
|
||||||
</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
|
|
||||||
type="primary"
|
|
||||||
preIcon="ep:view"
|
|
||||||
:title="t('action.detail')"
|
|
||||||
v-hasPermi="['${permissionPrefix}:update']"
|
|
||||||
@click="handleDetail(row)"
|
|
||||||
/>
|
|
||||||
<XButton
|
|
||||||
link
|
|
||||||
type="primary"
|
|
||||||
preIcon="ep:delete"
|
|
||||||
:title="t('action.del')"
|
|
||||||
v-hasPermi="['${permissionPrefix}:delete']"
|
|
||||||
@click="handleDelete(row.id)"
|
|
||||||
/>
|
|
||||||
</template>
|
|
||||||
</Table>
|
|
||||||
</ContentWrap>
|
|
||||||
|
|
||||||
<Dialog v-model="dialogVisible" :title="dialogTitle">
|
|
||||||
<!-- 对话框(添加 / 修改) -->
|
|
||||||
<Form
|
|
||||||
v-if="['create', 'update'].includes(actionType)"
|
|
||||||
:schema="allSchemas.formSchema"
|
|
||||||
:rules="rules"
|
|
||||||
ref="formRef"
|
|
||||||
/>
|
|
||||||
<!-- 对话框(详情) -->
|
|
||||||
<Descriptions
|
|
||||||
v-if="actionType === 'detail'"
|
|
||||||
:schema="allSchemas.detailSchema"
|
|
||||||
:data="detailRef"
|
|
||||||
>
|
|
||||||
#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"
|
|
||||||
/>
|
|
||||||
<XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" />
|
|
||||||
</template>
|
|
||||||
</Dialog>
|
|
||||||
</template>
|
|
||||||
|
Loading…
Reference in New Issue
Block a user