JeecgBoot 2.4 微服务正式版本发布，基于SpringBoot的低代码平台

jeecgboot · Nov 30, 2020 · c2db769 · c2db769
1 parent 543a49f
commit c2db769
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/ant-design-vue-jeecg/src/components/jeecg/JImageUpload.vue b/ant-design-vue-jeecg/src/components/jeecg/JImageUpload.vue
@@ -15,10 +15,12 @@
       @change="handleChange"
       @preview="handlePreview"
       :class="!isMultiple?'imgupload':''">
-      <img v-if="!isMultiple && picUrl" :src="getAvatarView()" style="height:104px;max-width:300px"/>
-      <div v-else class="iconp">
-        <a-icon :type="uploadLoading ? 'loading' : 'plus'" />
-        <div class="ant-upload-text">{{ text }}</div>
+      <div style="width:104px;height:104px">
+        <img v-if="!isMultiple && picUrl" :src="getAvatarView()" style="width:100%;height:100%"/>
+        <div v-else class="iconp">
+          <a-icon :type="uploadLoading ? 'loading' : 'plus'" />
+          <div class="ant-upload-text">{{ text }}</div>
+        </div>
       </div>
       <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel()">
         <img alt="example" style="width: 100%" :src="previewImage"/>

diff --git a/ant-design-vue-jeecg/src/views/examples/list/CardList.vue b/ant-design-vue-jeecg/src/views/examples/list/CardList.vue
@@ -5,7 +5,7 @@
       :dataSource="dataSource"
     >
       <a-list-item slot="renderItem" slot-scope="item, index">
-        <template v-if="item === null">
+        <template v-if="index === 0">
           <a-button class="new-btn" type="dashed">
             <a-icon type="plus"/>
             新增产品
@@ -32,8 +32,7 @@
 <script>
 
   const dataSource = []
-  dataSource.push(null)
-  for (let i = 0; i < 11; i++) {
+  for (let i = 0; i < 12; i++) {
     dataSource.push({
       title: 'Alipay',
       avatar: 'https://gw.alipayobjects.com/zos/rmsportal/WdGqmHpayyMjiEhcKoVE.png',
@@ -95,7 +94,7 @@
     background-color: #fff;
     border-radius: 2px;
     width: 100%;
-    height: 188px;
+    height: 186px;
   }
 
   .meta-content {

diff --git a/ant-design-vue-jeecg/src/views/system/modules/GateWayRouteModal.vue b/ant-design-vue-jeecg/src/views/system/modules/GateWayRouteModal.vue
@@ -174,9 +174,6 @@
       showInput(item, index) {
         this.inputVisible = true
         this.currentNameIndex = index
-        this.$nextTick(function() {
-          this.$refs.input.focus()
-        })
       },
       //路由选项输入框失去焦点事件
       handleInputChange(e) {

diff --git a/...-module-system/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java b/...-module-system/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java
@@ -42,6 +42,9 @@ public Result<?> uploadMinio(HttpServletRequest request) {
         String orgName = file.getOriginalFilename();// 获取文件名
         orgName = CommonUtils.getFileName(orgName);
         String file_url =  MinioUtil.upload(file,bizPath);
+        if(oConvertUtils.isEmpty(file_url)){
+            return Result.error("上传失败,请检查配置信息是否正确!");
+        }
         //保存文件信息
         OSSFile minioFile = new OSSFile();
         minioFile.setFileName(orgName);