Merge remote-tracking branch 'origin/gva_gormv2_dev' into gva_gormv2_dev

web/src/components/upload/image.vue

@@ -1,10 +1,3 @@
-<!--
-  <div>
-    带压缩的上传
-    <upload-image v-model="imageUrl" :fileSize="512" />
-    已上传文件 {{ imageUrl }}
-  </div>
--->
 
 <template>
   <div>
@@ -17,7 +10,7 @@
       :before-upload="beforeImageUpload"
       :multiple="false"
     >
-      <img v-if="imageUrl" :src="path + imageUrl" class="image">
+      <img v-if="imageUrl" :src="showImageUrl" class="image">
       <i v-else class="el-icon-plus image-uploader-icon" />
     </el-upload>
   </div>
@@ -53,7 +46,10 @@ export default {
     }
   },
   computed: {
-    ...mapGetters('user', ['userInfo', 'token'])
+    ...mapGetters('user', ['userInfo', 'token']),
+    showImageUrl() {
+      return (this.imageUrl && this.imageUrl.slice(0, 4) !== 'http') ? path + this.imageUrl : this.imageUrl
+    }
   },
   methods: {
     beforeImageUpload(file) {
@@ -70,6 +66,7 @@ export default {
       const { data } = res
       if (data.file) {
         this.$emit('change', data.file.url)
+        this.$emit('on-success')
       }
     }
   }

web/src/core/gin-vue-admin.js

@@ -22,7 +22,7 @@ Vue.use(uploader)
 
 console.log(`
    欢迎使用 Gin-Vue-Admin
-   当前版本:V2.4.2
+   当前版本:V2.4.3
    加群方式:微信：shouzi_1994 QQ群：622360840
    默认自动化文档地址:http://127.0.0.1:${process.env.VUE_APP_SERVER_PORT}/swagger/index.html
    默认前端文件运行地址:http://127.0.0.1:${process.env.VUE_APP_CLI_PORT}

web/src/view/example/upload/upload.vue

@@ -17,7 +17,7 @@
         </el-col>
         <el-col :span="12">
           带压缩的上传, (512(k)为压缩限制)
-          <upload-image v-model="imageUrl" :file-size="512" :max-w-h="1080" />
+          <upload-image v-model="imageUrl" :file-size="512" :max-w-h="1080" @on-success="getTableData" />
           已上传文件 {{ imageUrl }}
         </el-col>
       </el-row>

web/src/view/init/index.vue

@@ -85,7 +85,7 @@ export default {
       console.log(this.hello)
     },
     goDoc() {
-      window.open('https://www.gin-vue-admin.com')
+      window.open('https://www.gin-vue-admin.com/docs/first_master#3-init')
     },
     async onSubmit() {
       const loading = this.$loading({

web/src/view/systemTools/autoCode/index.vue

@@ -60,10 +60,20 @@
       <el-form-item label="文件名称" prop="packageName">
         <el-input v-model="form.packageName" placeholder="生成文件的默认名称(建议为驼峰格式,首字母小写,如sysXxxXxxx)" />
       </el-form-item>
-      <el-form-item label="自动创建api(将API相关信息注册到数据库中)">
+      <el-form-item>
+        <template slot="label">
+          <el-tooltip content="注：把自动生成的API注册进数据库" placement="bottom" effect="light">
+            <div> 自动创建API </div>
+          </el-tooltip>
+        </template>
         <el-checkbox v-model="form.autoCreateApiToSql" />
       </el-form-item>
-      <el-form-item label="自动移动文件">
+      <el-form-item>
+        <template slot="label">
+          <el-tooltip content="注：自动迁移生成的文件到ymal配置的对应位置" placement="bottom" effect="light">
+            <div> 自动移动文件 </div>
+          </el-tooltip>
+        </template>
         <el-checkbox v-model="form.autoMoveFile" />
       </el-form-item>
     </el-form>