diff --git a/ant-design-vue-jeecg/src/views/tablex/TablexList.vue b/ant-design-vue-jeecg/src/views/tablex/TablexList.vue index 3206d4e..40c1507 100644 --- a/ant-design-vue-jeecg/src/views/tablex/TablexList.vue +++ b/ant-design-vue-jeecg/src/views/tablex/TablexList.vue @@ -157,7 +157,8 @@ import JEllipsis from '@/components/jeecg/JEllipsis' import FieldxList from "@/views/fieldx/FieldxList"; import {getAction, httpAction} from "@api/manage"; import {filterObj} from "@/utils/util"; -import {JVXETypes} from "@comp/jeecg/JVxeTable"; +// import {JVXETypes} from "@comp/jeecg/JVxeTable"; +import { JVXETypes } from '@/components/jeecg/JVxeTable' export default { name: 'TablexList', @@ -230,7 +231,8 @@ export default { { title:'结构图', width: '10%', key: 'structuralDiagram', - type: JVXETypes.upload, + type:JVXETypes.image, + token:true, scopedSlots: {customRender: 'imgSlot'}, align: 'center', diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java index ba44718..e4f86c2 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java @@ -49,6 +49,7 @@ import org.jeecgframework.poi.excel.entity.TemplateExportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecgframework.poi.excel.view.JeecgTemplateExcelView; +import org.jetbrains.annotations.NotNull; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -194,14 +195,14 @@ public class TablexController extends JeecgController { @AutoLog(value = "实体表-编辑") @ApiOperation(value = "实体表-编辑", notes = "实体表-编辑") @PutMapping(value = "/edit") - public Result edit(@RequestBody Tablex tablex) { + public Result edit(@NotNull @RequestBody Tablex tablex) { tablex.setVerison(tablex.getVerison() + 1); - List tablexList = tablexService.list(); - for (Tablex tablex1 : tablexList) { - if (tablex1.getModuleId().equals(tablex.getModuleId())) { - return Result.error("该模块已有实体,编辑失败"); - } - } +// List tablexList = tablexService.list(); +// for (Tablex tablex1 : tablexList) { +// if (tablex1.getModuleId().equals(tablex.getModuleId())) { +// return Result.error("该模块已有实体,编辑失败"); +// } +// } if (tablex.getModuleId() != null) { Modulex modulex = modulexService.getById(tablex.getModuleId()); tablex.setTableName(modulex.getModuleName());