Skip to content

Commit c2db769

Browse files
committed
JeecgBoot 2.4 微服务正式版本发布,基于SpringBoot的低代码平台
1 parent 543a49f commit c2db769

4 files changed

Lines changed: 12 additions & 11 deletions

File tree

ant-design-vue-jeecg/src/components/jeecg/JImageUpload.vue

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515
@change="handleChange"
1616
@preview="handlePreview"
1717
:class="!isMultiple?'imgupload':''">
18-
<img v-if="!isMultiple && picUrl" :src="getAvatarView()" style="height:104px;max-width:300px"/>
19-
<div v-else class="iconp">
20-
<a-icon :type="uploadLoading ? 'loading' : 'plus'" />
21-
<div class="ant-upload-text">{{ text }}</div>
18+
<div style="width:104px;height:104px">
19+
<img v-if="!isMultiple && picUrl" :src="getAvatarView()" style="width:100%;height:100%"/>
20+
<div v-else class="iconp">
21+
<a-icon :type="uploadLoading ? 'loading' : 'plus'" />
22+
<div class="ant-upload-text">{{ text }}</div>
23+
</div>
2224
</div>
2325
<a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel()">
2426
<img alt="example" style="width: 100%" :src="previewImage"/>

ant-design-vue-jeecg/src/views/examples/list/CardList.vue

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
:dataSource="dataSource"
66
>
77
<a-list-item slot="renderItem" slot-scope="item, index">
8-
<template v-if="item === null">
8+
<template v-if="index === 0">
99
<a-button class="new-btn" type="dashed">
1010
<a-icon type="plus"/>
1111
新增产品
@@ -32,8 +32,7 @@
3232
<script>
3333
3434
const dataSource = []
35-
dataSource.push(null)
36-
for (let i = 0; i < 11; i++) {
35+
for (let i = 0; i < 12; i++) {
3736
dataSource.push({
3837
title: 'Alipay',
3938
avatar: 'https://gw.alipayobjects.com/zos/rmsportal/WdGqmHpayyMjiEhcKoVE.png',
@@ -95,7 +94,7 @@
9594
background-color: #fff;
9695
border-radius: 2px;
9796
width: 100%;
98-
height: 188px;
97+
height: 186px;
9998
}
10099
101100
.meta-content {

ant-design-vue-jeecg/src/views/system/modules/GateWayRouteModal.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,6 @@
174174
showInput(item, index) {
175175
this.inputVisible = true
176176
this.currentNameIndex = index
177-
this.$nextTick(function() {
178-
this.$refs.input.focus()
179-
})
180177
},
181178
//路由选项输入框失去焦点事件
182179
handleInputChange(e) {

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ public Result<?> uploadMinio(HttpServletRequest request) {
4242
String orgName = file.getOriginalFilename();// 获取文件名
4343
orgName = CommonUtils.getFileName(orgName);
4444
String file_url = MinioUtil.upload(file,bizPath);
45+
if(oConvertUtils.isEmpty(file_url)){
46+
return Result.error("上传失败,请检查配置信息是否正确!");
47+
}
4548
//保存文件信息
4649
OSSFile minioFile = new OSSFile();
4750
minioFile.setFileName(orgName);

0 commit comments

Comments
 (0)